summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite (renamed from branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite (renamed from branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE (renamed from branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE (renamed from branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml (renamed from branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml (renamed from branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp (renamed from branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/LICENSE (renamed from branches/sca-java-1.4/modules/node-launcher/LICENSE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/NOTICE (renamed from branches/sca-java-1.4/modules/node-launcher/NOTICE)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/pom.xml (renamed from branches/sca-java-1.4/modules/node-launcher/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java (renamed from branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java)0
59 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml
index 9dbc78e9c6..9dbc78e9c6 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index 61187eecac..61187eecac 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
index efe4d7bf8a..efe4d7bf8a 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHookConfigurator.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 63313b6f39..63313b6f39 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
index 90d682a74b..90d682a74b 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
index 0f595df758..0f595df758 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/JarFileFinder.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
index 4ff93ea84b..4ff93ea84b 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LibrariesBundleFileFactoryHook.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index b77382d6a0..b77382d6a0 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index f3bb8c04ae..f3bb8c04ae 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index b422651244..b422651244 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 17172dbd5e..17172dbd5e 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
index cf9c0f74df..cf9c0f74df 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/resources/hookconfigurators.properties
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 11e008619c..11e008619c 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index da0ab774a3..da0ab774a3 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index b16045a103..b16045a103 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 0608e70ca5..0608e70ca5 100644
--- a/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml
index 5929ee36ba..5929ee36ba 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
index 0214d5185f..0214d5185f 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
index f94c43bd52..f94c43bd52 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
index 5e4a0ed338..5e4a0ed338 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
index 38c7093a16..38c7093a16 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
index afd6804ad2..afd6804ad2 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
index bf17222e34..bf17222e34 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
index f0e4e9da70..f0e4e9da70 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
index ea487c384b..ea487c384b 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
index adba1e2da7..adba1e2da7 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
index 445ea80786..445ea80786 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
index fcbe259dba..fcbe259dba 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
index c5ea0439de..c5ea0439de 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
index c9a7560b12..c9a7560b12 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
index e5194d0e5f..e5194d0e5f 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
index 97976e256a..97976e256a 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
index 9e3299d691..9e3299d691 100644
--- a/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-osgi/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml
index 52e369dd21..52e369dd21 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp
index 3cc6c7b504..3cc6c7b504 100644
--- a/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher-webapp/src/main/webapp/index.jsp
diff --git a/branches/sca-java-1.4/modules/node-launcher/LICENSE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/LICENSE
diff --git a/branches/sca-java-1.4/modules/node-launcher/NOTICE b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.4/modules/node-launcher/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/NOTICE
diff --git a/branches/sca-java-1.4/modules/node-launcher/pom.xml b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/pom.xml
index f5c3864e10..f5c3864e10 100644
--- a/branches/sca-java-1.4/modules/node-launcher/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/pom.xml
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index eb06ad7411..eb06ad7411 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 7cfabfe265..7cfabfe265 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index be9bdb15c4..be9bdb15c4 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 7be1e14988..7be1e14988 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-1.x/branches/sca-java-1.4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java