Update to Jaxp 1.1

Also - handle spaces in classpaths


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268755 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 16 insertions, 12 deletions

diff --git a/WHATSNEW b/WHATSNEW
index a2c23ec4b..517788a62 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -1,4 +1,8 @@
-Changes from Ant 1.2 to Ant 1.3 Beta 3
+Changes from Ant 1.3 to CVS Version
+===========================================
+
+
+Changes from Ant 1.2 to Ant 1.3
 ===========================================
 
 Changes that could break older environments:
diff --git a/bootstrap.bat b/bootstrap.bat
index 4368dfdd2..417f25bba 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -21,7 +21,7 @@ echo ... Bootstrapping Ant Distribution
 if     "%OS%" == "Windows_NT" if exist bootstrap rmdir/s/q bootstrap
 if not "%OS%" == "Windows_NT" if exist bootstrap deltree/y bootstrap
 
-SET LOCALCLASSPATH=lib\parser.jar;lib\jaxp.jar;lib\optional\junit.jar
+SET LOCALCLASSPATH=lib\crimson.jar;lib\jaxp.jar;lib\optional\junit.jar
 
 if exist %JAVA_HOME%\lib\tools.jar call src\script\lcp.bat %JAVA_HOME%\lib\tools.jar
 if exist %JAVA_HOME%\lib\classes.zip call src\script\lcp.bat %JAVA_HOME%\lib\classes.zip
@@ -29,7 +29,7 @@ if exist %JAVA_HOME%\lib\classes.zip call src\script\lcp.bat %JAVA_HOME%\lib\cla
 set TOOLS=src\main\org\apache\tools
 set CLASSDIR=classes
 
-SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;%CLASSPATH%
+SET CLASSPATH=%LOCALCLASSPATH%;%CLASSDIR%;src\main;"%CLASSPATH%"
 
 echo JAVA_HOME=%JAVA_HOME%
 echo JAVA=%JAVA%
diff --git a/bootstrap.sh b/bootstrap.sh
index 52c6e1348..b886a7c91 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -41,7 +41,7 @@ if [ -d "bootstrap" ] ; then
   rm -r bootstrap
 fi
 
-CLASSPATH=lib/parser.jar:lib/jaxp.jar:lib/optional/junit.jar:${CLASSPATH}
+CLASSPATH=lib/crimson.jar:lib/jaxp.jar:lib/optional/junit.jar:${CLASSPATH}
 
 TOOLS=src/main/org/apache/tools
 CLASSDIR=classes
diff --git a/build.bat b/build.bat
index 11c91ebfa..c0aecfc9a 100755
--- a/build.bat
+++ b/build.bat
@@ -7,7 +7,7 @@ if exist bootstrap\lib\ant.jar if exist bootstrap\bin\ant.bat if exist bootstrap
 call bootstrap.bat
 
 :runAnt
-set LOCALCLASSPATH=lib\parser.jar;lib\jaxp.jar;bootstrap\lib\ant.jar
+set LOCALCLASSPATH=lib\crimson.jar;lib\jaxp.jar;bootstrap\lib\ant.jar
 for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat "%%i"
 set CLASSPATH=%LOCALCLASSPATH%;%CLASSPATH%
 set LOCALCLASSPATH=
diff --git a/build.sh b/build.sh
index 7858d1b05..629d16920 100755
--- a/build.sh
+++ b/build.sh
@@ -8,7 +8,7 @@ if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/
   /bin/sh ./bootstrap.sh
 fi    
 
-LOCALCLASSPATH=lib/parser.jar:lib/jaxp.jar
+LOCALCLASSPATH=lib/crimson.jar:lib/jaxp.jar
 # add in the dependency .jar files
 DIRLIBS=lib/optional/*.jar
 for i in ${DIRLIBS}
diff --git a/docs/manual/Integration/VAJAntTool.html b/docs/manual/Integration/VAJAntTool.html
index f64cbeb6f..622d00940 100644
--- a/docs/manual/Integration/VAJAntTool.html
+++ b/docs/manual/Integration/VAJAntTool.html
@@ -353,7 +353,7 @@ For more information see the <a href="#installation">installation</a> section.<b
   &lt;!-- =================================================================== --&gt;
   &lt;target name="expand"&gt;
     &lt;mkdir dir="${build.classes}"/&gt;
-    &lt;unzip src="${antdistribution.dir}\lib\parser.jar"
+    &lt;unzip src="${antdistribution.dir}\lib\crimson.jar"
            dest="${build.classes}"
     /&gt;
     &lt;unzip src="${antdistribution.dir}\lib\jaxp.jar"
diff --git a/docs/manual/OptionalTasks/dotnet.html b/docs/manual/OptionalTasks/dotnet.html
index 2a829450c..a5bc540bb 100644
--- a/docs/manual/OptionalTasks/dotnet.html
+++ b/docs/manual/OptionalTasks/dotnet.html
@@ -105,7 +105,7 @@ To use the net tasks one needs
 that typing 'ant' invokes ant via a batch file.</li>
 
 <li> An XML parser for ant. The usual distributions include an appropriate 
-version parser.jar and jaxp.jar.</li>
+version crimson.jar and jaxp.jar.</li>
 
 <li> the .net tasks archive (dotnettasks.jar) included in the
  ant\lib directory</li>
diff --git a/docs/manual/install.html b/docs/manual/install.html
index 1ba7de02d..aa5aeac6f 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -39,12 +39,12 @@ Ant CVS repository</a> on-line. </p>
 To build and use Ant, you must have a JAXP-compliant XML parser installed and 
 available on your classpath.</p>
 <p>
-Both the binary and source distributions of Ant include the reference 
-implementation of JAXP 1.0. Please see 
+The binary distribution of Ant includes the reference 
+implementation of JAXP 1.1. Please see 
 <a href="http://java.sun.com/xml/" target="_top">http://java.sun.com/xml/</a> 
 for more information. 
 If you wish to use a different JAXP-compliant parser, you should remove
-<code>jaxp.jar</code> and <code>parser.jar</code>
+<code>jaxp.jar</code> and <code>crimson.jar</code>
 from Ant's <code>lib</code> directory.
 
 You can then either put the jars from your preferred parser into Ant's 
diff --git a/lib/crimson.jar b/lib/crimson.jar
new file mode 100644
index 000000000..a734d4285
--- /dev/null
+++ b/lib/crimson.jar
diff --git a/lib/jaxp.jar b/lib/jaxp.jar
index 8a0880926..d79e6b56c 100644
--- a/lib/jaxp.jar
+++ b/lib/jaxp.jar
diff --git a/lib/parser.jar b/lib/parser.jar
deleted file mode 100644
index cd16d4c80..000000000
--- a/lib/parser.jar
+++ /dev/null
diff --git a/src/script/ant.bat b/src/script/ant.bat
index a69b2de12..9ccec2c90 100755
--- a/src/script/ant.bat
+++ b/src/script/ant.bat
@@ -55,7 +55,7 @@ goto end
 
 :checkJava
 set _JAVACMD=%JAVACMD%
-set LOCALCLASSPATH=%CLASSPATH%
+set LOCALCLASSPATH="%CLASSPATH%"
 for %%i in ("%ANT_HOME%\lib\*.jar") do call "%ANT_HOME%\bin\lcp.bat" "%%i"
 
 if "%JAVA_HOME%" == "" goto noJavaHome