From b5294ccd64f8adff3b9472dbb500210b5bb1a0ad Mon Sep 17 00:00:00 2001
From: crossley <crossley@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 3 Sep 2003 02:23:13 +0000
Subject: [PATCH] Copyright "Apache Software Foundation" rather than just
 "Apache". Copyright date 2003. Rename "javadocs" to "apidocs". Copy the docs
 that forrest built, into the distribution.

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

diff --git a/java/resolver.xml b/java/resolver.xml
index 082c894..75603fa 100644
--- a/java/resolver.xml
+++ b/java/resolver.xml
@@ -27,7 +27,8 @@ Build file for org.apache.xml.resolver. No dependencies.
   <property name="build.etc.dir" value="${build.classes.dir}/org/apache/xml/resolver/etc"/>
   <property name="docs.dir" value="${build.dir}"/>
   <property name="docs.user.dir" value="${docs.dir}/docs"/>
-  <property name="docs.java.dir" value="${docs.user.dir}/javadocs"/>
+  <property name="docs.java.dir" value="${docs.user.dir}/apidocs"/>
+  <property name="docs.site.dir" value="../build/site"/>
   <property name="dist.basename" value="${name.resolver}-${impl.version}"/> 
 
   <!-- Source constants and directories -->
@@ -51,9 +52,9 @@ Build file for org.apache.xml.resolver. No dependencies.
   <property name="build.optimize" value="off"/>
 
   <!-- Document constants -->
-  <property name="company.name" value="Apache"/>
+  <property name="company.name" value="Apache Software Foundation"/>
 
-  <property name="copyright.date" value="2001-2002"/>
+  <property name="copyright.date" value="2001-2003"/>
   <property name="copyright.message"
             value="Copyright &#169; ${copyright.date} ${company.name}. All Rights Reserved."/>
 
@@ -63,7 +64,7 @@ Build file for org.apache.xml.resolver. No dependencies.
           description="Alias for all, check."/>
 
   <target name="all"
-          depends="jar,docs,javadocs"
+          depends="jar,docs"
           description="This is the default target.  Compiles the program and docs.">
   </target>
 
@@ -188,6 +189,13 @@ Build file for org.apache.xml.resolver. No dependencies.
       <arg value="-XSL"/>
       <arg value="/sourceforge/docbook/xsl/html/docbook.xsl"/>
     </java>
+
+    <!-- Copy the docs that forrest built -->
+    <copy todir="${build.dir}/docs">
+      <fileset dir="${docs.site.dir}/components/resolver"
+               includes="resolver-*.html"/>
+    </copy>  
+    
   </target>
 
   <target name="dist"
@@ -204,12 +212,12 @@ Build file for org.apache.xml.resolver. No dependencies.
 
     <!-- Copy docs/javadocs -->
     <copy todir="${build.dir}/${dist.basename}/docs">
-      <fileset dir="${docs.java.dir}"/>
+      <fileset dir="${docs.user.dir}"/>
     </copy>  
 
     <!-- Copy pertinent top-level files and the .jar -->
     <copy todir="${build.dir}/${dist.basename}">
-      <fileset dir=".." includes="KEYS,README.html,README.txt,LICENSE.txt"/>
+      <fileset dir=".." includes="KEYS,README.txt,LICENSE.txt"/>
       <fileset dir="." includes="resolver.xml"/>
     </copy>
     <copy todir="${build.dir}/${dist.basename}" file="${resolver.jar}"/>