summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/binding-sca-runtime
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/LICENSE (renamed from java/sca/modules/binding-sca-runtime-rmi/LICENSE)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/META-INF/MANIFEST.MF (renamed from java/sca/modules/binding-sca-runtime-rmi/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/NOTICE (renamed from java/sca/modules/binding-sca-runtime-rmi/NOTICE)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/pom.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from java/sca/modules/binding-sca-runtime-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml (renamed from java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/LICENSE (renamed from java/sca/modules/binding-sca-runtime/LICENSE)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF (renamed from java/sca/modules/binding-sca-runtime/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/NOTICE (renamed from java/sca/modules/binding-sca-runtime/NOTICE)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml (renamed from java/sca/modules/binding-sca-runtime/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java (renamed from java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java (renamed from java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java (renamed from java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java (renamed from java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java (renamed from java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java (renamed from java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions (renamed from java/sca/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from java/sca/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml (renamed from java/sca/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java (renamed from java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java (renamed from java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java (renamed from java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite (renamed from java/sca/modules/binding-sca-runtime/src/test/resources/Calculator.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType (renamed from java/sca/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType)0
65 files changed, 0 insertions, 0 deletions
diff --git a/java/sca/modules/binding-sca-runtime-rmi/LICENSE b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/LICENSE
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/LICENSE
diff --git a/java/sca/modules/binding-sca-runtime-rmi/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/META-INF/MANIFEST.MF
index 6209b19080..6209b19080 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/META-INF/MANIFEST.MF
diff --git a/java/sca/modules/binding-sca-runtime-rmi/NOTICE b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/NOTICE
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/NOTICE
diff --git a/java/sca/modules/binding-sca-runtime-rmi/pom.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/pom.xml
index d556c4b0a0..d556c4b0a0 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/pom.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
index e1f700fa51..e1f700fa51 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCABindingProviderFactory.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
index 154aca8f53..154aca8f53 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAReferenceBindingProvider.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
index f230926183..f230926183 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/java/org/apache/tuscany/sca/binding/sca/rmi/RMISCAServiceBindingProvider.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 347e7b372c..347e7b372c 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
index b68fe7fed4..b68fe7fed4 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/AsynchTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
index 4c05006ba6..4c05006ba6 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/CallbackTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
index 4f1ad18a31..4f1ad18a31 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/PromotionTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
index 73354efbad..73354efbad 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/SimpleTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
index 7c4cf4b0b7..7c4cf4b0b7 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldCallbackRemote.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
index 017acee582..017acee582 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldClient.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
index 86f984e61a..86f984e61a 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackOnewayRemote.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
index 8e19fd7382..8e19fd7382 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceCallbackRemote.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
index b0d623e2e4..b0d623e2e4 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceLocal.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
index ccb44694d9..ccb44694d9 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
index 5c8bb13f43..5c8bb13f43 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/HelloWorldServiceRemote2.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
index 1ff1792bb7..1ff1792bb7 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
index b17d8e2016..b17d8e2016 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
index e230326f5f..e230326f5f 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientLocalImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
index 77df8c2c39..77df8c2c39 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemote2Impl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
index 8effa3ac36..8effa3ac36 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldClientRemoteImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
index 2467ddab88..2467ddab88 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
index d1b75d0a2c..d1b75d0a2c 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
index 44e7efc668..44e7efc668 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceLocalImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
index 88440de023..88440de023 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
index 06dc2c3f79..06dc2c3f79 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/java/org/apache/tuscany/sca/binding/sca/rmi/helloworld/impl/HelloWorldServiceRemoteImpl.java
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite
index 4a6c87318d..4a6c87318d 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchReference/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite
index 4e3e0c269b..4e3e0c269b 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/asynchService/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite
index eae8b705d3..eae8b705d3 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackReference/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite
index dbbdc9b774..dbbdc9b774 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/callbackService/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite
index c8cc77001c..c8cc77001c 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite
index 290ae8723b..290ae8723b 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/HelloWorldComponent.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionReference/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite
index aec75574f7..aec75574f7 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite
index 3f7e8f5cfa..3f7e8f5cfa 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/HelloWorldComponent.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/promotionService/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite
index 31b85329f1..31b85329f1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleReference/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite
index 9f0d212582..9f0d212582 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/HelloWorld.composite
diff --git a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml
index ac1d0a36c1..ac1d0a36c1 100644
--- a/java/sca/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime-rmi/src/test/resources/simpleService/META-INF/sca-contribution.xml
diff --git a/java/sca/modules/binding-sca-runtime/LICENSE b/sca-java-2.x/trunk/modules/binding-sca-runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca/modules/binding-sca-runtime/LICENSE
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/LICENSE
diff --git a/java/sca/modules/binding-sca-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF
index 6fa81c6834..6fa81c6834 100644
--- a/java/sca/modules/binding-sca-runtime/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/META-INF/MANIFEST.MF
diff --git a/java/sca/modules/binding-sca-runtime/NOTICE b/sca-java-2.x/trunk/modules/binding-sca-runtime/NOTICE
index 25bb89c9b2..25bb89c9b2 100644
--- a/java/sca/modules/binding-sca-runtime/NOTICE
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/NOTICE
diff --git a/java/sca/modules/binding-sca-runtime/pom.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml
index 40ca972851..40ca972851 100644
--- a/java/sca/modules/binding-sca-runtime/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/pom.xml
diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
index 331f152b50..331f152b50 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java
diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
index c4daa7c727..c4daa7c727 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java
diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
index c3bf2506cc..c3bf2506cc 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java
diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
index 22b1e5bd99..22b1e5bd99 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
index 500b4ba304..500b4ba304 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java
diff --git a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
index 4dee1b8601..4dee1b8601 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java
diff --git a/java/sca/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
index 151c00eec8..151c00eec8 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions
diff --git a/java/sca/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index 86e3d1e829..86e3d1e829 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/java/sca/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
index c00df2ef35..c00df2ef35 100644
--- a/java/sca/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml
diff --git a/java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
index 119d66d14d..119d66d14d 100644
--- a/java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
index 895a551f79..895a551f79 100644
--- a/java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
index be464172ed..be464172ed 100644
--- a/java/sca/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java
diff --git a/java/sca/modules/binding-sca-runtime/src/test/resources/Calculator.composite b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite
index c404b3bcd4..c404b3bcd4 100644
--- a/java/sca/modules/binding-sca-runtime/src/test/resources/Calculator.composite
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/Calculator.composite
diff --git a/java/sca/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
index 85535842be..85535842be 100644
--- a/java/sca/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType
+++ b/sca-java-2.x/trunk/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType