You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2001/12/30 10:36:23 UTC

cvs commit: jakarta-avalon-cornerstone/apps/hsql/src/xdocs index.xml

hammant     01/12/30 01:36:23

  Modified:    apps/hsql build.xml
               apps/hsql/src/xdocs index.xml
  Log:
  xdocs now building
  
  Revision  Changes    Path
  1.11      +43 -31    jakarta-avalon-cornerstone/apps/hsql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/hsql/build.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	20 Dec 2001 15:02:05 -0000	1.10
  +++ build.xml	30 Dec 2001 09:36:23 -0000	1.11
  @@ -78,6 +78,32 @@
       <echo message="Run ant -projecthelp to get a list of targets to run"/>
     </target>
   
  +  <!-- Setup the filters -->
  +  <target name="setup-filters">
  +    <filter token="Name" value="Avalon Cornerstone - HSQL"/>
  +    <filter token="name" value="hsql"/>
  +    <filter token="version" value="${version}"/>
  +    <filter token="year" value="${year}"/>
  +    <filter token="status" value="${status}"/>
  +    <filter token="release" value="${release}"/>
  +    <filter token="short-version" value="${short.version}"/>
  +
  +    <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  +    <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  +    <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  +    <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  +    <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  +    <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  +
  +    <filter token="year" value="${year}"/>
  +    <filter token="AVALON_BASE" value="${avalon.base}"/>
  +    <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  +    <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  +    <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  +    <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  +    <filter token="TESTLET_BASE" value="${testlet.base}"/>
  +  </target>
  +
     <!-- Compiles project -->
     <target name="compile">
     
  @@ -186,33 +212,19 @@
     </target>
   
     <!-- Prepares the documentation directory -->
  -  <target name="xdocs"/>  
  -  <!-- cant get this working yet -->
  -  <target name="xdocs_alt" description="Generates the Docs">
  +  <target name="docs" depends="setup-filters, javadocs" description="Generates the Docs">
  +    <mkdir dir="${docs.dir}"/>
   
       <mkdir dir="${build.context}"/>
  +    <mkdir dir="${build.xdocs}"/>
       <mkdir dir="${build.docs}"/>
       <mkdir dir="${build.dir}/work"/>
  +    <mkdir dir="../../docs/apps/hsql"/>
   
  -    <!-- Base pointers for non-xdocs documentation. Override these 
  -         in .ant.properties to link to local docs -->
  -    <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
  -    <property name="framework.base" value="http://jakarta.apache.org/avalon/framework"/>
  -    <property name="phoenix.base" value="http://jakarta.apache.org/avalon/phoenix"/>
  -    <property name="cornerstone.base" value="http://jakarta.apache.org/avalon/cornerstone"/>
  -    <property name="logkit.base" value="http://jakarta.apache.org/avalon/logkit"/>
  -    <property name="testlet.base" value="http://jakarta.apache.org/avalon/testlet"/>
  -
  -    <filter token="year" value="${year}"/>
  -    <filter token="AVALON_BASE" value="${avalon.base}"/>
  -    <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
  -    <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
  -    <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
  -    <filter token="LOGKIT_BASE" value="${logkit.base}"/>
  -    <filter token="TESTLET_BASE" value="${testlet.base}"/>
  -
  +    <!-- Base pointers for non-xdocs documentation. Override these in .ant.properties to link to local docs -->
       <copy todir="${build.context}" filtering="on">
         <fileset dir="${context.dir}">
  +        <exclude name="diagrams/**"/>
           <exclude name="resources/**"/>
           <exclude name="xdocs"/>
         </fileset>
  @@ -229,15 +241,6 @@
         </fileset>
       </copy>
   
  -    <mkdir dir="${build.docs}"/>
  -    <delete>
  -      <fileset dir="${build.docs}">
  -        <exclude name="api/**"/>
  -      </fileset>
  -    </delete>
  -
  -    <echo>tools.dir:${tools.dir}</echo>
  -
       <java classname="org.apache.cocoon.Main" fork="true">
         <arg value="-c${build.context}/"/>
         <arg value="-d${build.docs}"/>
  @@ -245,11 +248,20 @@
         <arg value="-l${build.dir}/work/cocoon.log"/>
         <arg value="-uINFO"/>
         <arg value="-f${xdocs.dir}/cornerstone.uris"/>
  -      <classpath refid="tools.class.path"/>
  +      <classpath>
  +        <path refid="tools.class.path"/>
  +        <fileset dir="${tools.dir}/ext"/>
  +      </classpath>
       </java>
  +
  +    <copy todir="../../docs/apps/hsql">
  +      <fileset dir="${build.docs}">
  +        <include name="**"/>
  +      </fileset>
  +    </copy>    
  +    
     </target>
   
  -  <target name="docs" depends="javadocs,xdocs"/>
   
   
     <!-- Completely build all dists -->
  
  
  
  1.2       +5 -1      jakarta-avalon-cornerstone/apps/hsql/src/xdocs/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-cornerstone/apps/hsql/src/xdocs/index.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.xml	21 Nov 2001 07:19:58 -0000	1.1
  +++ index.xml	30 Dec 2001 09:36:23 -0000	1.2
  @@ -23,12 +23,16 @@
           To build this block, hsqldb.jar will have to be placed in apps/hsql/lib/ before the 
           build script is invoked.
         </p>
  +      <p>
  +        <strong>Note</strong>This server app is not available for download from Apache, 
  +        because it depends on third party jars.  This is a build it yourself server app.
  +      </p>      
       </s1>
     </body>
     <footer>
       <legal>
         Copyright (c) @year@ The Jakarta Apache Project All rights reserved.
  -      $Revision: 1.1 $ $Date: 2001/11/21 07:19:58 $
  +      $Revision: 1.2 $ $Date: 2001/12/30 09:36:23 $
       </legal>
     </footer>
   </document>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>