Copy the javadocs for the components so that the website docs and the

distribution docs can consistently link to them.


git-svn-id: https://svn.apache.org/repos/asf/xml/commons/trunk@226083 13f79535-47bb-0310-9956-ffa450edef68

java/resolver.xml

@@ -27,7 +27,7 @@ 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}/apidocs"/>
+  <property name="docs.java.dir" value="${docs.dir}/apidocs/resolver"/>
   <property name="docs.site.dir" value="../build/site"/>
   <property name="dist.basename" value="${name.resolver}-${impl.version}"/> 
 
@@ -151,6 +151,9 @@ Build file for org.apache.xml.resolver. No dependencies.
 
   <target name="htmldocs" depends="jar">
     <echo message="Building docs for ${name.resolver} ..." />
+<!-- 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.
+-->
     <java fork="true" classname="org.apache.xalan.xslt.Process">
       <classpath>
 	<pathelement location="/usr/local/java/jakarta-ant-1.5.1/lib/xml-apis.jar"/>
@@ -190,11 +193,12 @@ Build file for org.apache.xml.resolver. No dependencies.
       <arg value="/sourceforge/docbook/xsl/html/docbook.xsl"/>
     </java>
 
-    <!-- Copy the docs that forrest built -->
+    <!-- Copy the docs that Forrest built.
+     The top-level build has already executed the forrest site target. -->
     <copy todir="${build.dir}/docs">
       <fileset dir="${docs.site.dir}/components/resolver"
                includes="resolver-*.html"/>
-    </copy>  
+    </copy>
     
   </target>
 
@@ -213,7 +217,10 @@ Build file for org.apache.xml.resolver. No dependencies.
     <!-- Copy docs/javadocs -->
     <copy todir="${build.dir}/${dist.basename}/docs">
       <fileset dir="${docs.user.dir}"/>
-    </copy>  
+    </copy>
+    <copy todir="${build.dir}/${dist.basename}/apidocs/resolver">
+      <fileset dir="${docs.java.dir}"/>
+    </copy>
 
     <!-- Copy pertinent top-level files and the .jar -->
     <copy todir="${build.dir}/${dist.basename}">

java/which.xml

@@ -27,7 +27,7 @@ Build file for org.apache.env.Which service. No dependencies.
   <property name="build.classes.dir" value="${build.dir}/classes"/>
   <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.dir}/apidocs/which"/>
   <property name="docs.printer.dir" value="${docs.user.dir}/printer"/>
   
   <!-- Source constants and directories -->