Index: webapp/WEB-INF/cmsshell.bat
===================================================================
RCS file: /usr/local/cvs/opencms/webapp/WEB-INF/cmsshell.bat,v
retrieving revision 1.15
diff -u -r1.15 cmsshell.bat
--- webapp/WEB-INF/cmsshell.bat	29 Oct 2008 12:46:48 -0000	1.15
+++ webapp/WEB-INF/cmsshell.bat	24 Aug 2010 16:20:45 -0000
@@ -66,23 +66,15 @@
 :okTomcatHome
 
 rem Guess OPENCMS_LIB if not defined
-if not "%OPENCMS_LIB%" == "" goto gotLib
+if not "%OPENCMS_LIB%" == "" goto gotHome
 set OPENCMS_LIB=%OPENCMS_HOME%\lib
 :gotHome
 if exist "%OPENCMS_LIB%\opencms.jar" goto okLib
+if exist "%OPENCMS_LIB%\opencms-core.jar" goto okLib
 echo The OPENCMS_LIB environment variable is not defined correctly
 echo This environment variable is needed to run this program
 goto end
 :okLib
-rem Add all jars in lib dir to OPENCMS_CP variable (will include a initial semicolon ";")
-for %%i in ("%OPENCMS_LIB%\*.jar") do call "%OPENCMS_HOME%\cpappend.bat" %%i
-
-rem Check for Tomcat libs
-rem Add all jars in TOMCAT_HOME\common\lib dir to TOMCAT_LIB variable (will include a initial semicolon ";")
-for %%i in ("%TOMCAT_HOME%\common\lib\*.jar") do call "%OPENCMS_HOME%\tlappend.bat" %%i
-rem also support different tomcat folder structure
-for %%i in ("%TOMCAT_HOME%\lib\*.jar") do call "%OPENCMS_HOME%\tlappend.bat" %%i
-:okLib
 
 rem ----- Execute The Requested Command ---------------------------------------
 echo Using JAVA_HOME:       %JAVA_HOME%
@@ -95,18 +87,13 @@
 
 rem Get command line arguments and save them in 
 rem the CMD_LINE_ARGS environment variable
-set CMD_LINE_ARGS=
-:setArgs
-if ""%1""=="""" goto doneSetArgs
-set CMD_LINE_ARGS=%CMD_LINE_ARGS% %1
-shift
-goto setArgs
-:doneSetArgs
+set CMD_LINE_ARGS=%*
 
 @rem set opencms arguments
 set CMD_LINE_ARGS=%CMD_LINE_ARGS% -base="%CD%"
+echo %CMD_LINE_ARGS%
 
 rem execute OPENCMS
-%_RUNJAVA% %JAVA_OPTS% -classpath "%OPENCMS_HOME%\classes%CLASSPATH%%OPENCMS_CP%%TOMCAT_LIB%" %MAINCLASS% %CMD_LINE_ARGS%
+%_RUNJAVA% %JAVA_OPTS% -Djava.ext.dirs=%OPENCMS_LIB%;%TOMCAT_HOME%\common\lib;%TOMCAT_HOME%\lib -classpath "%OPENCMS_HOME%\classes%CLASSPATH%" %MAINCLASS% %CMD_LINE_ARGS%
 
 :end
\ No newline at end of file
Index: webapp/WEB-INF/cmsshell.sh
===================================================================
RCS file: /usr/local/cvs/opencms/webapp/WEB-INF/cmsshell.sh,v
retrieving revision 1.9
diff -u -r1.9 cmsshell.sh
--- webapp/WEB-INF/cmsshell.sh	7 Dec 2009 17:30:44 -0000	1.9
+++ webapp/WEB-INF/cmsshell.sh	24 Aug 2010 16:20:45 -0000
@@ -9,7 +9,7 @@
 OPENCMS_BASE=`dirs +0`
 popd > /dev/null
 
-# get path to tomcat home 
+# get path to tomcat home
 if [ -z "$TOMCAT_HOME" ]; then
 	[ -n "$CATALINA_HOME" ] && TOMCAT_HOME="$CATALINA_HOME"
 	[ -z "$TOMCAT_HOME" ] && TOMCAT_HOME="$OPENCMS_BASE"/../../..
Index: webapp/WEB-INF/cpappend.bat
===================================================================
RCS file: webapp/WEB-INF/cpappend.bat
diff -N webapp/WEB-INF/cpappend.bat
--- webapp/WEB-INF/cpappend.bat	12 Jan 2005 14:59:30 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-rem ---------------------------------------------------------------------------
-rem Append to OPENCMS_CP
-rem ---------------------------------------------------------------------------
-
-rem Process the first argument
-if ""%1"" == """" goto end
-set OPENCMS_CP=%OPENCMS_CP%;%1
-shift
-
-rem Process the remaining arguments
-:setArgs
-if ""%1"" == """" goto doneSetArgs
-set OPENCMS_CP=%OPENCMS_CP% %1
-shift
-goto setArgs
-:doneSetArgs
-:end
Index: webapp/WEB-INF/tlappend.bat
===================================================================
RCS file: webapp/WEB-INF/tlappend.bat
diff -N webapp/WEB-INF/tlappend.bat
--- webapp/WEB-INF/tlappend.bat	12 Jan 2005 14:59:30 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-rem ---------------------------------------------------------------------------
-rem Append to TOMCAT_LIB
-rem ---------------------------------------------------------------------------
-
-rem Process the first argument
-if ""%1"" == """" goto end
-set TOMCAT_LIB=%TOMCAT_LIB%;%1
-shift
-
-rem Process the remaining arguments
-:setArgs
-if ""%1"" == """" goto doneSetArgs
-set TOMCAT_LIB=%TOMCAT_LIB% %1
-shift
-goto setArgs
-:doneSetArgs
-:end