Moving from Crimson 1.1.3 to Xerces 2.0.1

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

5 files changed, 9 insertions, 8 deletions

diff --git a/LICENSE.crimson b/LICENSE.xerces
index 7a042bdbf..70cb54a0d 100644
--- a/LICENSE.crimson
+++ b/LICENSE.xerces
@@ -24,7 +24,7 @@
  *    Alternately, this acknowledgment may appear in the software itself,
  *    if and wherever such third-party acknowledgments normally appear.
  *
- * 4. The names "Crimson" and "Apache Software Foundation" must
+ * 4. The names "Xerces" and "Apache Software Foundation" must
  *    not be used to endorse or promote products derived from this
  *    software without prior written permission. For written 
  *    permission, please contact apache@apache.org.
@@ -49,7 +49,8 @@
  *
  * This software consists of voluntary contributions made by many
  * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, Sun Microsystems, Inc., 
- * http://www.sun.com.  For more information on the Apache Software 
- * Foundation, please see <http://www.apache.org/>.
+ * originally based on software copyright (c) 1999, International
+ * Business Machines, Inc., http://www.ibm.com.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
  */
diff --git a/bootstrap.bat b/bootstrap.bat
index c941e1db3..f3049e323 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -26,7 +26,7 @@ if not "%OS%" == "Windows_NT" if exist bootstrap\nul deltree/y bootstrap
 if     "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build
 if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build
 
-SET LOCALCLASSPATH=lib\crimson.jar
+SET LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar
 for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i
 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
diff --git a/bootstrap.sh b/bootstrap.sh
index 9eafbfe67..c8036fb75 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -79,7 +79,7 @@ if [ -d "build" ] ; then
   rm -r build
 fi
 
-CLASSPATH=lib/crimson.jar:${CLASSPATH}
+CLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar:${CLASSPATH}
 
 DIRLIBS=lib/optional/*.jar
 for i in ${DIRLIBS}
diff --git a/build.bat b/build.bat
index e8152d583..6b9665749 100755
--- a/build.bat
+++ b/build.bat
@@ -13,7 +13,7 @@ echo Bootstrap FAILED
 goto cleanup
 
 :runAnt
-set LOCALCLASSPATH=lib\crimson.jar;bootstrap\lib\ant.jar
+set LOCALCLASSPATH=lib\xercesImpl.jar;lib\xmlParserAPIs.jar;bootstrap\lib\ant.jar
 for %%i in (lib\optional\*.jar) do call bootstrap\bin\lcp.bat %%i
 set CLASSPATH=lib\optional\xalanj1compat.jar;%LOCALCLASSPATH%;%CLASSPATH%
 set LOCALCLASSPATH=
diff --git a/build.sh b/build.sh
index 7d4651dcc..2bddf05b2 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ if test ! -f bootstrap/lib/ant.jar -o  ! -x bootstrap/bin/ant -o ! -x bootstrap/
   exit
 fi
 
-LOCALCLASSPATH=lib/crimson.jar
+LOCALCLASSPATH=lib/xercesImpl.jar:lib/xmlParserAPIs.jar
 # add in the dependency .jar files
 DIRLIBS=lib/optional/*.jar
 for i in ${DIRLIBS}