From 904b7c80a6a4ad625fb4005eb601940b6aec2d7dd6c185dd3e682d1aa9c94bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sat, 4 May 2024 02:09:11 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main xml-commons-apis-bootstrap revision ea5149516702a20acbb86b2b1979fc97 --- .gitattributes | 23 + xml-commons-1.0.b2.tar.bz2 | 3 + xml-commons-apis-bootstrap.changes | 116 +++++ xml-commons-apis-bootstrap.spec | 203 ++++++++ xml-commons-enum.patch | 598 +++++++++++++++++++++++ xml-commons-resolver-1.1-build_xml.patch | 16 + xml-commons-resolver-1.1.b1.tar.bz2 | 3 + xml-commons-resolver-crosslink.patch | 19 + 8 files changed, 981 insertions(+) create mode 100644 .gitattributes create mode 100644 xml-commons-1.0.b2.tar.bz2 create mode 100644 xml-commons-apis-bootstrap.changes create mode 100644 xml-commons-apis-bootstrap.spec create mode 100644 xml-commons-enum.patch create mode 100644 xml-commons-resolver-1.1-build_xml.patch create mode 100644 xml-commons-resolver-1.1.b1.tar.bz2 create mode 100644 xml-commons-resolver-crosslink.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/xml-commons-1.0.b2.tar.bz2 b/xml-commons-1.0.b2.tar.bz2 new file mode 100644 index 0000000..6f05b8a --- /dev/null +++ b/xml-commons-1.0.b2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:992fd5860da09ea203a54af20856d4d2d7e9a91b2defd5eef0a5c2641eb06504 +size 427547 diff --git a/xml-commons-apis-bootstrap.changes b/xml-commons-apis-bootstrap.changes new file mode 100644 index 0000000..da04905 --- /dev/null +++ b/xml-commons-apis-bootstrap.changes @@ -0,0 +1,116 @@ +------------------------------------------------------------------- +Fri Mar 18 16:22:47 UTC 2022 - Fridrich Strba + +- Build with source/target levels 8 + +------------------------------------------------------------------- +Fri Feb 1 12:14:36 UTC 2019 - Fridrich Strba + +- Speed-up build by compiling all *.java files in one javac + invocation + +------------------------------------------------------------------- +Fri Dec 7 07:33:59 UTC 2018 - Fridrich Strba + +- Provide xml-resolver by package xml-commons-resolver-bootstrap +- Provide compatibility symlinks xml-apis.jar and xml-resolver.jar +- Removed patches: + * xml-commons-encoding.patch + * xml-commons-no-javadoc.patch + + not needed any more + +------------------------------------------------------------------- +Wed Oct 4 19:43:23 UTC 2017 - fstrba@suse.com + +- Don't depend on java-1_5_0-gcj-compat +- Depend on java-devel >= 1.6 instead +- Don't build the javax.xml.parsers.* and javax.xml.transformers.* + classes, since they are part of jdk6+ + +------------------------------------------------------------------- +Thu Sep 14 09:00:18 UTC 2017 - fstrba@suse.com + +- Fix build with javac that has OpenJDK compatible options + +------------------------------------------------------------------- +Fri May 19 11:40:41 UTC 2017 - vsistek@suse.com + +- Add BuildRequires: javapackages-local (for maven conversions) +- .spec file cleanup + +------------------------------------------------------------------- +Sat Mar 7 12:17:15 UTC 2015 - afaerber@suse.de + +- Bump version to 1.4.01, to match xml-commons.spec +- Drop unused 1.2.06 and 1.3.05 sources for build speedup + +------------------------------------------------------------------- +Fri Mar 6 19:18:05 UTC 2015 - afaerber@suse.de + +- Update to 1.3.05 +- Update to 1.2.06 + +------------------------------------------------------------------- +Mon Jul 28 06:48:00 UTC 2014 - tchvatal@suse.com + +- Remove update-alternatives as they are not used here. + +------------------------------------------------------------------- +Sat Sep 14 09:29:44 UTC 2013 - schwab@suse.de + +- Fix quoting of $ + +------------------------------------------------------------------- +Mon Mar 14 13:20:56 UTC 2011 - mvyskocil@suse.cz + +- build ignore of openjdk + +------------------------------------------------------------------- +Tue Feb 22 09:29:27 UTC 2011 - mvyskocil@suse.cz + +- build xml-commons-resolver-bootstrap from own tarball + fix build of xerces-j2-bootstrap + +------------------------------------------------------------------- +Tue Nov 2 15:28:42 UTC 2010 - mvyskocil@suse.cz + +- merge with xml-commons-1.3.04-5.jpp5.src.rpm + * include xml-commons-resolver + +------------------------------------------------------------------- +Thu Sep 2 12:46:03 UTC 2010 - mvyskocil@suse.cz + +- ignore antlr(-java) to reduce build cycles + +------------------------------------------------------------------- +Tue Jan 22 15:49:47 CET 2008 - mvyskocil@suse.cz + +- fixed beta build + +------------------------------------------------------------------- +Tue Aug 28 16:36:50 CEST 2007 - skh@suse.de + +- add BuildRequires: antlr-bootstrap and #!BuildIgnore: antlr to break + build cycle caused further down the dependency chain + (java-1_4_2-gcj-compat->gjdoc->antlr->ant->xml-commons-apis-bootstrap) + +------------------------------------------------------------------- +Wed Jun 27 22:25:15 CEST 2007 - rguenther@suse.de + +- remove libgcj BuildRequires + +------------------------------------------------------------------- +Wed May 2 11:53:52 CEST 2007 - dbornkessel@suse.de + +- added unzip to BuildRequires + +------------------------------------------------------------------- +Fri Sep 29 02:20:37 CEST 2006 - ro@suse.de + +- added gcc-java,gcc-gij to BuildRequires + +------------------------------------------------------------------- +Thu Sep 21 21:23:34 CEST 2006 - dbornkessel@suse.de + +- first version + diff --git a/xml-commons-apis-bootstrap.spec b/xml-commons-apis-bootstrap.spec new file mode 100644 index 0000000..f43a37a --- /dev/null +++ b/xml-commons-apis-bootstrap.spec @@ -0,0 +1,203 @@ +# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: +# +# spec file for package xml-commons-apis-bootstrap +# +# Copyright (c) 2022 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define xml_commons_version 1.0.b2 +%define real_name xml-commons +%define apis_jar %{real_name}-apis-bootstrap +%define which_jar %{real_name}-which-bootstrap +%define resolver_jar %{real_name}-resolver-bootstrap +Name: xml-commons-apis-bootstrap +Version: 1.4.01 +Release: 0 +Summary: Common code for XML projects - bootstrapping package +License: Apache-2.0 +Group: Development/Libraries/Java +URL: http://xml.apache.org/commons/ +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-1_0_b2/ +Source0: xml-commons-1.0.b2.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-resolver-1_1_b1/ +Source3: xml-commons-resolver-1.1.b1.tar.bz2 +Patch1: %{real_name}-resolver-crosslink.patch +Patch2: %{real_name}-resolver-1.1-build_xml.patch +Patch3: %{real_name}-enum.patch +BuildRequires: antlr-bootstrap +BuildRequires: java-devel >= 1.8 +# Needed for maven conversions +BuildRequires: javapackages-tools +#!BuildIgnore: antlr +#!BuildIgnore: antlr-java +Provides: xml-apis +BuildArch: noarch + +%description +This is xml-apis from the java-bootrapping-tools package. DO NOT +INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! + +%package -n xml-commons-which-bootstrap +Summary: Which subproject of xml-commons +Group: Development/Libraries/Java +URL: http://xml.apache.org/commons/ + +%description -n xml-commons-which-bootstrap +This is xml-which from the java-bootrapping-tools package. DO NOT +INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! + +%package -n xml-commons-resolver-bootstrap +Summary: Resolver subproject of xml-commons +Group: Development/Libraries/Java +URL: http://xml.apache.org/commons/ +Provides: xml-resolver + +%description -n xml-commons-resolver-bootstrap +This is xml-resolver from the java-bootrapping-tools package. DO NOT +INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!! + +%prep +# To make patches unchanged +%setup -q -T -c +%setup -q -T -D -a 0 +%setup -q -T -D -a 3 + +%patch1 -b .sav +%patch2 -b .sav +%patch3 -b .sav + +%build +#>>> some useful functions ... used throughout bootstrap packages + +#>>> delete binary file and files not needed +function delBinaryFiles() { + set +x + echo deleting binary files ... + find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*" -delete + set -x +} +#<<< + +#>>> make a string with all jar files found in target folder that can be used for a classpath string +# string is saved in JAR_CLASSPATH +function mkTargetClasspath() { + set +x + JAR_CLASSPATH="" + for file in `find %{_javadir} -name "*.jar"` + do + JAR_CLASSPATH=$file:$JAR_CLASSPATH + done + set -x +} +#<<< + +#>>> compiles all *.java file in the current directory tree +# uses mkTargetClasspath for CLASSPATH variable +# uses LIB_GCJ for CLASSPATH +function compileFiles() { + COMPILE_CLASSPATH_PATH=.:${JAR_CLASSPATH} + echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs)" + $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $(find . -name "*.java" | xargs) + # check for errors + if [ $? != 0 ] + then + echo ERROR + exit 1; + fi + echo done +} +#<<< + +#>>> make jar archive +# PARAM#1: name of jar archive (without .jar suffix) +# uses $TARGET_DIR to move created jar to +function mkJar() { + find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" |\ + xargs jar cfm ${1}.jar manifest.* ; + mv ${1}.jar $TARGET_DIR +} +#<<< + +#<<< end functions + +# variables: +COMPILER_COMMAND="javac -source 1.8 -target 1.8 -classpath " +TARGET_DIR=`pwd` +CLASSPATH_ORIG="$CLASSPATH" + +delBinaryFiles +#>>> xml-apis and xml-which +# compile external files + +pushd xml-commons-1_0_b2 +cd java/external/src +# These are java internal +# classes since 1.6 +rm -rf javax/xml +mkTargetClasspath +compileFiles +mkJar %{apis_jar} +delBinaryFiles + +# compile the rest +cd ../../src/ +# remove resolver +rm -rf org/apache/xml/ +mkTargetClasspath +compileFiles +mkJar %{which_jar} +delBinaryFiles +popd + +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 +popd +popd +#<<< build end + +%install +#>>> % install +mkdir -p %{buildroot}%{_javadir} +cp %{apis_jar}.jar %{buildroot}%{_javadir} +ln -sf %{apis_jar}.jar %{buildroot}%{_javadir}/xml-apis.jar +cp %{which_jar}.jar %{buildroot}%{_javadir} +cp %{resolver_jar}.jar %{buildroot}%{_javadir} +ln -sf %{resolver_jar}.jar %{buildroot}%{_javadir}/xml-resolver.jar +#<<< install end + +%files +%license xml-commons-1_0_b2/LICENSE.txt +%{_javadir}/%{apis_jar}.jar +%{_javadir}/xml-apis.jar + +%files -n xml-commons-which-bootstrap +%license xml-commons-1_0_b2/LICENSE.txt +%{_javadir}/%{which_jar}.jar + +%files -n xml-commons-resolver-bootstrap +%license xml-commons-1_0_b2/LICENSE.txt +%{_javadir}/%{resolver_jar}.jar +%{_javadir}/xml-resolver.jar +#<<< + +%changelog diff --git a/xml-commons-enum.patch b/xml-commons-enum.patch new file mode 100644 index 0000000..8f5da64 --- /dev/null +++ b/xml-commons-enum.patch @@ -0,0 +1,598 @@ +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; + +- Enumeration enum = hash.keys(); ++ Enumeration myEnum = hash.keys(); + Vector v = new Vector(); + +- while (enum.hasMoreElements()) ++ while (myEnum.hasMoreElements()) + { +- Object key = enum.nextElement(); ++ Object key = myEnum.nextElement(); + String keyStr = key.toString(); + Object item = hash.get(key); + +@@ -311,12 +311,12 @@ + } + } + +- enum = v.elements(); ++ myEnum = v.elements(); + +- while (enum.hasMoreElements()) ++ while (myEnum.hasMoreElements()) + { +- String n = (String) enum.nextElement(); +- Hashtable h = (Hashtable) enum.nextElement(); ++ String n = (String) myEnum.nextElement(); ++ Hashtable h = (Hashtable) myEnum.nextElement(); + + reportHashtable(h, n, out); + } +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); + } + +- Enumeration enum = readerMap.keys(); +- while (enum.hasMoreElements()) { +- String mimeType = (String) enum.nextElement(); ++ Enumeration myEnum = readerMap.keys(); ++ while (myEnum.hasMoreElements()) { ++ String mimeType = (String) myEnum.nextElement(); + Integer pos = (Integer) readerMap.get(mimeType); + mapArr.set(pos.intValue(), mimeType); + } +@@ -1064,9 +1064,9 @@ + } + + // Parse all the DELEGATE catalogs +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == DELEGATE_PUBLIC + || e.getEntryType() == DELEGATE_SYSTEM + || e.getEntryType() == DELEGATE_URI) { +@@ -1140,9 +1140,9 @@ + + // If there's a DOCTYPE entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1178,9 +1178,9 @@ + + Debug.message(3, "resolveDocument"); + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == DOCUMENT) { + return e.getEntryArg(1); //FIXME check this + } +@@ -1253,9 +1253,9 @@ + + // If there's a ENTITY entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1339,9 +1339,9 @@ + + // If there's a NOTATION entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1498,9 +1498,9 @@ + + // If there's a PUBLIC entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1516,10 +1516,10 @@ + + // If there's a DELEGATE_PUBLIC entry in this catalog, use it + over = default_override; +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + Vector delCats = new Vector(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1624,9 +1624,9 @@ + + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == SYSTEM + && (e.getEntryArg(0).equals(systemId) + || (windows +@@ -1636,11 +1636,11 @@ + } + + // If there's a REWRITE_SYSTEM entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + String startString = null; + String prefix = null; +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == REWRITE_SYSTEM) { + String p = (String) e.getEntryArg(0); +@@ -1662,10 +1662,10 @@ + } + + // If there's a DELEGATE_SYSTEM entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + Vector delCats = new Vector(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == DELEGATE_SYSTEM) { + String p = (String) e.getEntryArg(0); +@@ -1759,9 +1759,9 @@ + */ + protected String resolveLocalURI(String uri) + throws MalformedURLException, IOException { +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == URI + && (e.getEntryArg(0).equals(uri))) { + return e.getEntryArg(1); +@@ -1769,11 +1769,11 @@ + } + + // If there's a REWRITE_URI entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + String startString = null; + String prefix = null; +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == REWRITE_URI) { + String p = (String) e.getEntryArg(0); +@@ -1795,10 +1795,10 @@ + } + + // If there's a DELEGATE_URI entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + Vector delCats = new Vector(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == DELEGATE_URI) { + String p = (String) e.getEntryArg(0); +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; + } + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == RESOLVER) { + resolved = resolveExternalSystem(uri, e.getEntryArg(0)); + if (resolved != null) { +@@ -272,9 +272,9 @@ + return resolved; + } + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == RESOLVER) { + resolved = resolveExternalSystem(systemId, e.getEntryArg(0)); + if (resolved != null) { +@@ -334,9 +334,9 @@ + return resolved; + } + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == RESOLVER) { + if (systemId != null) { + resolved = resolveExternalSystem(systemId, +@@ -575,9 +575,9 @@ + Vector map = new Vector(); + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == SYSTEM + && (e.getEntryArg(0).equals(systemId) + || (windows +@@ -603,9 +603,9 @@ + Vector map = new Vector(); + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == SYSTEM + && (e.getEntryArg(1).equals(systemId) + || (windows +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); + } + +- Enumeration enum = readerMap.keys(); +- while (enum.hasMoreElements()) { +- String mimeType = (String) enum.nextElement(); ++ Enumeration myEnum = readerMap.keys(); ++ while (myEnum.hasMoreElements()) { ++ String mimeType = (String) myEnum.nextElement(); + Integer pos = (Integer) readerMap.get(mimeType); + mapArr.set(pos.intValue(), mimeType); + } +@@ -1152,9 +1152,9 @@ + } + + // Parse all the DELEGATE catalogs +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == DELEGATE_PUBLIC + || e.getEntryType() == DELEGATE_SYSTEM + || e.getEntryType() == DELEGATE_URI) { +@@ -1228,9 +1228,9 @@ + + // If there's a DOCTYPE entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1266,9 +1266,9 @@ + + catalogManager.debug.message(3, "resolveDocument"); + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == DOCUMENT) { + return e.getEntryArg(1); //FIXME check this + } +@@ -1341,9 +1341,9 @@ + + // If there's a ENTITY entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1427,9 +1427,9 @@ + + // If there's a NOTATION entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1586,9 +1586,9 @@ + + // If there's a PUBLIC entry in this catalog, use it + boolean over = default_override; +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1604,10 +1604,10 @@ + + // If there's a DELEGATE_PUBLIC entry in this catalog, use it + over = default_override; +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + Vector delCats = new Vector(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == OVERRIDE) { + over = e.getEntryArg(0).equalsIgnoreCase("YES"); + continue; +@@ -1712,9 +1712,9 @@ + + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == SYSTEM + && (e.getEntryArg(0).equals(systemId) + || (windows +@@ -1724,11 +1724,11 @@ + } + + // If there's a REWRITE_SYSTEM entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + String startString = null; + String prefix = null; +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == REWRITE_SYSTEM) { + String p = (String) e.getEntryArg(0); +@@ -1750,10 +1750,10 @@ + } + + // If there's a DELEGATE_SYSTEM entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + Vector delCats = new Vector(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == DELEGATE_SYSTEM) { + String p = (String) e.getEntryArg(0); +@@ -1846,9 +1846,9 @@ + */ + protected String resolveLocalURI(String uri) + throws MalformedURLException, IOException { +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == URI + && (e.getEntryArg(0).equals(uri))) { + return e.getEntryArg(1); +@@ -1856,11 +1856,11 @@ + } + + // If there's a REWRITE_URI entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + String startString = null; + String prefix = null; +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == REWRITE_URI) { + String p = (String) e.getEntryArg(0); +@@ -1882,10 +1882,10 @@ + } + + // If there's a DELEGATE_URI entry in this catalog, use it +- enum = catalogEntries.elements(); ++ myEnum = catalogEntries.elements(); + Vector delCats = new Vector(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + + if (e.getEntryType() == DELEGATE_URI) { + String p = (String) e.getEntryArg(0); +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; + } + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == RESOLVER) { + resolved = resolveExternalSystem(uri, e.getEntryArg(0)); + if (resolved != null) { +@@ -254,9 +254,9 @@ + return resolved; + } + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == RESOLVER) { + resolved = resolveExternalSystem(systemId, e.getEntryArg(0)); + if (resolved != null) { +@@ -316,9 +316,9 @@ + return resolved; + } + +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == RESOLVER) { + if (systemId != null) { + resolved = resolveExternalSystem(systemId, +@@ -557,9 +557,9 @@ + Vector map = new Vector(); + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + if (e.getEntryType() == SYSTEM + && (e.getEntryArg(0).equals(systemId) + || (windows +@@ -585,9 +585,9 @@ + Vector map = new Vector(); + String osname = System.getProperty("os.name"); + boolean windows = (osname.indexOf("Windows") >= 0); +- Enumeration enum = catalogEntries.elements(); +- while (enum.hasMoreElements()) { +- CatalogEntry e = (CatalogEntry) enum.nextElement(); ++ Enumeration myEnum = catalogEntries.elements(); ++ while (myEnum.hasMoreElements()) { ++ CatalogEntry e = (CatalogEntry) myEnum.nextElement(); + 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); + } diff --git a/xml-commons-resolver-1.1-build_xml.patch b/xml-commons-resolver-1.1-build_xml.patch new file mode 100644 index 0000000..d9283a1 --- /dev/null +++ b/xml-commons-resolver-1.1-build_xml.patch @@ -0,0 +1,16 @@ +--- xml-commons-resolver-1_1_b1/build.xml.sav 2003-09-25 20:15:25.000000000 +0200 ++++ xml-commons-resolver-1_1_b1/build.xml 2006-03-31 20:30:38.000000000 +0200 +@@ -62,11 +62,10 @@ + + + +- ++ + +- ++ + + + diff --git a/xml-commons-resolver-1.1.b1.tar.bz2 b/xml-commons-resolver-1.1.b1.tar.bz2 new file mode 100644 index 0000000..28aac42 --- /dev/null +++ b/xml-commons-resolver-1.1.b1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:134c4e5b650c2c5b741388c6d1c59fe59d1c8b276b34b034002a7c872b6d7da7 +size 117121 diff --git a/xml-commons-resolver-crosslink.patch b/xml-commons-resolver-crosslink.patch new file mode 100644 index 0000000..18c48db --- /dev/null +++ b/xml-commons-resolver-crosslink.patch @@ -0,0 +1,19 @@ +--- xml-commons-1_0_b2/java/resolver.xml.sav 2006-03-24 19:01:42.000000000 +0100 ++++ xml-commons-1_0_b2/java/resolver.xml 2006-03-24 19:03:36.000000000 +0100 +@@ -51,6 +51,8 @@ + + ++ ++ + + + + ++ + + +