harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r957713 - in /harmony/enhanced/java/trunk: classlib/ classlib/depends/files/ classlib/depends/jars/ classlib/depends/manifests/xerces_2.10.0/ classlib/depends/manifests/xerces_2.10.0/META-INF/ classlib/depends/manifests/xerces_2.9.1/ classl...
Date Thu, 24 Jun 2010 20:59:18 GMT
Author: hindessm
Date: Thu Jun 24 20:59:17 2010
New Revision: 957713

URL: http://svn.apache.org/viewvc?rev=957713&view=rev
Log:
Applying patch from "[#HARMONY-6557] [classlib][build] Xerces 2.9.1 zip
no longer available, update to 2.10.0" with some additional changes to
complete the update.

Added:
    harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/
      - copied from r957145, harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.9.1/
Removed:
    harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.9.1/
Modified:
    harmony/enhanced/java/trunk/classlib/build.xml
    harmony/enhanced/java/trunk/classlib/depends/files/bootclasspath.properties
    harmony/enhanced/java/trunk/classlib/depends/jars/   (props changed)
    harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
    harmony/enhanced/java/trunk/classlib/make/depends.properties
    harmony/enhanced/java/trunk/classlib/make/depends.xml
    harmony/enhanced/java/trunk/common_resources/make/depends.properties

Modified: harmony/enhanced/java/trunk/classlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/build.xml?rev=957713&r1=957712&r2=957713&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/build.xml (original)
+++ harmony/enhanced/java/trunk/classlib/build.xml Thu Jun 24 20:59:17 2010
@@ -202,7 +202,7 @@ module:
             <fileset dir="${depends.jars}">
                 <patternset includes="icu4j_4.2.1/*.jar" />
                 <patternset includes="xalan-j_2.7.0/xalan.jar" />
-                <patternset includes="xerces_2.9.1/*.jar" />
+                <patternset includes="xerces_2.10.0/*.jar" />
             </fileset>
             <fileset dir="${depends.manifests}"/>
         </copy>

Modified: harmony/enhanced/java/trunk/classlib/depends/files/bootclasspath.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/files/bootclasspath.properties?rev=957713&r1=957712&r2=957713&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/files/bootclasspath.properties (original)
+++ harmony/enhanced/java/trunk/classlib/depends/files/bootclasspath.properties Thu Jun 24
20:59:17 2010
@@ -166,9 +166,9 @@ bootclasspath.32=icu4j_4.2.1/icu4j-chars
 
 # The following JARs are from Xerces/Xalan
 bootclasspath.34=xalan-j_2.7.0/xalan.jar
-bootclasspath.35=xerces_2.9.1/resolver.jar
-bootclasspath.36=xerces_2.9.1/xercesImpl.jar
-bootclasspath.37=xerces_2.9.1/xml-apis.jar
+bootclasspath.35=xerces_2.10.0/resolver.jar
+bootclasspath.36=xerces_2.10.0/xercesImpl.jar
+bootclasspath.37=xerces_2.10.0/xml-apis.jar
 
 # The following JARs are from mx4j.sf.net
 bootclasspath.38=mx4j_3.0.2/mx4j.jar

Propchange: harmony/enhanced/java/trunk/classlib/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 24 20:59:17 2010
@@ -11,3 +11,4 @@ bcprov-jdk15-141
 asm-3.1
 icu4j_4.2.1
 bcprov-jdk15-145
+xerces_2.10.0

Modified: harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF?rev=957713&r1=957145&r2=957713&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
(original)
+++ harmony/enhanced/java/trunk/classlib/depends/manifests/xerces_2.10.0/META-INF/MANIFEST.MF
Thu Jun 24 20:59:17 2010
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Harmony XML Xerces
-Bundle-SymbolicName: org.apache.harmony.xml.xerces
-Bundle-Version: 2.9.1
-Bundle-ClassPath: resolver.jar,xercesImpl.jar,xml-apis.jar
-Eclipse-JREBundle: true
-Export-Package: javax.xml,
- javax.xml.datatype,
- javax.xml.namespace,
- javax.xml.parsers,
- javax.xml.transform,
- javax.xml.transform.dom,
- javax.xml.transform.sax,
- javax.xml.transform.stream,
- javax.xml.validation,
- javax.xml.xpath,
- org.w3c.dom,
- org.w3c.dom.bootstrap,
- org.w3c.dom.css,
- org.w3c.dom.events,
- org.w3c.dom.html,
- org.w3c.dom.ls,
- org.w3c.dom.ranges,
- org.w3c.dom.stylesheets,
- org.w3c.dom.traversal,
- org.w3c.dom.views,
- org.xml.sax,
- org.xml.sax.ext,
- org.xml.sax.helpers
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Harmony XML Xerces
+Bundle-SymbolicName: org.apache.harmony.xml.xerces
+Bundle-Version: 2.10.0
+Bundle-ClassPath: resolver.jar,xercesImpl.jar,xml-apis.jar
+Eclipse-JREBundle: true
+Export-Package: javax.xml,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.transform,
+ javax.xml.transform.dom,
+ javax.xml.transform.sax,
+ javax.xml.transform.stream,
+ javax.xml.validation,
+ javax.xml.xpath,
+ org.w3c.dom,
+ org.w3c.dom.bootstrap,
+ org.w3c.dom.css,
+ org.w3c.dom.events,
+ org.w3c.dom.html,
+ org.w3c.dom.ls,
+ org.w3c.dom.ranges,
+ org.w3c.dom.stylesheets,
+ org.w3c.dom.traversal,
+ org.w3c.dom.views,
+ org.xml.sax,
+ org.xml.sax.ext,
+ org.xml.sax.helpers

Modified: harmony/enhanced/java/trunk/classlib/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends.properties?rev=957713&r1=957712&r2=957713&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends.properties Thu Jun 24 20:59:17 2010
@@ -27,10 +27,10 @@ xalan.jar=${xalan.dir}/xalan.jar
 xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
-xerces.dir=${depends.jars}/xerces_2.9.1
+xerces.dir=${depends.jars}/xerces_2.10.0
 xerces.zip=${xerces.dir}/xerces.zip
-xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.zip
-xerces.md5=a0e07ede1c3bd5231fe15eae24032b2e
+xerces.url=http://www.apache.org/dist/xerces/j/Xerces-J-bin.2.10.0.zip
+xerces.md5=8da14a7b2848eff131b7cc10668887e8
 
 junit.dir=${depends.jars}/junit_4.6
 junit.jar=${junit.dir}/junit-4.6.jar

Modified: harmony/enhanced/java/trunk/classlib/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/make/depends.xml?rev=957713&r1=957712&r2=957713&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/make/depends.xml (original)
+++ harmony/enhanced/java/trunk/classlib/make/depends.xml Thu Jun 24 20:59:17 2010
@@ -72,7 +72,7 @@
     <target name="-extract-xerces" unless="xerces.uptodate">
         <unzip src="${xerces.zip}" dest="${xerces.dir}.tmp" />
         <copy todir="${xerces.dir}" flatten="yes">
-            <fileset dir="${xerces.dir}.tmp/xerces-2_9_1">
+            <fileset dir="${xerces.dir}.tmp/xerces-2_10_0">
                 <include name="resolver.jar" />
 		<include name="xercesImpl.jar" />
 		<include name="xml-apis.jar" />

Modified: harmony/enhanced/java/trunk/common_resources/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/common_resources/make/depends.properties?rev=957713&r1=957712&r2=957713&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/common_resources/make/depends.properties (original)
+++ harmony/enhanced/java/trunk/common_resources/make/depends.properties Thu Jun 24 20:59:17
2010
@@ -77,10 +77,10 @@ xalan.jar=${xalan.dir}/xalan.jar
 xalan.url=${maven2.base}/xalan/xalan/2.7.0/xalan-2.7.0.jar
 xalan.md5=a018d032c21a873225e702b36b171a10
 
-xerces.dir=${depends.jars}/xerces_2.9.1
+xerces.dir=${depends.jars}/xerces_2.10.0
 xerces.zip=${xerces.dir}/xerces.zip
-xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.9.1.zip
-xerces.md5=a0e07ede1c3bd5231fe15eae24032b2e
+xerces.url=http://www.apache.org/dist/xml/xerces-j/Xerces-J-bin.2.10.0.zip
+xerces.md5=8da14a7b2848eff131b7cc10668887e8
 
 bcprov.ver=bcprov-jdk15-138
 bcprov.dir=${depends.jars}/${bcprov.ver}



Mime
View raw message