diff --git a/README.PACKAGER.xml-commons-external b/README.PACKAGER.xml-commons-external deleted file mode 100644 index 19574ec..0000000 --- a/README.PACKAGER.xml-commons-external +++ /dev/null @@ -1,9 +0,0 @@ -# the external packages in xml-commons are not packed up to date -mkdir external -cd external -svn co -r 406629 http://svn.apache.org/repos/asf/xml/commons/trunk/java/external -find . -name ".svn*" -exec rm -rf {} \; -cp ../xml-commons-externals.tar.bz2 ../xml-commons-externals.tar.bz2.bak -tar -jcf ../xml-commons-externals.tar.bz2 * -cd .. -rm -rf external diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 diff --git a/xml-apis-1.3.04.pom b/xml-apis-1.3.04.pom new file mode 100644 index 0000000..c01161e --- /dev/null +++ b/xml-apis-1.3.04.pom @@ -0,0 +1,41 @@ + + + apache + org.apache + 3 + + 4.0.0 + xml-apis + xml-apis + XML Commons External Components XML APIs + 1.3.04 + xml-commons provides an Apache-hosted set of DOM, SAX, and + JAXP interfaces for use in other xml-based projects. Our hope is that we + can standardize on both a common version and packaging scheme for these + critical XML standards interfaces to make the lives of both our developers + and users easier. The External Components portion of xml-commons contains + interfaces that are defined by external standards organizations. For DOM, + that's the W3C; for SAX it's David Megginson and sax.sourceforge.net; for + JAXP it's Sun. + http://xml.apache.org/commons/components/external/ + + bugzilla + http://issues.apache.org/bugzilla/ + + + + XML Commons Developer's List + commons-dev-subscribe@xml.apache.org + commons-dev-unsubscribe@xml.apache.org + commons-dev@xml.apache.org + http://mail-archives.apache.org/mod_mbox/xml-commons-dev/ + + + + scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/ + http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-external-1_3_04/ + + + deployed + + \ No newline at end of file diff --git a/xml-apis-1.4.01.pom b/xml-apis-1.4.01.pom new file mode 100644 index 0000000..9cb7ce3 --- /dev/null +++ b/xml-apis-1.4.01.pom @@ -0,0 +1,60 @@ + + 4.0.0 + xml-apis + xml-apis + XML Commons External Components XML APIs + 1.4.01 + xml-commons provides an Apache-hosted set of DOM, SAX, and + JAXP interfaces for use in other xml-based projects. Our hope is that we + can standardize on both a common version and packaging scheme for these + critical XML standards interfaces to make the lives of both our developers + and users easier. The External Components portion of xml-commons contains + interfaces that are defined by external standards organizations. For DOM, + that's the W3C; for SAX it's David Megginson and sax.sourceforge.net; for + JAXP it's Sun. + http://xml.apache.org/commons/components/external/ + + bugzilla + http://issues.apache.org/bugzilla/ + + + + XML Commons Developer's List + commons-dev-subscribe@xml.apache.org + commons-dev-unsubscribe@xml.apache.org + commons-dev@xml.apache.org + http://mail-archives.apache.org/mod_mbox/xml-commons-dev/ + + + + scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_4_01/ + https://svn.apache.org/viewvc/xml/commons/tags/xml-commons-external-1_4_01/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + The SAX License + http://www.saxproject.org/copying.html + repo + + + The W3C License + http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip + repo + + + + + xml-apis + Apache Software Foundation + commons-dev@xml.apache.org + http://xml.apache.org/commons/ + Apache Software Foundation + http://www.apache.org + + + \ No newline at end of file diff --git a/xml-apis-ext-1.3.04.pom b/xml-apis-ext-1.3.04.pom new file mode 100644 index 0000000..2d57514 --- /dev/null +++ b/xml-apis-ext-1.3.04.pom @@ -0,0 +1,41 @@ + + + apache + org.apache + 3 + + 4.0.0 + xml-apis + xml-apis-ext + XML Commons External Components XML APIs Extensions + 1.3.04 + xml-commons provides an Apache-hosted set of DOM, SAX, and + JAXP interfaces for use in other xml-based projects. Our hope is that we + can standardize on both a common version and packaging scheme for these + critical XML standards interfaces to make the lives of both our developers + and users easier. The External Components portion of xml-commons contains + interfaces that are defined by external standards organizations. For DOM, + that's the W3C; for SAX it's David Megginson and sax.sourceforge.net; for + JAXP it's Sun. + http://xml.apache.org/commons/components/external/ + + bugzilla + http://issues.apache.org/bugzilla/ + + + + XML Commons Developer's List + commons-dev-subscribe@xml.apache.org + commons-dev-unsubscribe@xml.apache.org + commons-dev@xml.apache.org + http://mail-archives.apache.org/mod_mbox/xml-commons-dev/ + + + + scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/ + http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-external-1_3_04/ + + + deployed + + \ No newline at end of file diff --git a/xml-commons-1.0.b2.tar.bz2 b/xml-commons-1.0.b2.tar.bz2 index 7a649e5..6f05b8a 100644 --- a/xml-commons-1.0.b2.tar.bz2 +++ b/xml-commons-1.0.b2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65f5a36bc93374fffd00f693796bc998707cb85056125da54567de869af53c8f -size 1337697 +oid sha256:992fd5860da09ea203a54af20856d4d2d7e9a91b2defd5eef0a5c2641eb06504 +size 427547 diff --git a/xml-commons-apis-bootstrap.changes b/xml-commons-apis-bootstrap.changes index 4c1c36c..85bfd34 100644 --- a/xml-commons-apis-bootstrap.changes +++ b/xml-commons-apis-bootstrap.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +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 diff --git a/xml-commons-apis-bootstrap.spec b/xml-commons-apis-bootstrap.spec index 0897279..1aaa7e5 100644 --- a/xml-commons-apis-bootstrap.spec +++ b/xml-commons-apis-bootstrap.spec @@ -1,7 +1,8 @@ +# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: # -# spec file for package xml-commons-apis-bootstrap (Version 1.3) +# spec file for package xml-commons-apis-bootstrap # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,103 +13,85 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# norootforbuild - -Name: xml-commons-apis-bootstrap -#!BuildIgnore: antlr -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.4.01 +Release: 0 Summary: Common code for XML projects - bootstrapping package -Version: 1.3 -Release: 227 -# ... externals have to be checked out with svn ... see README.PACKAGER.xml-commons-external -Url: http://xml.apache.org/commons/ -License: The Apache Software License +License: Apache-2.0 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -#BuildArchitectures: noarch -#ExclusiveArch: %ix86 -BuildArch: noarch +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.6 +# Needed for maven conversions +BuildRequires: javapackages-local +#!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 -License: The Apache Software License Summary: Which subproject of xml-commons Group: Development/Libraries/Java Url: http://xml.apache.org/commons/ -Version: 1.0.b2 -Release: 227 %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/ +%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 +%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 +%build #>>> some useful functions ... used throughout bootstrap packages -# variables: -TARGET_DIR=`pwd` -CLASSPATH_ORIG="$CLASSPATH" -LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`" + #>>> delete binary file and files not needed function delBinaryFiles() { set +x echo deleting binary files ... - for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"` - do + for file in `find . -name "*.class" -o -name "*.jar" -o -name "*DELETED-BY-PACKAGER*"` + do rm -rf $file done 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,14 +104,13 @@ function mkTargetClasspath() { set -x } #<<< + #>>> compiles all *.java file in the current directory tree # 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 + echo using: $COMPILER_COMMAND $COMPILE_CLASSPATH_PATH \$file for file in `find . -name "*.java"` do echo -e "$COMPILER_COMMAND $COMPILE_CLASSPATH_PATH $file ... \c" @@ -141,73 +123,83 @@ function compileFiles() { fi echo done done - set -x } #<<< + #>>> 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" -or -name "*manifest*" |\ - xargs /usr/bin/fastjar -m manifest.* -cf ${1}.jar ; + find -name "version.txt" -or -name "*.class" -or -name "*.properties" -or -name "*.rsc" |\ + xargs jar cfm ${1}.jar manifest.* ; mv ${1}.jar $TARGET_DIR } #<<< -COMPILER_COMMAND="javac -C -ftarget=1.4 -classpath " + #<<< end functions + +# variables: +COMPILER_COMMAND="javac -source 1.6 -target 1.6 -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/ -# we use the resolver classes from the resolver package and therefore delete all related resolver files: -rm -r org/apache/xml/ -rm manifest.resolver +# 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 $RPM_BUILD_ROOT/%{_javadir} -cp %{apis_jar}.jar $RPM_BUILD_ROOT/%{_javadir} -cp %{which_jar}.jar $RPM_BUILD_ROOT/%{_javadir} +#>>> % install +mkdir -p %{buildroot}/%{_javadir} +cp %{apis_jar}.jar %{buildroot}/%{_javadir} +cp %{which_jar}.jar %{buildroot}/%{_javadir} +cp %{resolver_jar}.jar %{buildroot}/%{_javadir} #<<< install end -%clean -rm -rf $RPM_BUILD_ROOT -#>>> files - -%files -%defattr(-,root,root) -#%dir %{_javadir} +%files +%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 +%doc xml-commons-1_0_b2/LICENSE.txt +%{_javadir}/%{resolver_jar}.jar #<<< -# vim:fdm=marker:foldmarker=#>>>,#<<<:foldcolumn=6: %changelog -* Tue Jan 22 2008 mvyskocil@suse.cz -- fixed beta build -* Tue Aug 28 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 2007 rguenther@suse.de -- remove libgcj BuildRequires -* Wed May 02 2007 dbornkessel@suse.de -- added unzip to BuildRequires -* Fri Sep 29 2006 ro@suse.de -- added gcc-java,gcc-gij to BuildRequires -* Thu Sep 21 2006 dbornkessel@suse.de -- first version diff --git a/xml-commons-component-info.xml b/xml-commons-component-info.xml new file mode 100644 index 0000000..3b32082 --- /dev/null +++ b/xml-commons-component-info.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/xml-commons-encoding.patch b/xml-commons-encoding.patch new file mode 100644 index 0000000..f116233 --- /dev/null +++ b/xml-commons-encoding.patch @@ -0,0 +1,22 @@ +--- xml-commons-1.4.01/xml-commons-external-1_3_05/java/external/build.xml 2017-10-04 21:48:12.614748719 +0200 ++++ xml-commons-1.4.01/xml-commons-external-1_3_05/java/external/build.xml 2017-10-04 21:49:20.994748978 +0200 +@@ -103,7 +103,7 @@ + + ++ debug="${debug}" encoding="UTF-8" /> + + + + ++ debug="${debug}" encoding="UTF-8" /> + + + = 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-external-1.2.06.tar.bz2 b/xml-commons-external-1.2.06.tar.bz2 new file mode 100644 index 0000000..827d59c --- /dev/null +++ b/xml-commons-external-1.2.06.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe241b66bcb19a3b68b965df6b116247985c226e23126706cebacd9dce568d2b +size 415313 diff --git a/xml-commons-external-1.3.05.tar.bz2 b/xml-commons-external-1.3.05.tar.bz2 new file mode 100644 index 0000000..ed02995 --- /dev/null +++ b/xml-commons-external-1.3.05.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26a5abac9a89f2b2ce5d5bc7cecfeb8956cb8d0b55176f37b65fafa89d3504d5 +size 682172 diff --git a/xml-commons-external-1.4.01.tar.bz2 b/xml-commons-external-1.4.01.tar.bz2 new file mode 100644 index 0000000..640b9fc --- /dev/null +++ b/xml-commons-external-1.4.01.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:688a5cd37da176eb585836714157d7462dab95c4bcdc07bb87017130fee13561 +size 6532480 diff --git a/xml-commons-externals.tar.bz2 b/xml-commons-externals.tar.bz2 deleted file mode 100644 index 097e072..0000000 --- a/xml-commons-externals.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:796f60ceb758a5fffc628939dc9c25c9cef96f508d1e4864fd218436dee23215 -size 642139 diff --git a/xml-commons-jdk5-build.patch b/xml-commons-jdk5-build.patch deleted file mode 100644 index d153079..0000000 --- a/xml-commons-jdk5-build.patch +++ /dev/null @@ -1,293 +0,0 @@ ---- java/src/org/apache/env/Which.java -+++ java/src/org/apache/env/Which.java -@@ -289,12 +289,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); - -@@ -311,12 +311,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); - } ---- java/src/org/apache/xml/resolver/Catalog.java -+++ java/src/org/apache/xml/resolver/Catalog.java -@@ -451,9 +451,9 @@ - mapArr.add(null); - } - -- Enumeration enum = readerMap.keys(); -- while (enum.hasMoreElements()) { -- String mimeType = (String) enum.nextElement(); -+ Enumeration enum2 = readerMap.keys(); -+ while (enum2.hasMoreElements()) { -+ String mimeType = (String) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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(); -+ enum2 = catalogEntries.elements(); - Vector delCats = new Vector(); -- while (enum.hasMoreElements()) { -- CatalogEntry e = (CatalogEntry) enum.nextElement(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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(); -+ enum2 = catalogEntries.elements(); - String startString = null; - String prefix = null; -- while (enum.hasMoreElements()) { -- CatalogEntry e = (CatalogEntry) enum.nextElement(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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(); -+ enum2 = catalogEntries.elements(); - Vector delCats = new Vector(); -- while (enum.hasMoreElements()) { -- CatalogEntry e = (CatalogEntry) enum.nextElement(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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(); -+ enum2 = catalogEntries.elements(); - String startString = null; - String prefix = null; -- while (enum.hasMoreElements()) { -- CatalogEntry e = (CatalogEntry) enum.nextElement(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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(); -+ enum2 = catalogEntries.elements(); - Vector delCats = new Vector(); -- while (enum.hasMoreElements()) { -- CatalogEntry e = (CatalogEntry) enum.nextElement(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.nextElement(); - - if (e.getEntryType() == DELEGATE_URI) { - String p = (String) e.getEntryArg(0); ---- java/src/org/apache/xml/resolver/Resolver.java -+++ java/src/org/apache/xml/resolver/Resolver.java -@@ -215,9 +215,9 @@ - return resolved; - } - -- Enumeration enum = catalogEntries.elements(); -- while (enum.hasMoreElements()) { -- CatalogEntry e = (CatalogEntry) enum.nextElement(); -+ Enumeration enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.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 enum2 = catalogEntries.elements(); -+ while (enum2.hasMoreElements()) { -+ CatalogEntry e = (CatalogEntry) enum2.nextElement(); - if (e.getEntryType() == SYSTEM - && (e.getEntryArg(1).equals(systemId) - || (windows diff --git a/xml-commons-no-javadoc.patch b/xml-commons-no-javadoc.patch new file mode 100644 index 0000000..7c913be --- /dev/null +++ b/xml-commons-no-javadoc.patch @@ -0,0 +1,45 @@ +--- + xml-commons-1_0_b2/build.xml | 8 +++++--- + xml-commons-external-1_3_04/build.xml | 6 ++++-- + xml-commons-resolver-1_1_b1/build.xml | 2 -- + 3 files changed, 9 insertions(+), 7 deletions(-) + +Index: xml-commons-1.3.04/xml-commons-1_0_b2/build.xml +=================================================================== +--- xml-commons-1.3.04.orig/xml-commons-1_0_b2/build.xml ++++ xml-commons-1.3.04/xml-commons-1_0_b2/build.xml +@@ -44,16 +44,18 @@ just creates a distribution out of all o + + +- ++ ++ ++ + + + + +- ++ + +- ++ + + + +Index: xml-commons-1.3.04/xml-commons-resolver-1_1_b1/build.xml +=================================================================== +--- xml-commons-1.3.04.orig/xml-commons-resolver-1_1_b1/build.xml ++++ xml-commons-1.3.04/xml-commons-resolver-1_1_b1/build.xml +@@ -65,8 +65,6 @@ just creates a distribution out of all o + description="Calls all other java build files."> + + +- +- + + + + + +- ++ + +- ++ + + + 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-1.2.tar.bz2 b/xml-commons-resolver-1.2.tar.bz2 new file mode 100644 index 0000000..692af9e --- /dev/null +++ b/xml-commons-resolver-1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc2407267cb8ba8c58e8bbfc4ac2c3cd55d3eb06d4cca6e3cc970ef32d44349f +size 6514000 diff --git a/xml-commons-resolver-CatalogManager.properties b/xml-commons-resolver-CatalogManager.properties new file mode 100644 index 0000000..43b33f8 --- /dev/null +++ b/xml-commons-resolver-CatalogManager.properties @@ -0,0 +1,64 @@ +# Central CatalogManager.properties for xml-commons-resolver +# JPackage Project + +######################################################################## +# 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 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 @@ + + ++ ++ + + + + ++ + + + diff --git a/xml-commons-resolver10-resolver.1 b/xml-commons-resolver10-resolver.1 new file mode 100644 index 0000000..7b07e96 --- /dev/null +++ b/xml-commons-resolver10-resolver.1 @@ -0,0 +1,48 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver10-resolver.sh b/xml-commons-resolver10-resolver.sh new file mode 100644 index 0000000..cce8eed --- /dev/null +++ b/xml-commons-resolver10-resolver.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver resolver script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver10-xparse.1 b/xml-commons-resolver10-xparse.1 new file mode 100644 index 0000000..0980fd8 --- /dev/null +++ b/xml-commons-resolver10-xparse.1 @@ -0,0 +1,46 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver10-xparse.sh b/xml-commons-resolver10-xparse.sh new file mode 100644 index 0000000..8b6ae70 --- /dev/null +++ b/xml-commons-resolver10-xparse.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xparse script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver10-xread.1 b/xml-commons-resolver10-xread.1 new file mode 100644 index 0000000..f624ad2 --- /dev/null +++ b/xml-commons-resolver10-xread.1 @@ -0,0 +1,46 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver10-xread.sh b/xml-commons-resolver10-xread.sh new file mode 100644 index 0000000..9f85eb4 --- /dev/null +++ b/xml-commons-resolver10-xread.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xread script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver11-resolver.1 b/xml-commons-resolver11-resolver.1 new file mode 100644 index 0000000..7b07e96 --- /dev/null +++ b/xml-commons-resolver11-resolver.1 @@ -0,0 +1,48 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver11-resolver.sh b/xml-commons-resolver11-resolver.sh new file mode 100644 index 0000000..4bb1fd7 --- /dev/null +++ b/xml-commons-resolver11-resolver.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver resolver script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver11-xparse.1 b/xml-commons-resolver11-xparse.1 new file mode 100644 index 0000000..0980fd8 --- /dev/null +++ b/xml-commons-resolver11-xparse.1 @@ -0,0 +1,46 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver11-xparse.sh b/xml-commons-resolver11-xparse.sh new file mode 100644 index 0000000..a94d792 --- /dev/null +++ b/xml-commons-resolver11-xparse.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xparse script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver11-xread.1 b/xml-commons-resolver11-xread.1 new file mode 100644 index 0000000..f624ad2 --- /dev/null +++ b/xml-commons-resolver11-xread.1 @@ -0,0 +1,46 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver11-xread.sh b/xml-commons-resolver11-xread.sh new file mode 100644 index 0000000..06b6716 --- /dev/null +++ b/xml-commons-resolver11-xread.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xread script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver12-resolver.1 b/xml-commons-resolver12-resolver.1 new file mode 100644 index 0000000..7b07e96 --- /dev/null +++ b/xml-commons-resolver12-resolver.1 @@ -0,0 +1,48 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver12-resolver.sh b/xml-commons-resolver12-resolver.sh new file mode 100644 index 0000000..a3fcf21 --- /dev/null +++ b/xml-commons-resolver12-resolver.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver resolver script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver12-xparse.1 b/xml-commons-resolver12-xparse.1 new file mode 100644 index 0000000..0980fd8 --- /dev/null +++ b/xml-commons-resolver12-xparse.1 @@ -0,0 +1,46 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver12-xparse.sh b/xml-commons-resolver12-xparse.sh new file mode 100644 index 0000000..896c435 --- /dev/null +++ b/xml-commons-resolver12-xparse.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xparse script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons-resolver12-xread.1 b/xml-commons-resolver12-xread.1 new file mode 100644 index 0000000..f624ad2 --- /dev/null +++ b/xml-commons-resolver12-xread.1 @@ -0,0 +1,46 @@ +.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 +. +.SH AUTHOR +Norman Walsh diff --git a/xml-commons-resolver12-xread.sh b/xml-commons-resolver12-xread.sh new file mode 100644 index 0000000..6504d79 --- /dev/null +++ b/xml-commons-resolver12-xread.sh @@ -0,0 +1,21 @@ +#!/bin/sh +# +# xml-commons-resolver xread script +# JPackage Project + +# 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 "$@" diff --git a/xml-commons.build.patch b/xml-commons.build.patch deleted file mode 100644 index 1b54b81..0000000 --- a/xml-commons.build.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naru xml-commons-1.0.b2.orig/build.xml xml-commons-1.0.b2/build.xml ---- xml-commons-1.0.b2.orig/build.xml 2002-02-06 17:53:15.000000000 +0200 -+++ xml-commons-1.0.b2/build.xml 2002-11-13 23:51:26.000000000 +0200 -@@ -53,8 +53,10 @@ - description="Calls all other java build files."> - - -+ - - - - - -+ - - - diff --git a/xml-commons.changes b/xml-commons.changes index f70eea3..b288e0b 100644 --- a/xml-commons.changes +++ b/xml-commons.changes @@ -1,3 +1,130 @@ +------------------------------------------------------------------- +Wed Nov 7 20:21:36 UTC 2018 - Fridrich Strba + +- Put maven metadata for each pom file to different metadata xml + file in order to avoid having duplicate entries for the same + artifact name in the same metadata file +- Obsolete correctly the packages so that not two version of the + same artifact will be installed by mistake + +------------------------------------------------------------------- +Wed Oct 4 19:55:32 UTC 2017 - fstrba@suse.com + +- Don't depend on java-1_5_0-gcj-compat +- Depend on java-devel >= 1.6 instead +- Added patch: + * xml-commons-encoding.patch + + Specify file encoding UTF-8 to avoid build breakages with + jdk9 + +------------------------------------------------------------------- +Fri May 19 11:39:11 UTC 2017 - vsistek@suse.com + +- Add BuildRequires: javapackages-local (for maven conversions) +- .spec file cleanup + +------------------------------------------------------------------- +Tue Mar 17 14:37:34 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + +------------------------------------------------------------------- +Fri Mar 6 19:17:14 UTC 2015 - afaerber@suse.de + +- Update jaxp to 1.3.05 - resolver 1.2 is now a separate tarball +* Drop xml-commons-external-1.3-build_xml.patch +* Drop 1.3.04 hunks from xml-commons-no-javadoc.patch + and xml-commons-resolver-crosslink.patch +* Tweak xml-apis{,-ext}-1.3.04.pom with new version and tags +* Drop resolver class name tweaks for xml-resolver 1.2 +- Drop resolver class name tweaks for jaxp 1.4 +- Add xml-resolver-1.2.pom +- Update jaxp to 1.2.06 + +------------------------------------------------------------------- +Thu Mar 5 21:12:42 UTC 2015 - afaerber@suse.de + +- Clean up 1.4 packaging +* Package .txt files from 1.4 rather than 1.3 +* Add xml-apis-1.4.01.pom +- Fix typos in description (including a copied one) + +------------------------------------------------------------------- +Thu Mar 5 15:24:41 UTC 2015 - afaerber@suse.de + +- Update jaxp to 1.4.01 + +------------------------------------------------------------------- +Fri Jul 25 09:08:26 UTC 2014 - tchvatal@suse.com + +- Fixup update-alternatives a bit to silence warnings. + +------------------------------------------------------------------- +Thu May 1 14:58:20 UTC 2014 - darin@darins.net + +- suppress bytecode check on SLE +- add missing links and alternative + +------------------------------------------------------------------- +Mon Apr 28 09:40:14 UTC 2014 - schwab@linux-m68k.org + +- Fix update-alternatives arguments to match what is actually packaged + +------------------------------------------------------------------- +Thu Sep 12 19:15:47 UTC 2013 - tchvatal@suse.com + +- Use javapackages-tools + +------------------------------------------------------------------- +Wed Aug 28 07:33:44 UTC 2013 - mvyskocil@suse.com + +- mark everything touched by update-alternatives as ghost file + to comfor Packaging Multiple Version guidelines +- remove few attrs on links + +------------------------------------------------------------------- +Mon Aug 26 12:48:12 UTC 2013 - mvyskocil@suse.com + +- Ignore own subpackages in order to break build cycle + +------------------------------------------------------------------- +Mon Aug 26 09:31:04 UTC 2013 - mvyskocil@suse.com + +- remove forgotten quilt from %%prep phase +- adjust rpm Groups + +------------------------------------------------------------------- +Fri Aug 23 14:04:09 UTC 2013 - mvyskocil@suse.com + +- drop javadoc subpackages + * add xml-commons-no-javadoc.patch +- port to add_maven_depmap from javapackages-tools + +------------------------------------------------------------------- +Thu Apr 18 09:05:14 UTC 2013 - mvyskocil@suse.com + +- install xml-commons-resolver as master alternative (bnc#814196) + +------------------------------------------------------------------- +Mon Mar 14 13:20:56 UTC 2011 - mvyskocil@suse.cz + +- build ignore of openjdk + +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Thu Sep 2 12:38:36 UTC 2010 - mvyskocil@suse.cz + +- ignore antlr(-java) to reduce build cycles + ------------------------------------------------------------------- Thu Sep 11 16:30:57 CEST 2008 - mvyskocil@suse.cz diff --git a/xml-commons.manifest.patch b/xml-commons.manifest.patch deleted file mode 100644 index fd180f4..0000000 --- a/xml-commons.manifest.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naru xml-commons-1.0.b2.orig/java/external/src/manifest.commons xml-commons-1.0.b2/java/external/src/manifest.commons ---- xml-commons-1.0.b2.orig/java/external/src/manifest.commons 2002-02-06 17:52:49.000000000 +0200 -+++ xml-commons-1.0.b2/java/external/src/manifest.commons 2002-11-13 23:48:12.000000000 +0200 -@@ -1,5 +1,4 @@ - Manifest-Version: 1.0 --Created-By: 1.2.2 (Sun Microsystems Inc.) - - Name: org/apache/xmlcommons/Version - Comment: @impl.name@ for http://xml.apache.org/ subproject's use -diff -Naru xml-commons-1.0.b2.orig/java/src/manifest.which xml-commons-1.0.b2/java/src/manifest.which ---- xml-commons-1.0.b2.orig/java/src/manifest.which 2002-02-06 17:52:40.000000000 +0200 -+++ xml-commons-1.0.b2/java/src/manifest.which 2002-11-13 23:48:02.000000000 +0200 -@@ -1,5 +1,4 @@ - Manifest-Version: 1.0 --Created-By: 1.2.2 (Sun Microsystems Inc.) - Main-Class: org.apache.env.Which - - Name: org/apache/env diff --git a/xml-commons.spec b/xml-commons.spec index 42e1a4d..0c259da 100644 --- a/xml-commons.spec +++ b/xml-commons.spec @@ -1,7 +1,8 @@ # -# spec file for package xml-commons (Version 1.3.02) +# spec file for package xml-commons # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,305 +13,915 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -# norootforbuild - +# FIXME: workaround for bnc#650905 +%define with_repolib 0 +%define without_repolib 1 +%define repo %{_javadir}/repository.jboss.com +%define repodir %{repo}/apache-xml-commons/1.3.04-brew +%define repodirlib %{repodir}/lib +%define repodirsrc %{repodir}/src +%define resolverdir %{_sysconfdir}/java/resolver +# To get around having multiple versions of projects within the same srpm +%define apis_version_1_1 1.0.b2 +%define apis_version_1_2 1.2.06 +%define apis_version_1_3 1.3.05 Name: xml-commons -BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel -#!BuildIgnore: xml-commons-resolver -%define section free -%define whichver 1.0 +Version: 1.4.01 +Release: 0 Summary: Common code for XML projects -Version: 1.3.02 -Release: 265 -License: The Apache Software License -Url: http://xml.apache.org/commons/ -#Source0: http://xml.apache.org/dist/commons/xml-commons-1.0.b2.tar.gz -Source0: xml-commons-1.0.b2.tar.bz2 -Source1: xml-commons.which.script -Source2: xml-commons-externals.tar.bz2 -# svn export http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_02/java/external/ -Patch0: xml-commons.build.patch -Patch1: xml-commons.manifest.patch -Patch2: xml-commons-jdk5-build.patch -Requires: jpackage-utils >= 1.5 +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/xerces/xml-commons/tags/xml-commons-external-1_2_06/ +Source1: xml-commons-external-1.2.06.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-1_3_05/ +Source2: xml-commons-external-1.3.05.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 +Source4: xml-commons.which10.script +Source5: xml-commons.which11.script +Source6: xml-commons-resolver10-resolver.1 +Source7: xml-commons-resolver10-resolver.sh +Source8: xml-commons-resolver10-xparse.1 +Source9: xml-commons-resolver10-xparse.sh +Source10: xml-commons-resolver10-xread.1 +Source11: xml-commons-resolver10-xread.sh +Source12: xml-commons-resolver11-resolver.1 +Source13: xml-commons-resolver11-resolver.sh +Source14: xml-commons-resolver11-xparse.1 +Source15: xml-commons-resolver11-xparse.sh +Source16: xml-commons-resolver11-xread.1 +Source17: xml-commons-resolver11-xread.sh +Source18: xml-commons-resolver12-resolver.1 +Source19: xml-commons-resolver12-resolver.sh +Source20: xml-commons-resolver12-xparse.1 +Source21: xml-commons-resolver12-xparse.sh +Source22: xml-commons-resolver12-xread.1 +Source23: xml-commons-resolver12-xread.sh +Source24: %{name}-resolver-CatalogManager.properties +# svn export http://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-external-1_4_01/ +Source25: xml-commons-external-1.4.01.tar.bz2 +# svn export http://svn.apache.org/repos/asf/xerces/xml-commons/tags/xml-commons-resolver-1_2/ +Source26: xml-commons-resolver-1.2.tar.bz2 +Source100: xml-commons-component-info.xml +Source200: http://mirrors.ibiblio.org/pub/mirrors/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom +Source201: http://mirrors.ibiblio.org/pub/mirrors/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom +Source202: http://mirrors.ibiblio.org/pub/mirrors/maven2/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.pom +Source203: http://mirrors.ibiblio.org/maven2/xml-resolver/xml-resolver/1.2/xml-resolver-1.2.pom +Patch1: %{name}-resolver-crosslink.patch +Patch2: %{name}-resolver-1.1-build_xml.patch +Patch3: %{name}-enum.patch +#PATCH-FIX-SUSE: don't call javadoc from any used target +Patch4: xml-commons-no-javadoc.patch +Patch5: xml-commons-encoding.patch +BuildRequires: ant +BuildRequires: java-devel >= 1.6 +# Needed for maven conversions +BuildRequires: javapackages-local +BuildRequires: javapackages-tools +BuildRequires: xalan-j2 +#!BuildIgnore: antlr +#!BuildIgnore: antlr-java +#!BuildIgnore: xml-commons +#!BuildIgnore: xml-commons-jaxp-1.3-apis +#!BuildIgnore: xml-commons-resolver BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: update-alternatives %description xml-commons is focused on common code and guidelines for xml projects. It's first focus will be to organize and have common packaging for the various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. +the DOM, SAX, and JAXP interfaces. +As the xml-commons community forms, we also hope to serve as a holding +area for other common xml-related utilities and code, and to help +promulgate common packaging, testing, documentation, and other +guidelines across all xml.apache.org subprojects. +%package jaxp-1.1-apis +Summary: JAXP 1.1, DOM2, SAX2, SAX2-ext 1.0 apis +Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: dom = 2 +Provides: jaxp = 1.1 +Provides: sax = 2.0 +Provides: xml-commons-apis = %{apis_version_1_1}-%{release} +Provides: xslt = 1.0 +Obsoletes: xml-commons-apis < %{apis_version_1_1}-%{release} +%description jaxp-1.1-apis +DOM 2 org.w3c.dom and SAX XML 2.0 org.xml.sax processor apis used +by several pieces of Apache software. XSLT 1.0. +This version includes the JAXP 1.1 APIs -- Java API for XML +Processing 1.1, i.e. javax.xml{.parsers,.transform} -%package apis -License: The Apache Software License -Summary: APIs subproject of xml-commons +%package jaxp-1.1-apis-manual +Summary: Documents for %{name}-jaxp-1.1-apis +Group: Documentation/HTML + +%description jaxp-1.1-apis-manual + +%{summary}. + +%package which10 +Summary: XmlWhich 1.0 utility from %{name} +Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires: jaxp_parser_impl +Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-which = 1.0 + +%description which10 + +%{name}. + +%package resolver10 +Summary: XmlResolver 1.0 utility from %{name} Group: Development/Libraries/Java Requires: %{name} = %{version}-%{release} -PreReq: update-alternatives +Requires: jaxp_parser_impl +Requires: xml-commons-jaxp-1.1-apis = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-resolver = 1.0 -%description apis -xml-commons is focused on common code and guidelines for xml projects. -It's first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. +%description resolver10 -This package contains the APIs subproject of xml-commons. +%{summary}. - - -%package which -License: The Apache Software License -Summary: which subproject of xml-commons +%package resolver11 +Summary: XmlResolver 1.1 utility from %{name} Group: Development/Libraries/Java +Requires: %{name} = %{version} +Requires: jaxp_parser_impl +Requires: xml-commons-jaxp-1.2-apis = %{version} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-resolver = 1.1 + +%description resolver11 + +%{summary}. + +%package jaxp-1.2-apis +Summary: JAXP 1.2, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis +Group: Productivity/Publishing/XML Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils >= 1.5 -PreReq: update-alternatives +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: dom = 2 +Provides: jaxp = 1.2 +Provides: sax = 2.0.1 +Provides: xml-commons-apis = %{apis_version_1_2}-%{release} +Provides: xslt = 1.0 +Obsoletes: xml-commons-apis < %{apis_version_1_2}-%{release} -%description which -xml-commons is focused on common code and guidelines for xml projects. -It's first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. +%description jaxp-1.2-apis +DOM 2 org.w3c.dom and SAX XML 2.0 org.xml.sax processor apis used +by several pieces of Apache software. XSLT 1.0. +This version includes the JAXP 1.2 APIs -- Java API for XML +Processing 1.2, i.e. javax.xml{.parsers,.transform} -This package contains the which subproject of xml-commons. +%package jaxp-1.2-apis-manual +Summary: Documents for %{name}-jaxp-1.2-apis +Group: Documentation/HTML +%description jaxp-1.2-apis-manual +%{summary}. -%package apis-manual -License: The Apache Software License -Summary: Manual for xml-commons-apis +%package jaxp-1.3-apis +Summary: JAXP 1.3, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis +Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: dom = 3 +Provides: jaxp = 1.3 +Provides: sax = 2.0.2 +Provides: xml-commons-apis = %{apis_version_1_3}-%{release} +Provides: xslt = 1.0 +Obsoletes: xml-commons-apis < %{apis_version_1_3}-%{release} + +%description jaxp-1.3-apis +DOM 3 org.w3c.dom and SAX XML 2.0.2 (sax2r3) org.xml.sax +processor apis used by several pieces of Apache software. +This version includes the JAXP 1.3 APIs -- +JSR 206, Java API for XML Processing 1.3, i.e. +javax.xml{.parsers,.transform,.validation,.datatype,.xtype}. + +%package jaxp-1.3-apis-manual +Summary: Documents for %{name}-jaxp-1.3-apis +Group: Documentation/HTML +Provides: xml-comons-apis-manual = %{apis_version_1_3}-%{release} +Obsoletes: xml-comons-apis-manual < %{apis_version_1_3}-%{release} + +%description jaxp-1.3-apis-manual + +%{summary}. + +%package which11 +Summary: XmlWhich 1.1 from %{name} +Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires: jaxp_parser_impl +Requires: xml-commons-jaxp-1.3-apis = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-which = %{version}-%{release} +Obsoletes: xml-commons-which <= 1.3.02 + +%description which11 + +%{summary}. + +%package resolver12 +Summary: XmlResolver 1.2 from %{name} +Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires: jaxp_parser_impl +Requires: xml-commons-jaxp-1.3-apis = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: xml-commons-resolver = 1.2 + +%description resolver12 + +%{summary}. + +%package jaxp-1.4-apis +Summary: JAXP 1.4, DOM 2, SAX 2.0.1, SAX2-ext 1.0 apis +Group: Productivity/Publishing/XML +Requires: %{name} = %{version}-%{release} +Requires(post): update-alternatives +Requires(preun): update-alternatives +Provides: dom = 3 +Provides: jaxp = 1.4 +Provides: sax = 2.0.2 +Provides: xml-commons-apis = %{version}-%{release} +Provides: xslt = 1.0 +Obsoletes: xml-commons-apis < %{version}-%{release} + +%description jaxp-1.4-apis +DOM 3 org.w3c.dom and SAX XML 2.0.2 (sax2r3) org.xml.sax +processor apis used by several pieces of Apache software. +This version includes the JAXP 1.4 APIs -- +JSR 206, Java API for XML Processing 1.4, i.e. +javax.xml{.parsers,.transform,.validation,.datatype,.xtype}. + +%package jaxp-1.4-apis-manual +Summary: Documents for %{name}-jaxp-1.4-apis +Group: Documentation/HTML +Provides: xml-comons-apis-manual = %{version}-%{release} +Obsoletes: xml-comons-apis-manual < %{version}-%{release} + +%description jaxp-1.4-apis-manual + +%{summary}. + +%if %{with_repolib} +%package repolib +Summary: Artifacts to be uploaded to a repository library Group: Development/Libraries/Java -%description apis-manual -xml-commons is focused on common code and guidelines for xml projects. -It's first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. - -This package contains the manual for the APIs subproject of -xml-commons. - - - -%package apis-javadoc -License: The Apache Software License -PreReq: coreutils -Summary: Javadoc for xml-commons-apis -Group: Development/Libraries/Java - -%description apis-javadoc -xml-commons is focused on common code and guidelines for xml projects. -It's first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. - -This package contains the javadoc documentation for the APIs subproject -of xml-commons. - - - -%package which-javadoc -License: The Apache Software License -PreReq: coreutils -Summary: Javadoc for xml-commons-which -Group: Development/Libraries/Java - -%description which-javadoc -xml-commons is focused on common code and guidelines for xml projects. -It's first focus will be to organize and have common packaging for the -various externally-defined standards code relating to XML - things like -the DOM, SAX, and JAXP interfaces. As the xml-commons community forms, -we also hope to serve as a holding area for other common xml-related -utilities and code, and to help promulgate common packaging, testing, -documentation, and other guidelines across all xml.apache.org -subprojects. - -This package contains the javadoc documentation for the which -subproject of xml-commons. - - +%description repolib +Artifacts to be uploaded to a repository library. +This package is not meant to be installed but so its contents +can be extracted through rpm2cpio. +%endif %prep -%setup -q -n %{name}-%{whichver}.b2 -%patch0 -p1 -%patch1 -p1 +%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 +%setup -q -T -D -a 25 +%setup -q -T -D -a 26 + +%patch1 -b .sav %patch2 -b .sav -# replace external -pushd java -rm -rf external -tar -jxf %{SOURCE2} -popd +%patch3 -b .sav + +%patch4 -p1 + +%patch5 -p1 + # remove all binary libs and prebuilt javadocs rm -rf `find . -name "*.jar" -o -name "*.gz"` rm -rf java/build java/external/build/docs/javadoc # ----------------------------------------------------------------------------- %build -for file in `find -name "*.xml"` ; do - grep -q " tempf +sed -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' tempf > resolver.xml +sed -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver > tempf +cp tempf src/manifest.resolver +rm tempf +popd +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jars +popd +pushd xml-commons-resolver-1_1_b1 +mkdir -p build/site/components/resolver +pushd java +sed -e 's|call Resolver|call resolver|g' resolver.xml > tempf +sed -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' tempf > resolver.xml +sed -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver > tempf +cp tempf src/manifest.resolver +rm tempf +popd +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jars +popd +pushd xml-commons-resolver-1_2 +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f java/resolver.xml jar +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f java/which.xml jar +popd +pushd xml-commons-external-1_2_* +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f java/external/build.xml jar +popd +pushd xml-commons-external-1_3_* +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f java/external/build.xml jar +popd +pushd xml-commons-external-1_4_* +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 -f java/external/build.xml jar +popd %install +%if 0%{?suse_version} == 1110 +export NO_BRP_CHECK_BYTECODE_VERSION=true +%endif + # Jars -mkdir -p $RPM_BUILD_ROOT%{_javadir} -cp -p java/external/build/xml-apis.jar \ - $RPM_BUILD_ROOT%{_javadir}/apache-%{name}-apis-%{version}.jar -cp -p java/build/which.jar \ - $RPM_BUILD_ROOT%{_javadir}/apache-%{name}-which-%{version}.jar -# Jar versioning -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in apache-%{name}-apis*.jar; do ln -sf ${jar} dom3-${jar}; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) -# Javadocs -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version} -mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which-%{version} -cp -pr java/external/build/docs/javadoc/* \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis-%{version} -cp -pr java/build/docs/javadocs/* \ - $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which-%{version} -ln -s %{name}-apis-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-apis # ghost symlink -ln -s %{name}-which-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-which # ghost symlink -# xml-apis ghost symlink -ln -s %{_sysconfdir}/alternatives \ - $RPM_BUILD_ROOT%{_javadir}/xml-commons-apis.jar +install -d -m 755 %{buildroot}%{_javadir} +# JAXP11 +install -m 644 xml-commons-1_0_b2/java/external/build/xml-apis.jar \ + %{buildroot}%{_javadir}/%{name}-jaxp-1.1-apis-%{version}.jar +# resolver10 +install -m 644 xml-commons-1_0_b2/java/build/resolver.jar \ + %{buildroot}%{_javadir}/%{name}-resolver10-%{version}.jar +# which10 +install -m 644 xml-commons-1_0_b2/java/build/which.jar \ + %{buildroot}%{_javadir}/%{name}-which10-%{version}.jar +# resolver11 +install -m 644 xml-commons-resolver-1_1_b1/java/build/resolver.jar \ + %{buildroot}%{_javadir}/%{name}-resolver11-%{version}.jar +# JAXP12 +install -m 644 xml-commons-external-1_2_*/java/external/build/xml-apis.jar \ + %{buildroot}%{_javadir}/%{name}-jaxp-1.2-apis-%{version}.jar +# JAXP13 +install -m 644 xml-commons-external-1_3_*/java/external/build/xml-apis.jar \ + %{buildroot}%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar +# JAXP13 ext +install -m 644 xml-commons-external-1_3_*/java/external/build/xml-apis-ext.jar \ + %{buildroot}%{_javadir}/%{name}-jaxp-1.3-apis-ext-%{version}.jar +# resolver12 +install -m 644 xml-commons-resolver-1_2/java/build/resolver.jar \ + %{buildroot}%{_javadir}/%{name}-resolver12-%{version}.jar +# which11 +install -m 644 xml-commons-resolver-1_2/java/build/which.jar \ + %{buildroot}%{_javadir}/%{name}-which11-%{version}.jar +# JAXP14 +install -m 644 xml-commons-external-1_4_*/java/external/build/xml-apis.jar \ + %{buildroot}%{_javadir}/%{name}-jaxp-1.4-apis-%{version}.jar +# JAXP14 ext +install -m 644 xml-commons-external-1_4_*/java/external/build/xml-apis-ext.jar \ + %{buildroot}%{_javadir}/%{name}-jaxp-1.4-apis-ext-%{version}.jar + +pushd %{buildroot}%{_javadir} +for jar in *-%{version}*; do +ln -sf ${jar} $(echo $jar | sed -e 's|-%{version}\.jar|.jar|'); +done +ln -sf %{name}-jaxp-1.1-apis.jar jaxp11.jar +ln -sf %{name}-jaxp-1.2-apis.jar jaxp12.jar +ln -sf %{name}-jaxp-1.3-apis.jar jaxp13.jar +ln -sf %{name}-jaxp-1.3-apis.jar dom3.jar +ln -sf %{name}-jaxp-1.4-apis.jar jaxp14.jar +popd + +# poms +mkdir -p %{buildroot}%{_mavenpomdir} +apis_tag_1_3=`echo %{apis_version_1_3} | sed -e 's|\.|_|g'` +sed -e 's|1\.3\.04|%{apis_version_1_3}|' -e "s|1_3_04|${apis_tag_1_3}|" < %{SOURCE200} \ + > %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis.pom +ln -s JPP-%{name}-jaxp-1.3-apis.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}-apis.pom +%add_maven_depmap JPP-%{name}-jaxp-1.3-apis.pom %{name}-jaxp-1.3-apis.jar -f jaxp-1.3-apis + +sed -e 's|1\.3\.04|%{apis_version_1_3}|' -e "s|1_3_04|${apis_tag_1_3}|" < %{SOURCE201} \ + > %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis-ext.pom +%add_maven_depmap JPP-%{name}-jaxp-1.3-apis-ext.pom %{name}-jaxp-1.3-apis-ext.jar -f jaxp-1.3-apis-ext + +cp -p %{SOURCE202} %{buildroot}%{_mavenpomdir}/JPP-%{name}-jaxp-1.4-apis.pom +%add_maven_depmap JPP-%{name}-jaxp-1.4-apis.pom %{name}-jaxp-1.4-apis.jar -f jaxp-1.4-apis + +cp -p %{SOURCE203} %{buildroot}%{_mavenpomdir}/JPP-%{name}-resolver12.pom +%add_maven_depmap JPP-%{name}-resolver12.pom %{name}-resolver12.jar -f resolver12 + # Scripts -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xml-which -# prevent apis javadoc from being included in doc -rm -rf java/external/build/docs/javadoc -# ----------------------------------------------------------------------------- +install -d -m 755 %{buildroot}%{_bindir} +install -d -m 755 %{buildroot}%{_mandir}/man1 -%post apis -/usr/sbin/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/apache-%{name}-apis.jar 42 -/usr/sbin/update-alternatives --auto xml-commons-apis +cp -p %{SOURCE4} %{buildroot}%{_bindir}/xml-which10 +cp -p %{SOURCE5} %{buildroot}%{_bindir}/xml-which11 -%preun apis -{ - [ $1 = 0 ] || exit 0 - /usr/sbin/update-alternatives --remove xml-commons-apis %{_javadir}/%{name}-xml-apis.jar -} >/dev/null 2>&1 || : +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE7} \ + > %{buildroot}%{_bindir}/xml-resolver10 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE9} \ + > %{buildroot}%{_bindir}/xml-xread10 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE11} \ + > %{buildroot}%{_bindir}/xml-xparse10 + +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE6} \ + > %{buildroot}%{_mandir}/man1/xml-resolver10.1 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE8} \ + > %{buildroot}%{_mandir}/man1/xml-xread10.1 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE10} \ + > %{buildroot}%{_mandir}/man1/xml-xparse10.1 + +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE13} \ + > %{buildroot}%{_bindir}/xml-resolver11 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE15} \ + > %{buildroot}%{_bindir}/xml-xread11 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE17} \ + > %{buildroot}%{_bindir}/xml-xparse11 + +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE12} \ + > %{buildroot}%{_mandir}/man1/xml-resolver11.1 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE14} \ + > %{buildroot}%{_mandir}/man1/xml-xread11.1 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE16} \ + > %{buildroot}%{_mandir}/man1/xml-xparse11.1 + +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE19} \ + > %{buildroot}%{_bindir}/xml-resolver12 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE21} \ + > %{buildroot}%{_bindir}/xml-xread12 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE23} \ + > %{buildroot}%{_bindir}/xml-xparse12 + +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE18} \ + > %{buildroot}%{_mandir}/man1/xml-resolver12.1 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE20} \ + > %{buildroot}%{_mandir}/man1/xml-xread12.1 +sed -e 's|__RESOLVERDIR__|%{resolverdir}|' < %{SOURCE22} \ + > %{buildroot}%{_mandir}/man1/xml-xparse12.1 + +# Central CatalogManager.properties +install -d -m 755 %{buildroot}%{resolverdir} +install -m 0644 %{SOURCE24} %{buildroot}%{resolverdir}/CatalogManager.properties + +# docs +# JAXP 1.1 +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.1-apis-%{version} +install -m 0644 xml-commons-1_0_b2/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.1-apis-%{version} +install -m 0644 xml-commons-1_0_b2/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.1-apis-%{version} +# JAXP 1.2 +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.2-apis-%{version} +install -m 0644 xml-commons-external-1_2_*/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.2-apis-%{version} +install -m 0644 xml-commons-external-1_2_*/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.2-apis-%{version} +# JAXP 1.3 +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.3-apis-%{version} +install -m 0644 xml-commons-external-1_3_*/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.3-apis-%{version} +install -m 0644 xml-commons-external-1_3_*/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.3-apis-%{version} +# JAXP 1.4 +install -d -m 755 %{buildroot}%{_datadir}/%{name}-jaxp-1.4-apis-%{version} +install -m 0644 xml-commons-external-1_4_*/java/external/LICENSE* %{buildroot}%{_datadir}/%{name}-jaxp-1.4-apis-%{version} +install -m 0644 xml-commons-external-1_4_*/java/external/README* %{buildroot}%{_datadir}/%{name}-jaxp-1.4-apis-%{version} + +# manuals +# JAXP 1.1 +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.1-apis-%{version} +cp -pr xml-commons-1_0_b2/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.1-apis-%{version} +# JAXP 1.2 +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.2-apis-%{version} +cp -pr xml-commons-external-1_2_*/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.2-apis-%{version} +# JAXP 1.3 +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.3-apis-%{version} +cp -pr xml-commons-external-1_3_*/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.3-apis-%{version} +# JAXP 1.4 +install -d -m 755 %{buildroot}%{_docdir}/%{name}-jaxp-1.4-apis-%{version} +cp -pr xml-commons-external-1_4_*/java/external/build/docs/* %{buildroot}%{_docdir}/%{name}-jaxp-1.4-apis-%{version} + +# For Symlinks and alternatives +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +ln -sf %{_sysconfdir}/alternatives/xml-commons-apis.jar %{buildroot}%{_javadir}/xml-commons-apis.jar +ln -sf %{_sysconfdir}/alternatives/xml-commons-which.jar %{buildroot}%{_javadir}/xml-commons-which.jar +ln -sf %{_sysconfdir}/alternatives/xml-commons-resolver.jar %{buildroot}%{_javadir}/xml-commons-resolver.jar +ln -sf %{_sysconfdir}/alternatives/jaxp.jar %{buildroot}%{_javadir}/jaxp.jar +ln -sf %{_sysconfdir}/alternatives/dom3.jar %{buildroot}%{_javadir}/dom3.jar +ln -sf %{_sysconfdir}/alternatives/dom2.jar %{buildroot}%{_javadir}/dom2.jar +ln -sf %{_sysconfdir}/alternatives/dom.jar %{buildroot}%{_javadir}/dom.jar +ln -sf %{_sysconfdir}/alternatives/sax2.jar %{buildroot}%{_javadir}/sax2.jar +ln -sf %{_sysconfdir}/alternatives/sax.jar %{buildroot}%{_javadir}/sax.jar +ln -sf %{_sysconfdir}/alternatives/xml-which %{buildroot}%{_bindir}/xml-which +ln -sf %{_sysconfdir}/alternatives/xml-resolver %{buildroot}%{_bindir}/xml-resolver +ln -sf %{_sysconfdir}/alternatives/xml-xread %{buildroot}%{_bindir}/xml-xread +ln -sf %{_sysconfdir}/alternatives/xml-xparse %{buildroot}%{_bindir}/xml-xparse +ln -sf %{_sysconfdir}/alternatives/jaxp11.jar %{buildroot}%{_javadir}/jaxp11.jar +ln -sf %{_sysconfdir}/alternatives/jaxp12.jar %{buildroot}%{_javadir}/jaxp12.jar +ln -sf %{_sysconfdir}/alternatives/jaxp13.jar %{buildroot}%{_javadir}/jaxp13.jar +ln -sf %{_sysconfdir}/alternatives/jaxp14.jar %{buildroot}%{_javadir}/jaxp14.jar +ln -sf %{_sysconfdir}/alternatives/xslt.jar %{buildroot}%{_javadir}/xslt.jar +ln -sf %{_sysconfdir}/alternatives/xml-resolver.1.gz %{buildroot}/%{_mandir}/man1/xml-resolver.1.gz +ln -sf %{_sysconfdir}/alternatives/xml-resolver.1.gz %{buildroot}/%{_mandir}/man1/xml-resolver.1.gz +ln -sf %{_sysconfdir}/alternatives/xml-xread.1.gz %{buildroot}/%{_mandir}/man1/xml-xread.1.gz +ln -sf %{_sysconfdir}/alternatives/xml-xparse.1.gz %{buildroot}/%{_mandir}/man1/xml-xparse.1.gz + +chmod 755 %{buildroot}%{_bindir}* + +perl -pi -e 's/\r$//g' README.html KEYS + +%if %{with_repolib} +install -d -m 755 %{buildroot}%{repodir} +install -d -m 755 %{buildroot}%{repodirlib} +install -m 755 %{SOURCE100} %{buildroot}%{repodir}/component-info.xml +sed -i 's/@VERSION@/%{version}-brew/g' %{buildroot}%{repodir}/component-info.xml +tag=`echo %{name}-%{version}-%{release} | sed 's|\.|_|g'` +sed -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml +install -d -m 755 %{buildroot}%{repodirsrc} +install -m 755 %{SOURCE0} %{buildroot}%{repodirsrc} +cp -p %{buildroot}%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar %{buildroot}%{repodirlib}/xml-apis.jar +cp -p %{buildroot}%{_javadir}/%{name}-resolver11-%{version}.jar %{buildroot}%{repodirlib}/resolver.jar +install -m 755 %{SOURCE3} %{buildroot}%{repodirsrc} +%endif + +%if 0%{?suse_version} +# disable of a link target doesn't exist error on ghost symlink +export NO_BRP_STALE_LINK_ERROR=yes +%endif + +%post jaxp-1.1-apis +rm -f %{_javadir}/jaxp11.jar +ln -s %{name}-jaxp-1.1-apis.jar %{_javadir}/jaxp11.jar +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/jaxp11.jar 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/jaxp.jar jaxp %{_javadir}/jaxp11.jar 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/dom2.jar dom2 %{_javadir}/jaxp11.jar 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/dom.jar dom %{_javadir}/jaxp11.jar 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/sax2.jar sax2 %{_javadir}/jaxp11.jar 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/sax.jar sax %{_javadir}/jaxp11.jar 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/xslt.jar xslt %{_javadir}/jaxp11.jar 10100 + +%postun jaxp-1.1-apis +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/jaxp11.jar + %{_sbindir}/update-alternatives --remove jaxp %{_javadir}/jaxp11.jar + %{_sbindir}/update-alternatives --remove dom2 %{_javadir}/jaxp11.jar + %{_sbindir}/update-alternatives --remove dom %{_javadir}/jaxp11.jar + %{_sbindir}/update-alternatives --remove sax2 %{_javadir}/jaxp11.jar + %{_sbindir}/update-alternatives --remove sax %{_javadir}/jaxp11.jar + %{_sbindir}/update-alternatives --remove xslt %{_javadir}/jaxp11.jar + rm -f %{_javadir}/jaxp11.jar +fi + +%post which10 +%{_sbindir}/update-alternatives --install %{_bindir}/xml-which xml-which %{_bindir}/xml-which10 10000 +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-which.jar xml-commons-which %{_javadir}/xml-commons-which10.jar 10000 + +%postun which10 +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-which %{_bindir}/xml-which10 + %{_sbindir}/update-alternatives --remove xml-commons-which %{_javadir}/xml-commons-which10.jar +fi + +%post resolver10 +%{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver10 10000 \ +--slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread10 \ +--slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse10 \ +--slave %{_mandir}/man1/xml-resolver.1%{ext_man} xml-resolver.1%{ext_man} %{_mandir}/man1/xml-resolver10.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xread.1%{ext_man} xml-xread.1%{ext_man} %{_mandir}/man1/xml-xread10.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xparse.1%{ext_man} xml-xparse.1%{ext_man} %{_mandir}/man1/xml-xparse10.1%{ext_man} +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver10.jar 10000 + +%postun resolver10 +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-resolver %{_bindir}/xml-resolver10 + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/xml-commons-resolver10.jar +fi + +%post resolver11 +%{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver11 10100 \ +--slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread11 \ +--slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse11 \ +--slave %{_mandir}/man1/xml-resolver.1%{ext_man} xml-resolver.1%{ext_man} %{_mandir}/man1/xml-resolver11.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xread.1%{ext_man} xml-xread.1%{ext_man} %{_mandir}/man1/xml-xread11.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xparse.1%{ext_man} xml-xparse.1%{ext_man} %{_mandir}/man1/xml-xparse11.1%{ext_man} +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver11.jar 10100 + +%postun resolver11 +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-resolver %{_bindir}/xml-resolver11 + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/xml-commons-resolver11.jar +fi + +%post jaxp-1.2-apis +rm -f %{_javadir}/xml-commons-apis.jar +rm -f %{_javadir}/jaxp12.jar +ln -s %{name}-jaxp-1.2-apis.jar %{_javadir}/jaxp12.jar +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/jaxp12.jar 10200 +%{_sbindir}/update-alternatives --install %{_javadir}/jaxp.jar jaxp %{_javadir}/jaxp12.jar 10200 +%{_sbindir}/update-alternatives --install %{_javadir}/dom2.jar dom2 %{_javadir}/jaxp12.jar 10200 +%{_sbindir}/update-alternatives --install %{_javadir}/dom.jar dom %{_javadir}/jaxp12.jar 10200 +%{_sbindir}/update-alternatives --install %{_javadir}/sax2.jar sax2 %{_javadir}/jaxp12.jar 10200 +%{_sbindir}/update-alternatives --install %{_javadir}/sax.jar sax %{_javadir}/jaxp12.jar 10200 +%{_sbindir}/update-alternatives --install %{_javadir}/xslt.jar xslt %{_javadir}/jaxp12.jar 10200 + +%postun jaxp-1.2-apis +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/jaxp12.jar + %{_sbindir}/update-alternatives --remove jaxp %{_javadir}/jaxp12.jar + %{_sbindir}/update-alternatives --remove dom2 %{_javadir}/jaxp12.jar + %{_sbindir}/update-alternatives --remove dom %{_javadir}/jaxp12.jar + %{_sbindir}/update-alternatives --remove sax2 %{_javadir}/jaxp12.jar + %{_sbindir}/update-alternatives --remove sax %{_javadir}/jaxp12.jar + %{_sbindir}/update-alternatives --remove xslt %{_javadir}/jaxp12.jar + rm -f %{_javadir}/jaxp12.jar +fi + +%post jaxp-1.3-apis +rm -f %{_javadir}/xml-commons-apis.jar +rm -f %{_javadir}/jaxp13.jar +ln -s %{name}-jaxp-1.3-apis.jar %{_javadir}/jaxp13.jar +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/jaxp13.jar 10300 +%{_sbindir}/update-alternatives --install %{_javadir}/jaxp.jar jaxp %{_javadir}/jaxp13.jar 10300 +%{_sbindir}/update-alternatives --install %{_javadir}/dom.jar dom %{_javadir}/jaxp13.jar 10300 +%{_sbindir}/update-alternatives --install %{_javadir}/sax2.jar sax2 %{_javadir}/jaxp13.jar 10300 +%{_sbindir}/update-alternatives --install %{_javadir}/sax.jar sax %{_javadir}/jaxp13.jar 10300 +%{_sbindir}/update-alternatives --install %{_javadir}/xslt.jar xslt %{_javadir}/jaxp13.jar 10300 + +%postun jaxp-1.3-apis +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/jaxp13.jar + %{_sbindir}/update-alternatives --remove jaxp %{_javadir}/jaxp13.jar + %{_sbindir}/update-alternatives --remove dom %{_javadir}/jaxp13.jar + %{_sbindir}/update-alternatives --remove sax2 %{_javadir}/jaxp13.jar + %{_sbindir}/update-alternatives --remove sax %{_javadir}/jaxp13.jar + %{_sbindir}/update-alternatives --remove xslt %{_javadir}/jaxp13.jar + rm -f %{_javadir}/jaxp13.jar +fi + +%post which11 +%{_sbindir}/update-alternatives --install %{_bindir}/xml-which xml-which %{_bindir}/xml-which11 10100 +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-which.jar xml-commons-which %{_javadir}/xml-commons-which11.jar 10100 + +%postun which11 +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-which %{_bindir}/xml-which11 + %{_sbindir}/update-alternatives --remove xml-commons-which %{_javadir}/xml-commons-which11.jar +fi + +%post resolver12 +%{_sbindir}/update-alternatives --install %{_bindir}/xml-resolver xml-resolver %{_bindir}/xml-resolver12 10200 \ +--slave %{_bindir}/xml-xread xml-xread %{_bindir}/xml-xread12 \ +--slave %{_bindir}/xml-xparse xml-xparse %{_bindir}/xml-xparse12 \ +--slave %{_mandir}/man1/xml-resolver.1%{ext_man} xml-resolver.1%{ext_man} %{_mandir}/man1/xml-resolver12.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xread.1%{ext_man} xml-xread.1%{ext_man} %{_mandir}/man1/xml-xread12.1%{ext_man} \ +--slave %{_mandir}/man1/xml-xparse.1%{ext_man} xml-xparse.1%{ext_man} %{_mandir}/man1/xml-xparse12.1%{ext_man} +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-resolver.jar xml-commons-resolver %{_javadir}/xml-commons-resolver12.jar 10200 + +%postun resolver12 +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-resolver %{_bindir}/xml-resolver12 + %{_sbindir}/update-alternatives --remove xml-commons-resolver %{_javadir}/xml-commons-resolver12.jar +fi + +%post jaxp-1.4-apis +rm -f %{_javadir}/xml-commons-apis.jar +rm -f %{_javadir}/jaxp14.jar +ln -s %{name}-jaxp-1.4-apis.jar %{_javadir}/jaxp14.jar +%{_sbindir}/update-alternatives --install %{_javadir}/xml-commons-apis.jar xml-commons-apis %{_javadir}/jaxp14.jar 10400 +%{_sbindir}/update-alternatives --install %{_javadir}/jaxp.jar jaxp %{_javadir}/jaxp14.jar 10400 +%{_sbindir}/update-alternatives --install %{_javadir}/dom.jar dom %{_javadir}/jaxp14.jar 10400 +%{_sbindir}/update-alternatives --install %{_javadir}/sax2.jar sax2 %{_javadir}/jaxp14.jar 10400 +%{_sbindir}/update-alternatives --install %{_javadir}/sax.jar sax %{_javadir}/jaxp14.jar 10400 +%{_sbindir}/update-alternatives --install %{_javadir}/xslt.jar xslt %{_javadir}/jaxp14.jar 10400 + +%postun jaxp-1.4-apis +if [ "$1" = "0" ]; then + %{_sbindir}/update-alternatives --remove xml-commons-apis %{_javadir}/jaxp14.jar + %{_sbindir}/update-alternatives --remove jaxp %{_javadir}/jaxp14.jar + %{_sbindir}/update-alternatives --remove dom %{_javadir}/jaxp14.jar + %{_sbindir}/update-alternatives --remove sax2 %{_javadir}/jaxp14.jar + %{_sbindir}/update-alternatives --remove sax %{_javadir}/jaxp14.jar + %{_sbindir}/update-alternatives --remove xslt %{_javadir}/jaxp14.jar + rm -f %{_javadir}/jaxp14.jar +fi -%clean -rm -rf $RPM_BUILD_ROOT # ----------------------------------------------------------------------------- %files -%defattr(0644,root,root,0755) -%doc KEYS README.html +%doc xml-commons-1_0_b2/LICENSE.txt +%doc xml-commons-external-1_4_*/java/external/*.txt +%config(noreplace) %{resolverdir}/* +%dir %{_sysconfdir}/java/resolver -%files apis -%defattr(0644,root,root,0755) -%{_javadir}/apache-%{name}-apis* -%{_javadir}/dom3-apache-%{name}-apis* -%ghost %{_javadir}/xml-commons-apis.jar +%files jaxp-1.1-apis +# FIXME: +# xml-commons-jaxp-1.1-apis.noarch: W: file-not-utf8 /usr/share/xml-commons-jaxp-1.1-apis-1.3.03/LICENSE.dom-software.txt +# xml-commons-jaxp-1.1-apis.noarch: W: file-not-utf8 /usr/share/xml-commons-jaxp-1.1-apis-1.3.03/LICENSE.dom-documentation.txt +%doc %{_datadir}/%{name}-jaxp-1.1-apis-%{version} +%{_javadir}/%{name}-jaxp-1.1-apis*.jar +%{_javadir}/xml-commons-apis.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar +%{_javadir}/jaxp11.jar +%ghost %{_sysconfdir}/alternatives/jaxp11.jar +%{_javadir}/jaxp.jar +%ghost %{_sysconfdir}/alternatives/jaxp.jar +%{_javadir}/dom2.jar +%ghost %{_sysconfdir}/alternatives/dom2.jar +%{_javadir}/dom.jar +%ghost %{_sysconfdir}/alternatives/dom.jar +%{_javadir}/sax2.jar +%ghost %{_sysconfdir}/alternatives/sax2.jar +%{_javadir}/sax.jar +%ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar -%files which -%defattr(0644,root,root,0755) -%{_javadir}/apache-%{name}-which* -%attr(0755,root,root) %{_bindir}/* +%files jaxp-1.1-apis-manual +%doc %{_docdir}/%{name}-jaxp-1.1-apis-%{version} -%files apis-manual -%defattr(0644,root,root,0755) -%doc java/external/build/docs/* +%files which10 +%{_javadir}/%{name}-which10*.jar +%{_javadir}/xml-commons-which.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-which.jar +%attr(0755,root,root) %{_bindir}/xml-which10 +%{_bindir}/xml-which +%ghost %{_sysconfdir}/alternatives/xml-which -%files apis-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-apis-%{version} -%ghost %{_javadocdir}/%{name}-apis +%files resolver10 +%{_javadir}/%{name}-resolver10*.jar +%{_javadir}/xml-commons-resolver.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar +%attr(0755,root,root) %{_bindir}/xml-resolver10 +%attr(0755,root,root) %{_bindir}/xml-xread10 +%attr(0755,root,root) %{_bindir}/xml-xparse10 +%{_mandir}/man1/xml-resolver10.1* +%{_mandir}/man1/xml-xread10.1* +%{_mandir}/man1/xml-xparse10.1* +%{_bindir}/xml-resolver +%{_bindir}/xml-xread +%{_bindir}/xml-xparse +%ghost %{_sysconfdir}/alternatives/xml-resolver +%ghost %{_sysconfdir}/alternatives/xml-xread +%ghost %{_sysconfdir}/alternatives/xml-xparse +%{_mandir}/man1/xml-resolver.1%{ext_man} +%{_mandir}/man1/xml-xread.1%{ext_man} +%{_mandir}/man1/xml-xparse.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xread.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz -%files which-javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-which-%{version} -%ghost %{_javadocdir}/%{name}-which -# ----------------------------------------------------------------------------- +%files resolver11 +%{_javadir}/%{name}-resolver11*.jar +%{_javadir}/xml-commons-resolver.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar +%attr(0755,root,root) %{_bindir}/xml-resolver11 +%attr(0755,root,root) %{_bindir}/xml-xread11 +%attr(0755,root,root) %{_bindir}/xml-xparse11 +%{_mandir}/man1/xml-resolver11.1* +%{_mandir}/man1/xml-xread11.1* +%{_mandir}/man1/xml-xparse11.1* +%{_bindir}/xml-resolver +%{_bindir}/xml-xread +%{_bindir}/xml-xparse +%ghost %{_sysconfdir}/alternatives/xml-resolver +%ghost %{_sysconfdir}/alternatives/xml-xread +%ghost %{_sysconfdir}/alternatives/xml-xparse +%{_mandir}/man1/xml-resolver.1%{ext_man} +%{_mandir}/man1/xml-xread.1%{ext_man} +%{_mandir}/man1/xml-xparse.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xread.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz -%post apis-javadoc -rm -f %{_javadocdir}/%{name}-apis -ln -s %{name}-apis-%{version} %{_javadocdir}/%{name}-apis +%files jaxp-1.2-apis +%doc %{_datadir}/%{name}-jaxp-1.2-apis-%{version} +%{_javadir}/%{name}-jaxp-1.2-apis*.jar +%{_javadir}/xml-commons-apis.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar +%{_javadir}/jaxp12.jar +%ghost %{_sysconfdir}/alternatives/jaxp12.jar +%{_javadir}/jaxp.jar +%ghost %{_sysconfdir}/alternatives/jaxp.jar +%{_javadir}/dom2.jar +%ghost %{_sysconfdir}/alternatives/dom2.jar +%{_javadir}/dom.jar +%ghost %{_sysconfdir}/alternatives/dom.jar +%{_javadir}/sax2.jar +%ghost %{_sysconfdir}/alternatives/sax2.jar +%{_javadir}/sax.jar +%ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar -%postun apis-javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name}-apis -fi +%files jaxp-1.2-apis-manual +%{_docdir}/%{name}-jaxp-1.2-apis-%{version} -%post which-javadoc -rm -f %{_javadocdir}/%{name}-which -ln -s %{name}-which-%{version} %{_javadocdir}/%{name}-which +%files jaxp-1.3-apis +%doc %{_datadir}/%{name}-jaxp-1.3-apis-%{version} +%{_javadir}/%{name}-jaxp-1.3-apis-%{version}.jar +%{_javadir}/%{name}-jaxp-1.3-apis.jar +%{_javadir}/%{name}-jaxp-1.3-apis-ext-%{version}.jar +%{_javadir}/%{name}-jaxp-1.3-apis-ext.jar +%{_mavenpomdir}/JPP-%{name}-apis.pom +%{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis.pom +%{_mavenpomdir}/JPP-%{name}-jaxp-1.3-apis-ext.pom +%{_datadir}/maven-metadata/%{name}-jaxp-1.3-apis.xml +%{_datadir}/maven-metadata/%{name}-jaxp-1.3-apis-ext.xml +%{_javadir}/xml-commons-apis.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar +%{_javadir}/jaxp13.jar +%ghost %{_sysconfdir}/alternatives/jaxp13.jar +%{_javadir}/jaxp.jar +%ghost %{_sysconfdir}/alternatives/jaxp.jar +%{_javadir}/dom3.jar +%ghost %{_sysconfdir}/alternatives/dom3.jar +%{_javadir}/dom.jar +%ghost %{_sysconfdir}/alternatives/dom.jar +%{_javadir}/sax2.jar +%ghost %{_sysconfdir}/alternatives/sax2.jar +%{_javadir}/sax.jar +%ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar -%postun which-javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name}-which -fi -# ----------------------------------------------------------------------------- +%files jaxp-1.3-apis-manual +%{_docdir}/%{name}-jaxp-1.3-apis-%{version} + +%files which11 +%{_javadir}/%{name}-which11*.jar +%{_javadir}/xml-commons-which.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-which.jar +%attr(0755,root,root) %{_bindir}/xml-which11 +%{_bindir}/xml-which +%ghost %{_sysconfdir}/alternatives/xml-which + +%files resolver12 +%{_javadir}/%{name}-resolver12*.jar +%{_mavenpomdir}/JPP-%{name}-resolver12.pom +%{_datadir}/maven-metadata/%{name}-resolver12.xml +%{_javadir}/xml-commons-resolver.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar +%attr(0755,root,root) %{_bindir}/xml-resolver12 +%attr(0755,root,root) %{_bindir}/xml-xread12 +%attr(0755,root,root) %{_bindir}/xml-xparse12 +%{_mandir}/man1/xml-resolver12.1* +%{_mandir}/man1/xml-xread12.1* +%{_mandir}/man1/xml-xparse12.1* +%{_bindir}/xml-resolver +%{_bindir}/xml-xread +%{_bindir}/xml-xparse +%ghost %{_sysconfdir}/alternatives/xml-resolver +%ghost %{_sysconfdir}/alternatives/xml-xread +%ghost %{_sysconfdir}/alternatives/xml-xparse +%{_mandir}/man1/xml-resolver.1%{ext_man} +%{_mandir}/man1/xml-xread.1%{ext_man} +%{_mandir}/man1/xml-xparse.1%{ext_man} +%ghost %{_sysconfdir}/alternatives/xml-resolver.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xread.1.gz +%ghost %{_sysconfdir}/alternatives/xml-xparse.1.gz + +%files jaxp-1.4-apis +%doc %{_datadir}/%{name}-jaxp-1.4-apis-%{version} +%{_javadir}/%{name}-jaxp-1.4-apis-%{version}.jar +%{_javadir}/%{name}-jaxp-1.4-apis.jar +%{_javadir}/%{name}-jaxp-1.4-apis-ext-%{version}.jar +%{_javadir}/%{name}-jaxp-1.4-apis-ext.jar +%{_mavenpomdir}/JPP-%{name}-jaxp-1.4-apis.pom +%{_datadir}/maven-metadata/%{name}-jaxp-1.4-apis.xml +%{_javadir}/xml-commons-apis.jar +%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar +%{_javadir}/jaxp14.jar +%ghost %{_sysconfdir}/alternatives/jaxp14.jar +%{_javadir}/jaxp.jar +%ghost %{_sysconfdir}/alternatives/jaxp.jar +%{_javadir}/dom3.jar +%ghost %{_sysconfdir}/alternatives/dom3.jar +%{_javadir}/dom.jar +%ghost %{_sysconfdir}/alternatives/dom.jar +%{_javadir}/sax2.jar +%ghost %{_sysconfdir}/alternatives/sax2.jar +%{_javadir}/sax.jar +%ghost %{_sysconfdir}/alternatives/sax.jar +%{_javadir}/xslt.jar +%ghost %{_sysconfdir}/alternatives/xslt.jar + +%files jaxp-1.4-apis-manual +%{_docdir}/%{name}-jaxp-1.4-apis-%{version} + +%if %{with_repolib} +%files repolib +%{repodir} +%endif %changelog -* Thu Sep 11 2008 mvyskocil@suse.cz -- Use a gcc-java for build -- Fixed a minor rpm lint error in which subpackage summary -* Tue Jan 22 2008 mvyskocil@suse.cz -- fixed beta build -* Sun Jul 22 2007 coolo@suse.de -- avoid autobuild loops -* Wed May 02 2007 dbornkessel@suse.de -- added unzip to BuildRequires -* Thu Sep 21 2006 dbornkessel@suse.de -- added xml-commons-apis-bootstrap spec file -* Mon Sep 18 2006 ro@suse.de -- use source=1.4 for java -* Wed Feb 08 2006 dbornkessel@suse.de -- added missing PreReq: update-alternatives -* Mon Jan 30 2006 dbornkessel@suse.de -- added update alternatives for xml-commons-apis with appropiate prio -* Fri Jan 27 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Wed Jan 25 2006 dbornkessel@suse.de -- deleted dependency on itself -* Mon Jan 16 2006 jsmeix@suse.de -- Current version 1.3.02 from JPackage.org -* Tue Oct 11 2005 jsmeix@suse.de -- Added xerces-j2 which is needed for build on ppc64 and ia64. -* Fri Jul 29 2005 jsmeix@suse.de -- Adjustments in the spec file. -* Wed Jul 20 2005 jsmeix@suse.de -- Current version 1.0 from JPackage.org -* Mon Jul 18 2005 jsmeix@suse.de -- Current version 1.0 from JPackage.org -* Thu Sep 16 2004 skh@suse.de -- Fix prerequires of javadoc subpackages -* Thu Sep 02 2004 skh@suse.de -- Initial package created with version 1.0 (JPackage 1.5) diff --git a/xml-commons.which.script b/xml-commons.which10.script similarity index 75% rename from xml-commons.which.script rename to xml-commons.which10.script index 2c8726a..c5d7f3d 100644 --- a/xml-commons.which.script +++ b/xml-commons.which10.script @@ -14,8 +14,8 @@ fi # 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 diff --git a/xml-commons.which11.script b/xml-commons.which11.script new file mode 100644 index 0000000..a44612e --- /dev/null +++ b/xml-commons.which11.script @@ -0,0 +1,27 @@ +#!/bin/sh +# +# xml-commons which script +# JPackage Project +# $Id: xml-commons.which.script,v 1.2 2002/11/14 20:08:56 jpackage Exp $ + +# Source functions library +if [ -f /usr/share/java-utils/java-functions ] ; then + . /usr/share/java-utils/java-functions +else + echo "Can't find functions library, aborting" + exit 1 +fi + +# Configuration +MAIN_CLASS=org.apache.env.Which +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 +set_classpath $BASE_JARS +set_flags $BASE_FLAGS +set_options $BASE_OPTIONS + +# Let's start +run "$@" diff --git a/xml-resolver-1.2.pom b/xml-resolver-1.2.pom new file mode 100644 index 0000000..16c7f23 --- /dev/null +++ b/xml-resolver-1.2.pom @@ -0,0 +1,38 @@ + + + apache + org.apache + 3 + + 4.0.0 + xml-resolver + xml-resolver + XML Commons Resolver Component + 1.2 + xml-commons provides an Apache-hosted set of DOM, SAX, and + JAXP interfaces for use in other xml-based projects. Our hope is that we + can standardize on both a common version and packaging scheme for these + critical XML standards interfaces to make the lives of both our developers + and users easier. + http://xml.apache.org/commons/components/resolver/ + + bugzilla + http://issues.apache.org/bugzilla/ + + + + XML Commons Developer's List + commons-dev-subscribe@xml.apache.org + commons-dev-unsubscribe@xml.apache.org + commons-dev@xml.apache.org + http://mail-archives.apache.org/mod_mbox/xml-commons-dev/ + + + + scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-resolver-1_2/ + http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-resolver-1_2/ + + + deployed + + \ No newline at end of file