2 files changed, 6 insertions, 5 deletions
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/default.config b/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/default.config
index d0f68de133..7ca60ac85e 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/default.config
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/default.config
@@ -16,7 +16,7 @@
 #
 
 classpath=modules/**
-mainClass=[firstArgJarManifestMainClass]|org.apache.tuscany.sca.domain.node.DomainNodeMain
+mainClass=[firstArgJarManifestMainClass]|org.apache.tuscany.sca.shell.Shell
 -Djava.util.logging.config.file={TUSCANY_HOME}/samples/logging.properties
 
 
diff --git a/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/tuscany.bat b/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/tuscany.bat
index cbf6962218..191b02c7db 100644
--- a/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/tuscany.bat
+++ b/sca-java-2.x/trunk/distribution/all/src/main/release/launcher/tuscany.bat
@@ -18,8 +18,9 @@ REM # specific language governing permissions and limitations
 REM # under the License. 
 
 REM TODO: can't get these to work yet when using the tribes domaim URI in quotes
-REM if "%1".=="/?". goto help
-REM if "%1".=="-help". goto help
+if "%1".=="/?". goto help
+if "%1".=="-help". goto help
+if "%1".=="-help". goto help
 
 if not "%TUSCANY_HOME%"=="" goto gotHome
 SET TUSCANY_HOME=%~dp0\..
@@ -32,13 +33,13 @@ goto error
 
 
 set _XDEBUG=
-if not %1==debug goto skipDebug
+if not "%1"=="debug" goto skipDebug
 set _XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y
 shift
 :skipDebug
 
 set _FORK=
-if not %1==fork goto skipFork
+if not "%1"=="fork" goto skipFork
 set _FORK=start
 shift
 :skipFORK