osc copypac from project:openSUSE:Factory package:xml-commons revision:41, using expand

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xml-commons-apis-bootstrap?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2018-12-11 08:05:32 +00:00 committed by Git OBS Bridge
parent d06c1b8bc1
commit 183eb15d48
47 changed files with 2760 additions and 696 deletions

View File

@ -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

0
ready
View File

41
xml-apis-1.3.04.pom Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<parent>
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
<version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<name>XML Commons External Components XML APIs</name>
<version>1.3.04</version>
<description>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.</description>
<url>http://xml.apache.org/commons/components/external/</url>
<issueManagement>
<system>bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>XML Commons Developer's List</name>
<subscribe>commons-dev-subscribe@xml.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@xml.apache.org</unsubscribe>
<post>commons-dev@xml.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/xml-commons-dev/</archive>
</mailingList>
</mailingLists>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/</connection>
<url>http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-external-1_3_04/</url>
</scm>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>

60
xml-apis-1.4.01.pom Normal file
View File

@ -0,0 +1,60 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<name>XML Commons External Components XML APIs</name>
<version>1.4.01</version>
<description>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.</description>
<url>http://xml.apache.org/commons/components/external/</url>
<issueManagement>
<system>bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>XML Commons Developer's List</name>
<subscribe>commons-dev-subscribe@xml.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@xml.apache.org</unsubscribe>
<post>commons-dev@xml.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/xml-commons-dev/</archive>
</mailingList>
</mailingLists>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_4_01/</connection>
<url>https://svn.apache.org/viewvc/xml/commons/tags/xml-commons-external-1_4_01/</url>
</scm>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
<license>
<name>The SAX License</name>
<url>http://www.saxproject.org/copying.html</url>
<distribution>repo</distribution>
</license>
<license>
<name>The W3C License</name>
<url>http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/java-binding.zip</url>
<distribution>repo</distribution>
</license>
</licenses>
<developers>
<developer>
<id>xml-apis</id>
<name>Apache Software Foundation</name>
<email>commons-dev@xml.apache.org</email>
<url>http://xml.apache.org/commons/</url>
<organization>Apache Software Foundation</organization>
<organizationUrl>http://www.apache.org</organizationUrl>
</developer>
</developers>
</project>

41
xml-apis-ext-1.3.04.pom Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<parent>
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
<version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis-ext</artifactId>
<name>XML Commons External Components XML APIs Extensions</name>
<version>1.3.04</version>
<description>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.</description>
<url>http://xml.apache.org/commons/components/external/</url>
<issueManagement>
<system>bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>XML Commons Developer's List</name>
<subscribe>commons-dev-subscribe@xml.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@xml.apache.org</unsubscribe>
<post>commons-dev@xml.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/xml-commons-dev/</archive>
</mailingList>
</mailingLists>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-external-1_3_04/</connection>
<url>http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-external-1_3_04/</url>
</scm>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>

BIN
xml-commons-1.0.b2.tar.bz2 (Stored with Git LFS)

Binary file not shown.

View File

@ -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

View File

@ -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,92 +13,73 @@
# 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
# To make patches unchanged
%setup -q -T -c
%setup -q -T -D -a 0
%setup -q -T -D -a 3
%patch1 -b .sav
%patch2 -b .sav
%patch3 -b .sav
%build
#>>> some useful functions ... used throughout bootstrap packages
# variables:
TARGET_DIR=`pwd`
CLASSPATH_ORIG="$CLASSPATH"
LIB_GCJ="`ls %{_javadir}/libgcj-*.jar`"
#>>> delete binary file and files not needed
function delBinaryFiles() {
set +x
@ -109,6 +91,7 @@ function delBinaryFiles() {
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}
%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

View File

@ -0,0 +1,24 @@
<project name="apache-xerces-component-info">
<!-- ============================================================ -->
<!-- Apache Xerces -->
<!-- ============================================================ -->
<component id="apache-xml-commons"
licenseType="apache-2.0"
version="@VERSION@"
projectHome="http://xml.apache.org/commons/"
description="Common code for XML projects"
scm=":ext:cvs.devel.redhat.com:/cvs/dist/xml-commons"
tag="@TAG@">
<!-- Build using JDK 1.4 -->
<artifact id="resolver.jar"/>
<artifact id="xml-apis.jar"/>
<export>
<include input="resolver.jar"/>
<include input="xml-apis.jar"/>
</export>
</component>
</project>

View File

@ -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 @@
<target name="compile" depends="prepare"
description="Compile all classes">
<javac srcdir="${src.dir}" destdir="${build.classes.dir}"
- debug="${debug}" />
+ debug="${debug}" encoding="UTF-8" />
</target>
<target name="jar" depends="compile"
--- xml-commons-1.4.01/xml-commons-external-1_4_01/java/external/build.xml 2017-10-04 21:48:12.666748720 +0200
+++ xml-commons-1.4.01/xml-commons-external-1_4_01/java/external/build.xml 2017-10-04 21:52:22.566291530 +0200
@@ -103,7 +103,7 @@
<target name="compile" depends="prepare"
description="Compile all classes">
<javac srcdir="${src.dir}" destdir="${build.classes.dir}"
- debug="${debug}" />
+ debug="${debug}" encoding="UTF-8" />
</target>
<target name="jar" depends="compile"

598
xml-commons-enum.patch Normal file
View File

@ -0,0 +1,598 @@
Index: xml-commons-1_0_b2/java/src/org/apache/env/Which.java
===================================================================
--- xml-commons-1_0_b2/java/src/org/apache/env/Which.java.orig 2001-12-21 23:59:05.000000000 +0100
+++ xml-commons-1_0_b2/java/src/org/apache/env/Which.java 2011-02-21 14:32:51.244975486 +0100
@@ -289,12 +289,12 @@
if (null == hash)
return;
- Enumeration enum = hash.keys();
+ Enumeration myEnum = hash.keys();
Vector v = new Vector();
- while (enum.hasMoreElements())
+ while (myEnum.hasMoreElements())
{
- Object key = enum.nextElement();
+ Object key = myEnum.nextElement();
String keyStr = key.toString();
Object item = hash.get(key);
@@ -311,12 +311,12 @@
}
}
- enum = v.elements();
+ myEnum = v.elements();
- while (enum.hasMoreElements())
+ while (myEnum.hasMoreElements())
{
- String n = (String) enum.nextElement();
- Hashtable h = (Hashtable) enum.nextElement();
+ String n = (String) myEnum.nextElement();
+ Hashtable h = (Hashtable) myEnum.nextElement();
reportHashtable(h, n, out);
}
Index: xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java
===================================================================
--- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java.orig 2002-01-30 13:25:00.000000000 +0100
+++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Catalog.java 2011-02-21 14:32:51.246975564 +0100
@@ -451,9 +451,9 @@
mapArr.add(null);
}
- Enumeration enum = readerMap.keys();
- while (enum.hasMoreElements()) {
- String mimeType = (String) enum.nextElement();
+ Enumeration myEnum = readerMap.keys();
+ while (myEnum.hasMoreElements()) {
+ String mimeType = (String) myEnum.nextElement();
Integer pos = (Integer) readerMap.get(mimeType);
mapArr.set(pos.intValue(), mimeType);
}
@@ -1064,9 +1064,9 @@
}
// Parse all the DELEGATE catalogs
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_PUBLIC
|| e.getEntryType() == DELEGATE_SYSTEM
|| e.getEntryType() == DELEGATE_URI) {
@@ -1140,9 +1140,9 @@
// If there's a DOCTYPE entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1178,9 +1178,9 @@
Debug.message(3, "resolveDocument");
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DOCUMENT) {
return e.getEntryArg(1); //FIXME check this
}
@@ -1253,9 +1253,9 @@
// If there's a ENTITY entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1339,9 +1339,9 @@
// If there's a NOTATION entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1498,9 +1498,9 @@
// If there's a PUBLIC entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1516,10 +1516,10 @@
// If there's a DELEGATE_PUBLIC entry in this catalog, use it
over = default_override;
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1624,9 +1624,9 @@
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -1636,11 +1636,11 @@
}
// If there's a REWRITE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1662,10 +1662,10 @@
}
// If there's a DELEGATE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1759,9 +1759,9 @@
*/
protected String resolveLocalURI(String uri)
throws MalformedURLException, IOException {
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == URI
&& (e.getEntryArg(0).equals(uri))) {
return e.getEntryArg(1);
@@ -1769,11 +1769,11 @@
}
// If there's a REWRITE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_URI) {
String p = (String) e.getEntryArg(0);
@@ -1795,10 +1795,10 @@
}
// If there's a DELEGATE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_URI) {
String p = (String) e.getEntryArg(0);
Index: xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java
===================================================================
--- xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java.orig 2002-01-30 13:25:00.000000000 +0100
+++ xml-commons-1_0_b2/java/src/org/apache/xml/resolver/Resolver.java 2011-02-21 14:32:51.269976454 +0100
@@ -215,9 +215,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(uri, e.getEntryArg(0));
if (resolved != null) {
@@ -272,9 +272,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(systemId, e.getEntryArg(0));
if (resolved != null) {
@@ -334,9 +334,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
if (systemId != null) {
resolved = resolveExternalSystem(systemId,
@@ -575,9 +575,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -603,9 +603,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(1).equals(systemId)
|| (windows
Index: xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java
===================================================================
--- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java.orig 2003-09-02 09:05:08.000000000 +0200
+++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Catalog.java 2011-02-21 14:32:51.412981992 +0100
@@ -486,9 +486,9 @@
mapArr.add(null);
}
- Enumeration enum = readerMap.keys();
- while (enum.hasMoreElements()) {
- String mimeType = (String) enum.nextElement();
+ Enumeration myEnum = readerMap.keys();
+ while (myEnum.hasMoreElements()) {
+ String mimeType = (String) myEnum.nextElement();
Integer pos = (Integer) readerMap.get(mimeType);
mapArr.set(pos.intValue(), mimeType);
}
@@ -1152,9 +1152,9 @@
}
// Parse all the DELEGATE catalogs
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_PUBLIC
|| e.getEntryType() == DELEGATE_SYSTEM
|| e.getEntryType() == DELEGATE_URI) {
@@ -1228,9 +1228,9 @@
// If there's a DOCTYPE entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1266,9 +1266,9 @@
catalogManager.debug.message(3, "resolveDocument");
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DOCUMENT) {
return e.getEntryArg(1); //FIXME check this
}
@@ -1341,9 +1341,9 @@
// If there's a ENTITY entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1427,9 +1427,9 @@
// If there's a NOTATION entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1586,9 +1586,9 @@
// If there's a PUBLIC entry in this catalog, use it
boolean over = default_override;
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1604,10 +1604,10 @@
// If there's a DELEGATE_PUBLIC entry in this catalog, use it
over = default_override;
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == OVERRIDE) {
over = e.getEntryArg(0).equalsIgnoreCase("YES");
continue;
@@ -1712,9 +1712,9 @@
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -1724,11 +1724,11 @@
}
// If there's a REWRITE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1750,10 +1750,10 @@
}
// If there's a DELEGATE_SYSTEM entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_SYSTEM) {
String p = (String) e.getEntryArg(0);
@@ -1846,9 +1846,9 @@
*/
protected String resolveLocalURI(String uri)
throws MalformedURLException, IOException {
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == URI
&& (e.getEntryArg(0).equals(uri))) {
return e.getEntryArg(1);
@@ -1856,11 +1856,11 @@
}
// If there's a REWRITE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
String startString = null;
String prefix = null;
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == REWRITE_URI) {
String p = (String) e.getEntryArg(0);
@@ -1882,10 +1882,10 @@
}
// If there's a DELEGATE_URI entry in this catalog, use it
- enum = catalogEntries.elements();
+ myEnum = catalogEntries.elements();
Vector delCats = new Vector();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == DELEGATE_URI) {
String p = (String) e.getEntryArg(0);
Index: xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java
===================================================================
--- xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java.orig 2003-09-02 09:05:08.000000000 +0200
+++ xml-commons-resolver-1_1_b1/java/src/org/apache/xml/resolver/Resolver.java 2011-02-21 14:32:51.413982030 +0100
@@ -197,9 +197,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(uri, e.getEntryArg(0));
if (resolved != null) {
@@ -254,9 +254,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
resolved = resolveExternalSystem(systemId, e.getEntryArg(0));
if (resolved != null) {
@@ -316,9 +316,9 @@
return resolved;
}
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == RESOLVER) {
if (systemId != null) {
resolved = resolveExternalSystem(systemId,
@@ -557,9 +557,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(0).equals(systemId)
|| (windows
@@ -585,9 +585,9 @@
Vector map = new Vector();
String osname = System.getProperty("os.name");
boolean windows = (osname.indexOf("Windows") >= 0);
- Enumeration enum = catalogEntries.elements();
- while (enum.hasMoreElements()) {
- CatalogEntry e = (CatalogEntry) enum.nextElement();
+ Enumeration myEnum = catalogEntries.elements();
+ while (myEnum.hasMoreElements()) {
+ CatalogEntry e = (CatalogEntry) myEnum.nextElement();
if (e.getEntryType() == SYSTEM
&& (e.getEntryArg(1).equals(systemId)
|| (windows
Index: xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java
===================================================================
--- xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java.orig 2002-08-07 21:24:05.000000000 +0200
+++ xml-commons-resolver-1_1_b1/java/src/org/apache/env/Which.java 2011-02-21 16:42:54.303931676 +0100
@@ -316,12 +316,12 @@
if (null == hash)
return;
- Enumeration enum = hash.keys();
+ Enumeration enum2 = hash.keys();
Vector v = new Vector();
- while (enum.hasMoreElements())
+ while (enum2.hasMoreElements())
{
- Object key = enum.nextElement();
+ Object key = enum2.nextElement();
String keyStr = key.toString();
Object item = hash.get(key);
@@ -338,12 +338,12 @@
}
}
- enum = v.elements();
+ enum2 = v.elements();
- while (enum.hasMoreElements())
+ while (enum2.hasMoreElements())
{
- String n = (String) enum.nextElement();
- Hashtable h = (Hashtable) enum.nextElement();
+ String n = (String) enum2.nextElement();
+ Hashtable h = (Hashtable) enum2.nextElement();
reportHashtable(h, n, out);
}

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fe241b66bcb19a3b68b965df6b116247985c226e23126706cebacd9dce568d2b
size 415313

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:26a5abac9a89f2b2ce5d5bc7cecfeb8956cb8d0b55176f37b65fafa89d3504d5
size 682172

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:688a5cd37da176eb585836714157d7462dab95c4bcdc07bb87017130fee13561
size 6532480

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:796f60ceb758a5fffc628939dc9c25c9cef96f508d1e4864fd218436dee23215
size 642139

View File

@ -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

View File

@ -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
<target name="external"
description="Calls just java/external/build.xml only.">
- <ant dir="java/external" antfile="build.xml" target="all" >
+ <ant dir="java/external" antfile="build.xml" target="jar" >
+ </ant>
+ <ant dir="java/external" antfile="build.xml" target="exportsrc" >
</ant>
</target>
<target name="jars"
depends="external"
description="Calls all other java build files.">
- <ant dir="java" antfile="which.xml" target="all" >
+ <ant dir="java" antfile="which.xml" target="jar" >
</ant>
- <ant dir="java" antfile="resolver.xml" target="all" >
+ <ant dir="java" antfile="resolver.xml" target="jar" >
</ant>
</target>
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.">
<ant dir="java" antfile="resolver.xml" target="jar" >
</ant>
- <ant dir="java" antfile="resolver.xml" target="javadocs" >
- </ant>
</target>
<target name="dist"

View File

@ -0,0 +1,16 @@
--- xml-commons-resolver-1_1_b1/build.xml.sav 2003-09-25 20:15:25.000000000 +0200
+++ xml-commons-resolver-1_1_b1/build.xml 2006-03-31 20:30:38.000000000 +0200
@@ -62,11 +62,10 @@
</target>
<target name="jars"
- depends="external"
description="Calls all other java build files.">
- <ant dir="java" antfile="which.xml" target="all" >
+ <ant dir="java" antfile="resolver.xml" target="jar" >
</ant>
- <ant dir="java" antfile="resolver.xml" target="all" >
+ <ant dir="java" antfile="resolver.xml" target="javadocs" >
</ant>
</target>

BIN
xml-commons-resolver-1.1.b1.tar.bz2 (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dc2407267cb8ba8c58e8bbfc4ac2c3cd55d3eb06d4cca6e3cc970ef32d44349f
size 6514000

View File

@ -0,0 +1,64 @@
# Central CatalogManager.properties for xml-commons-resolver
# JPackage Project <http://www.jpackage.org/>
########################################################################
# CatalogManager provides an interface to the catalog properties.
# Properties can come from two places: from system properties or
# from a CatalogManager.properties file. This class provides a
# transparent interface to both, with system properties preferred
# over property file values.
#######################################################################
# Catalog Files:
# The semicolon-delimited list of catalog files.
# Example: catalogs=./xcatalog;/share/doctypes/catalog
catalogs=/etc/xml/catalog;/etc/sgml/catalog
#######################################################################
# Relative Catalogs:
# If false, relative catalog URIs are made absolute with respect to the
# base URI of the CatalogManager.properties file. This setting only
# applies to catalog URIs obtained from the catalogs property in the
# CatalogManager.properties file
# Example: relative-catalogs = [yes|no]
relative-catalogs=no
#######################################################################
# Verbosity:
# If non-zero, the Catalog classes will print informative and debugging
# messages. The higher the number, the more messages.
# Example: verbosity = [0..99]
verbosity=0
#######################################################################
# Prefer:
# Which identifier is preferred, "public" or "system"?
# Example: xml.catalog.prefer = [public|system]
prefer=public
#######################################################################
# Static-catalog:
# Should a single catalog be constructed for all parsing, or should a
# different catalog be created for each parser?
# Example: static-catalog = [yes|no]
static-catalog=yes
#######################################################################
# Allow-oasis-xml-catalog-pi
# If the source document contains "oasis-xml-catalog" processing
# instructions, should they be used?
# Example: allow-oasis-xml-catalog-pi = [yes|no]
allow-oasis-xml-catalog-pi=yes
#######################################################################
# catalog-class-name
# If you're using the convenience classes
# org.apache.xml.resolver.tools.*, this setting allows you to specify
# an alternate class name to use for the underlying catalog.
# Example: catalog-class-name=org.apache.xml.resolver.Resolver

View File

@ -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 @@
<property name="copyright.message"
value="Copyright &#169; ${copyright.date} ${company.name}. All Rights Reserved."/>
+ <property name="j2se.apidoc" value="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+
<!-- Public Targets -->
<target name="main"
depends="all, check"
@@ -124,6 +126,7 @@
<package name="org.apache.xml.resolver.readers"/>
<package name="org.apache.xml.resolver.tools"/>
<package name="org.apache.xml.resolver.apps"/>
+ <link href="${j2se.apidoc}"/>
</javadoc>
</target>

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver resolver script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.resolver
BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver xparse script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.xparse
BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver xread script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.xread
BASE_JARS="xml-commons-resolver10.jar xml-commons-jaxp-1.1-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver resolver script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.resolver
BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver xparse script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.xparse
BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver xread script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.xread
BASE_JARS="xml-commons-resolver11.jar xml-commons-jaxp-1.2-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver resolver script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.resolver
BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver xparse script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.xparse
BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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
<http://www.oasis-open.org/committees/entity/>.
.SH AUTHOR
Norman Walsh <Norman.Walsh@Sun.COM>

View File

@ -0,0 +1,21 @@
#!/bin/sh
#
# xml-commons-resolver xread script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
. /usr/share/java-utils/java-functions
# Configuration
MAIN_CLASS=org.apache.xml.resolver.apps.xread
BASE_JARS="xml-commons-resolver12.jar xml-commons-jaxp-1.3-apis.jar jaxp_parser_impl.jar"
CLASSPATH="$CLASSPATH:__RESOLVERDIR__"
# Set parameters
set_jvm
set_classpath $BASE_JARS
set_flags $BASE_FLAGS
set_options $BASE_OPTIONS
# Let's start
run "$@"

View File

@ -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.">
<ant dir="java" antfile="which.xml" target="all" >
</ant>
+<!--
<ant dir="java" antfile="resolver.xml" target="all" >
</ant>
+-->
</target>
<target name="dist"
@@ -95,8 +97,10 @@
</ant>
<ant dir="java" antfile="which.xml" target="clean" >
</ant>
+<!--
<ant dir="java" antfile="resolver.xml" target="clean" >
</ant>
+-->
</target>
</project>

View File

@ -1,3 +1,130 @@
-------------------------------------------------------------------
Wed Nov 7 20:21:36 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- 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

View File

@ -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

File diff suppressed because it is too large Load Diff

View File

@ -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

View File

@ -0,0 +1,27 @@
#!/bin/sh
#
# xml-commons which script
# JPackage Project <http://www.jpackage.org/>
# $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 "$@"

38
xml-resolver-1.2.pom Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<parent>
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
<version>3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<name>XML Commons Resolver Component</name>
<version>1.2</version>
<description>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.</description>
<url>http://xml.apache.org/commons/components/resolver/</url>
<issueManagement>
<system>bugzilla</system>
<url>http://issues.apache.org/bugzilla/</url>
</issueManagement>
<mailingLists>
<mailingList>
<name>XML Commons Developer's List</name>
<subscribe>commons-dev-subscribe@xml.apache.org</subscribe>
<unsubscribe>commons-dev-unsubscribe@xml.apache.org</unsubscribe>
<post>commons-dev@xml.apache.org</post>
<archive>http://mail-archives.apache.org/mod_mbox/xml-commons-dev/</archive>
</mailingList>
</mailingLists>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/xml/commons/tags/xml-commons-resolver-1_2/</connection>
<url>http://svn.apache.org/viewvc/xml/commons/tags/xml-commons-resolver-1_2/</url>
</scm>
<distributionManagement>
<status>deployed</status>
</distributionManagement>
</project>