conor 01/03/04 05:35:51
Modified: . WHATSNEW bootstrap.bat bootstrap.sh build.bat
build.sh
docs/manual install.html
docs/manual/Integration VAJAntTool.html
docs/manual/OptionalTasks dotnet.html
lib jaxp.jar
src/script ant.bat
Added: lib crimson.jar
Removed: lib parser.jar
Log:
Update to Jaxp 1.1
Also - handle spaces in classpaths
Revision Changes Path
1.78 +5 -1 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- WHATSNEW 2001/03/02 23:08:28 1.77
+++ WHATSNEW 2001/03/04 13:35:46 1.78
@@ -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:
1.33 +2 -2 jakarta-ant/bootstrap.bat
Index: bootstrap.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- bootstrap.bat 2001/02/27 02:16:06 1.32
+++ bootstrap.bat 2001/03/04 13:35:47 1.33
@@ -21,7 +21,7 @@
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 @@
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%
1.45 +1 -1 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- bootstrap.sh 2001/02/27 02:16:06 1.44
+++ bootstrap.sh 2001/03/04 13:35:47 1.45
@@ -41,7 +41,7 @@
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
1.28 +1 -1 jakarta-ant/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/build.bat,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.bat 2001/02/27 02:16:06 1.27
+++ build.bat 2001/03/04 13:35:47 1.28
@@ -7,7 +7,7 @@
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=
1.22 +1 -1 jakarta-ant/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/build.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- build.sh 2001/02/27 02:16:06 1.21
+++ build.sh 2001/03/04 13:35:47 1.22
@@ -8,7 +8,7 @@
/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}
1.3 +3 -3 jakarta-ant/docs/manual/install.html
Index: install.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/install.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- install.html 2001/02/13 12:31:49 1.2
+++ install.html 2001/03/04 13:35:48 1.3
@@ -39,12 +39,12 @@
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
1.4 +1 -1 jakarta-ant/docs/manual/Integration/VAJAntTool.html
Index: VAJAntTool.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/Integration/VAJAntTool.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VAJAntTool.html 2001/02/18 13:44:40 1.3
+++ VAJAntTool.html 2001/03/04 13:35:49 1.4
@@ -347,7 +347,7 @@
<!--
=================================================================== -->
<target name="expand">
<mkdir dir="${build.classes}"/>
- <unzip src="${antdistribution.dir}\lib\parser.jar"
+ <unzip src="${antdistribution.dir}\lib\crimson.jar"
dest="${build.classes}"
/>
<unzip src="${antdistribution.dir}\lib\jaxp.jar"
1.3 +1 -1 jakarta-ant/docs/manual/OptionalTasks/dotnet.html
Index: dotnet.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/OptionalTasks/dotnet.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dotnet.html 2001/02/13 12:31:55 1.2
+++ dotnet.html 2001/03/04 13:35:49 1.3
@@ -105,7 +105,7 @@
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>
1.2 +132 -19 jakarta-ant/lib/jaxp.jar
<<Binary file>>
1.1 jakarta-ant/lib/crimson.jar
<<Binary file>>
1.6 +1 -1 jakarta-ant/src/script/ant.bat
Index: ant.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/src/script/ant.bat,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ant.bat 2001/02/04 00:50:50 1.5
+++ ant.bat 2001/03/04 13:35:51 1.6
@@ -55,7 +55,7 @@
: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
