mpoeschl 01/11/04 09:17:18
Modified: . build.xml
xdocs user-guide.xml
Log:
fix generation of the html docs even if they are not usefull at the moment :-(
Revision Changes Path
1.23 +92 -90 jakarta-turbine-torque/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 2001/10/28 18:39:11 1.22
+++ build.xml 2001/11/04 17:17:18 1.23
@@ -24,7 +24,7 @@
<!-- ================================================================== -->
<!-- E N V I R O N M E N T -->
<!-- ================================================================== -->
-
+
<target name="env">
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
@@ -42,10 +42,10 @@
<!-- ================================================================== -->
<!-- U S A G E -->
<!-- ================================================================== -->
-
- <target
+
+ <target
name="usage">
-
+
<echo message="use -projecthelp to see the available targets"/>
</target>
@@ -56,7 +56,7 @@
<target
name="test"
depends="compile-test,dist">
-
+
<ant antfile="build-test.xml"/>
</target>
@@ -64,35 +64,35 @@
<!-- I N I T -->
<!-- ================================================================== -->
- <target
+ <target
name="init">
-
- <available
+
+ <available
classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present"
classpathref="classpath"
/>
-
- <available
+
+ <available
classname="org.apache.velocity.runtime.Runtime"
property="velocity.present"
classpathref="classpath"
/>
-
- <available
+
+ <available
classname="org.apache.xerces.parsers.SAXParser"
property="xerces.present"
classpathref="classpath"
/>
- <available
+ <available
classname="com.workingdogs.village.Column"
property="village.present"
classpathref="classpath"
/>
<available
- classname="org.apache.log4j.Category"
+ classname="org.apache.log4j.Category"
property="log4j.present"
classpathref="classpath"
/>
@@ -126,20 +126,20 @@
<!-- P R O P E R T Y C H E C K S A N D W A R N I N G S -->
<!-- ================================================================== -->
- <target
- name="check.velocity"
+ <target
+ name="check.velocity"
unless="velocity.present">
-
+
<antcall target="property-warning">
<param name="name" value="velocity.jar"/>
<param name="value" value="${velocity.jar}"/>
</antcall>
</target>
- <target
- name="check.xerces"
+ <target
+ name="check.xerces"
unless="xerces.present">
-
+
<antcall target="property-warning">
<param name="name" value="xerces.jar"/>
<param name="value" value="${xerces.jar}"/>
@@ -153,40 +153,40 @@
</antcall>
</target>
- <target
- name="check.log4j"
+ <target
+ name="check.log4j"
unless="log4j.present">
-
+
<antcall target="property-warning">
<param name="name" value="log4j.jar"/>
<param name="value" value="${log4j.jar}"/>
</antcall>
</target>
- <target
+ <target
name="check.commons-collections"
unless="commons-collections.present">
-
+
<antcall target="property-warning">
<param name="name" value="commons-collections.jar"/>
<param name="value" value="${commons-collections.jar}"/>
</antcall>
</target>
- <target
- name="check.commons-util"
+ <target
+ name="check.commons-util"
unless="commons-util.present">
-
+
<antcall target="property-warning">
<param name="name" value="commons-util.jar"/>
<param name="value" value="${commons-util.jar}"/>
</antcall>
</target>
- <target
- name="check.jdbc"
+ <target
+ name="check.jdbc"
unless="jdbc.present">
-
+
<antcall target="property-warning">
<param name="name" value="jdbc.jar"/>
<param name="value" value="${jdbc.jar}"/>
@@ -205,7 +205,7 @@
| |
| You can set this property in the provided build.properties |
| file, or you may set this property in your |
- | ${user.home}/build.properties file.
+ | ${user.home}/build.properties file.
+----------------------------------------------------------------+
</echo>
<fail message="Failed Requirement"/>
@@ -214,12 +214,12 @@
<!-- ================================================================== -->
<!-- P R E P A R E -->
<!-- ================================================================== -->
-
- <target
- name="prepare"
+
+ <target
+ name="prepare"
depends="init,check.velocity,check.xerces,check.village,check.log4j,
check.commons-collections,check.commons-util,check.jdbc,env">
-
+
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dest}"/>
@@ -228,12 +228,12 @@
<!-- ================================================================== -->
<!-- C O M P I L E -->
<!-- ================================================================== -->
-
- <target
- name="compile"
+
+ <target
+ name="compile"
depends="prepare"
description="==> compiles the source code">
-
+
<javac srcdir="${src.dir}/java"
destdir="${build.dest}"
debug="${debug}"
@@ -241,7 +241,7 @@
optimize="${optimize}">
<classpath refid="classpath"/>
</javac>
-
+
<!-- copy database.dtd to the right place -->
<copy file="${src.dir}/dtd/database.dtd"
todir="${build.dest}/org/apache/torque/engine/database/transform"/>
@@ -251,12 +251,12 @@
<!-- C O M P I L E T E S T S -->
<!-- ================================================================== -->
- <target
- name="compile-test"
- depends="compile"
+ <target
+ name="compile-test"
+ depends="compile"
if="junit.present"
description="==> compiles the test source code">
-
+
<javac srcdir="${test.dir}"
destdir="${build.dest}"
excludes="**/package.html"
@@ -273,13 +273,13 @@
<!-- ================================================================== -->
<!-- T E S T -->
<!-- ================================================================== -->
- <target
- name="run-test"
- depends="prepare,compile-test"
+ <target
+ name="run-test"
+ depends="prepare,compile-test"
if="junit.present"
description="==> runs the test source code">
- <taskdef
+ <taskdef
name="junit"
classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTask">
<classpath refid="classpath"/>
@@ -303,7 +303,7 @@
</batchtest>
</junit>
- <!-- Not currently working due to the way that Ant mucks with
+ <!-- Not currently working due to the way that Ant mucks with
a subprocess's threads. (JSS)
<java classname="org.apache.torque.pool.PoolTest">
<classpath refid="classpath"/>
@@ -319,19 +319,19 @@
<!-- ================================================================== -->
<!-- J A R -->
<!-- ================================================================== -->
-
- <target
- name="jar"
- depends="compile"
+
+ <target
+ name="jar"
+ depends="compile"
description="==> generates the torque.jar">
-
+
<jar jarfile="${build.dir}/${final.name}.jar">
<fileset dir="${build.dest}">
<exclude name="**/package.html"/>
</fileset>
<fileset dir="${src.dir}/templates"/>
</jar>
-
+
<!--
basedir="${build.dest}"
excludes="**/package.html"/> -->
@@ -340,12 +340,12 @@
<!-- ================================================================== -->
<!-- J A V A D O C S -->
<!-- ================================================================== -->
-
- <target
+
+ <target
name="javadocs"
depends="prepare"
description="==> generates the API documentation">
-
+
<mkdir dir="${docs.dest}/api"/>
<javadoc
@@ -367,30 +367,32 @@
<!-- ================================================================== -->
<!-- C L E A N -->
<!-- ================================================================== -->
-
- <target
- name="clean"
+
+ <target
+ name="clean"
description="==> cleans up the build directory">
-
+
<delete dir="${build.dir}"/>
</target>
<!-- ================================================================== -->
<!-- A N A K I A D O C U M E N T A T I O N -->
<!-- ================================================================== -->
-
- <target
+
+ <target
name="check_for_jdom">
-
- <available
+
+ <available
property="jdom.present"
classname="org.jdom.JDOMException">
<classpath>
- <pathelement location="${jakarta.site2}/lib/${jdom.jar}"/>
+ <fileset dir="${jakarta.site2}/lib">
+ <include name="*.jar"/>
+ </fileset>
</classpath>
</available>
</target>
-
+
<target depends="check_for_jdom" name="docs-prepare-error"
unless="jdom.present">
<echo>
@@ -401,7 +403,7 @@
</echo>
</target>
- <target
+ <target
name="docs"
depends="docs-prepare-error"
description="==> generates the HTML documentation"
@@ -416,8 +418,8 @@
</classpath>
</taskdef>
- <anakia
- basedir="${docs.src}"
+ <anakia
+ basedir="${docs.src}"
destdir="${docs.dest}/"
extension=".html" style="./site.vsl"
projectFile="stylesheets/project.xml"
@@ -434,7 +436,7 @@
<include name="**/*.jpg"/>
</fileset>
</copy>
-
+
<!-- In case we have CSS someday
<copy todir="${docs.dest}" filtering="no">
<fileset dir="${docs.src}">
@@ -447,11 +449,11 @@
<!-- ================================================================== -->
<!-- D I S T - L I T E -->
<!-- ================================================================== -->
- <target
- name="dist-lite"
+ <target
+ name="dist-lite"
depends="jar,check.village"
- description="==> Creates torque.zip distribution without jars">
-
+ description="==> Creates torque.zip distribution without jars">
+
<property name="torque.dir" value="${build.dir}/torque/torque"/>
<mkdir dir="${torque.dir}"/>
<mkdir dir="${torque.dir}/lib"/>
@@ -463,7 +465,7 @@
<include name="${final.name}.jar"/>
</fileset>
</copy>
-
+
<copy todir="${torque.dir}/templates" filtering="yes">
<fileset dir="./src/templates"/>
</copy>
@@ -475,22 +477,22 @@
<copy todir="${torque.dir}/schema" filtering="yes">
<fileset dir="./examples"/>
</copy>
-
+
<zip zipfile="${build.dir}/${final.name}.zip"
basedir="${build.dir}/torque"
/>
-
+
</target>
<!-- ================================================================== -->
<!-- D I S T -->
<!-- ================================================================== -->
- <target
- name="dist"
- depends="jar,check.village"
+ <target
+ name="dist"
+ depends="jar,check.village"
description="==> Creates torque.zip distribution">
-
+
<property name="torque.dir" value="${build.dir}/torque/torque"/>
<mkdir dir="${torque.dir}"/>
<mkdir dir="${torque.dir}/lib"/>
@@ -510,7 +512,7 @@
<include name="${final.name}.jar"/>
</fileset>
</copy>
-
+
<copy todir="${torque.dir}/templates" filtering="yes">
<fileset dir="./src/templates"/>
</copy>
@@ -522,7 +524,7 @@
<copy todir="${torque.dir}/schema" filtering="yes">
<fileset dir="./examples"/>
</copy>
-
+
<zip zipfile="${build.dir}/${final.name}.zip"
basedir="${build.dir}/torque"
/>
@@ -532,11 +534,11 @@
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
- <target
- name="install-jar"
- depends="jar"
+ <target
+ name="install-jar"
+ depends="jar"
description="==> Installs .jar file in ${lib.repo}">
-
+
<copy todir="${lib.repo}" filtering="no">
<fileset dir="${build.dir}">
<include name="${final.name}.jar"/>
1.2 +2 -0 jakarta-turbine-torque/xdocs/user-guide.xml
Index: user-guide.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/user-guide.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- user-guide.xml 2001/10/31 17:40:18 1.1
+++ user-guide.xml 2001/11/04 17:17:18 1.2
@@ -14,5 +14,7 @@
<p>
</p>
+</section>
+
</body>
</document>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
