harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim Ellison <t.p.elli...@gmail.com>
Subject Re: [classlib][xml] update to xerces 2.9.0
Date Thu, 29 Mar 2007 10:40:34 GMT
Kalpak Gadre wrote:
> I have looked at the properties and the ant scripts where we specify this.
> 
> Only question I have is what do I give as download URL? Is there any
> standard place where we copy these files before we give reference URL
> or should I give the download URL as Xerces standard download location?

This is how I tried it a while ago, when I saw test failures.

Warning: this patch will be out of date now...but should give you the
idea of where I was going.

Tim

 Index: depends/files/bootclasspath.properties
 ===================================================================
 --- depends/files/bootclasspath.properties	(revision 492214)
 +++ depends/files/bootclasspath.properties	(working copy)
 @@ -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.1/mx4j.jar
 Index: make/build-java.xml
 ===================================================================
 --- make/build-java.xml	(revision 492214)
 +++ make/build-java.xml	(working copy)
 @@ -211,13 +211,21 @@
                  <patternset includes="icu4jni_3.4/*.jar" />
                  <patternset includes="mx4j_3.0.1/*.jar" />
                  <patternset includes="xalan-j_2.7.0/*.jar" />
 -                <patternset includes="xerces_2.8.0/*.jar" />
                  <patternset includes="yoko_M1-20061027/yoko-rmi.jar" />
                  <patternset includes="yoko_M2-20061115/yoko.jar" />
                  <patternset includes="yoko_M2-20061115/yoko-core.jar" />
              </fileset>
              <fileset dir="${depends.manifests}"/>
          </copy>
 +        <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>

          <!-- delete these lines if BC version is greater than
jdk15-134 -->
          <!-- delete the original signed.bcprov.jar
  -->
 Index: make/depends.properties
 ===================================================================
 --- make/depends.properties	(revision 492128)
 +++ make/depends.properties	(working copy)
 @@ -22,19 +22,11 @@
  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.dir=${depends.jars}/xerces_2.9.0
 +xerces.jar=${xerces.dir}/xerces.zip
 +xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.0.zip
 +xerces.md5=a3aece3feb68be6d319072b85ad06023

 -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
 -
  junit.dir=${depends.jars}/junit_3.8.2
  junit.jar=${junit.dir}/junit.jar
  junit.url=${mirror.base}/junit/junit/3.8.2/junit-3.8.2.jar
 Index: make/depends.xml
 ===================================================================
 --- make/depends.xml	(revision 492128)
 +++ make/depends.xml	(working copy)
 @@ -37,9 +37,7 @@
          <check-one-file src="${yoko-rmi.url}" dest="${yoko-rmi.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.jar}" />
          <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}" />
 @@ -230,15 +228,9 @@
                             md5="${xalan.md5}" />

      <mkdir dir="${xerces.dir}" />
 -    <download-one-file src="${resolver.url}" dest="${resolver.jar}"
 -                           md5="${resolver.md5}" />
 +    <download-one-file src="${xerces.url}" dest="${xerces.jar}"
 +                           md5="${xerces.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}" />
 -
      <mkdir dir="${junit.dir}" />
      <download-one-file src="${junit.url}" dest="${junit.jar}"
                             md5="${junit.md5}" />

Mime
View raw message