Moving 1.x contribs

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835167 13f79535-47bb-0310-9956-ffa450edef68

626 files changed, 0 insertions, 0 deletions

diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/LICENSE b/sca-java-1.x/contrib/demos/load-balancing-webapp/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/LICENSE
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/LICENSE
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/NOTICE b/sca-java-1.x/contrib/demos/load-balancing-webapp/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/NOTICE
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/NOTICE
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/README b/sca-java-1.x/contrib/demos/load-balancing-webapp/README
index b7bbb64b1a..b7bbb64b1a 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/README
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/README
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/build-tomcat.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/build-tomcat.xml
index 7e1dc4b0e9..7e1dc4b0e9 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/build-tomcat.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/build-tomcat.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/build.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/build.xml
index 506fa61015..506fa61015 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/build.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/build.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/pom.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/pom.xml
index 22662f2526..22662f2526 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/pom.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/pom.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
index efa89b4fe9..efa89b4fe9 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/client/LaunchClient.java
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
index 33c37869a3..33c37869a3 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/domain/LaunchDomain.java
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
index 65dc030d89..65dc030d89 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
index 7245513b2a..7245513b2a 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldService.java
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
index f3d2fdb2ed..f3d2fdb2ed 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/helloworld/HelloWorldServiceClient.java
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
index 5dc1b6671b..5dc1b6671b 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/java/org/apache/tuscany/sca/demos/loadbalancer/rule/RoundRobinRule.java
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
index 9b6052741e..9b6052741e 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/resources/client-contribution/helloworldwsclient.composite
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 11347004f9..11347004f9 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
index 1ab78d802d..1ab78d802d 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/webapp/META-INF/sca-deployables/helloworldws.composite
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
index 8d47ae2207..8d47ae2207 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
index 37cf284d35..37cf284d35 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/httpd.conf
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
index 9228c4fd8e..9228c4fd8e 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/apache-80/conf/workers.properties
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
index 920fa7b037..920fa7b037 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/conf/server.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
index 7486dc8148..7486dc8148 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8085/webapps/balancer/WEB-INF/config/rules.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
index 5ecb8fe5c4..5ecb8fe5c4 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8086/conf/server.xml
diff --git a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
index f83c68191c..f83c68191c 100644
--- a/java/sca-1.x-contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
+++ b/sca-java-1.x/contrib/demos/load-balancing-webapp/src/test/resources/tomcat-8087/conf/server.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/LICENSE b/sca-java-1.x/contrib/demos/workpool-distributed/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/LICENSE
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/LICENSE
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/NOTICE b/sca-java-1.x/contrib/demos/workpool-distributed/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/NOTICE
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/NOTICE
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/build.xml b/sca-java-1.x/contrib/demos/workpool-distributed/build.xml
index 9e10e8ec91..9e10e8ec91 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/build.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/build.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/pom.xml b/sca-java-1.x/contrib/demos/workpool-distributed/pom.xml
index 2f821d76a5..2f821d76a5 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/pom.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/pom.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
index a278499aae..a278499aae 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNode.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
index 9d05761ad6..9d05761ad6 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/DomainNodeDaemon.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
index f48e647bd6..f48e647bd6 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/TestJob.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
index 1f2a4d1f9a..1f2a4d1f9a 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolDaemon.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
index 86557548af..86557548af 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/WorkpoolNode.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
index 9c5a5d1b7f..9c5a5d1b7f 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/node/workerRules1.drl
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
index cdd0f30b34..cdd0f30b34 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/MetaComponentWorker.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
index c45696e3cf..c45696e3cf 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/MyWorker.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
index fb930adf2e..fb930adf2e 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/NullJob.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
index e04411668b..e04411668b 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/ResultJob.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
index 469675b19b..469675b19b 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/Trigger.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
index 520203e190..520203e190 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManager.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
index d4337cad2f..d4337cad2f 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerManagerImpl.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
index 37b7ea227a..37b7ea227a 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerService.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
index 6fb1278e5e..6fb1278e5e 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceCallback.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
index 2c9bf5ea48..2c9bf5ea48 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkerServiceImpl.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
index 80c093ff1c..80c093ff1c 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBean.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
index 0ecc223fed..0ecc223fed 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolBeanListener.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
index 0bdc3671d5..0bdc3671d5 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolEvent.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
index 6520954bdd..6520954bdd 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManager.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
index f7c727ad04..f7c727ad04 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolManagerImpl.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
index d84ae549d8..d84ae549d8 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolService.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
index 52b88af42c..52b88af42c 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/java/workpool/WorkpoolServiceImpl.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
index 9a00a8e839..9a00a8e839 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeA/Workpool.composite
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
index a71dc9e08a..a71dc9e08a 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeB/Workpool.composite
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
index 771db5370b..771db5370b 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeC/Workpool.composite
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
index 55fd48934f..55fd48934f 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeD/Workpool.composite
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
index b3e2d16c05..b3e2d16c05 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
index 1dc9ccfcea..1dc9ccfcea 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/main/resources/nodeE/Workpool.composite
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java b/sca-java-1.x/contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
index 5c20537fab..5c20537fab 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/src/test/java/workpool/AComponent.java
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules.drl b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules.drl
index e7ebcad4c0..e7ebcad4c0 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules.drl
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules.drl
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules1.drl b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules1.drl
index 6fa0b85ba2..6fa0b85ba2 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules1.drl
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules1.drl
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules2.drl b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules2.drl
index 9d9551c3ea..9d9551c3ea 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules2.drl
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules2.drl
diff --git a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules3.drl b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules3.drl
index a67af910a4..a67af910a4 100644
--- a/java/sca-1.x-contrib/demos/workpool-distributed/workerRules3.drl
+++ b/sca-java-1.x/contrib/demos/workpool-distributed/workerRules3.drl
diff --git a/java/sca-1.x-contrib/distribution/bundle-minimal/pom.xml b/sca-java-1.x/contrib/distribution/bundle-minimal/pom.xml
index c5b0417143..c5b0417143 100644
--- a/java/sca-1.x-contrib/distribution/bundle-minimal/pom.xml
+++ b/sca-java-1.x/contrib/distribution/bundle-minimal/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/bundle/pom.xml b/sca-java-1.x/contrib/distribution/bundle/pom.xml
index c41f97ad68..c41f97ad68 100644
--- a/java/sca-1.x-contrib/distribution/bundle/pom.xml
+++ b/sca-java-1.x/contrib/distribution/bundle/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/compact/pom.xml b/sca-java-1.x/contrib/distribution/compact/pom.xml
index 8e3f7f78d1..8e3f7f78d1 100644
--- a/java/sca-1.x-contrib/distribution/compact/pom.xml
+++ b/sca-java-1.x/contrib/distribution/compact/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/compact/src/main/assembly/bin.xml
index 0a45066945..0a45066945 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/compact/src/main/assembly/src.xml
index 92c6aae714..92c6aae714 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/compact/src/main/release/CHANGES
index e73a7c5710..e73a7c5710 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/README b/sca-java-1.x/contrib/distribution/compact/src/main/release/README
index 0d27dbddcb..0d27dbddcb 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/compact/src/main/release/RELEASE_NOTES
index e0d1a69305..e0d1a69305 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/compact/src/main/release/bin/INSTALL
index 8ad077c231..8ad077c231 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/compact/src/main/release/bin/LICENSE
index 20ce406f9a..20ce406f9a 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/compact/src/main/release/bin/NOTICE
index d2288798a6..d2288798a6 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/compact/src/main/release/src/BUILDING
index f4fbed4ea2..f4fbed4ea2 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/compact/src/main/release/src/LICENSE
index 57b068ef88..57b068ef88 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/compact/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/compact/src/main/release/src/NOTICE
index 77663aaa3a..77663aaa3a 100644
--- a/java/sca-1.x-contrib/distribution/compact/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/compact/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/all/pom.xml b/sca-java-1.x/contrib/distribution/features/all/pom.xml
index beb5b0c205..beb5b0c205 100644
--- a/java/sca-1.x-contrib/distribution/features/all/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/all/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/all/src/main/assembly/bin.xml
index b0db7835e7..b0db7835e7 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/all/src/main/assembly/src.xml
index d6ede9777d..d6ede9777d 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/all/src/main/components/src-modules.xml
index c04086ce61..c04086ce61 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/all/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/README b/sca-java-1.x/contrib/distribution/features/all/src/main/release/README
index 59518dd685..59518dd685 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/all/src/main/release/RELEASE_NOTES
index 3526fdeeaf..3526fdeeaf 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/all/src/main/release/bin/INSTALL
index fae934f442..fae934f442 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/all/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/all/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/all/src/main/release/src/BUILDING
index 6958d8391c..6958d8391c 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/all/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/all/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/all/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/all/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/all/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/core/pom.xml b/sca-java-1.x/contrib/distribution/features/core/pom.xml
index d19ca09081..d19ca09081 100644
--- a/java/sca-1.x-contrib/distribution/features/core/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/assembly/bin.xml
index e012d9d907..e012d9d907 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/assembly/src.xml
index 02203f61f8..02203f61f8 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-common.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-common.xml
index c69e8e3699..c69e8e3699 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-common.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-common.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-dependencies.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-dependencies.xml
index a1bde3932b..a1bde3932b 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-dependencies.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-dependencies.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
index 8e4981e687..8e4981e687 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-samples.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-samples.xml
index fbe46a296c..fbe46a296c 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/components/bin-samples.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/components/src-common.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/components/src-common.xml
index 002df33fc7..002df33fc7 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/components/src-common.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/components/src-common.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/core/src/main/components/src-modules.xml
index c90e182204..c90e182204 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/core/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/README b/sca-java-1.x/contrib/distribution/features/core/src/main/release/README
index 59518dd685..59518dd685 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/core/src/main/release/RELEASE_NOTES
index 3526fdeeaf..3526fdeeaf 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/core/src/main/release/bin/INSTALL
index 91a9175508..91a9175508 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/core/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/core/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/core/src/main/release/src/BUILDING
index 308f0fce23..308f0fce23 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/core/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/core/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/core/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/core/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/core/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/pom.xml b/sca-java-1.x/contrib/distribution/features/ejava/pom.xml
index 867f787236..867f787236 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/ejava/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/ejava/src/main/assembly/bin.xml
index a32fead634..a32fead634 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/ejava/src/main/assembly/src.xml
index 29ecb5ab49..29ecb5ab49 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/components/bin-samples.xml b/sca-java-1.x/contrib/distribution/features/ejava/src/main/components/bin-samples.xml
index f1c691965b..f1c691965b 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/components/bin-samples.xml
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/ejava/src/main/components/src-modules.xml
index f7c82c7b54..f7c82c7b54 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/README b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/README
index 59518dd685..59518dd685 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/RELEASE_NOTES
index 3526fdeeaf..3526fdeeaf 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/bin/INSTALL
index 0f5efaebe2..0f5efaebe2 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/src/BUILDING
index 308f0fce23..308f0fce23 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/ejava/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/ejava/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/etc/generate-all-maven-files.sh b/sca-java-1.x/contrib/distribution/features/etc/generate-all-maven-files.sh
index 4d1327f518..4d1327f518 100755
--- a/java/sca-1.x-contrib/distribution/features/etc/generate-all-maven-files.sh
+++ b/sca-java-1.x/contrib/distribution/features/etc/generate-all-maven-files.sh
diff --git a/java/sca-1.x-contrib/distribution/features/etc/generate-filtered-dependencies.sh b/sca-java-1.x/contrib/distribution/features/etc/generate-filtered-dependencies.sh
index 7a04369b50..7a04369b50 100755
--- a/java/sca-1.x-contrib/distribution/features/etc/generate-filtered-dependencies.sh
+++ b/sca-java-1.x/contrib/distribution/features/etc/generate-filtered-dependencies.sh
diff --git a/java/sca-1.x-contrib/distribution/features/etc/generate-maven-files.sh b/sca-java-1.x/contrib/distribution/features/etc/generate-maven-files.sh
index adb190eabd..adb190eabd 100755
--- a/java/sca-1.x-contrib/distribution/features/etc/generate-maven-files.sh
+++ b/sca-java-1.x/contrib/distribution/features/etc/generate-maven-files.sh
diff --git a/java/sca-1.x-contrib/distribution/features/etc/generate-pom.sh b/sca-java-1.x/contrib/distribution/features/etc/generate-pom.sh
index ce0228694c..ce0228694c 100755
--- a/java/sca-1.x-contrib/distribution/features/etc/generate-pom.sh
+++ b/sca-java-1.x/contrib/distribution/features/etc/generate-pom.sh
diff --git a/java/sca-1.x-contrib/distribution/features/etc/generate-src-modules.sh b/sca-java-1.x/contrib/distribution/features/etc/generate-src-modules.sh
index 60dbbcd2d0..60dbbcd2d0 100755
--- a/java/sca-1.x-contrib/distribution/features/etc/generate-src-modules.sh
+++ b/sca-java-1.x/contrib/distribution/features/etc/generate-src-modules.sh
diff --git a/java/sca-1.x-contrib/distribution/features/manager/pom.xml b/sca-java-1.x/contrib/distribution/features/manager/pom.xml
index dd0e76cf43..dd0e76cf43 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/manager/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/manager/src/main/assembly/bin.xml
index a32fead634..a32fead634 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/manager/src/main/assembly/src.xml
index 29ecb5ab49..29ecb5ab49 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/components/bin-samples.xml b/sca-java-1.x/contrib/distribution/features/manager/src/main/components/bin-samples.xml
index d4b13c42e0..d4b13c42e0 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/components/bin-samples.xml
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/manager/src/main/components/src-modules.xml
index e599001dd6..e599001dd6 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/README b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/README
index d938e52248..d938e52248 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/RELEASE_NOTES
index 3526fdeeaf..3526fdeeaf 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/bin/INSTALL
index 0f5efaebe2..0f5efaebe2 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/src/BUILDING
index 308f0fce23..308f0fce23 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/manager/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/manager/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/pom.xml b/sca-java-1.x/contrib/distribution/features/pom.xml
index 880fded16e..880fded16e 100644
--- a/java/sca-1.x-contrib/distribution/features/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/process/pom.xml b/sca-java-1.x/contrib/distribution/features/process/pom.xml
index 3cb691d2b6..3cb691d2b6 100644
--- a/java/sca-1.x-contrib/distribution/features/process/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/process/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/process/src/main/assembly/bin.xml
index a32fead634..a32fead634 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/process/src/main/assembly/src.xml
index 29ecb5ab49..29ecb5ab49 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/components/bin-samples.xml b/sca-java-1.x/contrib/distribution/features/process/src/main/components/bin-samples.xml
index 8e8bc2e507..8e8bc2e507 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/components/bin-samples.xml
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/process/src/main/components/src-modules.xml
index 6579513758..6579513758 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/process/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/README b/sca-java-1.x/contrib/distribution/features/process/src/main/release/README
index 59518dd685..59518dd685 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/process/src/main/release/RELEASE_NOTES
index 3526fdeeaf..3526fdeeaf 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/process/src/main/release/bin/INSTALL
index 0f5efaebe2..0f5efaebe2 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/process/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/process/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/process/src/main/release/src/BUILDING
index 308f0fce23..308f0fce23 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/process/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/process/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/process/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/process/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/process/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/repository/pom.xml b/sca-java-1.x/contrib/distribution/features/repository/pom.xml
index 62963708c0..62963708c0 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/repository/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/assembly/repository.xml b/sca-java-1.x/contrib/distribution/features/repository/src/main/assembly/repository.xml
index 420aa20eac..420aa20eac 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/assembly/repository.xml
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/assembly/repository.xml
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/repository/src/main/components/src-modules.xml
index a28962cdc7..a28962cdc7 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/README b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/README
index d938e52248..d938e52248 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/RELEASE_NOTES
index f3b78b4957..f3b78b4957 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/bin/INSTALL
index efefcbfa05..efefcbfa05 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/src/BUILDING
index 308f0fce23..308f0fce23 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/repository/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/repository/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/web20/pom.xml b/sca-java-1.x/contrib/distribution/features/web20/pom.xml
index 8d07ec800b..8d07ec800b 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/web20/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/web20/src/main/assembly/bin.xml
index a32fead634..a32fead634 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/web20/src/main/assembly/src.xml
index 29ecb5ab49..29ecb5ab49 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/components/bin-samples.xml b/sca-java-1.x/contrib/distribution/features/web20/src/main/components/bin-samples.xml
index 5cc62040c0..5cc62040c0 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/components/bin-samples.xml
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/web20/src/main/components/src-modules.xml
index 99082280ad..99082280ad 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/README b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/README
index b692bf4711..b692bf4711 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/RELEASE_NOTES
index 67642b9270..67642b9270 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/bin/INSTALL
index df41296348..df41296348 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/web20/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/web20/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/pom.xml b/sca-java-1.x/contrib/distribution/features/webservice/pom.xml
index 9b2a1e2db4..9b2a1e2db4 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/pom.xml
+++ b/sca-java-1.x/contrib/distribution/features/webservice/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/features/webservice/src/main/assembly/bin.xml
index a32fead634..a32fead634 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/assembly/src.xml b/sca-java-1.x/contrib/distribution/features/webservice/src/main/assembly/src.xml
index 29ecb5ab49..29ecb5ab49 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/assembly/src.xml
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/assembly/src.xml
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/components/bin-samples.xml b/sca-java-1.x/contrib/distribution/features/webservice/src/main/components/bin-samples.xml
index 1bb5c20536..1bb5c20536 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/components/bin-samples.xml
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/components/bin-samples.xml
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/components/src-modules.xml b/sca-java-1.x/contrib/distribution/features/webservice/src/main/components/src-modules.xml
index e551ca97ba..e551ca97ba 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/components/src-modules.xml
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/components/src-modules.xml
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/CHANGES b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/CHANGES
index 3de7358ec6..3de7358ec6 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/CHANGES
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/CHANGES
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/README b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/README
index b692bf4711..b692bf4711 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/RELEASE_NOTES b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/RELEASE_NOTES
index 67642b9270..67642b9270 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/RELEASE_NOTES
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/RELEASE_NOTES
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/bin/INSTALL b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/bin/INSTALL
index df41296348..df41296348 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/bin/INSTALL
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/bin/INSTALL
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/bin/LICENSE b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/bin/LICENSE
index 1c50090e09..1c50090e09 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/bin/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/bin/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/bin/NOTICE b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/bin/NOTICE
index 0b2fe5dff3..0b2fe5dff3 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/bin/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/bin/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/src/BUILDING b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/src/BUILDING
index 65d09c5eae..65d09c5eae 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/src/BUILDING
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/src/BUILDING
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/src/LICENSE b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/src/LICENSE
index 144d8ae692..144d8ae692 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/src/LICENSE
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/src/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/src/NOTICE b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/src/NOTICE
index a37f9b03f5..a37f9b03f5 100644
--- a/java/sca-1.x-contrib/distribution/features/webservice/src/main/release/src/NOTICE
+++ b/sca-java-1.x/contrib/distribution/features/webservice/src/main/release/src/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/standalone/pom.xml b/sca-java-1.x/contrib/distribution/standalone/pom.xml
index 2cbb51973a..2cbb51973a 100644
--- a/java/sca-1.x-contrib/distribution/standalone/pom.xml
+++ b/sca-java-1.x/contrib/distribution/standalone/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/standalone/src/test/resources/repo/tuscany.properties b/sca-java-1.x/contrib/distribution/standalone/src/test/resources/repo/tuscany.properties
index a0d83168f7..a0d83168f7 100644
--- a/java/sca-1.x-contrib/distribution/standalone/src/test/resources/repo/tuscany.properties
+++ b/sca-java-1.x/contrib/distribution/standalone/src/test/resources/repo/tuscany.properties
diff --git a/java/sca-1.x-contrib/distribution/tomcat/pom.xml b/sca-java-1.x/contrib/distribution/tomcat/pom.xml
index 04a2317b5b..04a2317b5b 100644
--- a/java/sca-1.x-contrib/distribution/tomcat/pom.xml
+++ b/sca-java-1.x/contrib/distribution/tomcat/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/tomcat/src/main/assembly/bin.xml b/sca-java-1.x/contrib/distribution/tomcat/src/main/assembly/bin.xml
index c66b086e27..c66b086e27 100644
--- a/java/sca-1.x-contrib/distribution/tomcat/src/main/assembly/bin.xml
+++ b/sca-java-1.x/contrib/distribution/tomcat/src/main/assembly/bin.xml
diff --git a/java/sca-1.x-contrib/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties b/sca-java-1.x/contrib/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
index 6e2ca20deb..6e2ca20deb 100644
--- a/java/sca-1.x-contrib/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
+++ b/sca-java-1.x/contrib/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
diff --git a/java/sca-1.x-contrib/distribution/war/pom.xml b/sca-java-1.x/contrib/distribution/war/pom.xml
index 60b3f87d6b..60b3f87d6b 100644
--- a/java/sca-1.x-contrib/distribution/war/pom.xml
+++ b/sca-java-1.x/contrib/distribution/war/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/war/src/main/release/LICENSE b/sca-java-1.x/contrib/distribution/war/src/main/release/LICENSE
index 1589695785..1589695785 100644
--- a/java/sca-1.x-contrib/distribution/war/src/main/release/LICENSE
+++ b/sca-java-1.x/contrib/distribution/war/src/main/release/LICENSE
diff --git a/java/sca-1.x-contrib/distribution/war/src/main/release/NOTICE b/sca-java-1.x/contrib/distribution/war/src/main/release/NOTICE
index c34934e5cd..c34934e5cd 100644
--- a/java/sca-1.x-contrib/distribution/war/src/main/release/NOTICE
+++ b/sca-java-1.x/contrib/distribution/war/src/main/release/NOTICE
diff --git a/java/sca-1.x-contrib/distribution/war/src/main/release/README b/sca-java-1.x/contrib/distribution/war/src/main/release/README
index baa8f764c4..baa8f764c4 100644
--- a/java/sca-1.x-contrib/distribution/war/src/main/release/README
+++ b/sca-java-1.x/contrib/distribution/war/src/main/release/README
diff --git a/java/sca-1.x-contrib/distribution/war/src/main/webapp/web.xml b/sca-java-1.x/contrib/distribution/war/src/main/webapp/web.xml
index 787ff847b0..787ff847b0 100644
--- a/java/sca-1.x-contrib/distribution/war/src/main/webapp/web.xml
+++ b/sca-java-1.x/contrib/distribution/war/src/main/webapp/web.xml
diff --git a/java/sca-1.x-contrib/distribution/war/war.xml b/sca-java-1.x/contrib/distribution/war/war.xml
index 8fb1044714..8fb1044714 100644
--- a/java/sca-1.x-contrib/distribution/war/war.xml
+++ b/sca-java-1.x/contrib/distribution/war/war.xml
diff --git a/java/sca-1.x-contrib/distribution/webapp/pom.xml b/sca-java-1.x/contrib/distribution/webapp/pom.xml
index 9d7bf39b4e..9d7bf39b4e 100644
--- a/java/sca-1.x-contrib/distribution/webapp/pom.xml
+++ b/sca-java-1.x/contrib/distribution/webapp/pom.xml
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java b/sca-java-1.x/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
index 9a0c66a776..9a0c66a776 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java b/sca-java-1.x/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
index e46cadfa3d..e46cadfa3d 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/WarContextListener.java
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/WEB-INF/web.xml
index 8e65a9b96d..8e65a9b96d 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
index 4efe4b5db3..4efe4b5db3 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/sca-contributions/safeToDelete.tmp
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
index 0df7ab8d74..0df7ab8d74 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-calculator-nodeB.jar
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
index acf47451b3..acf47451b3 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/sca-contributions/sample-helloworld-ws-service.jar
diff --git a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/scaDomainInfo.jsp b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
index c92c164cfb..c92c164cfb 100644
--- a/java/sca-1.x-contrib/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
+++ b/sca-java-1.x/contrib/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
diff --git a/java/sca-1.x-contrib/etc/policy-continuum.policy b/sca-java-1.x/contrib/etc/policy-continuum.policy
index c929703993..c929703993 100644
--- a/java/sca-1.x-contrib/etc/policy-continuum.policy
+++ b/sca-java-1.x/contrib/etc/policy-continuum.policy
diff --git a/java/sca-1.x-contrib/modules/api/LICENSE b/sca-java-1.x/contrib/modules/api/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-1.x-contrib/modules/api/LICENSE
+++ b/sca-java-1.x/contrib/modules/api/LICENSE
diff --git a/java/sca-1.x-contrib/modules/api/NOTICE b/sca-java-1.x/contrib/modules/api/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca-1.x-contrib/modules/api/NOTICE
+++ b/sca-java-1.x/contrib/modules/api/NOTICE
diff --git a/java/sca-1.x-contrib/modules/api/pom.xml b/sca-java-1.x/contrib/modules/api/pom.xml
index 62092ea610..62092ea610 100644
--- a/java/sca-1.x-contrib/modules/api/pom.xml
+++ b/sca-java-1.x/contrib/modules/api/pom.xml
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/LICENSE b/sca-java-1.x/contrib/modules/assembly-java-dsl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/LICENSE
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/LICENSE
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/NOTICE b/sca-java-1.x/contrib/modules/assembly-java-dsl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/NOTICE
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/NOTICE
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/pom.xml b/sca-java-1.x/contrib/modules/assembly-java-dsl/pom.xml
index 953615f596..953615f596 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/pom.xml
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/pom.xml
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
index 28a5ecdc24..28a5ecdc24 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
index 3d97041907..3d97041907 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
index 7f3c89fd2f..7f3c89fd2f 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
index 8966a4be9d..8966a4be9d 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
index f3e36e8c38..f3e36e8c38 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
index e2108b5ef8..e2108b5ef8 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
index 0968310548..0968310548 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
index 9022b9d9e6..9022b9d9e6 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
index 49f7cd46b2..49f7cd46b2 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
index d9aab9de22..d9aab9de22 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
index 379429d17e..379429d17e 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
index 709562cd72..709562cd72 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
index ba91fd2168..ba91fd2168 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
index 4e239d03d3..4e239d03d3 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
index 030c820ed2..030c820ed2 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
index 92f448ec87..92f448ec87 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
index b856201551..b856201551 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
index fb950b5c13..fb950b5c13 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
diff --git a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
index a0580095a0..a0580095a0 100644
--- a/java/sca-1.x-contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ b/sca-java-1.x/contrib/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
diff --git a/java/sca-1.x-contrib/modules/compact-base/pom.xml b/sca-java-1.x/contrib/modules/compact-base/pom.xml
index a1357309db..a1357309db 100644
--- a/java/sca-1.x-contrib/modules/compact-base/pom.xml
+++ b/sca-java-1.x/contrib/modules/compact-base/pom.xml
diff --git a/java/sca-1.x-contrib/modules/compact-bpel/pom.xml b/sca-java-1.x/contrib/modules/compact-bpel/pom.xml
index ed28ae19c3..ed28ae19c3 100644
--- a/java/sca-1.x-contrib/modules/compact-bpel/pom.xml
+++ b/sca-java-1.x/contrib/modules/compact-bpel/pom.xml
diff --git a/java/sca-1.x-contrib/modules/compact-spring/pom.xml b/sca-java-1.x/contrib/modules/compact-spring/pom.xml
index cf44588d40..cf44588d40 100644
--- a/java/sca-1.x-contrib/modules/compact-spring/pom.xml
+++ b/sca-java-1.x/contrib/modules/compact-spring/pom.xml
diff --git a/java/sca-1.x-contrib/modules/compact-standalone/pom.xml b/sca-java-1.x/contrib/modules/compact-standalone/pom.xml
index 99441c20c5..99441c20c5 100644
--- a/java/sca-1.x-contrib/modules/compact-standalone/pom.xml
+++ b/sca-java-1.x/contrib/modules/compact-standalone/pom.xml
diff --git a/java/sca-1.x-contrib/modules/compact-webservices/pom.xml b/sca-java-1.x/contrib/modules/compact-webservices/pom.xml
index e3b388de7d..e3b388de7d 100644
--- a/java/sca-1.x-contrib/modules/compact-webservices/pom.xml
+++ b/sca-java-1.x/contrib/modules/compact-webservices/pom.xml
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/LICENSE b/sca-java-1.x/contrib/modules/contribution-updater-impl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/LICENSE
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/LICENSE
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/NOTICE b/sca-java-1.x/contrib/modules/contribution-updater-impl/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/NOTICE
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/NOTICE
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/pom.xml b/sca-java-1.x/contrib/modules/contribution-updater-impl/pom.xml
index bece514f4a..bece514f4a 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/pom.xml
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/pom.xml
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
index a23bf6f8cd..a23bf6f8cd 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ArtifactsFinder.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
index a6a6084f5f..a6a6084f5f 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ComponentUpdaterImpl.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
index c5a15b5108..c5a15b5108 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/CompositeUpdaterImpl.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
index 7f5870ad55..7f5870ad55 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/main/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterFactoryImpl.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
index 83d0224ad4..83d0224ad4 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/ContributionUpdaterTestCase.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
index 0eb7fb692b..0eb7fb692b 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/GreetService.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
index 38fa2721bb..38fa2721bb 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/HelloComponent.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
index 1495ff2cea..1495ff2cea 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/java/org/apache/tuscany/sca/contribution/updater/impl/MetaComponentHello.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
index 76714a0e9c..76714a0e9c 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/resources/HelloComposite.composite
diff --git a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/contrib/modules/contribution-updater-impl/src/test/resources/repository/sample-calculator.jar
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/LICENSE b/sca-java-1.x/contrib/modules/contribution-updater/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/LICENSE
+++ b/sca-java-1.x/contrib/modules/contribution-updater/LICENSE
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/NOTICE b/sca-java-1.x/contrib/modules/contribution-updater/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/NOTICE
+++ b/sca-java-1.x/contrib/modules/contribution-updater/NOTICE
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/pom.xml b/sca-java-1.x/contrib/modules/contribution-updater/pom.xml
index cbfa6772e4..cbfa6772e4 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/pom.xml
+++ b/sca-java-1.x/contrib/modules/contribution-updater/pom.xml
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
index 885fe8cfb0..885fe8cfb0 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/MetaComponent.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
index 44673bfdb9..44673bfdb9 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/assembly/xml/MetaComponentProcessor.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
index d93a92b32c..d93a92b32c 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentNotFoundException.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
index 8743556538..8743556538 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdater.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
index f94238089f..f94238089f 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ComponentUpdaterException.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
index 52d7e602b7..52d7e602b7 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeNotFoundException.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
index 4f55148651..4f55148651 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdater.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
index 3dc86d97f7..3dc86d97f7 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/CompositeUpdaterException.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
index a364c23174..a364c23174 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/main/java/org/apache/tuscany/sca/contribution/updater/ContributionUpdater.java
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/test/resources/HelloComposite.composite b/sca-java-1.x/contrib/modules/contribution-updater/src/test/resources/HelloComposite.composite
index 76714a0e9c..76714a0e9c 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/test/resources/HelloComposite.composite
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/test/resources/HelloComposite.composite
diff --git a/java/sca-1.x-contrib/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar b/sca-java-1.x/contrib/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
index 9c46c679d2..9c46c679d2 100644
--- a/java/sca-1.x-contrib/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
+++ b/sca-java-1.x/contrib/modules/contribution-updater/src/test/resources/repository/sample-calculator.jar
diff --git a/java/sca-1.x-contrib/modules/core-spring/LICENSE b/sca-java-1.x/contrib/modules/core-spring/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/core-spring/LICENSE
+++ b/sca-java-1.x/contrib/modules/core-spring/LICENSE
diff --git a/java/sca-1.x-contrib/modules/core-spring/NOTICE b/sca-java-1.x/contrib/modules/core-spring/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/core-spring/NOTICE
+++ b/sca-java-1.x/contrib/modules/core-spring/NOTICE
diff --git a/java/sca-1.x-contrib/modules/core-spring/pom.xml b/sca-java-1.x/contrib/modules/core-spring/pom.xml
index acbe20875c..acbe20875c 100644
--- a/java/sca-1.x-contrib/modules/core-spring/pom.xml
+++ b/sca-java-1.x/contrib/modules/core-spring/pom.xml
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
index 94bd5c8cf2..94bd5c8cf2 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanAssemblyFactory.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
index 9d874262e9..9d874262e9 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanComponentImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
index 7b747372b4..7b747372b4 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/assembly/impl/BeanReferenceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
index b275bfa9a7..b275bfa9a7 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ModelResolverImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
index 8fa5f4cd53..8fa5f4cd53 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/SCADomainContext.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
index 493ffe3798..493ffe3798 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanBaseJavaImplementationImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
index 6b19bac413..6b19bac413 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationFactory.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
index 7fc82d8711..7fc82d8711 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaImplementationImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
index 17a7e9084c..17a7e9084c 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceContractImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
index 492ab2732e..492ab2732e 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceFactory.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
index 6c3afdb129..6c3afdb129 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/BeanJavaInterfaceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/AddService.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/AddService.java
index f3a24ed6b2..f3a24ed6b2 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/AddService.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
index 61654ea811..61654ea811 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/AddServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/CalculatorClient.java
index 73aa028084..73aa028084 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/CalculatorClient.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/CalculatorService.java
index e0cf23dc17..e0cf23dc17 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/CalculatorService.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
index c1fceb575d..c1fceb575d 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/DivideService.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/DivideService.java
index 7c69b10b25..7c69b10b25 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/DivideService.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
index e1f35f99b5..e1f35f99b5 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/MultiplyService.java
index 686542c18e..686542c18e 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/MultiplyService.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
index d621407908..d621407908 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
index e8e4a6f71b..e8e4a6f71b 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/NestedCalculatorClient.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/SubtractService.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/SubtractService.java
index 30632688f9..30632688f9 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/SubtractService.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
index 4fed0a8c6a..4fed0a8c6a 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
index 44b447cc64..44b447cc64 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/CalculatorTestCase.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java b/sca-java-1.x/contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
index baf73ac197..baf73ac197 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/java/org/apache/tuscany/sca/core/spring/NestedCalculatorTestCaseFIXME.java
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
index 6d998ba035..6d998ba035 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/Calculator.composite
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
index 8b043f2b4f..8b043f2b4f 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerCalculator.composite
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
index d7d1124050..d7d1124050 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/InnerOperations.composite
diff --git a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
index c2b6cced36..c2b6cced36 100644
--- a/java/sca-1.x-contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
+++ b/sca-java-1.x/contrib/modules/core-spring/src/test/resources/org/apache/tuscany/sca/core/spring/OuterCalculator.composite
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/LICENSE b/sca-java-1.x/contrib/modules/data-engine-helper/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/LICENSE
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/LICENSE
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/NOTICE b/sca-java-1.x/contrib/modules/data-engine-helper/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/NOTICE
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/NOTICE
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/pom.xml b/sca-java-1.x/contrib/modules/data-engine-helper/pom.xml
index 52bf3b1cfe..52bf3b1cfe 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/pom.xml
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/pom.xml
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
index 99709857b8..99709857b8 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/ConnectionInfoArtifactProcessor.java
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
index aef9ac3261..aef9ac3261 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngine.java
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
index 572c190037..572c190037 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/DataAccessEngineManager.java
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
index a010e089e9..a010e089e9 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/MissingConfigFileException.java
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
index c72308f733..c72308f733 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionInfo.java
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
index df08a970b3..df08a970b3 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/java/org/apache/tuscany/sca/data/engine/config/ConnectionProperties.java
diff --git a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
index b040d69cc5..b040d69cc5 100644
--- a/java/sca-1.x-contrib/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
+++ b/sca-java-1.x/contrib/modules/data-engine-helper/src/main/resources/dataengine-helper-validation-messages.properties
diff --git a/java/sca-1.x-contrib/modules/databinding-job/LICENSE b/sca-java-1.x/contrib/modules/databinding-job/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/LICENSE
+++ b/sca-java-1.x/contrib/modules/databinding-job/LICENSE
diff --git a/java/sca-1.x-contrib/modules/databinding-job/NOTICE b/sca-java-1.x/contrib/modules/databinding-job/NOTICE
index 94481d6cfa..94481d6cfa 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/NOTICE
+++ b/sca-java-1.x/contrib/modules/databinding-job/NOTICE
diff --git a/java/sca-1.x-contrib/modules/databinding-job/pom.xml b/sca-java-1.x/contrib/modules/databinding-job/pom.xml
index 258da47ed9..258da47ed9 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/pom.xml
+++ b/sca-java-1.x/contrib/modules/databinding-job/pom.xml
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java
index 98ca6c7429..98ca6c7429 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java
index 9752815640..9752815640 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/Job2OMElement.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
index 9d3c6fac5a..9d3c6fac5a 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataBinding.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java
index 40ee2ff010..40ee2ff010 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobDataMap.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java
index 8c98fd2e26..8c98fd2e26 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/JobExecutionContext.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java
index 5665e4f492..5665e4f492 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/OMElement2Job.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java
index 693e0f1af7..693e0f1af7 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/java/org/apache/tuscany/sca/databinding/job/RemoteJob.java
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding b/sca-java-1.x/contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
index e9e7dc9d09..e9e7dc9d09 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.DataBinding
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer b/sca-java-1.x/contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
index f42a526a48..f42a526a48 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/main/resources/META-INF/services/org.apache.tuscany.sca.databinding.PullTransformer
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/test/resources/ipo.xml b/sca-java-1.x/contrib/modules/databinding-job/src/test/resources/ipo.xml
index df901d183d..df901d183d 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/test/resources/ipo.xml
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/test/resources/ipo.xml
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/test/resources/ipo.xsd b/sca-java-1.x/contrib/modules/databinding-job/src/test/resources/ipo.xsd
index cce0cf1019..cce0cf1019 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/test/resources/ipo.xsd
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/test/resources/ipo.xsd
diff --git a/java/sca-1.x-contrib/modules/databinding-job/src/test/resources/order.wsdl b/sca-java-1.x/contrib/modules/databinding-job/src/test/resources/order.wsdl
index 913d9e4928..913d9e4928 100644
--- a/java/sca-1.x-contrib/modules/databinding-job/src/test/resources/order.wsdl
+++ b/sca-java-1.x/contrib/modules/databinding-job/src/test/resources/order.wsdl
diff --git a/java/sca-1.x-contrib/modules/host-osgi/LICENSE b/sca-java-1.x/contrib/modules/host-osgi/LICENSE
index 4b5ab74408..4b5ab74408 100644
--- a/java/sca-1.x-contrib/modules/host-osgi/LICENSE
+++ b/sca-java-1.x/contrib/modules/host-osgi/LICENSE
diff --git a/java/sca-1.x-contrib/modules/host-osgi/NOTICE b/sca-java-1.x/contrib/modules/host-osgi/NOTICE
index a3c65715e5..a3c65715e5 100644
--- a/java/sca-1.x-contrib/modules/host-osgi/NOTICE
+++ b/sca-java-1.x/contrib/modules/host-osgi/NOTICE
diff --git a/java/sca-1.x-contrib/modules/host-osgi/pom.xml b/sca-java-1.x/contrib/modules/host-osgi/pom.xml
index 40e305c854..40e305c854 100644
--- a/java/sca-1.x-contrib/modules/host-osgi/pom.xml
+++ b/sca-java-1.x/contrib/modules/host-osgi/pom.xml
diff --git a/java/sca-1.x-contrib/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/contrib/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 8bab603184..8bab603184 100644
--- a/java/sca-1.x-contrib/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/contrib/modules/host-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/java/sca-1.x-contrib/modules/host-webapp-junit/LICENSE b/sca-java-1.x/contrib/modules/host-webapp-junit/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/host-webapp-junit/LICENSE
+++ b/sca-java-1.x/contrib/modules/host-webapp-junit/LICENSE
diff --git a/java/sca-1.x-contrib/modules/host-webapp-junit/NOTICE b/sca-java-1.x/contrib/modules/host-webapp-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca-1.x-contrib/modules/host-webapp-junit/NOTICE
+++ b/sca-java-1.x/contrib/modules/host-webapp-junit/NOTICE
diff --git a/java/sca-1.x-contrib/modules/host-webapp-junit/pom.xml b/sca-java-1.x/contrib/modules/host-webapp-junit/pom.xml
index 4245aebbe8..4245aebbe8 100644
--- a/java/sca-1.x-contrib/modules/host-webapp-junit/pom.xml
+++ b/sca-java-1.x/contrib/modules/host-webapp-junit/pom.xml
diff --git a/java/sca-1.x-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java b/sca-java-1.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
index b2d3d0abf1..b2d3d0abf1 100644
--- a/java/sca-1.x-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
+++ b/sca-java-1.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/JUnitServletFilter.java
diff --git a/java/sca-1.x-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java b/sca-java-1.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
index 72ec478cd6..72ec478cd6 100644
--- a/java/sca-1.x-contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
+++ b/sca-java-1.x/contrib/modules/host-webapp-junit/src/main/java/org/apache/tuscany/sca/host/webapp/junit/XMLFormatter.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/LICENSE b/sca-java-1.x/contrib/modules/implementation-das/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/LICENSE
+++ b/sca-java-1.x/contrib/modules/implementation-das/LICENSE
diff --git a/java/sca-1.x-contrib/modules/implementation-das/NOTICE b/sca-java-1.x/contrib/modules/implementation-das/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/NOTICE
+++ b/sca-java-1.x/contrib/modules/implementation-das/NOTICE
diff --git a/java/sca-1.x-contrib/modules/implementation-das/company.sql b/sca-java-1.x/contrib/modules/implementation-das/company.sql
index e9f8b06901..e9f8b06901 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/company.sql
+++ b/sca-java-1.x/contrib/modules/implementation-das/company.sql
diff --git a/java/sca-1.x-contrib/modules/implementation-das/pom.xml b/sca-java-1.x/contrib/modules/implementation-das/pom.xml
index 10e9bb9692..10e9bb9692 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/pom.xml
+++ b/sca-java-1.x/contrib/modules/implementation-das/pom.xml
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/Constants.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/Constants.java
index b0b4b132e6..b0b4b132e6 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/Constants.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/Constants.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DAS.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DAS.java
index 1fc46ea710..1fc46ea710 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DAS.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DAS.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
index 0e0c689b41..0e0c689b41 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementation.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationFactory.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationFactory.java
index 93d22d2d5a..93d22d2d5a 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationFactory.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationFactory.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessor.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessor.java
index 0e90c90082..0e90c90082 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessor.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessor.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DefaultDASImplementationFactory.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DefaultDASImplementationFactory.java
index 2e18541b3b..2e18541b3b 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DefaultDASImplementationFactory.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/DefaultDASImplementationFactory.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/annotations/Command.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/annotations/Command.java
index c8c3fd75e6..c8c3fd75e6 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/annotations/Command.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/annotations/Command.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProvider.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProvider.java
index 40f414b7ef..40f414b7ef 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProvider.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProvider.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProviderFactory.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProviderFactory.java
index 3ce182347c..3ce182347c 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProviderFactory.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASImplementationProviderFactory.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASInvoker.java b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASInvoker.java
index 4cd227717c..4cd227717c 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASInvoker.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/java/org/apache/tuscany/sca/implementation/das/provider/DASInvoker.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 417195c684..417195c684 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index 290f05d03e..290f05d03e 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/main/resources/impl-das-validation-messages.properties b/sca-java-1.x/contrib/modules/implementation-das/src/main/resources/impl-das-validation-messages.properties
index a002d3cef0..a002d3cef0 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/main/resources/impl-das-validation-messages.properties
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/main/resources/impl-das-validation-messages.properties
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java
index 8659280891..8659280891 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASImplementationProcessorTestCase.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java
index 7d8b4181c1..7d8b4181c1 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/DASTestCase.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java
index 63d0c92683..63d0c92683 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyService.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java
index 565a930ebe..565a930ebe 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/java/org/apache/tuscany/sca/implementation/das/company/CompanyServiceTestCase.java
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/company.componentType b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/company.componentType
index 5017cfcffd..5017cfcffd 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/company.componentType
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/company.componentType
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/company.composite b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/company.composite
index ee6104360e..ee6104360e 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/company.composite
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/company.composite
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/company.xml b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/company.xml
index 350c8b99ce..350c8b99ce 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/company.xml
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/company.xml
diff --git a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/das.composite b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/das.composite
index e54f4390ac..e54f4390ac 100644
--- a/java/sca-1.x-contrib/modules/implementation-das/src/test/resources/das.composite
+++ b/sca-java-1.x/contrib/modules/implementation-das/src/test/resources/das.composite
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/LICENSE b/sca-java-1.x/contrib/modules/implementation-data-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/LICENSE
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/LICENSE
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/NOTICE b/sca-java-1.x/contrib/modules/implementation-data-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/NOTICE
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/NOTICE
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/company.sql b/sca-java-1.x/contrib/modules/implementation-data-xml/company.sql
index e9f8b06901..e9f8b06901 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/company.sql
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/company.sql
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/pom.xml b/sca-java-1.x/contrib/modules/implementation-data-xml/pom.xml
index e2fb965ddb..e2fb965ddb 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/pom.xml
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/pom.xml
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATA.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATA.java
index 3ce96e58da..3ce96e58da 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATA.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATA.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java
index 1dc5673fe5..1dc5673fe5 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATACollection.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
index a50ad89b64..a50ad89b64 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementation.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
index d4cf816dbf..d4cf816dbf 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationFactory.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
index 16c5a370ec..16c5a370ec 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessor.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCHelper.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCHelper.java
index 265f250717..265f250717 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCHelper.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCHelper.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCResultSetStreamReader.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCResultSetStreamReader.java
index 316330243b..316330243b 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCResultSetStreamReader.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/JDBCResultSetStreamReader.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/ResultSetXmlNodeImpl.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/ResultSetXmlNodeImpl.java
index 576fe5605d..576fe5605d 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/ResultSetXmlNodeImpl.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/jdbc/ResultSetXmlNodeImpl.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProvider.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProvider.java
index bbd963922c..bbd963922c 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProvider.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProvider.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProviderFactory.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProviderFactory.java
index e1af9ecd92..e1af9ecd92 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProviderFactory.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAImplementationProviderFactory.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java
index e74bf4d134..e74bf4d134 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/java/org/apache/tuscany/sca/implementation/data/provider/DATAInvoker.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 5cd3334e3f..5cd3334e3f 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
index e20f1a6379..e20f1a6379 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATACollectionTestCaseFIXME.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATACollectionTestCaseFIXME.java
index 458025dd66..458025dd66 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATACollectionTestCaseFIXME.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATACollectionTestCaseFIXME.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
index dcf87d8c68..dcf87d8c68 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATAImplementationProcessorTestCase.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java
index 4010cb63d3..4010cb63d3 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/DATATestCase.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
index 7f0707c0bc..7f0707c0bc 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeed.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeedTestCaseFIXME.java b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeedTestCaseFIXME.java
index b72ff89e3b..b72ff89e3b 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeedTestCaseFIXME.java
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/java/org/apache/tuscany/sca/implementation/data/companyFeed/CompanyFeedTestCaseFIXME.java
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/data-feed.composite b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/data-feed.composite
index 40c755b134..40c755b134 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/data-feed.composite
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/data-feed.composite
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/data.composite b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/data.composite
index f30b15e34c..f30b15e34c 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/data.composite
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/data.composite
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/insert.xml b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/insert.xml
index c0a5ada4bf..c0a5ada4bf 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/insert.xml
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/insert.xml
diff --git a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/update.xml b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/update.xml
index c6cef75274..c6cef75274 100644
--- a/java/sca-1.x-contrib/modules/implementation-data-xml/src/test/resources/update.xml
+++ b/sca-java-1.x/contrib/modules/implementation-data-xml/src/test/resources/update.xml
diff --git a/java/sca-1.x-contrib/modules/node-dynamic/LICENSE b/sca-java-1.x/contrib/modules/node-dynamic/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-1.x-contrib/modules/node-dynamic/LICENSE
+++ b/sca-java-1.x/contrib/modules/node-dynamic/LICENSE
diff --git a/java/sca-1.x-contrib/modules/node-dynamic/NOTICE b/sca-java-1.x/contrib/modules/node-dynamic/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca-1.x-contrib/modules/node-dynamic/NOTICE
+++ b/sca-java-1.x/contrib/modules/node-dynamic/NOTICE
diff --git a/java/sca-1.x-contrib/modules/node-dynamic/pom.xml b/sca-java-1.x/contrib/modules/node-dynamic/pom.xml
index 6afaa70c14..6afaa70c14 100644
--- a/java/sca-1.x-contrib/modules/node-dynamic/pom.xml
+++ b/sca-java-1.x/contrib/modules/node-dynamic/pom.xml
diff --git a/java/sca-1.x-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java b/sca-java-1.x/contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
index af6155e500..af6155e500 100644
--- a/java/sca-1.x-contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
+++ b/sca-java-1.x/contrib/modules/node-dynamic/src/main/java/org/apache/tuscany/sca/node/DynamicNodeMain.java
diff --git a/java/sca-1.x-contrib/modules/node-dynamic/src/main/resources/log4j.properties b/sca-java-1.x/contrib/modules/node-dynamic/src/main/resources/log4j.properties
index e5b3f8ebfb..e5b3f8ebfb 100644
--- a/java/sca-1.x-contrib/modules/node-dynamic/src/main/resources/log4j.properties
+++ b/sca-java-1.x/contrib/modules/node-dynamic/src/main/resources/log4j.properties
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/LICENSE b/sca-java-1.x/contrib/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/LICENSE
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/NOTICE b/sca-java-1.x/contrib/modules/node-launcher-equinox/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/NOTICE
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/pom.xml b/sca-java-1.x/contrib/modules/node-launcher-equinox/pom.xml
index 7378edc5e9..7378edc5e9 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/pom.xml
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index 61187eecac..61187eecac 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
index efe4d7bf8a..efe4d7bf8a 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 63313b6f39..63313b6f39 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
index 90d682a74b..90d682a74b 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
index 0f595df758..0f595df758 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
index 4ff93ea84b..4ff93ea84b 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index b77382d6a0..b77382d6a0 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index f3bb8c04ae..f3bb8c04ae 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index b422651244..b422651244 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 17172dbd5e..17172dbd5e 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
index cf9c0f74df..cf9c0f74df 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 11e008619c..11e008619c 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index da0ab774a3..da0ab774a3 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index b16045a103..b16045a103 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 0608e70ca5..0608e70ca5 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/contrib/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/java/sca-1.x-contrib/modules/node-launcher-webapp/LICENSE b/sca-java-1.x/contrib/modules/node-launcher-webapp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-webapp/LICENSE
+++ b/sca-java-1.x/contrib/modules/node-launcher-webapp/LICENSE
diff --git a/java/sca-1.x-contrib/modules/node-launcher-webapp/NOTICE b/sca-java-1.x/contrib/modules/node-launcher-webapp/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-webapp/NOTICE
+++ b/sca-java-1.x/contrib/modules/node-launcher-webapp/NOTICE
diff --git a/java/sca-1.x-contrib/modules/node-launcher-webapp/pom.xml b/sca-java-1.x/contrib/modules/node-launcher-webapp/pom.xml
index 32c7ca00b9..32c7ca00b9 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-webapp/pom.xml
+++ b/sca-java-1.x/contrib/modules/node-launcher-webapp/pom.xml
diff --git a/java/sca-1.x-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/contrib/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/java/sca-1.x-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/contrib/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/java/sca-1.x-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp b/sca-java-1.x/contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
index 3cc6c7b504..3cc6c7b504 100644
--- a/java/sca-1.x-contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-1.x/contrib/modules/node-launcher-webapp/src/main/webapp/index.jsp
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/LICENSE b/sca-java-1.x/contrib/modules/runtime-standalone/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/LICENSE
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/LICENSE
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/NOTICE b/sca-java-1.x/contrib/modules/runtime-standalone/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/NOTICE
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/NOTICE
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/pom.xml b/sca-java-1.x/contrib/modules/runtime-standalone/pom.xml
index 3217da778b..3217da778b 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/pom.xml
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/pom.xml
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java b/sca-java-1.x/contrib/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
index ae05f0bd29..ae05f0bd29 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/src/main/java/org/apache/tuscany/sca/runtime/standalone/StandaloneLauncher.java
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java b/sca-java-1.x/contrib/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
index d29d4a3851..d29d4a3851 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/src/test/java/org/apache/tuscany/sca/runtime/standalone/LauncherTestCase.java
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar b/sca-java-1.x/contrib/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
index 6978bee727..6978bee727 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/src/test/resources/repo/bla/helloworld-ws-js.jar
diff --git a/java/sca-1.x-contrib/modules/runtime-standalone/src/test/resources/repo/tuscany.properties b/sca-java-1.x/contrib/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
index 2735d130e8..2735d130e8 100644
--- a/java/sca-1.x-contrib/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
+++ b/sca-java-1.x/contrib/modules/runtime-standalone/src/test/resources/repo/tuscany.properties
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/LICENSE b/sca-java-1.x/contrib/modules/runtime-tomcat/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/LICENSE
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/LICENSE
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/NOTICE b/sca-java-1.x/contrib/modules/runtime-tomcat/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/NOTICE
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/NOTICE
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/pom.xml b/sca-java-1.x/contrib/modules/runtime-tomcat/pom.xml
index f737801dad..f737801dad 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/pom.xml
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/pom.xml
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
index 45ea279889..45ea279889 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverFactoryImpl.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
index e05004160c..e05004160c 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/EndpointResolverImpl.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
index 7351ecabe0..7351ecabe0 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyAnnotationProcessor.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
index c8d3aa7a46..c8d3aa7a46 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContext.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
index b19e2326a2..b19e2326a2 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyContextListener.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
index 38280443f0..38280443f0 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyHost.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
index 112b404515..112b404515 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyServlet.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
index 8764094d48..8764094d48 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/java/org/apache/tuscany/sca/runtime/tomcat/TuscanyWrapper.java
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
index e59ade0150..e59ade0150 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/main/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory
diff --git a/java/sca-1.x-contrib/modules/runtime-tomcat/src/test/resources/content/test.html b/sca-java-1.x/contrib/modules/runtime-tomcat/src/test/resources/content/test.html
index f4b79d7f01..f4b79d7f01 100644
--- a/java/sca-1.x-contrib/modules/runtime-tomcat/src/test/resources/content/test.html
+++ b/sca-java-1.x/contrib/modules/runtime-tomcat/src/test/resources/content/test.html
diff --git a/java/sca-1.x-contrib/modules/runtime-war/LICENSE b/sca-java-1.x/contrib/modules/runtime-war/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/runtime-war/LICENSE
+++ b/sca-java-1.x/contrib/modules/runtime-war/LICENSE
diff --git a/java/sca-1.x-contrib/modules/runtime-war/NOTICE b/sca-java-1.x/contrib/modules/runtime-war/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/runtime-war/NOTICE
+++ b/sca-java-1.x/contrib/modules/runtime-war/NOTICE
diff --git a/java/sca-1.x-contrib/modules/runtime-war/pom.xml b/sca-java-1.x/contrib/modules/runtime-war/pom.xml
index aad5c68a55..aad5c68a55 100644
--- a/java/sca-1.x-contrib/modules/runtime-war/pom.xml
+++ b/sca-java-1.x/contrib/modules/runtime-war/pom.xml
diff --git a/java/sca-1.x-contrib/modules/runtime/LICENSE b/sca-java-1.x/contrib/modules/runtime/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/modules/runtime/LICENSE
+++ b/sca-java-1.x/contrib/modules/runtime/LICENSE
diff --git a/java/sca-1.x-contrib/modules/runtime/NOTICE b/sca-java-1.x/contrib/modules/runtime/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/modules/runtime/NOTICE
+++ b/sca-java-1.x/contrib/modules/runtime/NOTICE
diff --git a/java/sca-1.x-contrib/modules/runtime/pom.xml b/sca-java-1.x/contrib/modules/runtime/pom.xml
index 8b962801cc..8b962801cc 100644
--- a/java/sca-1.x-contrib/modules/runtime/pom.xml
+++ b/sca-java-1.x/contrib/modules/runtime/pom.xml
diff --git a/java/sca-1.x-contrib/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java b/sca-java-1.x/contrib/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
index 1f03ade970..1f03ade970 100644
--- a/java/sca-1.x-contrib/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
+++ b/sca-java-1.x/contrib/modules/runtime/src/main/java/org/apache/tuscany/sca/runtime/Launcher.java
diff --git a/java/sca-1.x-contrib/modules/runtime2/pom.xml b/sca-java-1.x/contrib/modules/runtime2/pom.xml
index d53552d896..d53552d896 100644
--- a/java/sca-1.x-contrib/modules/runtime2/pom.xml
+++ b/sca-java-1.x/contrib/modules/runtime2/pom.xml
diff --git a/java/sca-1.x-contrib/modules/scdl4j/pom.xml b/sca-java-1.x/contrib/modules/scdl4j/pom.xml
index 7b23beb489..7b23beb489 100644
--- a/java/sca-1.x-contrib/modules/scdl4j/pom.xml
+++ b/sca-java-1.x/contrib/modules/scdl4j/pom.xml
diff --git a/java/sca-1.x-contrib/modules/thirdparty-library/pom.xml b/sca-java-1.x/contrib/modules/thirdparty-library/pom.xml
index c7da9d224d..c7da9d224d 100644
--- a/java/sca-1.x-contrib/modules/thirdparty-library/pom.xml
+++ b/sca-java-1.x/contrib/modules/thirdparty-library/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/core/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/features/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/core/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/core/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/core/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/features/core/META-INF/MANIFEST.MF
index 63215d7c6f..63215d7c6f 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/core/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/core/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/features/core/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/core/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/core/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/core/build.properties b/sca-java-1.x/contrib/tools/eclipse34/features/core/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/core/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/core/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/core/feature.xml b/sca-java-1.x/contrib/tools/eclipse34/features/core/feature.xml
index 1a20ac1eb1..1a20ac1eb1 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/core/feature.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/core/feature.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/core/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/features/core/pom.xml
index ccce95de05..ccce95de05 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/core/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/core/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
index f363ae7b2a..f363ae7b2a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/build.properties b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/feature.xml b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/feature.xml
index ef2ab6c2ba..ef2ab6c2ba 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/feature.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/feature.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/pom.xml
index 0d42beba16..0d42beba16 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/ejava/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/ejava/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/manager/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/features/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/manager/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/manager/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/manager/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
index 8d8f5b271d..8d8f5b271d 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/manager/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/manager/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/features/manager/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/manager/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/manager/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/manager/build.properties b/sca-java-1.x/contrib/tools/eclipse34/features/manager/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/manager/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/manager/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/manager/feature.xml b/sca-java-1.x/contrib/tools/eclipse34/features/manager/feature.xml
index 189342993d..189342993d 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/manager/feature.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/manager/feature.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/manager/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/features/manager/pom.xml
index 9731166cf6..9731166cf6 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/manager/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/manager/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/process/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/features/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/process/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/process/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/process/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/features/process/META-INF/MANIFEST.MF
index 7f10d43405..7f10d43405 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/process/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/process/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/process/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/features/process/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/process/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/process/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/process/build.properties b/sca-java-1.x/contrib/tools/eclipse34/features/process/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/process/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/process/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/process/feature.xml b/sca-java-1.x/contrib/tools/eclipse34/features/process/feature.xml
index 08332be61e..08332be61e 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/process/feature.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/process/feature.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/process/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/features/process/pom.xml
index 6515b0958e..6515b0958e 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/process/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/process/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/web20/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/features/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/web20/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/web20/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/web20/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
index 2dc129ebaa..2dc129ebaa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/web20/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/web20/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/features/web20/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/web20/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/web20/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/web20/build.properties b/sca-java-1.x/contrib/tools/eclipse34/features/web20/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/web20/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/web20/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/web20/feature.xml b/sca-java-1.x/contrib/tools/eclipse34/features/web20/feature.xml
index 8fe97d24a3..8fe97d24a3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/web20/feature.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/web20/feature.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/web20/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/features/web20/pom.xml
index e64700d106..e64700d106 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/web20/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/web20/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
index 9fb9f1282b..9fb9f1282b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/build.properties b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/build.properties
index f36e15c5d3..f36e15c5d3 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/feature.xml b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/feature.xml
index d905b6475c..d905b6475c 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/feature.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/feature.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/pom.xml
index 2caaef89d4..2caaef89d4 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/features/webservice/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/features/webservice/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
index 0d8b1053bf..0d8b1053bf 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/build.properties b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
index 6b6d79d45b..6b6d79d45b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/icons/t.gif b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/icons/t.gif
index ba896ced08..ba896ced08 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/icons/t.gif
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/icons/t.gif
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/icons/tuscany.gif b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/icons/tuscany.gif
index 849dd76d4a..849dd76d4a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/icons/tuscany.gif
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/icons/tuscany.gif
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
index ee9a3d2de9..ee9a3d2de9 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
index 7ea8d700f7..7ea8d700f7 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
index 70e794d2ce..70e794d2ce 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
index 7891cc31a6..7891cc31a6 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
index 883c7c0781..883c7c0781 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
index f90483a00d..f90483a00d 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
index 4830268272..4830268272 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
index 18850d9333..18850d9333 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
index 909290859a..909290859a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
index 060f6ff6cb..060f6ff6cb 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
index edbe4b3e69..edbe4b3e69 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
index 056deb5b27..056deb5b27 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
index 5f8ea73db4..5f8ea73db4 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
index f66fa71191..f66fa71191 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
index 6eba5ffdc2..6eba5ffdc2 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
index 2a4c7206db..2a4c7206db 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
index 5fc1a75960..5fc1a75960 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
index 702da9701e..702da9701e 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
index a1c6cb86a7..a1c6cb86a7 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
index 5e059308e6..5e059308e6 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
index 5d9f2bdf70..5d9f2bdf70 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/plugin.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/plugin.xml
index edc17c5ee2..edc17c5ee2 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/plugin.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/plugin.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/pom.xml
index 3fa51063e4..3fa51063e4 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/src/main/assembly/jar.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
index 7832ba5131..7832ba5131 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-all.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-all.xsd
index 1b19ede427..1b19ede427 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-all.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-all.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-ejb.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-jms.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-sca.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-binding-webservice.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
index c7f92f6c3b..c7f92f6c3b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-contribution.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-core.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-core.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-core.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-definitions.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-bpel.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-composite.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-cpp.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
index 1bca6199cb..1bca6199cb 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-ejb.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-java.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-implementation-spring.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-interface-cpp.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-interface-java.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-interface-wsdl.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-policy.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca-policy.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/sca.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/sca.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
index c93a1d72de..c93a1d72de 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-atom.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-http.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-notification.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
index 821f323d73..821f323d73 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-binding-rss.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
index 1b5c8aece2..1b5c8aece2 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-node.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-script.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/core/xsd/tuscany-sca.xsd
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
index fb238f04b1..fb238f04b1 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/build.properties b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
index 4051436888..4051436888 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
index 9b7c199c79..9b7c199c79 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/plugin.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/plugin.xml
index fef1afe0b9..fef1afe0b9 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/plugin.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/plugin.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/pom.xml
index 7604fc516a..7604fc516a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/ejava/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/ejava/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
index 2a70682fae..2a70682fae 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/build.properties b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
index 4ec1688b56..4ec1688b56 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
index 9c7df0f488..9c7df0f488 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/plugin.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/plugin.xml
index 2e09146dfd..2e09146dfd 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/plugin.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/plugin.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/pom.xml
index c6db3d21b2..c6db3d21b2 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/manager/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/manager/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
index 0acd32e51c..0acd32e51c 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/build.properties b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
index a342de7bde..a342de7bde 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
index dab0eeaadc..dab0eeaadc 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/plugin.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/plugin.xml
index 3e5f87f634..3e5f87f634 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/plugin.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/plugin.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/pom.xml
index f1edd8a706..f1edd8a706 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/process/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/process/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
index 3c2816ec4b..3c2816ec4b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/build.properties b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
index 3ccaa053bf..3ccaa053bf 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
index 96026db08e..96026db08e 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/plugin.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/plugin.xml
index 6bf9087474..6bf9087474 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/plugin.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/plugin.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/pom.xml
index 2e643a4064..2e643a4064 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/web20/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/web20/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
index 9d83fd9b6b..9d83fd9b6b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/META-INF/MANIFEST.MF
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/NOTICE
index 6dcfe88195..6dcfe88195 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/build.properties b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/build.properties
index c402b2eb45..c402b2eb45 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/build.properties
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/build.properties
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
index 36ff7bb8df..36ff7bb8df 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
index 6310209c3a..6310209c3a 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/plugin.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/plugin.xml
index 1fd46d3e75..1fd46d3e75 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/plugin.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/plugin.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/pom.xml
index 24f03f7274..24f03f7274 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/plugins/webservice/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/plugins/webservice/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/pom.xml
index 025b57cbc1..025b57cbc1 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/LICENSE b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/LICENSE
+++ b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/LICENSE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/NOTICE b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/NOTICE
+++ b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/NOTICE
diff --git a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/etc/generate-p2.sh b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/etc/generate-p2.sh
index ea2eb865f4..ea2eb865f4 100755
--- a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/etc/generate-p2.sh
+++ b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/etc/generate-p2.sh
diff --git a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/pom.xml b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/pom.xml
index b96902df2f..b96902df2f 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/pom.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/pom.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/site.xml b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/site.xml
index 1496bdc2c8..1496bdc2c8 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/site.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/site.xml
diff --git a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
index c1225e320b..c1225e320b 100644
--- a/java/sca-1.x-contrib/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
+++ b/sca-java-1.x/contrib/tools/eclipse34/site/updatesite/src/main/assembly/updatesite.xml
diff --git a/java/sca-1.x-contrib/tools/maven/maven-web-junit/LICENSE b/sca-java-1.x/contrib/tools/maven/maven-web-junit/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/java/sca-1.x-contrib/tools/maven/maven-web-junit/LICENSE
+++ b/sca-java-1.x/contrib/tools/maven/maven-web-junit/LICENSE
diff --git a/java/sca-1.x-contrib/tools/maven/maven-web-junit/NOTICE b/sca-java-1.x/contrib/tools/maven/maven-web-junit/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/java/sca-1.x-contrib/tools/maven/maven-web-junit/NOTICE
+++ b/sca-java-1.x/contrib/tools/maven/maven-web-junit/NOTICE
diff --git a/java/sca-1.x-contrib/tools/maven/maven-web-junit/pom.xml b/sca-java-1.x/contrib/tools/maven/maven-web-junit/pom.xml
index 4e36d63245..4e36d63245 100644
--- a/java/sca-1.x-contrib/tools/maven/maven-web-junit/pom.xml
+++ b/sca-java-1.x/contrib/tools/maven/maven-web-junit/pom.xml
diff --git a/java/sca-1.x-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java b/sca-java-1.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
index d1afe2c995..d1afe2c995 100644
--- a/java/sca-1.x-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
+++ b/sca-java-1.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitGeneratorMojo.java
diff --git a/java/sca-1.x-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java b/sca-java-1.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
index 658d65d7c3..658d65d7c3 100644
--- a/java/sca-1.x-contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
+++ b/sca-java-1.x/contrib/tools/maven/maven-web-junit/src/main/java/org/apache/tuscany/tools/sca/web/junit/plugin/WebJUnitMojo.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/LICENSE b/sca-java-1.x/contrib/tools/runtime-inspector/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/LICENSE
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/LICENSE
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/NOTICE b/sca-java-1.x/contrib/tools/runtime-inspector/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/NOTICE
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/NOTICE
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/pom.xml b/sca-java-1.x/contrib/tools/runtime-inspector/pom.xml
index 57bdf1134e..57bdf1134e 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/pom.xml
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/pom.xml
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
index ff32d1b48f..ff32d1b48f 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/AssemblyInspector.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
index 283d5e3df9..283d5e3df9 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RegistryInspector.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
index 26080b2e12..26080b2e12 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/main/java/org/apache/tuscany/sca/tools/inspector/RuntimeInspector.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
index 188451ebac..188451ebac 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddService.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/AddServiceImpl.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
index 8001ab7818..8001ab7818 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorClient.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
index 031fa8b912..031fa8b912 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorService.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
index 3d861f2018..3d861f2018 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/CalculatorServiceImpl.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
index 30d248208b..30d248208b 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideService.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/DivideServiceImpl.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyService.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/MultiplyServiceImpl.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractService.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/calculator/SubtractServiceImpl.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
index 0710b670cd..0710b670cd 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/java/org/apache/tuscany/sca/tools/inspector/RegistryInspectorTestCase.java
diff --git a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
index 90872041b0..90872041b0 100644
--- a/java/sca-1.x-contrib/tools/runtime-inspector/src/test/resources/Calculator.composite
+++ b/sca-java-1.x/contrib/tools/runtime-inspector/src/test/resources/Calculator.composite