Hello community, here is the log from the commit of package xml-commons for openSUSE:11.4 checked in at Tue Feb 22 21:24:06 CET 2011.
-------- --- old-versions/11.4/all/xml-commons/xml-commons-apis-bootstrap.changes 2010-11-02 16:31:43.000000000 +0100 +++ 11.4/xml-commons/xml-commons-apis-bootstrap.changes 2011-02-22 10:30:21.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Feb 22 09:29:27 UTC 2011 - [email protected] + +- build xml-commons-resolver-bootstrap from own tarball + fix build of xerces-j2-bootstrap + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.dlJ8N7/_old 2011-02-22 21:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.dlJ8N7/_new 2011-02-22 21:23:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xml-commons-apis-bootstrap (Version 1.3.04) +# spec file for package xml-commons-apis-bootstrap # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Name: xml-commons-apis-bootstrap Version: 1.3.04 -Release: 1 +Release: 2.<RELEASE2> Summary: Common code for XML projects - bootstrapping package Group: Development/Libraries/Java License: ASL 2.0 @@ -93,11 +93,6 @@ %build #>>> some useful functions ... used throughout bootstrap packages -# variables: -pushd xml-commons-1_0_b2 -TARGET_DIR=`pwd` -CLASSPATH_ORIG="$CLASSPATH" -LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`" #>>> delete binary file and files not needed function delBinaryFiles() { @@ -128,8 +123,6 @@ # uses mkTargetClasspath for CLASSPATH variable # uses LIB_GCJ for CLASSPATH function compileFiles() { - mkTargetClasspath - set +x COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH} echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $$file for file in `find . -name "*.java"` @@ -144,7 +137,6 @@ fi echo done done - set -x } #<<< @@ -158,48 +150,56 @@ } #<<< -COMPILER_COMMAND="javac -C -ftarget=1.4 -classpath " - #<<< end functions +# variables: +COMPILER_COMMAND="javac -C -ftarget=1.4 -classpath " +TARGET_DIR=`pwd` +CLASSPATH_ORIG="$CLASSPATH" +LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`" + delBinaryFiles #>>> xml-apis and xml-which # compile external files +pushd xml-commons-1_0_b2 cd java/external/src +mkTargetClasspath compileFiles mkJar %{apis_jar} delBinaryFiles # compile the rest cd ../../src/ -# move resolver to an another location to create own jar/package -mkdir -p ../../resolver.src/org/apache -mv org/apache/xml/ ../../resolver.src/org/apache -mv manifest.resolver ../../resolver.src +# remove resolver +rm -rf org/apache/xml/ +mkTargetClasspath compileFiles mkJar %{which_jar} delBinaryFiles +popd -# compile the resolver -cd ../../resolver.src/ -# move resolver to an another location to create own jar/package -compileFiles +pushd xml-commons-resolver-1_1_b1 +mkTargetClasspath +export JAR_CLASSPATH=$JAR_CLASSPATH:${TARGET_DIR}/%{apis_jar}.jar:${TARGET_DIR}/%{which_jar}.jar +#compileFiles +pushd java/src/ +$COMPILER_COMMAND $JAR_CLASSPATH `find . -name *.java` +rm manifest.which mkJar %{resolver_jar} delBinaryFiles #<<< xml-commons end -#<<< build end popd +popd +#<<< build end %install #>>> % install -pushd xml-commons-1_0_b2 mkdir -p $RPM_BUILD_ROOT/%{_javadir} cp %{apis_jar}.jar $RPM_BUILD_ROOT/%{_javadir} cp %{which_jar}.jar $RPM_BUILD_ROOT/%{_javadir} cp %{resolver_jar}.jar $RPM_BUILD_ROOT/%{_javadir} #<<< install end -popd %clean rm -rf $RPM_BUILD_ROOT ++++++ xml-commons.spec ++++++ --- /var/tmp/diff_new_pack.dlJ8N7/_old 2011-02-22 21:23:33.000000000 +0100 +++ /var/tmp/diff_new_pack.dlJ8N7/_new 2011-02-22 21:23:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package xml-commons (Version 1.3.04) +# spec file for package xml-commons # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2000-2008, JPackage Project # All rights reserved. # @@ -40,7 +40,7 @@ Name: xml-commons Version: 1.3.04 -Release: 1 +Release: 4.<RELEASE2> Summary: Common code for XML projects Group: Development/Libraries/Java License: ASL 2.0 ++++++ xml-commons-enum.patch ++++++ --- /var/tmp/diff_new_pack.dlJ8N7/_old 2011-02-22 21:23:34.000000000 +0100 +++ /var/tmp/diff_new_pack.dlJ8N7/_new 2011-02-22 21:23:34.000000000 +0100 @@ -1,6 +1,8 @@ ---- xml-commons-1_0_b2/java/src/org/apache/env/Which.java.orig 2008-04-25 16:26:14.000000000 -0400 -+++ xml-commons-1_0_b2/java/src/org/apache/env/Which.java 2008-04-25 16:27:21.000000000 -0400 -@@ -289,12 +289,12 @@ public class Which +Index: xml-commons-1_0_b2/java/src/org/apache/env/Which.java +=================================================================== +--- xml-commons-1_0_b2/java/src/org/apache/env/Which.java.orig 2001-12-21 23:59:05.000000000 +0100 ++++ xml-commons-1_0_b2/java/src/org/apache/env/Which.java 2011-02-21 14:32:51.244975486 +0100 +@@ -289,12 +289,12 @@ if (null == hash) return; @@ -16,7 +18,7 @@ String keyStr = key.toString(); Object item = hash.get(key); -@@ -311,12 +311,12 @@ public class Which +@@ -311,12 +311,12 @@ } } @@ -33,9 +35,11 @@ reportHashtable(h, n, out); } ---- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java.orig 2008-04-25 16:44:12.000000000 -0400 -+++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java 2008-04-25 16:45:44.000000000 -0400 -@@ -451,9 +451,9 @@ public class Catalog { +Index: xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java +=================================================================== +--- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java.orig 2002-01-30 13:25:00.000000000 +0100 ++++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java 2011-02-21 14:32:51.246975564 +0100 +@@ -451,9 +451,9 @@ mapArr.add(null); } @@ -48,7 +52,7 @@ Integer pos = (Integer) readerMap.get(mimeType); mapArr.set(pos.intValue(), mimeType); } -@@ -1064,9 +1064,9 @@ public class Catalog { +@@ -1064,9 +1064,9 @@ } // Parse all the DELEGATE catalogs @@ -61,7 +65,7 @@ if (e.getEntryType() == DELEGATE_PUBLIC || e.getEntryType() == DELEGATE_SYSTEM || e.getEntryType() == DELEGATE_URI) { -@@ -1140,9 +1140,9 @@ public class Catalog { +@@ -1140,9 +1140,9 @@ // If there's a DOCTYPE entry in this catalog, use it boolean over = default_override; @@ -74,7 +78,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1178,9 +1178,9 @@ public class Catalog { +@@ -1178,9 +1178,9 @@ Debug.message(3, "resolveDocument"); @@ -87,7 +91,7 @@ if (e.getEntryType() == DOCUMENT) { return e.getEntryArg(1); //FIXME check this } -@@ -1253,9 +1253,9 @@ public class Catalog { +@@ -1253,9 +1253,9 @@ // If there's a ENTITY entry in this catalog, use it boolean over = default_override; @@ -100,7 +104,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1339,9 +1339,9 @@ public class Catalog { +@@ -1339,9 +1339,9 @@ // If there's a NOTATION entry in this catalog, use it boolean over = default_override; @@ -113,7 +117,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1498,9 +1498,9 @@ public class Catalog { +@@ -1498,9 +1498,9 @@ // If there's a PUBLIC entry in this catalog, use it boolean over = default_override; @@ -126,7 +130,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1516,10 +1516,10 @@ public class Catalog { +@@ -1516,10 +1516,10 @@ // If there's a DELEGATE_PUBLIC entry in this catalog, use it over = default_override; @@ -140,7 +144,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1624,9 +1624,9 @@ public class Catalog { +@@ -1624,9 +1624,9 @@ String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); @@ -153,7 +157,7 @@ if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows -@@ -1636,11 +1636,11 @@ public class Catalog { +@@ -1636,11 +1636,11 @@ } // If there's a REWRITE_SYSTEM entry in this catalog, use it @@ -168,7 +172,7 @@ if (e.getEntryType() == REWRITE_SYSTEM) { String p = (String) e.getEntryArg(0); -@@ -1662,10 +1662,10 @@ public class Catalog { +@@ -1662,10 +1662,10 @@ } // If there's a DELEGATE_SYSTEM entry in this catalog, use it @@ -182,7 +186,7 @@ if (e.getEntryType() == DELEGATE_SYSTEM) { String p = (String) e.getEntryArg(0); -@@ -1759,9 +1759,9 @@ public class Catalog { +@@ -1759,9 +1759,9 @@ */ protected String resolveLocalURI(String uri) throws MalformedURLException, IOException { @@ -195,7 +199,7 @@ if (e.getEntryType() == URI && (e.getEntryArg(0).equals(uri))) { return e.getEntryArg(1); -@@ -1769,11 +1769,11 @@ public class Catalog { +@@ -1769,11 +1769,11 @@ } // If there's a REWRITE_URI entry in this catalog, use it @@ -210,7 +214,7 @@ if (e.getEntryType() == REWRITE_URI) { String p = (String) e.getEntryArg(0); -@@ -1795,10 +1795,10 @@ public class Catalog { +@@ -1795,10 +1795,10 @@ } // If there's a DELEGATE_URI entry in this catalog, use it @@ -224,9 +228,11 @@ if (e.getEntryType() == DELEGATE_URI) { String p = (String) e.getEntryArg(0); ---- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java.orig 2008-04-25 16:46:39.000000000 -0400 -+++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java 2008-04-25 16:47:01.000000000 -0400 -@@ -215,9 +215,9 @@ public class Resolver extends Catalog { +Index: xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java +=================================================================== +--- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java.orig 2002-01-30 13:25:00.000000000 +0100 ++++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java 2011-02-21 14:32:51.269976454 +0100 +@@ -215,9 +215,9 @@ return resolved; } @@ -239,7 +245,7 @@ if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(uri, e.getEntryArg(0)); if (resolved != null) { -@@ -272,9 +272,9 @@ public class Resolver extends Catalog { +@@ -272,9 +272,9 @@ return resolved; } @@ -252,7 +258,7 @@ if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(systemId, e.getEntryArg(0)); if (resolved != null) { -@@ -334,9 +334,9 @@ public class Resolver extends Catalog { +@@ -334,9 +334,9 @@ return resolved; } @@ -265,7 +271,7 @@ if (e.getEntryType() == RESOLVER) { if (systemId != null) { resolved = resolveExternalSystem(systemId, -@@ -575,9 +575,9 @@ public class Resolver extends Catalog { +@@ -575,9 +575,9 @@ Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); @@ -278,7 +284,7 @@ if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows -@@ -603,9 +603,9 @@ public class Resolver extends Catalog { +@@ -603,9 +603,9 @@ Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); @@ -291,9 +297,11 @@ if (e.getEntryType() == SYSTEM && (e.getEntryArg(1).equals(systemId) || (windows ---- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java.orig 2008-04-25 16:59:11.000000000 -0400 -+++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java 2008-04-25 17:00:06.000000000 -0400 -@@ -486,9 +486,9 @@ public class Catalog { +Index: xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java +=================================================================== +--- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java.orig 2003-09-02 09:05:08.000000000 +0200 ++++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java 2011-02-21 14:32:51.412981992 +0100 +@@ -486,9 +486,9 @@ mapArr.add(null); } @@ -306,7 +314,7 @@ Integer pos = (Integer) readerMap.get(mimeType); mapArr.set(pos.intValue(), mimeType); } -@@ -1152,9 +1152,9 @@ public class Catalog { +@@ -1152,9 +1152,9 @@ } // Parse all the DELEGATE catalogs @@ -319,7 +327,7 @@ if (e.getEntryType() == DELEGATE_PUBLIC || e.getEntryType() == DELEGATE_SYSTEM || e.getEntryType() == DELEGATE_URI) { -@@ -1228,9 +1228,9 @@ public class Catalog { +@@ -1228,9 +1228,9 @@ // If there's a DOCTYPE entry in this catalog, use it boolean over = default_override; @@ -332,7 +340,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1266,9 +1266,9 @@ public class Catalog { +@@ -1266,9 +1266,9 @@ catalogManager.debug.message(3, "resolveDocument"); @@ -345,7 +353,7 @@ if (e.getEntryType() == DOCUMENT) { return e.getEntryArg(1); //FIXME check this } -@@ -1341,9 +1341,9 @@ public class Catalog { +@@ -1341,9 +1341,9 @@ // If there's a ENTITY entry in this catalog, use it boolean over = default_override; @@ -358,7 +366,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1427,9 +1427,9 @@ public class Catalog { +@@ -1427,9 +1427,9 @@ // If there's a NOTATION entry in this catalog, use it boolean over = default_override; @@ -371,7 +379,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1586,9 +1586,9 @@ public class Catalog { +@@ -1586,9 +1586,9 @@ // If there's a PUBLIC entry in this catalog, use it boolean over = default_override; @@ -384,7 +392,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1604,10 +1604,10 @@ public class Catalog { +@@ -1604,10 +1604,10 @@ // If there's a DELEGATE_PUBLIC entry in this catalog, use it over = default_override; @@ -398,7 +406,7 @@ if (e.getEntryType() == OVERRIDE) { over = e.getEntryArg(0).equalsIgnoreCase("YES"); continue; -@@ -1712,9 +1712,9 @@ public class Catalog { +@@ -1712,9 +1712,9 @@ String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); @@ -411,7 +419,7 @@ if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows -@@ -1724,11 +1724,11 @@ public class Catalog { +@@ -1724,11 +1724,11 @@ } // If there's a REWRITE_SYSTEM entry in this catalog, use it @@ -426,7 +434,7 @@ if (e.getEntryType() == REWRITE_SYSTEM) { String p = (String) e.getEntryArg(0); -@@ -1750,10 +1750,10 @@ public class Catalog { +@@ -1750,10 +1750,10 @@ } // If there's a DELEGATE_SYSTEM entry in this catalog, use it @@ -440,7 +448,7 @@ if (e.getEntryType() == DELEGATE_SYSTEM) { String p = (String) e.getEntryArg(0); -@@ -1846,9 +1846,9 @@ public class Catalog { +@@ -1846,9 +1846,9 @@ */ protected String resolveLocalURI(String uri) throws MalformedURLException, IOException { @@ -453,7 +461,7 @@ if (e.getEntryType() == URI && (e.getEntryArg(0).equals(uri))) { return e.getEntryArg(1); -@@ -1856,11 +1856,11 @@ public class Catalog { +@@ -1856,11 +1856,11 @@ } // If there's a REWRITE_URI entry in this catalog, use it @@ -468,7 +476,7 @@ if (e.getEntryType() == REWRITE_URI) { String p = (String) e.getEntryArg(0); -@@ -1882,10 +1882,10 @@ public class Catalog { +@@ -1882,10 +1882,10 @@ } // If there's a DELEGATE_URI entry in this catalog, use it @@ -482,9 +490,11 @@ if (e.getEntryType() == DELEGATE_URI) { String p = (String) e.getEntryArg(0); ---- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java.orig 2008-04-25 17:00:51.000000000 -0400 -+++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java 2008-04-25 17:01:13.000000000 -0400 -@@ -197,9 +197,9 @@ public class Resolver extends Catalog { +Index: xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java +=================================================================== +--- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java.orig 2003-09-02 09:05:08.000000000 +0200 ++++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java 2011-02-21 14:32:51.413982030 +0100 +@@ -197,9 +197,9 @@ return resolved; } @@ -497,7 +507,7 @@ if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(uri, e.getEntryArg(0)); if (resolved != null) { -@@ -254,9 +254,9 @@ public class Resolver extends Catalog { +@@ -254,9 +254,9 @@ return resolved; } @@ -510,7 +520,7 @@ if (e.getEntryType() == RESOLVER) { resolved = resolveExternalSystem(systemId, e.getEntryArg(0)); if (resolved != null) { -@@ -316,9 +316,9 @@ public class Resolver extends Catalog { +@@ -316,9 +316,9 @@ return resolved; } @@ -523,7 +533,7 @@ if (e.getEntryType() == RESOLVER) { if (systemId != null) { resolved = resolveExternalSystem(systemId, -@@ -557,9 +557,9 @@ public class Resolver extends Catalog { +@@ -557,9 +557,9 @@ Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); @@ -536,7 +546,7 @@ if (e.getEntryType() == SYSTEM && (e.getEntryArg(0).equals(systemId) || (windows -@@ -585,9 +585,9 @@ public class Resolver extends Catalog { +@@ -585,9 +585,9 @@ Vector map = new Vector(); String osname = System.getProperty("os.name"); boolean windows = (osname.indexOf("Windows") >= 0); @@ -549,3 +559,40 @@ if (e.getEntryType() == SYSTEM && (e.getEntryArg(1).equals(systemId) || (windows +Index: xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java +=================================================================== +--- xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java.orig 2002-08-07 21:24:05.000000000 +0200 ++++ xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java 2011-02-21 16:42:54.303931676 +0100 +@@ -316,12 +316,12 @@ + if (null == hash) + return; + +- Enumeration enum = hash.keys(); ++ Enumeration enum2 = hash.keys(); + Vector v = new Vector(); + +- while (enum.hasMoreElements()) ++ while (enum2.hasMoreElements()) + { +- Object key = enum.nextElement(); ++ Object key = enum2.nextElement(); + String keyStr = key.toString(); + Object item = hash.get(key); + +@@ -338,12 +338,12 @@ + } + } + +- enum = v.elements(); ++ enum2 = v.elements(); + +- while (enum.hasMoreElements()) ++ while (enum2.hasMoreElements()) + { +- String n = (String) enum.nextElement(); +- Hashtable h = (Hashtable) enum.nextElement(); ++ String n = (String) enum2.nextElement(); ++ Hashtable h = (Hashtable) enum2.nextElement(); + + reportHashtable(h, n, out); + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
