163 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/META-INF/MANIFEST.MF
index ab4d626d6e..ab4d626d6e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/pom.xml
index 46c3fa2efa..46c3fa2efa 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
index e2d99852d8..e2d99852d8 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
index df21e013f1..df21e013f1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/InstanceFactoryProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
index ba71abd826..ba71abd826 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
index 7c96606cf6..7c96606cf6 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapper.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
index 2513c63e38..2513c63e38 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ArrayMultiplicityObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
index d8eef18c74..d8eef18c74 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ContextInjector.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
index dd454be7c5..dd454be7c5 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjector.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
index fbc2ace341..fbc2ace341 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InjectionRuntimeException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
index 4d062859b9..4d062859b9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/Injector.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
index 5aeebcca36..5aeebcca36 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/InvalidAccessorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
index 01c3b148f8..01c3b148f8 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
index 2906897e96..2906897e96 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ListMultiplicityObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
index baf9eb9cc1..baf9eb9cc1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjector.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
index 43fb5d6170..43fb5d6170 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/RequestContextObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
index 70c368a0e6..70c368a0e6 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceHost.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
index d5c1c7b69e..d5c1c7b69e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceNotFoundException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
index 8f55eb18bc..8f55eb18bc 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
index f94b24762a..f94b24762a 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/injection/ResourceResolutionException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
index 25c09231c5..25c09231c5 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvocationException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
index e6ebb5abc3..e6ebb5abc3 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/EventInvoker.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
index 1c330ea913..1c330ea913 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/InvalidConversationSequenceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
index 602dc5d31a..602dc5d31a 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaCallbackRuntimeWireProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
index f2a0d576db..f2a0d576db 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
index 6929b5d0ca..6929b5d0ca 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentContextProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
index 4a5ad98e5b..4a5ad98e5b 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaComponentNameFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
index 476ed9ac83..476ed9ac83 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationInvoker.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
index 55765ef6e4..55765ef6e4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
index 36d9878fd9..36d9878fd9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaImplementationProviderFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
index 7fcfaad615..7fcfaad615 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/JavaInstanceFactoryProvider.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
index 515a7c8a43..515a7c8a43 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/MethodEventInvoker.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
index dbc5c6b640..dbc5c6b640 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/java/org/apache/tuscany/sca/implementation/java/invocation/NoConversationalContractException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
index 9d5f943f46..9d5f943f46 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.context.PropertyValueFactory
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 2b67aa59ca..2b67aa59ca 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 1c2626706b..1c2626706b 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
index 07008049e8..07008049e8 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.RuntimeWireProcessor
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
index 14d99e8b02..14d99e8b02 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/main/resources/org/apache/tuscany/sca/implementation/java/definitions/definitions.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
index 629ba8b321..629ba8b321 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/MultiplicityTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
index 628a308c86..628a308c86 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/context/ReflectiveInstanceWrapperTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
index 29dcfa8169..29dcfa8169 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/CallbackWireObjectFactoryTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
index 098789f495..098789f495 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/FieldInjectorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
index 366f21d9f0..366f21d9f0 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/JavaPropertyValueObjectFactoryTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
index e9cbce4390..e9cbce4390 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodEventInvokerTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
index 19184d5204..19184d5204 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/MethodInjectorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
index ed7a0e7d03..ed7a0e7d03 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/ResourceObjectFactoryTestCase.java.fixme
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
index c1650c3a83..c1650c3a83 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
index 0bb222bad4..0bb222bad4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/SingletonObjectFactoryTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
index de371e09bb..de371e09bb 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
index ea9d15b3f6..ea9d15b3f6 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/injection/TestObjectFactoryTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
index e993cdd382..e993cdd382 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean1.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
index f5128f6a6c..f5128f6a6c 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Bean2.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
index a5e12d181c..a5e12d181c 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/Entry.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
index 9624865dcc..9624865dcc 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/JavaIntrospectionHelperTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
index 408cedb8be..408cedb8be 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java-runtime/src/test/java/org/apache/tuscany/sca/implementation/java/util/SuperBean.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/META-INF/MANIFEST.MF
index 517aaac39f..517aaac39f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/pom.xml
index 9787363dd7..9787363dd7 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
index c8b7c072ac..c8b7c072ac 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/BaseJavaImplementation.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
index f98a617925..f98a617925 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/DefaultJavaImplementationFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
index 2198a632c0..2198a632c0 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/IntrospectionException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
index df76d3ea4e..df76d3ea4e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaConstructorImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
index e748a5f6fa..e748a5f6fa 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaElementImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
index d3c9c16f48..d3c9c16f48 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementation.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
index 8228c80372..8228c80372 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaImplementationFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
index 80911a9552..80911a9552 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaParameterImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
index 19a9f38549..19a9f38549 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaResourceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
index c977736630..c977736630 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/JavaScopeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
index 0d9187c14f..0d9187c14f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/BaseJavaImplementationImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
index 6cb5e3730b..6cb5e3730b 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaClassIntrospectorImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
index aefc5c7e6b..aefc5c7e6b 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationFactoryImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
index 9e4c2eb8f4..9e4c2eb8f4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/impl/JavaImplementationImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
index 26ca54df88..26ca54df88 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/BaseJavaClassVisitor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
index 4b0f5bea55..4b0f5bea55 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaClassVisitor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
index ce4a0ef928..ce4a0ef928 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/JavaIntrospectionHelper.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
index b951e17fd2..b951e17fd2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractPropertyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
index 4aa29d3b91..4aa29d3b91 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
index c6e6b6e4d6..c6e6b6e4d6 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AmbiguousConstructorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
index 1813a177b4..1813a177b4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ComponentNameProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
index 68f0b46f2e..68f0b46f2e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
index 651ecdbd7e..651ecdbd7e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
index 25f31c5f12..25f31c5f12 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
index d6494e3845..d6494e3845 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateConstructorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
index 8bfae89162..8bfae89162 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateDestructorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
index 38f6478531..38f6478531 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateInitException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
index b9e1923e73..b9e1923e73 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicatePropertyException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
index 300ad6817e..300ad6817e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateReferenceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
index 2d177b3f76..2d177b3f76 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DuplicateResourceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
index 9ad7e8f7a9..9ad7e8f7a9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
index 87a8031ea7..87a8031ea7 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
index badd41fbb9..badd41fbb9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalCallbackReferenceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
index fa1e67a336..fa1e67a336 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalContextException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
index 0c4c3d5646..0c4c3d5646 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalDestructorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
index 2956b60b65..2956b60b65 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalInitException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
index 54f7dfad1e..54f7dfad1e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalPropertyException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
index 25196c56e5..25196c56e5 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalReferenceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
index ccfbaf0043..ccfbaf0043 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalResourceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
index e0f90779a1..e0f90779a1 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/IllegalServiceDefinitionException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
index 8d67236fe2..8d67236fe2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
index c75dfdaf46..c75dfdaf46 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConstructorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
index 079495e4db..079495e4db 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidConversationalImplementationException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
index 429b88aa1f..429b88aa1f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidPropertyException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
index fbf3fc9ed3..fbf3fc9ed3 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidReferenceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
index debb5cbacc..debb5cbacc 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidResourceException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
index 230c8c6fdd..230c8c6fdd 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InvalidServiceTypeException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
index 453cfa35fe..453cfa35fe 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/NoConstructorException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
index 79a0adac88..79a0adac88 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
index ed68be20b4..ed68be20b4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
index d30ac074af..d30ac074af 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
index 3d43e39ce8..3d43e39ce8 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/Resource.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
index 3abe832cb9..3abe832cb9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
index dfc122c715..dfc122c715 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
index 30ed5dda44..30ed5dda44 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
index e1ca3ea565..e1ca3ea565 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceTypeNotFoundException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
index bfaa759cd2..bfaa759cd2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/UnknownContextTypeException.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
index 3537dc97cf..3537dc97cf 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationConstants.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
index efb4a37143..efb4a37143 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/java/org/apache/tuscany/sca/implementation/java/xml/JavaImplementationProcessor.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index aa889448f6..aa889448f6 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
index 5c1a797cf5..5c1a797cf5 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.JavaImplementationFactory
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
index 2760b94e39..2760b94e39 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.java.introspect.JavaClassVisitor
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
index 337a0b8458..337a0b8458 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/main/resources/impl-javaxml-validation-messages.properties
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddService.java
index 9c22177684..9c22177684 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddService.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
index 64298b6275..64298b6275 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
index 9f64dc8bca..9f64dc8bca 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideService.java
index 9599c86292..9599c86292 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideService.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
index f5b8ff5be0..f5b8ff5be0 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyService.java
index 7a3d06c15e..7a3d06c15e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
index d146d23153..d146d23153 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractService.java
index 21af91f392..21af91f392 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractService.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
index ffe09c3dde..ffe09c3dde 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
index b77aea4c78..b77aea4c78 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AbstractProcessorTest.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
index ce79ae2045..ce79ae2045 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/AllowsPassByReferenceProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
index 512e34a0fa..512e34a0fa 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
index 83e26dff84..83e26dff84 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorPropertyTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
index eeeee851e4..eeeee851e4 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorReferenceTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
index e8d26f6103..e8d26f6103 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConstructorResourceTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
index 124c83e9e2..124c83e9e2 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ContextProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
index b82205863c..b82205863c 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/DestroyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
index 04d87f60fe..04d87f60fe 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/EagerInitProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
index 39a2980b2b..39a2980b2b 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicAndPropertyTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
index 394857576d..394857576d 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicConstructorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
index ede71a90dd..ede71a90dd 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeuristicPojoProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
index 07ab6f28c8..07ab6f28c8 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/HeutisticExtensibleConstructorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
index 5df7078aa6..5df7078aa6 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/InitProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
index aad6b96cf9..aad6b96cf9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ModelHelper.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
index e3d747fc28..e3d747fc28 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PolicyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
index 559659cdeb..559659cdeb 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/PropertyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
index 6a7987a376..6a7987a376 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ReferenceProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
index c09b0547c9..c09b0547c9 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ResourceProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
index 758584221d..758584221d 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ScopeProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
index 68f3b9e456..68f3b9e456 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceCallbackTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
index d591123aef..d591123aef 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ServiceProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
index a90a6d18c7..a90a6d18c7 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/TestAbstractPropertyProcessorTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
index 635b491b06..635b491b06 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/ReadTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
index 6be50d138f..6be50d138f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/TestModelResolver.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
index fdd606c58e..fdd606c58e 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/java/org/apache/tuscany/sca/implementation/java/xml/WriteTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
index f4182679bc..f4182679bc 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/Calculator.composite
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
index 88a8e346c7..88a8e346c7 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions.xml
diff --git a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
index 60d63a3e5f..60d63a3e5f 100644
--- a/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/implementation-java/src/test/resources/org/apache/tuscany/sca/implementation/java/xml/definitions_with_policysets.xml