242 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-0.91/modules/core-databinding/.checkstyle b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/.checkstyle
index c7b30ffd5e..c7b30ffd5e 100644
--- a/branches/sca-java-0.91/modules/core-databinding/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/.checkstyle
diff --git a/branches/sca-java-0.91/modules/core-databinding/.pmd b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/.pmd
index 2db10d6a6a..2db10d6a6a 100644
--- a/branches/sca-java-0.91/modules/core-databinding/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/.pmd
diff --git a/branches/sca-java-0.91/modules/core-databinding/.ruleset b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.91/modules/core-databinding/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/.ruleset
diff --git a/branches/sca-java-0.91/modules/core-databinding/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.91/modules/core-databinding/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/DISCLAIMER
diff --git a/branches/sca-java-0.91/modules/core-databinding/LICENSE b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.91/modules/core-databinding/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/LICENSE
diff --git a/branches/sca-java-0.91/modules/core-databinding/NOTICE b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.91/modules/core-databinding/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/NOTICE
diff --git a/branches/sca-java-0.91/modules/core-databinding/pom.xml b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/pom.xml
index 9fb6d998b6..9fb6d998b6 100644
--- a/branches/sca-java-0.91/modules/core-databinding/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/pom.xml
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
index 32666174b2..32666174b2 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/module/DataBindingModuleActivator.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
index b26846c682..b26846c682 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
index 9711fe881a..9711fe881a 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Exception2ExceptionTransformer.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
index 88d47deed7..88d47deed7 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Input2InputTransformer.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
index b1bc8dfe1b..b1bc8dfe1b 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/transformers/Output2OutputTransformer.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
index feaf48f501..feaf48f501 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataBindingRuntimeWireProcessor.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java
index 39bc6cf913..39bc6cf913 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/java/org/apache/tuscany/core/databinding/wire/DataTransformationInteceptor.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 60f6de3b96..60f6de3b96 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
index 1c521af842..1c521af842 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/processor/DataBindingJavaInterfaceProcessorTestCase.java
diff --git a/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme
index ecae54188c..ecae54188c 100644
--- a/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-databinding/src/test/java/org/apache/tuscany/core/databinding/transformers/IDLTransformerTestCase.java.fixme
diff --git a/branches/sca-java-0.91/modules/core-spi/.checkstyle b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.91/modules/core-spi/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/.checkstyle
diff --git a/branches/sca-java-0.91/modules/core-spi/.pmd b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/.pmd
index 4abfdec2b5..4abfdec2b5 100644
--- a/branches/sca-java-0.91/modules/core-spi/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/.pmd
diff --git a/branches/sca-java-0.91/modules/core-spi/.ruleset b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/.ruleset
index 3886f07f2d..3886f07f2d 100644
--- a/branches/sca-java-0.91/modules/core-spi/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/.ruleset
diff --git a/branches/sca-java-0.91/modules/core-spi/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.91/modules/core-spi/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/DISCLAIMER
diff --git a/branches/sca-java-0.91/modules/core-spi/LICENSE b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.91/modules/core-spi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/LICENSE
diff --git a/branches/sca-java-0.91/modules/core-spi/NOTICE b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.91/modules/core-spi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/NOTICE
diff --git a/branches/sca-java-0.91/modules/core-spi/pom.xml b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/pom.xml
index a8981db137..a8981db137 100644
--- a/branches/sca-java-0.91/modules/core-spi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/pom.xml
diff --git a/branches/sca-java-0.91/modules/core-spi/src/doc/Context Model.emx b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/doc/Context Model.emx
index 0445ea5a6b..0445ea5a6b 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/doc/Context Model.emx
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/doc/Context Model.emx
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
index 7a42300098..7a42300098 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistry.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
index 6765a6c8f1..6765a6c8f1 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/DefaultModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
index 9609487080..9609487080 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ExtensionPointRegistry.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
index 64706c6efc..64706c6efc 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModelFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
index 0244862309..0244862309 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/core/ModuleActivator.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
index 6a0c44a404..6a0c44a404 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/Event.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
index c116be921c..c116be921c 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventFilter.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
index b0debc36c4..b0debc36c4 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/EventPublisher.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
index b34dceee62..b34dceee62 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/RuntimeEventListener.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
index ca0f4889a5..ca0f4889a5 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/event/TrueFilter.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
index a5f221fc11..a5f221fc11 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Interceptor.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
index cd75d06ab3..cd75d06ab3 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/InvocationChain.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
index 2748bbed9a..2748bbed9a 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Invoker.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
index ef23118e78..ef23118e78 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/Message.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
index c2a9c488b8..c2a9c488b8 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/invocation/MessageFactory.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
index 3626e16425..3626e16425 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/management/ManagementService.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
index 0f6a932c51..0f6a932c51 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/BindingProviderFactory.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
index 1adb9287f1..1adb9287f1 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/DefaultProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
index a680277b99..a680277b99 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProvider.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
index 6a37d1e951..6a37d1e951 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ImplementationProviderFactory.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
index 2102806881..2102806881 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactory.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
index 5e781dd5b3..5e781dd5b3 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ProviderFactoryExtensionPoint.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
index 4da4108168..4da4108168 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ReferenceBindingProvider.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
index d2646d8d00..d2646d8d00 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/provider/ServiceBindingProvider.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
index 851afee3c1..851afee3c1 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/DefaultWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
index 627180b2d1..627180b2d1 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/EndpointReference.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
index ddb5ae746c..ddb5ae746c 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponent.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
index 18166d8c1d..18166d8c1d 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentReference.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
index 19327321a6..19327321a6 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeComponentService.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
index d6b56d822e..d6b56d822e 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWire.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
index fbb7aae467..fbb7aae467 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessor.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
index 4b2c71b397..4b2c71b397 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/runtime/RuntimeWireProcessorExtensionPoint.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
index 3cf82982dc..3cf82982dc 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/DuplicateRecordException.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
index 9d965a3369..9d965a3369 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/RecoveryListener.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
index b15cde066a..b15cde066a 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/Store.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
index 647eba33aa..647eba33aa 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreException.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
index 5c1a3ca79d..5c1a3ca79d 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreExpirationEvent.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
index 66bbae684d..66bbae684d 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreMonitor.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
index 3a563b9fb5..3a563b9fb5 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreReadException.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
index ad55ce386b..ad55ce386b 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/store/StoreWriteException.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
index 5701a04ed1..5701a04ed1 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/NotificationListener.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
index 99cb601107..99cb601107 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkScheduler.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
index f3d32e376b..f3d32e376b 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/main/java/org/apache/tuscany/sca/work/WorkSchedulerException.java
diff --git a/branches/sca-java-0.91/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite
index 337ec02f06..337ec02f06 100644
--- a/branches/sca-java-0.91/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spi/src/test/resources/org/apache/tuscany/spi/util/stax/test.composite
diff --git a/branches/sca-java-0.91/modules/core-spring/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.91/modules/core-spring/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/DISCLAIMER
diff --git a/branches/sca-java-0.91/modules/core-spring/LICENSE b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.91/modules/core-spring/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/LICENSE
diff --git a/branches/sca-java-0.91/modules/core-spring/NOTICE b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.91/modules/core-spring/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/NOTICE
diff --git a/branches/sca-java-0.91/modules/core-spring/pom.xml b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/pom.xml
index 25c9eb8634..25c9eb8634 100644
--- a/branches/sca-java-0.91/modules/core-spring/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/pom.xml
diff --git a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index 5b04d9e363..5b04d9e363 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 85c5e7ec43..85c5e7ec43 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index bc139a3ef3..bc139a3ef3 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index ba2d5045f2..ba2d5045f2 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 24bc719e6a..24bc719e6a 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 8a88ba28d9..8a88ba28d9 100644
--- a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
index c9cd0f8892..c9cd0f8892 100644
--- a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 5d787d2fd2..5d787d2fd2 100644
--- a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/branches/sca-java-0.91/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-0.91/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-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
index 6557d23f27..6557d23f27 100644
--- a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index 91cd352724..91cd352724 100644
--- a/branches/sca-java-0.91/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-0.91/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddService.java
index 4eeb30a9c2..4eeb30a9c2 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index ea3e5341d5..ea3e5341d5 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 56e737e3ab..56e737e3ab 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorService.java
index c89043276e..c89043276e 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index 11e8974657..11e8974657 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideService.java
index 131c5a8014..131c5a8014 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index 9c7e96a668..9c7e96a668 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyService.java
index a917896aeb..a917896aeb 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index 4892481203..4892481203 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index 27430b7f5d..27430b7f5d 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractService.java
index e328f024ea..e328f024ea 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index ee1d7c3457..ee1d7c3457 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 97a44258a8..97a44258a8 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
index 5ef16a91d8..5ef16a91d8 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCase.java
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/branches/sca-java-0.91/modules/core/.checkstyle b/sca-java-1.x/branches/sca-java-0.91/modules/core/.checkstyle
index 3e57539570..3e57539570 100644
--- a/branches/sca-java-0.91/modules/core/.checkstyle
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/.checkstyle
diff --git a/branches/sca-java-0.91/modules/core/.pmd b/sca-java-1.x/branches/sca-java-0.91/modules/core/.pmd
index ffc4fe2bbb..ffc4fe2bbb 100644
--- a/branches/sca-java-0.91/modules/core/.pmd
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/.pmd
diff --git a/branches/sca-java-0.91/modules/core/.ruleset b/sca-java-1.x/branches/sca-java-0.91/modules/core/.ruleset
index ba9b5ce886..ba9b5ce886 100644
--- a/branches/sca-java-0.91/modules/core/.ruleset
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/.ruleset
diff --git a/branches/sca-java-0.91/modules/core/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.91/modules/core/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-0.91/modules/core/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/DISCLAIMER
diff --git a/branches/sca-java-0.91/modules/core/LICENSE b/sca-java-1.x/branches/sca-java-0.91/modules/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-0.91/modules/core/LICENSE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/LICENSE
diff --git a/branches/sca-java-0.91/modules/core/NOTICE b/sca-java-1.x/branches/sca-java-0.91/modules/core/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/branches/sca-java-0.91/modules/core/NOTICE
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/NOTICE
diff --git a/branches/sca-java-0.91/modules/core/pom.xml b/sca-java-1.x/branches/sca-java-0.91/modules/core/pom.xml
index 66cf94e76a..66cf94e76a 100644
--- a/branches/sca-java-0.91/modules/core/pom.xml
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/pom.xml
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java
index f0f0049056..f0f0049056 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallableReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
index 45a48730d3..45a48730d3 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/CallbackReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java
index abcd17f505..abcd17f505 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java
index 3999d0d5b4..3999d0d5b4 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ComponentContextProvider.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java
index 3a219b9cd9..3a219b9cd9 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/RequestContextImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java
index e268f5750f..e268f5750f 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/component/ServiceReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
index 517e5579a4..517e5579a4 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/BaseEventPublisher.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
index 8e90c953e5..8e90c953e5 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStart.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
index d879182e14..d879182e14 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ComponentStop.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
index cd14710880..cd14710880 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationEnd.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
index a4cc49204e..a4cc49204e 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/ConversationStart.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
index 4c3fd8b397..4c3fd8b397 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionEnd.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
index 67b922b99c..67b922b99c 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/HttpSessionStart.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
index 8b5c512cf2..8b5c512cf2 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestEnd.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
index 974563b57c..974563b57c 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/event/RequestStart.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
index 6c1f38e4c2..6c1f38e4c2 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/AbstractInvocationHandler.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
index 219dc55536..219dc55536 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackInterfaceInterceptor.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
index dae4ed708b..dae4ed708b 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/CallbackWireObjectFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
index 934f2f7aa0..934f2f7aa0 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ExtensibleWireProcessor.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
index e04148e374..e04148e374 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/InvocationChainImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
index 5a028e6e22..5a028e6e22 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKCallbackInvocationHandler.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
index 756e5c545f..756e5c545f 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKInvocationHandler.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
index 371f9bedb8..371f9bedb8 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/JDKProxyService.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
index 6e182a6a14..6e182a6a14 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageFactoryImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
index a1b2963cf5..a1b2963cf5 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/MessageImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
index cbeedc086d..cbeedc086d 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NoMethodForOperationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
index be6f364271..be6f364271 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/NonBlockingInterceptor.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
index 4900ae9a7e..4900ae9a7e 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyCreationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
index 381844ffc5..381844ffc5 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ProxyFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
index 52bea91341..52bea91341 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/ThreadMessageContext.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
index e6e41e8f85..e6e41e8f85 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/invocation/WireObjectFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java
index 987a8288b0..987a8288b0 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/ActivationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java
index fc8a8f0a15..fc8a8f0a15 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivator.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
index 9f5d2ab63d..9f5d2ab63d 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/CompositeActivatorImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java
index 233f81ccae..233f81ccae 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/EndpointReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java
index ec0cdadde6..ec0cdadde6 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeAssemblyFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
index aacce904b5..aacce904b5 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
index 128ae29b81..128ae29b81 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
index 0bb8e2c457..0bb8e2c457 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeComponentServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java
index ad055731f3..ad055731f3 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProvider.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java
index 06b7b3d40e..06b7b3d40e 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeSCABindingProviderFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
index cdf7ec01c0..cdf7ec01c0 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/runtime/RuntimeWireImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
index 1d776b729c..1d776b729c 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
index 520d3ab48c..520d3ab48c 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
index 7078903b8b..7078903b8b 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/CompositeScopeContainerFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
index 61f7d51c29..61f7d51c29 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
index 4fdda90bc2..4fdda90bc2 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ConversationalScopeContainerFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
index bcbf3cdf3c..bcbf3cdf3c 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
index e275bb56b9..e275bb56b9 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/HttpSessionScopeContainerFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
index aaafb4603c..aaafb4603c 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
index 3851637220..3851637220 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/RequestScopeContainerFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
index 774c1edf37..774c1edf37 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/ScopeRegistryImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
index dd481fa062..dd481fa062 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
index e0eff710e9..e0eff710e9 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/scope/StatelessScopeContainerFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
index 5b838116c5..5b838116c5 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/store/MemoryStore.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java
index 2058397fb0..2058397fb0 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/util/IOHelper.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
index 6fe883157f..6fe883157f 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237Work.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
index c8a5dd7afe..c8a5dd7afe 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/Jsr237WorkScheduler.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
index 0bc6f1b336..0bc6f1b336 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/ThreadPoolWorkManager.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
index 62ebeea1fb..62ebeea1fb 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkEventImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
index fae3f1aae3..fae3f1aae3 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/core/work/WorkItemImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java
index 3432c61c76..3432c61c76 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectCreationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java
index c5e0dad4e7..c5e0dad4e7 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/ObjectFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java
index 074a1121c9..074a1121c9 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/factory/SingletonObjectFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
index e5f88d91c6..e5f88d91c6 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/AbstractLifecycle.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java
index ac3e51a982..ac3e51a982 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/CoreRuntimeException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
index a952e2e72b..a952e2e72b 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/InstanceWrapper.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java
index 02075cad01..02075cad01 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Lifecycle.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
index 54fba1ee03..54fba1ee03 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/PersistenceException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
index 9b3f208cb3..9b3f208cb3 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/Scope.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
index 30482fae90..30482fae90 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainer.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java
index b6acae7382..b6acae7382 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeContainerFactory.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java
index 77e7d76842..77e7d76842 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeIdentifier.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java
index 40a251c6f2..40a251c6f2 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeNotFoundException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java
index f3319ee093..f3319ee093 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopeRegistry.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
index 8b9c50b070..8b9c50b070 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedImplementationProvider.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
index 6c33683bde..6c33683bde 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/ScopedRuntimeComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
index 6b251295f5..6b251295f5 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetDestructionException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
index 17cd21967f..17cd21967f 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInitializationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
index f9bfa0a788..f9bfa0a788 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvocationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
index a20d030ee8..a20d030ee8 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetInvokerCreationException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
index 4dd63f58f0..4dd63f58f0 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetNotFoundException.java
diff --git a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
index 284ab8b6c7..284ab8b6c7 100644
--- a/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/main/java/org/apache/tuscany/sca/scope/TargetResolutionException.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
index 40a146e129..40a146e129 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/DefaultExtensionPointRegistryTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
index d2050523eb..d2050523eb 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/BaseEventPublisherTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
index bf95d640c5..bf95d640c5 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/event/EventTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java
index c30e19de88..c30e19de88 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/AsyncTarget.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java
index f9ae94f152..f9ae94f152 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadContextPojo.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java
index c4074484b9..c4074484b9 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BadNamePojo.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java
index ca305b9ef0..ca305b9ef0 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterface.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java
index ea32d1f6b9..ea32d1f6b9 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/BasicInterfaceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java
index 6d320df145..6d320df145 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java
index 9ff289a502..9ff289a502 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java
index 832055a084..832055a084 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java
index e8b76e13c0..e8b76e13c0 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java
index 057580be7a..057580be7a 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/CompositeScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java
index 79f48a57c5..79f48a57c5 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java
index 5b42d92191..5b42d92191 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
index c64556e754..c64556e754 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java
index 6f930ef750..6f930ef750 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java
index 70733f4d99..70733f4d99 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/ConversationalScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java
index 4bb9cde958..4bb9cde958 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderException.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java
index df59029884..df59029884 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojo.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java
index 1b51c2772d..1b51c2772d 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedDependentPojoImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java
index 139086bf0d..139086bf0d 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedEagerInitPojo.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java
index 1c3615fcd0..1c3615fcd0 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojo.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java
index b65ead9b19..b65ead9b19 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OrderedInitPojoImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java
index 963c31a4ca..963c31a4ca 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTarget.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java
index 91ccc9e772..91ccc9e772 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/OtherTargetImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java
index 7d03c4372d..7d03c4372d 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java
index f94f071086..f94f071086 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeDestroyOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java
index f2de2d9afa..f2de2d9afa 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java
index 9bcef40834..9bcef40834 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/RequestScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java
index 8318333feb..8318333feb 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java
index 0494d587aa..0494d587aa 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java
index fdc11a80af..fdc11a80af 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitDestroyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java
index 4e849895f8..4e849895f8 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SessionScopeInitOnlyComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java
index 44eb94260e..44eb94260e 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTarget.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java
index 662b21116a..662b21116a 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SimpleTargetImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java
index aa3b5be528..aa3b5be528 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Source.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java
index 81e39a9fe9..81e39a9fe9 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/SourceImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java
index 89d0be7a53..89d0be7a53 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponent.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java
index 28eb28e76d..28eb28e76d 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/StatelessComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java
index 5e85ed48b0..5e85ed48b0 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/Target.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java
index 169b38a8d0..169b38a8d0 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/mock/component/TargetImpl.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
index 5be8fe21b3..5be8fe21b3 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/scope/AbstractScopeContainerTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
index 2f5c182f45..2f5c182f45 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/store/MemoryStoreTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
index 58503fd852..58503fd852 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/CallbackInterfaceInterceptorTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
index 83f7bdd887..83f7bdd887 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/InvocationChainImplTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
index c5f93edeb6..c5f93edeb6 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/core/wire/NonBlockingInterceptorTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java
index 77d0e01dc9..77d0e01dc9 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/AssertionTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java
index 4d38c447ea..4d38c447ea 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/factory/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
index 1b95c6ff63..1b95c6ff63 100644
--- a/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/core/src/test/java/org/apache/tuscany/sca/scope/ScopeTestCase.java