summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/sca-equinox/modules/node-launcher
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/LICENSE (renamed from branches/sca-equinox/modules/node-launcher-equinox/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF (renamed from branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/NOTICE (renamed from branches/sca-equinox/modules/node-launcher-equinox/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/pom.xml (renamed from branches/sca-equinox/modules/node-launcher-equinox/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite (renamed from branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/LICENSE (renamed from branches/sca-equinox/modules/node-launcher-webapp/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/NOTICE (renamed from branches/sca-equinox/modules/node-launcher-webapp/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/pom.xml (renamed from branches/sca-equinox/modules/node-launcher-webapp/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml (renamed from branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml (renamed from branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp (renamed from branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/LICENSE (renamed from branches/sca-equinox/modules/node-launcher/LICENSE)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF (renamed from branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/NOTICE (renamed from branches/sca-equinox/modules/node-launcher/NOTICE)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/pom.xml (renamed from branches/sca-equinox/modules/node-launcher/pom.xml)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java)0
-rw-r--r--sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java (renamed from branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java)0
39 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/LICENSE
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index 37d3c72d1b..37d3c72d1b 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/NOTICE
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
index 2f583ece35..2f583ece35 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
index fd7aaed4c8..fd7aaed4c8 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index 61187eecac..61187eecac 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index 6007c0dac2..6007c0dac2 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index b77382d6a0..b77382d6a0 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index 68d1fa05e7..68d1fa05e7 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index 93f1b01206..93f1b01206 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 17172dbd5e..17172dbd5e 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
index 3814b42d00..3814b42d00 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
index 816e7c44f4..816e7c44f4 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index 2f519cb81d..2f519cb81d 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 11e008619c..11e008619c 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index cd3f1e294e..cd3f1e294e 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index 6186b1799a..6186b1799a 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index 0608e70ca5..0608e70ca5 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/LICENSE
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/NOTICE
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
index 0522800e1e..0522800e1e 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/pom.xml
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
index 78bbebbb83..78bbebbb83 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/META-INF/sca-contribution.xml
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
index 6c2c943c99..6c2c943c99 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp
index 3cc6c7b504..3cc6c7b504 100644
--- a/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher-webapp/src/main/webapp/index.jsp
diff --git a/branches/sca-equinox/modules/node-launcher/LICENSE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-equinox/modules/node-launcher/LICENSE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/LICENSE
diff --git a/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
index 6827dde638..6827dde638 100644
--- a/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/META-INF/MANIFEST.MF
diff --git a/branches/sca-equinox/modules/node-launcher/NOTICE b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-equinox/modules/node-launcher/NOTICE
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/NOTICE
diff --git a/branches/sca-equinox/modules/node-launcher/pom.xml b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/pom.xml
index 1679218bf0..1679218bf0 100644
--- a/branches/sca-equinox/modules/node-launcher/pom.xml
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/pom.xml
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index eb06ad7411..eb06ad7411 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 7cfabfe265..7cfabfe265 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index be9bdb15c4..be9bdb15c4 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 10d3e14838..10d3e14838 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index eafe4ddaa0..eafe4ddaa0 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-2.x/branches/sca-equinox/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java