Hello community, here is the log from the commit of package xml-commons for openSUSE:Factory checked in at Mon Nov 15 17:41:55 CET 2010. -------- --- xml-commons/xml-commons-apis-bootstrap.changes 2010-09-02 14:47:00.000000000 +0200 +++ xml-commons/xml-commons-apis-bootstrap.changes 2010-11-02 16:31:43.000000000 +0100 @@ -1,0 +2,6 @@ +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 + +------------------------------------------------------------------- --- xml-commons/xml-commons.changes 2010-09-02 14:47:01.000000000 +0200 +++ xml-commons/xml-commons.changes 2010-11-08 10:42:33.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 2 15:27:37 UTC 2010 - mvyskocil@suse.cz + +- merge spec file with xml-commons-1.3.04-5.jpp5.src.rpm + * add external-1.2.04 and 1.3.04 + * include the resolver + * new subpackages - which[10-11], resolver[10-12], + jaxp-1.[1-3]-apis + * old xml-commons-apis is now provided by xml-commons-jaxp-1.3-apis + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- README.PACKAGER.xml-commons-external xml-commons-externals.tar.bz2 xml-commons-jdk5-build.patch xml-commons.build.patch xml-commons.manifest.patch xml-commons.which.script New: ---- xml-apis-1.3.04.pom xml-apis-ext-1.3.04.pom xml-commons-component-info.xml xml-commons-enum.patch xml-commons-external-1.2.04.tar.bz2 xml-commons-external-1.3-build_xml.patch xml-commons-external-1.3.04.tar.bz2 xml-commons-resolver-1.1-build_xml.patch xml-commons-resolver-1.1.b1.tar.bz2 xml-commons-resolver-CatalogManager.properties xml-commons-resolver-crosslink.patch xml-commons-resolver10-resolver.1 xml-commons-resolver10-resolver.sh xml-commons-resolver10-xparse.1 xml-commons-resolver10-xparse.sh xml-commons-resolver10-xread.1 xml-commons-resolver10-xread.sh xml-commons-resolver11-resolver.1 xml-commons-resolver11-resolver.sh xml-commons-resolver11-xparse.1 xml-commons-resolver11-xparse.sh xml-commons-resolver11-xread.1 xml-commons-resolver11-xread.sh xml-commons-resolver12-resolver.1 xml-commons-resolver12-resolver.sh xml-commons-resolver12-xparse.1 xml-commons-resolver12-xparse.sh xml-commons-resolver12-xread.1 xml-commons-resolver12-xread.sh xml-commons.which10.script xml-commons.which11.script ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xml-commons-apis-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.b8Miap/_old 2010-11-15 17:28:49.000000000 +0100 +++ /var/tmp/diff_new_pack.b8Miap/_new 2010-11-15 17:28:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xml-commons-apis-bootstrap (Version 1.3) +# spec file for package xml-commons-apis-bootstrap (Version 1.3.04) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,87 +17,88 @@ # norootforbuild - -Name: xml-commons-apis-bootstrap -#!BuildIgnore: antlr antlr-java -BuildRequires: antlr-bootstrap fastjar gcc-gij gcc-java java-1_4_2-gcj-compat java-1_4_2-gcj-compat-devel unzip zip -%if %{?!suse_version:1}0 -%if %{?!mandriva_release:1}0 -BuildRequires: chkconfig which -%endif -%else -BuildRequires: update-alternatives -%endif -%if %{undefined _jvmdir} -%define _jvmdir %{_libdir}/jvm -%endif -%if %{undefined _jvmjardir} -%define _jvmjardir %{_libdir}/jvm-exports -%endif %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.3.04 +Release: 1 Summary: Common code for XML projects - bootstrapping package -Version: 1.3 -Release: 268 -# ... externals have to be checked out with svn ... see README.PACKAGER.xml-commons-external -Url: http://xml.apache.org/commons/ -License: ASLv.. Group: Development/Libraries/Java -AutoReqProv: on -Source0: %{real_name}-%{xml_commons_version}.tar.bz2 -Source1: %{real_name}-externals.tar.bz2 -# files for the source package -Source42: README.PACKAGER.xml-commons-external -# to be consistent with xml-commons.spec -Patch2: xml-commons-jdk5-build.patch +License: ASL 2.0 +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-external-1_2_04... +Source1: xml-commons-external-1.2.04.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04... +Source2: xml-commons-external-1.3.04.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 +Patch0: %{real_name}-external-1.3-build_xml.patch +Patch1: %{real_name}-resolver-crosslink.patch +Patch2: %{real_name}-resolver-1.1-build_xml.patch +Patch3: %{real_name}-enum.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildArchitectures: noarch -#ExclusiveArch: %ix86 BuildArch: noarch Provides: xml-apis +#!BuildIgnore: antlr antlr-java +BuildRequires: antlr-bootstrap +BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: update-alternatives +BuildRequires: fastjar %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 License: ASLv.. Summary: Which subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ -Version: 1.0.b2 -Release: 268 %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 +License: ASLv.. +Summary: Resolver subproject of xml-commons +Group: Development/Libraries/Java +Url: http://xml.apache.org/commons/ + +%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 -#<<< package descriptions end -#>>> %prep -# xml-commons -%setup -n %{real_name}-%{version} -pushd java -# use more up to date external sources -rm -rf external -tar -jxf %{SOURCE1} -#<<< -#>>> %build -popd +# To make patches unchanged +%setup -q -T -c +%setup -q -T -D -a 0 +%setup -q -T -D -a 1 +%setup -q -T -D -a 2 +%setup -q -T -D -a 3 + +%patch1 -b .sav %patch2 -b .sav +%patch3 -b .sav +pushd xml-commons-external-1_3_* +%patch0 -b .sav +popd %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() { set +x @@ -109,6 +110,7 @@ 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() { @@ -121,6 +123,7 @@ set -x } #<<< + #>>> compiles all *.java file in the current directory tree # uses mkTargetClasspath for CLASSPATH variable # uses LIB_GCJ for CLASSPATH @@ -144,6 +147,7 @@ set -x } #<<< + #>>> make jar archive # PARAM#1: name of jar archive (without .jar suffix) # uses $TARGET_DIR to move created jar to @@ -153,32 +157,49 @@ mv ${1}.jar $TARGET_DIR } #<<< + COMPILER_COMMAND="javac -C -ftarget=1.4 -classpath " + #<<< end functions + delBinaryFiles #>>> xml-apis and xml-which # compile external files + cd java/external/src compileFiles mkJar %{apis_jar} delBinaryFiles + # compile the rest cd ../../src/ -# we use the resolver classes from the resolver package and therefore delete all related resolver files: -rm -r org/apache/xml/ -rm manifest.resolver +# 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 compileFiles mkJar %{which_jar} delBinaryFiles + +# compile the resolver +cd ../../resolver.src/ +# move resolver to an another location to create own jar/package +compileFiles +mkJar %{resolver_jar} +delBinaryFiles #<<< xml-commons end #<<< build end -#>>> %install +popd %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 @@ -186,13 +207,18 @@ %files %defattr(-,root,root) -#%dir %{_javadir} +%doc xml-commons-1_0_b2/LICENSE.txt %{_javadir}/%{apis_jar}.jar %files -n xml-commons-which-bootstrap %defattr(-,root,root) -#%dir %{_javadir} +%doc xml-commons-1_0_b2/LICENSE.txt %{_javadir}/%{which_jar}.jar + +%files -n xml-commons-resolver-bootstrap +%defattr(-,root,root) +%doc xml-commons-1_0_b2/LICENSE.txt +%{_javadir}/%{resolver_jar}.jar #<<< # vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: ++++++ xml-commons.spec ++++++ ++++ 1203 lines (skipped) ++++ between xml-commons/xml-commons.spec ++++ and xml-commons/xml-commons.spec ++++++ xml-commons-1.0.b2.tar.bz2 ++++++ ++++ 380395 lines of diff (skipped) ++++++ xml-commons-component-info.xml ++++++ <project name="apache-xerces-component-info"> <!-- ============================================================ --> <!-- Apache Xerces --> <!-- ============================================================ --> <component id="apache-xml-commons" licenseType="apache-2.0" version="@VERSION@" projectHome="http://xml.apache.org/commons/" description="Common code for XML projects" scm=":ext:cvs.devel.redhat.com:/cvs/dist/xml-commons" tag="@TAG@"> <!-- Build using JDK 1.4 --> <artifact id="resolver.jar"/> <artifact id="xml-apis.jar"/> <export> <include input="resolver.jar"/> <include input="xml-apis.jar"/> </export> </component> </project> ++++++ xml-commons-enum.patch ++++++ --- 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 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 @@ public class Which } } - 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); } --- 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 { 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 @@ public class Catalog { } // 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 @@ public class Catalog { // 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 @@ public class Catalog { 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 @@ public class Catalog { // 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 @@ public class Catalog { // 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 @@ public class Catalog { // 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 @@ public class Catalog { // 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 @@ public class Catalog { 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 @@ public class Catalog { } // 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 @@ public class Catalog { } // 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 @@ public class Catalog { */ 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 @@ public class Catalog { } // 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 @@ public class Catalog { } // 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); --- 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 { 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 @@ public class Resolver extends Catalog { 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 @@ public class Resolver extends Catalog { 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 @@ public class Resolver extends Catalog { 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 @@ public class Resolver extends Catalog { 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 --- 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 { 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 @@ public class Catalog { } // 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 @@ public class Catalog { // 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 @@ public class Catalog { 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 @@ public class Catalog { // 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 @@ public class Catalog { // 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 @@ public class Catalog { // 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 @@ public class Catalog { // 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 @@ public class Catalog { 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 @@ public class Catalog { } // 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 @@ public class Catalog { } // 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 @@ public class Catalog { */ 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 @@ public class Catalog { } // 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 @@ public class Catalog { } // 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); --- 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 { 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 @@ public class Resolver extends Catalog { 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 @@ public class Resolver extends Catalog { 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 @@ public class Resolver extends Catalog { 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 @@ public class Resolver extends Catalog { 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 ++++++ xml-commons-external-1.3-build_xml.patch ++++++ --- build.xml.sav 2005-07-14 04:23:37.000000000 +0200 +++ build.xml 2006-03-22 11:16:11.000000000 +0100 @@ -75,7 +75,9 @@ description="Calls all other java build files."> <ant dir="java" antfile="which.xml" target="all" > </ant> - <ant dir="java" antfile="resolver.xml" target="all" > + <ant dir="java" antfile="resolver.xml" target="jar" > + </ant> + <ant dir="java" antfile="resolver.xml" target="javadocs" > </ant> </target> ++++++ xml-commons-resolver-1.1-build_xml.patch ++++++ --- 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 @@ </target> <target name="jars" - depends="external" description="Calls all other java build files."> - <ant dir="java" antfile="which.xml" target="all" > + <ant dir="java" antfile="resolver.xml" target="jar" > </ant> - <ant dir="java" antfile="resolver.xml" target="all" > + <ant dir="java" antfile="resolver.xml" target="javadocs" > </ant> </target> ++++++ xml-commons-resolver-CatalogManager.properties ++++++ # Central CatalogManager.properties for xml-commons-resolver # JPackage Project <http://www.jpackage.org/> ######################################################################## # CatalogManager provides an interface to the catalog properties. # Properties can come from two places: from system properties or # from a CatalogManager.properties file. This class provides a # transparent interface to both, with system properties preferred # over property file values. ####################################################################### # Catalog Files: # The semicolon-delimited list of catalog files. # Example: catalogs=./xcatalog;/share/doctypes/catalog catalogs=/etc/xml/catalog;/etc/sgml/catalog ####################################################################### # Relative Catalogs: # If false, relative catalog URIs are made absolute with respect to the # base URI of the CatalogManager.properties file. This setting only # applies to catalog URIs obtained from the catalogs property in the # CatalogManager.properties file # Example: relative-catalogs = [yes|no] relative-catalogs=no ####################################################################### # Verbosity: # If non-zero, the Catalog classes will print informative and debugging # messages. The higher the number, the more messages. # Example: verbosity = [0..99] verbosity=0 ####################################################################### # Prefer: # Which identifier is preferred, "public" or "system"? # Example: xml.catalog.prefer = [public|system] prefer=public ####################################################################### # Static-catalog: # Should a single catalog be constructed for all parsing, or should a # different catalog be created for each parser? # Example: static-catalog = [yes|no] static-catalog=yes ####################################################################### # Allow-oasis-xml-catalog-pi # If the source document contains "oasis-xml-catalog" processing # instructions, should they be used? # Example: allow-oasis-xml-catalog-pi = [yes|no] allow-oasis-xml-catalog-pi=yes ####################################################################### # catalog-class-name # If you're using the convenience classes # org.apache.xml.resolver.tools.*, this setting allows you to specify # an alternate class name to use for the underlying catalog. # Example: catalog-class-name=org.apache.xml.resolver.Resolver ++++++ xml-commons-resolver-crosslink.patch ++++++ --- 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 @@ <property name="copyright.message" value="Copyright © ${copyright.date} ${company.name}. All Rights Reserved."/> + <property name="j2se.apidoc" value="http://java.sun.com/j2se/1.4.2/docs/api/"/> + <!-- Public Targets --> <target name="main" depends="all, check" @@ -124,6 +126,7 @@ <package name="org.apache.xml.resolver.readers"/> <package name="org.apache.xml.resolver.tools"/> <package name="org.apache.xml.resolver.apps"/> + <link href="${j2se.apidoc}"/> </javadoc> </target> --- xml-commons-external-1_3_04/java/resolver.xml.sav 2006-03-24 19:01:27.000000000 +0100 +++ xml-commons-external-1_3_04/java/resolver.xml 2006-03-24 19:04:22.000000000 +0100 @@ -68,6 +68,8 @@ <property name="copyright.message" value="Copyright © ${copyright.date} ${company.name}. All Rights Reserved."/> + <property name="j2se.apidoc" value="http://java.sun.com/j2se/1.4.2/docs/api/"/> + <!-- Public Targets --> <target name="main" depends="all,check" @@ -154,6 +156,7 @@ <package name="org.apache.xml.resolver.readers"/> <package name="org.apache.xml.resolver.tools"/> <package name="org.apache.xml.resolver.apps"/> + <link href="${j2se.apidoc}"/> </javadoc> </target> ++++++ xml-commons-resolver10-resolver.1 ++++++ .TH XML-RESOLVER "1" "July 2004" "1.1" "User Commands" .SH NAME xml-resolver \- Resolve XML entities and URIs .SH SYNOPSIS .B xml-resolver \fR[\fIoptions\fR] \fIkeyword\fR .SH DESCRIPTION xml-resolver is a simple command line XML entity and URI resolver. It takes a number of parameters and passes them through the actual resolver class, and prints out the result. .PP The keyword argument identifies the type of resolution to perform, it must be one of "doctype", "document", "entity", "notation", "public", "system", or "uri". .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-n\fR \fIname\fR Set the name. .TP \fB\-p\fR \fIpublicid\fR Set the public identifier. .TP \fB\-s\fR \fIsystemid\fR Set the system identifier. .TP \fB\-a\fR Make the system URI absolute before resolution. .TP \fB\-u\fR \fIuri\fR Set the URI. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). The default is 0. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-resolver\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-xparse (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver10-resolver.sh ++++++ #!/bin/sh # # xml-commons-resolver resolver script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.resolver BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver10-xparse.1 ++++++ .TH XML-XPARSE "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xparse \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xparse \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xparse is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP Parser, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xparse\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver10-xparse.sh ++++++ #!/bin/sh # # xml-commons-resolver xparse script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xparse BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver10-xread.1 ++++++ .TH XML-XREAD "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xread \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xread \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xread is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP XMLReader, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xread\fR. .SH "SEE ALSO" .BR xml-parse (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver10-xread.sh ++++++ #!/bin/sh # # xml-commons-resolver xread script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xread BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver11-resolver.1 ++++++ .TH XML-RESOLVER "1" "July 2004" "1.1" "User Commands" .SH NAME xml-resolver \- Resolve XML entities and URIs .SH SYNOPSIS .B xml-resolver \fR[\fIoptions\fR] \fIkeyword\fR .SH DESCRIPTION xml-resolver is a simple command line XML entity and URI resolver. It takes a number of parameters and passes them through the actual resolver class, and prints out the result. .PP The keyword argument identifies the type of resolution to perform, it must be one of "doctype", "document", "entity", "notation", "public", "system", or "uri". .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-n\fR \fIname\fR Set the name. .TP \fB\-p\fR \fIpublicid\fR Set the public identifier. .TP \fB\-s\fR \fIsystemid\fR Set the system identifier. .TP \fB\-a\fR Make the system URI absolute before resolution. .TP \fB\-u\fR \fIuri\fR Set the URI. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). The default is 0. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-resolver\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-xparse (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver11-resolver.sh ++++++ #!/bin/sh # # xml-commons-resolver resolver script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.resolver BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver11-xparse.1 ++++++ .TH XML-XPARSE "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xparse \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xparse \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xparse is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP Parser, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xparse\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver11-xparse.sh ++++++ #!/bin/sh # # xml-commons-resolver xparse script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xparse BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver11-xread.1 ++++++ .TH XML-XREAD "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xread \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xread \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xread is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP XMLReader, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xread\fR. .SH "SEE ALSO" .BR xml-parse (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver11-xread.sh ++++++ #!/bin/sh # # xml-commons-resolver xread script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xread BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver12-resolver.1 ++++++ .TH XML-RESOLVER "1" "July 2004" "1.1" "User Commands" .SH NAME xml-resolver \- Resolve XML entities and URIs .SH SYNOPSIS .B xml-resolver \fR[\fIoptions\fR] \fIkeyword\fR .SH DESCRIPTION xml-resolver is a simple command line XML entity and URI resolver. It takes a number of parameters and passes them through the actual resolver class, and prints out the result. .PP The keyword argument identifies the type of resolution to perform, it must be one of "doctype", "document", "entity", "notation", "public", "system", or "uri". .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-n\fR \fIname\fR Set the name. .TP \fB\-p\fR \fIpublicid\fR Set the public identifier. .TP \fB\-s\fR \fIsystemid\fR Set the system identifier. .TP \fB\-a\fR Make the system URI absolute before resolution. .TP \fB\-u\fR \fIuri\fR Set the URI. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). The default is 0. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-resolver\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-xparse (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver12-resolver.sh ++++++ #!/bin/sh # # xml-commons-resolver resolver script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.resolver BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver12-xparse.1 ++++++ .TH XML-XPARSE "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xparse \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xparse \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xparse is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP Parser, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xparse\fR. .SH "SEE ALSO" .BR xml-xread (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver12-xparse.sh ++++++ #!/bin/sh # # xml-commons-resolver xparse script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xparse BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons-resolver12-xread.1 ++++++ .TH XML-XREAD "1" "July 2004" "1.1" "User Commands" .SH NAME xml-xread \- Parse XML documents with entity and URI resolution .SH SYNOPSIS .B xml-xread \fR[\fIoptions\fR] \fIxmlfile\fR .SH DESCRIPTION xml-xread is a simple command line tool for parsing and validating XML documents. It is not an actual XML parser, it just wraps around a JAXP XMLReader, adding support for catalog-based entity and URI resolution. .SH OPTIONS .TP \fB\-c\fR \fIcatalogfile\fR Load a particular catalog file. May be specified multiple times. .TP \fB\-v\fR Perform a validating parse. This is the default. .TP \fB\-w\fR Perform a well-formed parse, not a validating parse. .TP \fB\-N\fR Perform a namespace-aware parse. This is the default. .TP \fB\-n\fR Perform a namespace-ignorant parse. .TP \fB\-d\fR \fIdebuglevel\fR Set the debug level (an integer). Warnings are shown if the debug level is set to greater than 2. .TP \fB\-E\fR \fImaxerrors\fR Set the maximum number of errors to display. The default is 10. .SH FILES .B __RESOLVERDIR__/CatalogManager.properties .RS The central catalog manager configuration file used by \fBxml-xread\fR. .SH "SEE ALSO" .BR xml-parse (1), .BR xml-resolver (1), .BR java (1), the OASIS entity resolution technical committee home page at <http://www.oasis-open.org/committees/entity/>. .SH AUTHOR Norman Walsh <Norman.Walsh@Sun.COM> ++++++ xml-commons-resolver12-xread.sh ++++++ #!/bin/sh # # xml-commons-resolver xread script # JPackage Project <http://www.jpackage.org/> # Source functions library . /usr/share/java-utils/java-functions # Configuration MAIN_CLASS=org.apache.xml.resolver.apps.xread BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar" CLASSPATH="$CLASSPATH:__RESOLVERDIR__" # Set parameters set_jvm set_classpath $BASE_JARS set_flags $BASE_FLAGS set_options $BASE_OPTIONS # Let's start run "$@" ++++++ xml-commons.which.script -> xml-commons.which10.script ++++++ --- xml-commons/xml-commons.which.script 2006-04-21 16:25:16.000000000 +0200 +++ xml-commons/xml-commons.which10.script 2008-10-03 13:41:47.000000000 +0200 @@ -14,8 +14,8 @@ # Configuration MAIN_CLASS=org.apache.env.Which -BASE_JARS=xml-commons-which.jar -CLASSPATH="$CLASSPATH:$(build-classpath ant xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-apis 2>/dev/null)" || : +BASE_JARS=xml-commons-which10.jar +CLASSPATH="$CLASSPATH:$(build-classpath ant ant-launcher xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-jaxp-1.1-apis 2>/dev/null)" || : # Set parameters set_jvm ++++++ xml-commons.which.script -> xml-commons.which11.script ++++++ --- xml-commons/xml-commons.which.script 2006-04-21 16:25:16.000000000 +0200 +++ xml-commons/xml-commons.which11.script 2008-10-03 13:41:48.000000000 +0200 @@ -14,8 +14,8 @@ # Configuration MAIN_CLASS=org.apache.env.Which -BASE_JARS=xml-commons-which.jar -CLASSPATH="$CLASSPATH:$(build-classpath ant xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-apis 2>/dev/null)" || : +BASE_JARS=xml-commons-which11.jar +CLASSPATH="$CLASSPATH:$(build-classpath ant ant-launcher xerces-j2 crimson xalan-j2 xalan-j1 xml-commons-jaxp-1.3-apis 2>/dev/null)" || : # Set parameters set_jvm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org