diff --git a/xml-apis-1.3.04.pom b/xml-apis-1.3.04.pom
deleted file mode 100644
index c01161e..0000000
--- a/xml-apis-1.3.04.pom
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- 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
deleted file mode 100644
index 9cb7ce3..0000000
--- a/xml-apis-1.4.01.pom
+++ /dev/null
@@ -1,60 +0,0 @@
-
- 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
deleted file mode 100644
index 2d57514..0000000
--- a/xml-apis-ext-1.3.04.pom
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
- 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-apis-bootstrap.changes b/xml-commons-apis-bootstrap.changes
index 85bfd34..073d862 100644
--- a/xml-commons-apis-bootstrap.changes
+++ b/xml-commons-apis-bootstrap.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec 7 07:33:59 UTC 2018 - Fridrich Strba
+
+- Provide xml-resolver by package xml-commons-resolver-bootstrap
+- Provide compatibility symlinks xml-apis.jar and xml-resolver.jar
+- Removed patches:
+ * xml-commons-encoding.patch
+ * xml-commons-no-javadoc.patch
+ + not needed any more
+
-------------------------------------------------------------------
Wed Oct 4 19:43:23 UTC 2017 - fstrba@suse.com
diff --git a/xml-commons-apis-bootstrap.spec b/xml-commons-apis-bootstrap.spec
index cc6158a..9eac128 100644
--- a/xml-commons-apis-bootstrap.spec
+++ b/xml-commons-apis-bootstrap.spec
@@ -39,7 +39,7 @@ Patch3: %{real_name}-enum.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.6
# Needed for maven conversions
-BuildRequires: javapackages-local
+BuildRequires: javapackages-tools
#!BuildIgnore: antlr
#!BuildIgnore: antlr-java
Provides: xml-apis
@@ -62,6 +62,7 @@ INSTALL ... THIS IS JUST FOR PACKAGING & BOOTSTRAPPING JAVA PURPOSES!!
Summary: Resolver subproject of xml-commons
Group: Development/Libraries/Java
URL: http://xml.apache.org/commons/
+Provides: xml-resolver
%description -n xml-commons-resolver-bootstrap
This is xml-resolver from the java-bootrapping-tools package. DO NOT
@@ -183,15 +184,18 @@ popd
%install
#>>> % install
-mkdir -p %{buildroot}/%{_javadir}
-cp %{apis_jar}.jar %{buildroot}/%{_javadir}
-cp %{which_jar}.jar %{buildroot}/%{_javadir}
-cp %{resolver_jar}.jar %{buildroot}/%{_javadir}
+mkdir -p %{buildroot}%{_javadir}
+cp %{apis_jar}.jar %{buildroot}%{_javadir}
+ln -sf %{apis_jar}.jar %{buildroot}%{_javadir}/xml-apis.jar
+cp %{which_jar}.jar %{buildroot}%{_javadir}
+cp %{resolver_jar}.jar %{buildroot}%{_javadir}
+ln -sf %{resolver_jar}.jar %{buildroot}%{_javadir}/xml-resolver.jar
#<<< install end
%files
%license xml-commons-1_0_b2/LICENSE.txt
%{_javadir}/%{apis_jar}.jar
+%{_javadir}/xml-apis.jar
%files -n xml-commons-which-bootstrap
%license xml-commons-1_0_b2/LICENSE.txt
@@ -200,6 +204,7 @@ cp %{resolver_jar}.jar %{buildroot}/%{_javadir}
%files -n xml-commons-resolver-bootstrap
%license xml-commons-1_0_b2/LICENSE.txt
%{_javadir}/%{resolver_jar}.jar
+%{_javadir}/xml-resolver.jar
#<<<
%changelog
diff --git a/xml-commons-component-info.xml b/xml-commons-component-info.xml
deleted file mode 100644
index 3b32082..0000000
--- a/xml-commons-component-info.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xml-commons-encoding.patch b/xml-commons-encoding.patch
deleted file mode 100644
index f116233..0000000
--- a/xml-commons-encoding.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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" />
-
-
-
--
-+
-+
-+
-
-
-
-
--
-+
-
--
-+
-
-
-
-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.">
-
-
--
--
-
-
-
-
-########################################################################
-# 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-resolver10-resolver.1 b/xml-commons-resolver10-resolver.1
deleted file mode 100644
index 7b07e96..0000000
--- a/xml-commons-resolver10-resolver.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.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
deleted file mode 100644
index cce8eed..0000000
--- a/xml-commons-resolver10-resolver.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index 0980fd8..0000000
--- a/xml-commons-resolver10-xparse.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 8b6ae70..0000000
--- a/xml-commons-resolver10-xparse.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index f624ad2..0000000
--- a/xml-commons-resolver10-xread.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 9f85eb4..0000000
--- a/xml-commons-resolver10-xread.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index 7b07e96..0000000
--- a/xml-commons-resolver11-resolver.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.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
deleted file mode 100644
index 4bb1fd7..0000000
--- a/xml-commons-resolver11-resolver.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index 0980fd8..0000000
--- a/xml-commons-resolver11-xparse.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index a94d792..0000000
--- a/xml-commons-resolver11-xparse.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index f624ad2..0000000
--- a/xml-commons-resolver11-xread.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 06b6716..0000000
--- a/xml-commons-resolver11-xread.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index 7b07e96..0000000
--- a/xml-commons-resolver12-resolver.1
+++ /dev/null
@@ -1,48 +0,0 @@
-.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
deleted file mode 100644
index a3fcf21..0000000
--- a/xml-commons-resolver12-resolver.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index 0980fd8..0000000
--- a/xml-commons-resolver12-xparse.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 896c435..0000000
--- a/xml-commons-resolver12-xparse.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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
deleted file mode 100644
index f624ad2..0000000
--- a/xml-commons-resolver12-xread.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.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
deleted file mode 100644
index 6504d79..0000000
--- a/xml-commons-resolver12-xread.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/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.which10.script b/xml-commons.which10.script
deleted file mode 100644
index c5d7f3d..0000000
--- a/xml-commons.which10.script
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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-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
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
diff --git a/xml-commons.which11.script b/xml-commons.which11.script
deleted file mode 100644
index a44612e..0000000
--- a/xml-commons.which11.script
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/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
deleted file mode 100644
index 16c7f23..0000000
--- a/xml-resolver-1.2.pom
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
- 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