From 332f7d30f68680c79afb21b7f3e0cd2a03a0148f Mon Sep 17 00:00:00 2001
From: crossley <crossley@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 5 Sep 2003 00:06:00 +0000
Subject: [PATCH] Consistently link to licenses from both the website docs and
 the distribution docs.

git-svn-id: https://svn.apache.org/repos/asf/xml/commons/trunk@226089 13f79535-47bb-0310-9956-ffa450edef68
---
 build.xml                                          | 14 +++++++++++++-
 java/resolver.xml                                  |  3 ++-
 .../xdocs/components/resolver/resolver-article.xml |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index b8d903c..32c3189 100644
--- a/build.xml
+++ b/build.xml
@@ -38,11 +38,13 @@ just creates a distribution out of all of them.
   <!-- Overall distribution unit -->
   <property name="dist.basename" value="xml-commons-${version}"/> 
   <property name="dist.dir" value="${tmp.dir}/build"/>
+
   <property name="site.dir" value="${dist.dir}/site"/>
+  <property name="build.docs.content.dir" value="${dist.dir}/tmp/context/content"/>
 
   <!-- Public Targets -->
   <target name="all"
-          depends="site,jars,javadocs,dist"
+          depends="docs,jars,javadocs,dist"
           description="Default all target; calls every sub-build file directly.">
   </target>
 
@@ -103,6 +105,16 @@ just creates a distribution out of all of them.
     </ant>
   </target>
 
+  <target name="docs">
+    <!-- prepare some other docs -->
+    <copy todir="${build.docs.content.dir}/components">
+      <fileset dir="java/src/org/apache/xml/resolver" includes="LICENSE.resolver.txt"/>
+    </copy>  
+
+    <!-- call forrest to generate the docs -->
+    <ant target="site"/>
+  </target>
+
   <target name="javadocs">
     <!-- copy the various javadocs into the website docs -->
     <copy todir="${site.dir}/components/apidocs">
diff --git a/java/resolver.xml b/java/resolver.xml
index 120cad5..c1a1f52 100644
--- a/java/resolver.xml
+++ b/java/resolver.xml
@@ -226,8 +226,9 @@ Both ways have system-specific pathnames, so both may bust on your system.
 
     <!-- Copy pertinent top-level files and the .jar -->
     <copy todir="${build.dir}/${dist.basename}">
-      <fileset dir=".." includes="KEYS,README.txt,LICENSE.txt"/>
+      <fileset dir=".." includes="KEYS"/>
       <fileset dir="." includes="resolver.xml"/>
+      <fileset dir="src/org/apache/xml/resolver" includes="LICENSE.resolver.txt"/>
     </copy>
     <copy todir="${build.dir}/${dist.basename}" file="${resolver.jar}"/>
 
diff --git a/src/documentation/content/xdocs/components/resolver/resolver-article.xml b/src/documentation/content/xdocs/components/resolver/resolver-article.xml
index 983191a..e76ff30 100644
--- a/src/documentation/content/xdocs/components/resolver/resolver-article.xml
+++ b/src/documentation/content/xdocs/components/resolver/resolver-article.xml
@@ -172,7 +172,7 @@ API Documentation</ulink>.
 
 <para>The most important change in this release is the availability of
 both source and binary forms under a <ulink
-url="copyright.html">generous license agreement</ulink>.</para>
+url="../LICENSE.resolver.txt">generous license agreement</ulink>.</para>
 
 <para>Other than that, there have been a number of minor bug fixes and the introduction
 of system properties in addition to the <filename>CatalogManager.properties</filename>