You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ap...@apache.org on 2007/04/04 11:25:18 UTC
svn commit: r525473 - in /harmony/enhanced/classlib/trunk:
depends/files/bootclasspath.properties make/build-java.xml
make/depends.properties make/depends.xml
Author: apetrenko
Date: Wed Apr 4 02:25:17 2007
New Revision: 525473
URL: http://svn.apache.org/viewvc?view=rev&rev=525473
Log:
Patch for HARMONY-3545 "[classlib] Upgrade to Xerces 2.9.0"
Modified:
harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
harmony/enhanced/classlib/trunk/make/build-java.xml
harmony/enhanced/classlib/trunk/make/depends.properties
harmony/enhanced/classlib/trunk/make/depends.xml
Modified: harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties?view=diff&rev=525473&r1=525472&r2=525473
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/classlib/trunk/depends/files/bootclasspath.properties Wed Apr 4 02:25:17 2007
@@ -170,9 +170,9 @@
# The following JARs are from Xerces/Xalan
bootclasspath.34=xalan-j_2.7.0/xalan.jar
-bootclasspath.35=xerces_2.8.0/resolver.jar
-bootclasspath.36=xerces_2.8.0/xercesImpl.jar
-bootclasspath.37=xerces_2.8.0/xml-apis.jar
+bootclasspath.35=xerces_2.9.0/resolver.jar
+bootclasspath.36=xerces_2.9.0/xercesImpl.jar
+bootclasspath.37=xerces_2.9.0/xml-apis.jar
# The following JARs are from mx4j.sf.net
bootclasspath.38=mx4j_3.0.2/mx4j.jar
Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?view=diff&rev=525473&r1=525472&r2=525473
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Wed Apr 4 02:25:17 2007
@@ -218,7 +218,6 @@
<patternset includes="icu4jni_3.4/*.jar" />
<patternset includes="mx4j_3.0.2/*.jar" />
<patternset includes="xalan-j_2.7.0/*.jar" />
- <patternset includes="xerces_2.8.0/*.jar" />
<patternset includes="yoko_M2-20070130/yoko-rmi-spec.jar" />
<patternset includes="yoko_M2-20070130/yoko-rmi-impl.jar" />
<patternset includes="yoko_M2-20070130/yoko.jar" />
@@ -226,6 +225,20 @@
</fileset>
<fileset dir="${depends.manifests}"/>
</copy>
+
+ <!-- Unzip xerces jars -->
+ <mkdir dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0" />
+ <unzip src="${depends.jars}/xerces_2.9.0/xerces.zip"
+ dest="${hy.jdk}/jre/lib/boot" >
+ <patternset>
+ <include name="xerces-2_9_0/resolver.jar" />
+ <include name="xerces-2_9_0/xercesImpl.jar" />
+ <include name="xerces-2_9_0/xml-apis.jar" />
+ </patternset>
+ </unzip>
+ <move todir="${hy.jdk}/jre/lib/boot/xerces_2.9.0">
+ <fileset dir="${hy.jdk}/jre/lib/boot/xerces-2_9_0"/>
+ </move>
<!-- delete these lines if BC version is greater than jdk15-134 -->
<!-- delete the original signed.bcprov.jar -->
Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?view=diff&rev=525473&r1=525472&r2=525473
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Wed Apr 4 02:25:17 2007
@@ -23,18 +23,10 @@
xalan.url=${mirror.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
xalan.md5=a018d032c21a873225e702b36b171a10
-xerces.dir=${depends.jars}/xerces_2.8.0
-resolver.jar=${xerces.dir}/resolver.jar
-resolver.url=${mirror.base}/xml-resolver/xml-resolver/1.1/xml-resolver-1.1.jar
-resolver.md5=39546d6a7f9cf0fd971874d43214dbe4
-
-xerces.impl.jar=${xerces.dir}/xercesImpl.jar
-xerces.impl.url=${mirror.base}/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar
-xerces.impl.md5=7eb2db331a62e74744ab79aab5b454bd
-
-xml.apis.jar=${xerces.dir}/xml-apis.jar
-xml.apis.url=${mirror.base}/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.jar
-xml.apis.md5=6dee9238dd2900171197104951940778
+xerces.dir=${depends.jars}/xerces_2.9.0
+xerces.zip=${xerces.dir}/xerces.zip
+xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.0.zip
+xerces.md5=a3aece3feb68be6d319072b85ad06023
junit.dir=${depends.jars}/junit_3.8.2
junit.jar=${junit.dir}/junit.jar
Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?view=diff&rev=525473&r1=525472&r2=525473
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Wed Apr 4 02:25:17 2007
@@ -38,9 +38,7 @@
<check-one-file src="${yoko-rmi-spec.url}" dest="${yoko-rmi-spec.jar}" />
<check-one-file src="${bcel.url}" dest="${bcel.jar}" />
<check-one-file src="${xalan.url}" dest="${xalan.jar}" />
- <check-one-file src="${resolver.url}" dest="${resolver.jar}" />
- <check-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}" />
- <check-one-file src="${xml.apis.url}" dest="${xml.apis.jar}" />
+ <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
<check-one-file src="${junit.url}" dest="${junit.jar}" />
<check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
<check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
@@ -311,14 +309,8 @@
md5="${xalan.md5}" />
<mkdir dir="${xerces.dir}" />
- <download-one-file src="${resolver.url}" dest="${resolver.jar}"
- md5="${resolver.md5}" />
-
- <download-one-file src="${xerces.impl.url}" dest="${xerces.impl.jar}"
- md5="${xerces.impl.md5}" />
-
- <download-one-file src="${xml.apis.url}" dest="${xml.apis.jar}"
- md5="${xml.apis.md5}" />
+ <download-one-file src="${xerces.url}" dest="${xerces.zip}"
+ md5="${xerces.md5}" />
<mkdir dir="${junit.dir}" />
<download-one-file src="${junit.url}" dest="${junit.jar}"