239 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.3/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/pom.xml
index 357c9a87f8..357c9a87f8 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
index 2056789089..2056789089 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index e182b472d4..e182b472d4 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
index 38ca2cd10c..38ca2cd10c 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Array2ArrayTransformer.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
index 124928db24..124928db24 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReference2XMLStreamReader.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
index 7384b8a31d..7384b8a31d 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceDataBinding.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
index ff6e444dcd..ff6e444dcd 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/CallableReferenceXMLAdapter.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
index 6e2e714bdb..6e2e714bdb 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
index fb5f939edb..fb5f939edb 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
index 8d586905c4..8d586905c4 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
index 841efa9398..841efa9398 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/transformers/XMLStreamReader2CallableReference.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index e5965db2c5..e5965db2c5 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
index 5814f3d215..5814f3d215 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/DataTransformationInterceptor.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
index 3586f54d71..3586f54d71 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/wire/PassByValueInterceptor.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index baba638c9b..baba638c9b 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index b0c39e18ef..b0c39e18ef 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
index 7d49fb7112..7d49fb7112 100644
--- a/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-databinding/src/test/java/org/apache/tuscany/sca/core/databinding/transformers/IDLTransformerTestCaseFIXME.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/LICENSE
diff --git a/branches/sca-java-1.3.3/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/NOTICE
diff --git a/branches/sca-java-1.3.3/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/pom.xml
index 2edbb4ce78..2edbb4ce78 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/pom.xml
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
index ed4b57639c..ed4b57639c 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ComponentContextFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
index e92a8f2844..e92a8f2844 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/ContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
index 5a0aefe55d..5a0aefe55d 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
index 9766e164b8..9766e164b8 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/PropertyValueFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
index 546757c766..546757c766 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/RequestContextFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
index 41735261e6..41735261e6 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/DefaultEndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
index 79a10f6d84..79a10f6d84 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolver.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
index fdd304a9c7..fdd304a9c7 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
index be55981131..be55981131 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/endpointresolver/EndpointResolverFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 992c1188f7..992c1188f7 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index d17aebd7e8..d17aebd7e8 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index f209eb8936..f209eb8936 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index f888908340..f888908340 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
index 957a15ce8a..957a15ce8a 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/DataExchangeSemantics.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index 75719bb0cc..75719bb0cc 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index 4c27c8b06f..4c27c8b06f 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index 38c900e36a..38c900e36a 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
index 2deb273f84..2deb273f84 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Phase.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3887db4873..3887db4873 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 51e5e91589..51e5e91589 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
index 068d0d12d7..068d0d12d7 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultSCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index 015c673d66..015c673d66 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
index f2b59a7c54..f2b59a7c54 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyImplementor.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
index 644283dea1..644283dea1 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProvider.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
index b60a14d2da..b60a14d2da 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/PolicyProviderFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index d8f9973338..d8f9973338 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index b3ab1d8b87..b3ab1d8b87 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
index bd0f4d4b75..bd0f4d4b75 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProvider.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
index b05130d6c8..b05130d6c8 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderException.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
index a5d60cc6eb..a5d60cc6eb 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/SCADefinitionsProviderExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index e15234a549..e15234a549 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index b6fafa5fb6..b6fafa5fb6 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
index 0e19538aff..0e19538aff 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/ReferenceParameters.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index 30bba78a40..30bba78a40 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
index 801bb9e294..801bb9e294 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentContext.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 44ae7f552a..44ae7f552a 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 982724d798..982724d798 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index da37385af1..da37385af1 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 7d5cd6c54b..7d5cd6c54b 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 24eaddd3e0..24eaddd3e0 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 4bc7facf39..4bc7facf39 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index c2346bddca..c2346bddca 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index b37519b31c..b37519b31c 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index d32af450ff..d32af450ff 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index b1beac78e2..b1beac78e2 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index 18ec2dfeaa..18ec2dfeaa 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
index ddd91bceac..ddd91bceac 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.ContextFactoryExtensionPoint
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
index 91839e998f..91839e998f 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactoryExtensionPoint
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
index e9de1f135f..e9de1f135f 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
index 2f700671ca..2f700671ca 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCADefinitionsProviderExtensionPoint
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
index 95591dca5d..95591dca5d 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessorExtensionPoint
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
index 3a27569a3b..3a27569a3b 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/context/DefaultContextFactoryExtensionPointTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
index 2425133273..2425133273 100644
--- a/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spi/src/test/java/org/apache/tuscany/sca/event/TrueFilterTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/LICENSE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/LICENSE
diff --git a/branches/sca-java-1.3.3/modules/core-spring/NOTICE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/NOTICE
diff --git a/branches/sca-java-1.3.3/modules/core-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/pom.xml
index 21a43068c2..21a43068c2 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/pom.xml
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index 94bd5c8cf2..94bd5c8cf2 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 05bb50d496..05bb50d496 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index 7b747372b4..7b747372b4 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index b275bfa9a7..b275bfa9a7 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 7855818904..7855818904 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 54818c8e8b..54818c8e8b 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
index 6b19bac413..6b19bac413 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 27dc7ec6c7..27dc7ec6c7 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
index 17a7e9084c..17a7e9084c 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
index 492ab2732e..492ab2732e 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index f3c84e900b..f3c84e900b 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddService.java
index f3a24ed6b2..f3a24ed6b2 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index 61654ea811..61654ea811 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 73aa028084..73aa028084 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideService.java
index 7c69b10b25..7c69b10b25 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyService.java
index 686542c18e..686542c18e 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index e8e4a6f71b..e8e4a6f71b 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractService.java
index 30632688f9..30632688f9 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 44b447cc64..44b447cc64 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
index baf73ac197..baf73ac197 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/branches/sca-java-1.3.3/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.3.3/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/LICENSE
diff --git a/branches/sca-java-1.3.3/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.3.3/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/NOTICE
diff --git a/branches/sca-java-1.3.3/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/pom.xml
index 5fa3767cd5..5fa3767cd5 100644
--- a/branches/sca-java-1.3.3/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/pom.xml
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
index c86c876075..c86c876075 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ActivationException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
index 29dcc20f0b..29dcc20f0b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivator.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
index d205cbf823..d205cbf823 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
index 78096b20ab..78096b20ab 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointReferenceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
index 87dbf0eeac..87dbf0eeac 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/EndpointWireImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
index c82543c4ca..c82543c4ca 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParameterProcessor.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
index 14a5f565fc..14a5f565fc 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/ReferenceParametersImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
index b174dea6ce..b174dea6ce 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
index be594994cc..be594994cc 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
index b840de42a8..b840de42a8 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
index 14b38fdd73..14b38fdd73 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
index 9a02c200b3..9a02c200b3 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/RuntimeWireImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
index 5b8ad81545..5b8ad81545 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/CallableReferenceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
index 78b0887482..78b0887482 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextHelper.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
index 33de9f34bb..33de9f34bb 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ComponentContextImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
index c5b68389b2..c5b68389b2 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/DefaultComponentContextFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
index b577180291..b577180291 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/InstanceWrapper.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
index aa69bb3ae5..aa69bb3ae5 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/RequestContextImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
index 857a193260..857a193260 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/context/ServiceReferenceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
index efa362a929..efa362a929 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationListener.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
index 28e22b4f2c..28e22b4f2c 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManager.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
index 0aa9430666..0aa9430666 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationManagerImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
index 692d6861ba..692d6861ba 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ConversationState.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
index 03c18c26b8..03c18c26b8 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversation.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
index 0bf66b2817..0bf66b2817 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/conversation/ExtendedConversationImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 45eab7da1b..45eab7da1b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index 4dc79c3844..4dc79c3844 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index d3106c7052..d3106c7052 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index 123400fbdd..123400fbdd 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 68cb5c2966..68cb5c2966 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 38a4fb10d6..38a4fb10d6 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index d7e797bbb9..d7e797bbb9 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 7530156b11..7530156b11 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
index d35b27fd24..d35b27fd24 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectCreationException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
index 3f64d2405b..3f64d2405b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/factory/ObjectFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
index 588c43b8b1..588c43b8b1 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallableReferenceObjectFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index d19aa237cd..d19aa237cd 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
index dcc1312a3f..dcc1312a3f 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
index b5b40811ad..b5b40811ad 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackReferenceObjectFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index 2b37c30451..2b37c30451 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
index 0fa1d27d2a..0fa1d27d2a 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CglibProxyFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
index 9acb4be6f8..9acb4be6f8 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/DefaultProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
index fcb48259b9..fcb48259b9 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleProxyFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index 1a33e91a98..1a33e91a98 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index cade0499d3..cade0499d3 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index a23b9af9ad..a23b9af9ad 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
index a2cbd1365b..a2cbd1365b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index b5b41b9d00..b5b41b9d00 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index 733544d387..733544d387 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index e83f9e64f9..e83f9e64f9 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
index 4c98066fa2..4c98066fa2 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseManager.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
index fc4bea3d9f..fc4bea3d9f 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/PhaseSorter.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 0b36b178f3..0b36b178f3 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index cb836e42c1..cb836e42c1 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
index 875a252798..875a252798 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactoryExtensionPoint.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
index c007669bdf..c007669bdf 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/RuntimeWireInvoker.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
index 1112d02b7e..1112d02b7e 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/SCAProxy.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
index 2c4d657882..2c4d657882 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/TargetInvocationException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 504bd9b036..504bd9b036 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index 246f9c45d6..246f9c45d6 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 1168d1d0dd..1168d1d0dd 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 7e7ab7a9e4..7e7ab7a9e4 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 786988613b..786988613b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index deea96e641..deea96e641 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index a6663aba09..a6663aba09 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index 5ae8b94647..5ae8b94647 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index 49f89661b1..49f89661b1 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index f11a61e662..f11a61e662 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 1cfb6b06a4..1cfb6b06a4 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
index 0a20d793f7..0a20d793f7 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/Scope.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
index 6b2980b989..6b2980b989 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
index b19c14b3e0..b19c14b3e0 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
index 842ed4c547..842ed4c547 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistry.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 75261e11a8..75261e11a8 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
index 85a6626cdd..85a6626cdd 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
index c27b112f8a..c27b112f8a 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index a2c0edb9b4..a2c0edb9b4 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index 0471b2c52e..0471b2c52e 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
index 0f83dad97d..0f83dad97d 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetDestructionException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
index 15959c0608..15959c0608 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetInitializationException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
index bb46a2499b..bb46a2499b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
index ea8d0e876c..ea8d0e876c 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/TargetResolutionException.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index adeb667277..adeb667277 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index b331517c85..b331517c85 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index fb47a65edf..fb47a65edf 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 67d2b66f84..67d2b66f84 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index 170319b6e6..170319b6e6 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5f54178483..5f54178483 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
index 898054509b..898054509b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.conversation.ConversationManager
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
index af281d8f4d..af281d8f4d 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.invocation.ProxyFactoryExtensionPoint
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
index bcbd5b0abf..bcbd5b0abf 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.invocation.MessageFactory
diff --git a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
index 56e99be0f2..56e99be0f2 100644
--- a/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/main/resources/META-INF/services/org.apache.tuscany.sca.work.WorkScheduler
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 7b44736d4b..7b44736d4b 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index 2bc78c3d35..2bc78c3d35 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index 48dcf8df07..48dcf8df07 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
index 99d5ec7bc9..99d5ec7bc9 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseManagerTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
index 61164fa2de..61164fa2de 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/invocation/PhaseSorterTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 64114f7fb2..64114f7fb2 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index d46d77b4b8..d46d77b4b8 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 1aba9656d8..1aba9656d8 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 1ad0927d16..1ad0927d16 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index b8150d4edc..b8150d4edc 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
index 3184c3de92..3184c3de92 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/FailingWork.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
index cdf47cf970..cdf47cf970 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyFailingRunnable.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
index a7617f7a70..a7617f7a70 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnable.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
index 75840efef4..75840efef4 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/JSR237MyRunnerListener.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
index 225f23cb93..225f23cb93 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/Jsr237WorkSchedulerTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
index ba32a92c18..ba32a92c18 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TestWorkListener.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
index 715f5f95c0..715f5f95c0 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManagerTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
index 3b30d86f14..3b30d86f14 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/core/work/TimeDelayWork.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 341d889b7d..341d889b7d 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
diff --git a/branches/sca-java-1.3.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
index 9ed0928a33..9ed0928a33 100644
--- a/branches/sca-java-1.3.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest
+++ b/sca-java-1.x/branches/sca-java-1.3.3/modules/core/src/test/resources/META-INF/services/org.apache.tuscany.sca.invocation.PhaseTest