Moving 2.x branches

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

39 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/META-INF/MANIFEST.MF
index 359daed2cc..359daed2cc 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/pom.xml
index e470de82d9..e470de82d9 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
index 892412b395..892412b395 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/Contribution.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
index 056ec080ba..056ec080ba 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/ContributionLocationHelper.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
index e6f59e1b07..e6f59e1b07 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
index fd4d0ee5bf..fd4d0ee5bf 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
index 414f3aae63..414f3aae63 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/FrameworkLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
index b9bb70b5d7..b9bb70b5d7 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/LauncherException.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
index aeb29c0789..aeb29c0789 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
index 79aedc81c4..79aedc81c4 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
index 14018a7af5..14018a7af5 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncher2.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
index f3ddbe0f80..f3ddbe0f80 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherCommand.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
index 939372d782..939372d782 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
index 4b4c4a8978..4b4c4a8978 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeMain.java
diff --git a/branches/sca-java-2.0-M4/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-java-2.0-M4/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-java-2.0-M4/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-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/J2SE-1.5.profile
diff --git a/branches/sca-java-2.0-M4/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-java-2.0-M4/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-java-2.0-M4/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-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/JavaSE-1.6.profile
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
index 400fdc58e8..400fdc58e8 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axiom-api-1.2.7.MF
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
index 58630c02ef..58630c02ef 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/axis2-kernel-1.4.1.MF
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
index b3e9d79d28..b3e9d79d28 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/main/resources/org/apache/tuscany/sca/node/equinox/launcher/woden-impl-dom-1.0M8.MF
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
index e3fcdfd25f..e3fcdfd25f 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorld.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
index 8232acb658..8232acb658 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldClient.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
index e51d3c79d9..e51d3c79d9 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/hello/HelloWorldImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
index 5728ad2e07..5728ad2e07 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxOSGiHostTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
index 5cc40ca77f..5cc40ca77f 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherTestCase.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
index ccd116e848..ccd116e848 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher-equinox/src/test/resources/HelloWorld.composite
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/LICENSE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/LICENSE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/LICENSE
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/META-INF/MANIFEST.MF b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/META-INF/MANIFEST.MF
index ef73723b48..ef73723b48 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/META-INF/MANIFEST.MF
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/NOTICE b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/NOTICE
index 51042eab05..51042eab05 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/NOTICE
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/NOTICE
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/pom.xml b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/pom.xml
index cfbcce2359..cfbcce2359 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/pom.xml
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/pom.xml
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
index 4f4f861e2f..4f4f861e2f 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
index ba795216a9..ba795216a9 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
index 39e8d81139..39e8d81139 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
index 56be9f9921..56be9f9921 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
index d8df30377b..d8df30377b 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
index 38dea77eda..38dea77eda 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
index 77751dcc47..77751dcc47 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
diff --git a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
index 5345363031..5345363031 100644
--- a/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java