48 files changed, 7 insertions, 7 deletions
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-command-line/README b/sca-java-2.x/trunk/samples/running-tuscany/command-line/README
index bf963ea98e..bf963ea98e 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-command-line/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/command-line/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/README b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/README
index b10f588d0d..b10f588d0d 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
index cab461b156..cab461b156 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/build.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/build.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
index a30d55d2e9..a30d55d2e9 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/pom.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
index 3d6af9f561..3d6af9f561 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingJSONRPCCalculator.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
index 0a77a31955..0a77a31955 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingRMICalculator.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
index bb860faf44..bb860faf44 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingSCACalculator.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
index 238dd40ff7..238dd40ff7 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
index 254f67aae9..254f67aae9 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
index ca652718d7..ca652718d7 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/JSELauncherImplementationScriptCalculator.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/RuntimeIntegration.java
index fdff16c12c..fdff16c12c 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/test/java/launcher/LauncherTestCase.java
index 6bbbe32a7f..6bbbe32a7f 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-jse/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-jse/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/README b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/README
index 362d6032d2..362d6032d2 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/build.xml
index 139ff054f7..139ff054f7 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/build.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/build.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml
index aa0876b338..aa0876b338 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/pom.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/calculator/CalculatorService.java
index a59a7c3b16..a59a7c3b16 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java
index 2c1cdf187a..2c1cdf187a 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
index 46cdcc73e4..46cdcc73e4 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java
index 1eacb94b19..1eacb94b19 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java
index 9228d33018..9228d33018 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi-base/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/README b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/README
index 01d277ae09..01d277ae09 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/build.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/build.xml
index edc930f6f8..edc930f6f8 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/build.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/build.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/pom.xml
index c3cf7e6577..c3cf7e6577 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/pom.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/calculator/CalculatorService.java
index 12d80ffd1c..12d80ffd1c 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/calculator/CalculatorService.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
index f4a2f0780c..f4a2f0780c 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/RuntimeIntegration.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleLauncherException.java
index f2ed3d421d..f2ed3d421d 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleLauncherException.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleLauncherException.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
index ea22d3cc7b..ea22d3cc7b 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingSCA.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
index d85c1cf5f8..d85c1cf5f8 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/main/java/launcher/SampleOSGILauncherBindingWS.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/test/java/launcher/LauncherTestCase.java
index 789484ceec..789484ceec 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-embedded-osgi/src/test/java/launcher/LauncherTestCase.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/embedded-osgi/src/test/java/launcher/LauncherTestCase.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-maven/README b/sca-java-2.x/trunk/samples/running-tuscany/maven/README
index ff976c3515..ff976c3515 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-maven/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/maven/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-osgi/README b/sca-java-2.x/trunk/samples/running-tuscany/osgi/README
index 6df2c1d2f2..6df2c1d2f2 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-osgi/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/osgi/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
index 67b6a29eb3..06d5ff3306 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/pom.xml
@@ -38,14 +38,14 @@
             <modules>
 
                 <!-- don't need to process these as they just contain README files
-                <module>launcher-command-line</module>
-                <module>launcher-maven</module>
-                <module>launcher-webapp</module>
+                <module>command-line</module>
+                <module>maven</module>
+                <module>webapp</module>
                 -->
-                <module>launcher-embedded-jse</module>
-                <module>launcher-embedded-osgi</module>
-                <module>launcher-embedded-osgi-base</module>
-                <module>launcher-shell</module>
+                <module>embedded-jse</module>
+                <module>embedded-osgi</module>
+                <module>embedded-osgi-base</module>
+                <module>shell</module>
 
             </modules>
         </profile>
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/README b/sca-java-2.x/trunk/samples/running-tuscany/shell/README
index 9745f57ad9..9745f57ad9 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/README
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/pom.xml b/sca-java-2.x/trunk/samples/running-tuscany/shell/pom.xml
index 5fea678288..5fea678288 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/pom.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/pom.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/sca b/sca-java-2.x/trunk/samples/running-tuscany/shell/sca
index 8f6cf268b3..8f6cf268b3 100755
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/sca
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/sca
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/sca.bat b/sca-java-2.x/trunk/samples/running-tuscany/shell/sca.bat
index 5110effc25..5110effc25 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/sca.bat
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/sca.bat
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-remote.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-remote.txt
index dc13e5c401..dc13e5c401 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-remote.txt
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-remote.txt
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-start.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-start.txt
index 2514a9058d..2514a9058d 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-start.txt
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-start.txt
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-status.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-status.txt
index 4df56e85e8..4df56e85e8 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-status.txt
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-status.txt
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-stop.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-stop.txt
index 39eb36aa77..39eb36aa77 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test-stop.txt
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test-stop.txt
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test.txt b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test.txt
index bf489a46a5..bf489a46a5 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/scripts/test.txt
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/scripts/test.txt
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/java/sample/Shell.java b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/Shell.java
index d0d8fb5dfe..d0d8fb5dfe 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/java/sample/Shell.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/Shell.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/java/sample/ShellServlet.java b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/ShellServlet.java
index 55aadbd09b..55aadbd09b 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/java/sample/ShellServlet.java
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/java/sample/ShellServlet.java
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/WEB-INF/web.xml
index ac1ad1cc8e..ac1ad1cc8e 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/WEB-INF/web.xml
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/index.html
index 7d8a8568e8..7d8a8568e8 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-shell/src/main/webapp/index.html
+++ b/sca-java-2.x/trunk/samples/running-tuscany/shell/src/main/webapp/index.html
diff --git a/sca-java-2.x/trunk/samples/running-tuscany/launcher-webapp/README b/sca-java-2.x/trunk/samples/running-tuscany/webapp/README
index 4031b9c0bd..4031b9c0bd 100644
--- a/sca-java-2.x/trunk/samples/running-tuscany/launcher-webapp/README
+++ b/sca-java-2.x/trunk/samples/running-tuscany/webapp/README