Index: server/src/bin/service.bat
===================================================================
--- server/src/bin/service.bat	(revision 111957)
+++ server/src/bin/service.bat	(working copy)
@@ -26,10 +26,10 @@
 REM during the build with ant filter.
 REM
 if "x%SVCNAME%" == "x" (
-    set "SVCNAME=JBAS60SVC"
+    set "SVCNAME=JBAS61SVC"
 )
-set SVCDISP=JBoss Application Server 6.0
-set SVCDESC=JBoss Application Server 6.0.0 GA/Platform: Windows %PROCESSOR_ARCHITECTURE%
+set SVCDISP=JBoss Application Server 6.1
+set SVCDESC=JBoss Application Server 6.1.0 Final/Platform: Windows %PROCESSOR_ARCHITECTURE%
 set NOPAUSE=Y
 
 REM Suppress killing service on logoff event
@@ -59,10 +59,10 @@
 REM ERR_RET_MODE            6
 
 :errExplain
-if errorlevel 1 echo Invalid command line parameters
-if errorlevel 2 echo Failed installing %SVCDISP%
-if errorlevel 4 echo Failed removing %SVCDISP%
-if errorlevel 6 echo Unknown service mode for %SVCDISP%
+if %errorlevel% EQU 1 echo Invalid command line parameters
+if %errorlevel% EQU 2 echo Failed installing %SVCDISP%
+if %errorlevel% EQU 4 echo Failed removing %SVCDISP%
+if %errorlevel% EQU 6 echo Unknown service mode for %SVCDISP%
 goto cmdEnd
 
 :cmdInstall
Index: server/src/bin/README-service.txt
===================================================================
--- server/src/bin/README-service.txt	(revision 111957)
+++ server/src/bin/README-service.txt	(working copy)
@@ -11,7 +11,7 @@
 
 $Id$
 ---------------------------------------------------------------------
-The JBoss(R)* app server is Copyright 2000-2008, Red Hat Middleware LLC
+The JBoss(R)* app server is Copyright 2000-2011, Red Hat Middleware LLC
 and individual contributors, and is licensed under the GNU LGPL.
 
 
@@ -28,7 +28,7 @@
 To install the JBoss Application Server as Windows service use
 the provided service.bat batch file.
 
-C:\> cd c:\jboss-6.0.0\bin
+C:\> cd c:\jboss-6.1.0\bin
 C:\> service.bat install
 
 To start the JBoss Application Server as Windows service use Control pannel
@@ -37,9 +37,9 @@
 during service startup.
 
 
-C:\> net start JBAS60SVC
-  The JBoss Application Server 6.0 service is starting.
-  The JBoss Application Server 6.0 service was started successfully.
+C:\> net start JBAS61SVC
+  The JBoss Application Server 6.1 service is starting.
+  The JBoss Application Server 6.1 service was started successfully.
 
 
 To stop the JBoss Application Server as Windows service use Control pannel
@@ -48,8 +48,8 @@
 any errors during service shutdown.
 
 
-C:\> net stop JBAS60SVC
-  The JBoss Application Server 6.0 service was stopped successfully.
+C:\> net stop JBAS61SVC
+  The JBoss Application Server 6.1 service was stopped successfully.
 
 
 To restart the JBoss Application Server as Windows service use Control pannel.
@@ -58,7 +58,7 @@
 service.bat batch file.
 
 
-C:\> cd c:\jboss-6.0.0\bin
+C:\> cd c:\jboss-6.1.0\bin
 C:\> service.bat uninstall
 
 
Index: server/src/bin/jboss_init_suse.sh
===================================================================
--- server/src/bin/jboss_init_suse.sh	(revision 111957)
+++ server/src/bin/jboss_init_suse.sh	(working copy)
@@ -27,7 +27,7 @@
 JBOSS_HOME=${JBOSS_HOME:-"/opt/jboss"}
 
 #make java is on your path
-JAVAPTH=${JAVAPTH:-"/usr/java/j2sdk1.4.1/bin"}
+JAVAPTH=${JAVAPTH:-"/usr/java/jdk1.6.0/bin"}
 
 #define the classpath for the shutdown class
 JBOSSCP=${JBOSSCP:-"$JBOSS_HOME/bin/shutdown.jar:$JBOSS_HOME/client/jnet.jar"}