From c063c991bb7da5d62044da1b06de4cc69dca4083 Mon Sep 17 00:00:00 2001
From: curcuru <curcuru@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 25 Sep 2003 18:16:51 +0000
Subject: [PATCH] - Update classpath entries; JAXP-parsers is already included
 by Ant - Update hardcoded entries to use params so it's easier to rebuild on
 other systems - Copy /etc files into distro so downloaders can rebuild -
 Update version number for possible 1.1 release

git-svn-id: https://svn.apache.org/repos/asf/xml/commons/trunk@226130 13f79535-47bb-0310-9956-ffa450edef68
---
 java/resolver.xml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/java/resolver.xml b/java/resolver.xml
index c1a1f52..8325845 100644
--- a/java/resolver.xml
+++ b/java/resolver.xml
@@ -8,7 +8,7 @@ Build file for org.apache.xml.resolver. No dependencies.
   <!-- Name and version information -->
   <property name="name.resolver" value="xml-commons-resolver"/>
   <property name="impl.name" value="XmlResolver"/>
-  <property name="impl.version" value="1.0"/>
+  <property name="impl.version" value="1.1"/>
 
   <!-- Allow properties following these statements to be overridden -->
   <!-- Note that all of these don't have to exist.  They've just been defined
@@ -41,9 +41,8 @@ Build file for org.apache.xml.resolver. No dependencies.
   <property name="resolver.jar.name" value="resolver.jar" />
   <property name="resolver.jar" value="${resolver.jar.location}/${resolver.jar.name}" />
 
-  <property name="jaxp.jar" value="/usr/local/jaxp-1.1/jaxp.jar"/>
-  <property name="xmlParserAPIs.jar" value="/projects/apache/xml-xerces/java/build/xmlParserAPIs.jar"/>
-  <property name="xerces2.jar" value="/projects/apache/xml-xerces/java/build/xercesImpl.jar"/>
+  <!-- NOTE: Removed jaxp.jar/xmlParserAPIs.jar/xerces2.jar since Ant 
+       already natively has those in it's classpath already. Sep-03 -sc -->
 
   <!-- Test results directory -->
   <property name="check.dir" value="${tmp.dir}/${project.name}/check"/>
@@ -76,14 +75,7 @@ Build file for org.apache.xml.resolver. No dependencies.
    <echo message="Compiling..." />
 
    <javac srcdir="${src.dir}" destdir="${build.classes.dir}">
-     <classpath>
-       <pathelement location="${jaxp.jar}"/>
-       <pathelement location="${xmlParserAPIs.jar}"/>
-       <pathelement location="${xerces2.jar}"/>
-       <pathelement location="${resolver.jar}"/>
-       <pathelement path="${java.class.path}"/>
-     </classpath>
-
+     <!-- <classpath> not needed since Ant already supplies these Sep-03 -sc -->
      <include name="${resolver.subdir}/*.java"/>
      <include name="${resolver.subdir}/helpers/*.java"/>
      <include name="${resolver.subdir}/readers/*.java"/>
@@ -156,12 +148,14 @@ Build file for org.apache.xml.resolver. No dependencies.
 <!-- Note: The docs are built in two ways until we stabilise the doc generation.
 Both ways have system-specific pathnames, so both may bust on your system.
 -->
+    <property name="xalan.jar" value="../../xml-xalan/java/build/classes"/>
+    <property name="docbook.dir" value="../../docbook"/>
+
     <java fork="true" classname="org.apache.xalan.xslt.Process">
       <classpath>
-	<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xml-apis.jar"/>
-	<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xercesImpl.jar"/>
-	<pathelement location="../../xml-xalan/java/build/classes"/>
+	<pathelement location="${xalan.jar}"/>
 	<pathelement location="${build.dir}/resolver.jar"/>
+    <pathelement path="${java.class.path}"/>
       </classpath>
 <!-- why doesn't this work???
       <arg value="-URIRESOLVER"/>
@@ -174,14 +168,13 @@ Both ways have system-specific pathnames, so both may bust on your system.
       <arg value="-OUT"/>
       <arg value="${build.dir}/docs/resolver.html"/>
       <arg value="-XSL"/>
-      <arg value="/sourceforge/docbook/xsl/html/docbook.xsl"/>
+      <arg value="${docbook.dir}/html/docbook.xsl"/>
     </java>
     <java fork="true" classname="org.apache.xalan.xslt.Process">
       <classpath>
-	<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xml-apis.jar"/>
-	<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xercesImpl.jar"/>
-	<pathelement location="../../xml-xalan/java/build/classes"/>
+	<pathelement location="${xalan.jar}"/>
 	<pathelement location="${build.dir}/resolver.jar"/>
+    <pathelement path="${java.class.path}"/>
       </classpath>
       <arg value="-URIRESOLVER"/>
       <arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
@@ -192,7 +185,7 @@ Both ways have system-specific pathnames, so both may bust on your system.
       <arg value="-OUT"/>
       <arg value="${build.dir}/docs/release-notes.html"/>
       <arg value="-XSL"/>
-      <arg value="/sourceforge/docbook/xsl/html/docbook.xsl"/>
+      <arg value="${docbook.dir}/html/docbook.xsl"/>
     </java>
 
     <!-- Copy the docs that Forrest built.
@@ -209,12 +202,17 @@ Both ways have system-specific pathnames, so both may bust on your system.
           description="Generates all the artifacts used for a distribution.">
     <mkdir dir="${build.dir}/${dist.basename}"/>
     <mkdir dir="${build.dir}/${dist.basename}/src"/>
+    <mkdir dir="${build.dir}/${dist.basename}/etc"/>
         
     <!-- Copy all sources and original source manifest -->
     <copy todir="${build.dir}/${dist.basename}/src">
       <fileset dir="${src.dir}" includes="${resolver.subdir}/"/>
       <fileset dir="${src.dir}" includes="manifest.resolver"/>
     </copy>  
+    <!-- Must include etc dir so distro downloaders can rebuild from source -->
+    <copy todir="${build.dir}/${dist.basename}/etc">
+      <fileset dir="${etc.dir}" includes="${resolver.subdir}/"/>
+    </copy>  
 
     <!-- Copy docs/javadocs -->
     <copy todir="${build.dir}/${dist.basename}/docs">
@@ -232,6 +230,8 @@ Both ways have system-specific pathnames, so both may bust on your system.
     </copy>
     <copy todir="${build.dir}/${dist.basename}" file="${resolver.jar}"/>
 
+    <!-- Note: we really should create separate bin and src distros, to 
+         follow everyone else's standards, but I don't have time now Sep-03 -sc -->
     <tar tarfile="${build.dir}/${dist.basename}.tar" >
       <tarfileset dir="${build.dir}">
         <include name="${dist.basename}/"/>