Index: build.bat
===================================================================
--- build.bat	(Revision 6861)
+++ build.bat	(Arbeitskopie)
@@ -1,18 +1,17 @@
 @echo off
 REM $Id$
-set JAVA="%JAVA_HOME%\bin\java"
 set LIB_DIR=..\lib
 set ANT_LIB_DIR=lib
 REM Include Ant infrastructure on CLASSPATH
-set "CP=%ANT_LIB_DIR%\ant-1.6.jar;%ANT_LIB_DIR%\ant-1.6-launcher.jar;%ANT_LIB_DIR%\ant-1.6-trax.jar"
+set CP="%ANT_LIB_DIR%\ant-1.6.jar";"%ANT_LIB_DIR%\ant-1.6-launcher.jar";"%ANT_LIB_DIR%\ant-1.6-trax.jar"
 REM Include compiled Castor artefacts
 REM set "CP=%CP%;..\build\classes"
 REM Include SUN's tools.jar (incl. the compiler), required by Ant for compilation
-set "CP=%CP%;%JAVA_HOME%\lib\tools.jar"
+set CP=%CP%;"%JAVA_HOME%\lib\tools.jar"
 REM Include various dependencies
 REM Disable for for JDK 1.4 and above
-set "CP=%CP%;%LIB_DIR%\xerces-J_1.4.0.jar;
+set CP=%CP%;"%LIB_DIR%\xerces-J_1.4.0.jar"
 REM Not sure why those would ever be needed
-REM set "CP=%CP%;%LIB_DIR%\commons-logging-1.1.jar;%LIB_DIR%\log4j-1.2.8.jar"
-%JAVA% -classpath %CP% -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile ..\src\build.xml
+REM set CP=%CP%;"%LIB_DIR%\commons-logging-1.1.jar";"%LIB_DIR%\log4j-1.2.8.jar"
+"%JAVA_HOME%\bin\java" -classpath %CP% -Dant.home=lib org.apache.tools.ant.Main %1 %2 %3 %4 %5 %6 -buildfile ..\src\build.xml
 
Index: build11.bat
===================================================================
--- build11.bat	(Revision 6861)
+++ build11.bat	(Arbeitskopie)
@@ -1,11 +1,10 @@
 @echo off
 REM $Id$
-set JAVA=%JAVA_HOME%\bin\java
 REM Ant infrastructure
-set "CP=lib\ant-1.6.jar;lib\ant-1.6-launcher.jar;build\classes"
+set CP=lib\ant-1.6.jar;lib\ant-1.6-launcher.jar;build\classes
 REM Sun's JDK tools
-set "CP=%CP;%JAVA_HOME%\lib\classes.zip"
+set CP=%CP;"%JAVA_HOME%\lib\classes.zip"
 REM Xerces 1.4, disable for JDK 1.4 and above
-set "CP=%CP%;..\lib\xerces-J_1.4.0.jar"
-%JAVA% -nojit -mx128M -classpath %CP% -Dant.home=lib org.apache.tools.ant.Main -Dexcludes="**/package.html,org/exolab/castor/mapping/loader/J2CollectionHandlers.java,org/exolab/castor/util/IteratorEnumeration.java,org/exolab/castor/xml/dtd/**,org/exolab/castor/jdo/**,org/exolab/castor/gui/**,org/exolab/castor/tools/**,org/exolab/castor/dax/**,org/exolab/castor/persist/**,org/exolab/castor/dtx/**" -Dexampleexcludes="SourceGenerator/*,dax/*,**/jdo/**,**/dtx/**,**/oes/**,**/servlet/**,**/myapp/**" -Dtestexcludes="**/package.html,**/jdo/**,**/introspection/**,**/tests/framework/**" -Dapipackagenames="org.exolab.castor.xml,org.exolab.castor.dsml,org.exolab.castor.mapping" -Dallpackagenames="org.exolab.castor.xml.*,org.exolab.castor.dsml.*,org.exolab.castor.tools.*,org.exolab.castor.types.*,org.exolab.castor.util.*,org.exolab.castor.builder.*,org.exolab.castor.mapping.*" %1 %2 %3 %4 %5 %6 -buildfile ..\src\build.xml
+set CP=%CP%;"..\lib\xerces-J_1.4.0.jar"
+"%JAVA_HOME%\bin\java-nojit" -mx128M -classpath %CP% -Dant.home=lib org.apache.tools.ant.Main -Dexcludes="**/package.html,org/exolab/castor/mapping/loader/J2CollectionHandlers.java,org/exolab/castor/util/IteratorEnumeration.java,org/exolab/castor/xml/dtd/**,org/exolab/castor/jdo/**,org/exolab/castor/gui/**,org/exolab/castor/tools/**,org/exolab/castor/dax/**,org/exolab/castor/persist/**,org/exolab/castor/dtx/**" -Dexampleexcludes="SourceGenerator/*,dax/*,**/jdo/**,**/dtx/**,**/oes/**,**/servlet/**,**/myapp/**" -Dtestexcludes="**/package.html,**/jdo/**,**/introspection/**,**/tests/framework/**" -Dapipackagenames="org.exolab.castor.xml,org.exolab.castor.dsml,org.exolab.castor.mapping" -Dallpackagenames="org.exolab.castor.xml.*,org.exolab.castor.dsml.*,org.exolab.castor.tools.*,org.exolab.castor.types.*,org.exolab.castor.util.*,org.exolab.castor.builder.*,org.exolab.castor.mapping.*" %1 %2 %3 %4 %5 %6 -buildfile ..\src\build.xml
 rem ,**/xml/xml2java/**,