mpoeschl 02/01/18 05:28:31
Modified: . build.xml
xdocs changes.xml
Added: xdocs index.xml
xdocs/stylesheets project.xml
xdocs/images logo.gif
Log:
add docs task to build.xml
add basic xdocs
fix changes.xml
Revision Changes Path
1.18 +120 -49 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 17 Jan 2002 16:43:22 -0000 1.17
+++ build.xml 18 Jan 2002 13:28:31 -0000 1.18
@@ -47,33 +47,33 @@
<target
name="update-jars">
-
- <taskdef
- name="httpget"
+
+ <taskdef
+ name="httpget"
className="org.apache.tdk.task.Get">
<classpath refid="classpath"/>
</taskdef>
-
+
<!-- If you need proxy support you'll have to manually add:
-
+
proxyHost="x"
proxyPort="y"
-
+
We'll clean this up but it worked for a user behind a proxy.
-->
-
+
<httpget
baseUrl="http://jakarta.apache.org/turbine/jars/";
dest="${lib.repo}"
dependencyFile="deps.list"
/>
- </target>
+ </target>
<!-- ================================================================== -->
<!-- Prints useful build environment values -->
<!-- ================================================================== -->
-
+
<target name="env" depends="check_available">
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
@@ -97,7 +97,7 @@
<!-- ================================================================== -->
<!-- Help on usage -->
<!-- ================================================================== -->
-
+
<target name="usage">
<echo message="use -projecthelp to see the available targets"/>
</target>
@@ -105,9 +105,9 @@
<!-- ================================================================== -->
<!-- Check to see what optional dependencies are available -->
<!-- ================================================================== -->
-
+
<target name="check_available">
-
+
<available
classname="org.apache.commons.beanutils.PropertyUtils"
property="commons-beanutils.present"
@@ -120,62 +120,62 @@
classpathref="classpath"
/>
- <available
+ <available
classname="org.apache.velocity.runtime.Runtime"
property="velocity.present"
classpathref="classpath"
/>
<available
- classname="org.apache.log4j.Category"
+ classname="org.apache.log4j.Category"
property="log4j.present"
classpathref="classpath"
/>
<available
- classname="javax.servlet.http.HttpServletRequest"
+ classname="javax.servlet.http.HttpServletRequest"
property="servlet.present"
classpathref="classpath"
/>
<available
- classname="org.apache.fulcrum.BaseService"
+ classname="org.apache.fulcrum.BaseService"
property="fulcrum.present"
classpathref="classpath"
/>
<available
- classname="org.apache.regexp.RE"
+ classname="org.apache.regexp.RE"
property="regexp.present"
classpathref="classpath"
/>
<available
- classname="org.apache.torque.Torque"
+ classname="org.apache.torque.Torque"
property="torque.present"
classpathref="classpath"
/>
<available
- classname="javax.activation.DataSource"
+ classname="javax.activation.DataSource"
property="jaf.present"
classpathref="classpath"
/>
- <available
+ <available
classname="org.apache.xerces.parsers.SAXParser"
property="xerces.present"
classpathref="classpath"
/>
<available
- classname="org.apache.commons.collections.FastHashMap"
+ classname="org.apache.commons.collections.FastHashMap"
property="commons-collections.present"
classpathref="classpath"
/>
<available
- classname="org.apache.commons.util.exception.NestableException"
+ classname="org.apache.commons.util.exception.NestableException"
property="commons-util.present"
classpathref="classpath"
/>
@@ -187,13 +187,13 @@
/>
<!-- Not required for building -->
- <available
+ <available
property="jsdk2.2.present"
classname="javax.servlet.jsp.PageContext">
<classpath refid="classpath"/>
</available>
- <available
+ <available
classname="org.apache.velocity.anakia.AnakiaTask"
property="AnakiaTask.present"
classpathref="classpath"
@@ -306,7 +306,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"/>
@@ -315,9 +315,9 @@
<!-- ================================================================== -->
<!-- Prepares the build directory -->
<!-- ================================================================== -->
-
+
<target name="prepare"
- depends="env,
+ depends="env,
check.commons-beanutils,check.commons-collections,
check.commons-util,check.dom4j,check.jaf,check.log4j,
check.fulcrum,check.regexp,check.servlet,check.stratum,
@@ -347,7 +347,7 @@
<!-- ================================================================== -->
<!-- Adds Jsp related files to the build directory -->
<!-- ================================================================== -->
-
+
<target name="prepare-jsp" depends="prepare" if="jsdk2.2.present">
<copy todir="${build.src}/org" filtering="yes">
<fileset dir="${src.java.dir}/org">
@@ -360,12 +360,12 @@
<!-- ================================================================== -->
<!-- Compiles the source directory -->
<!-- ================================================================== -->
-
+
<target name="compile"
depends="prepare, prepare-jsp"
description="--> compiles the source code">
- <javac
+ <javac
srcdir="${build.src}"
destdir="${build.dest}"
excludes="**/package.html"
@@ -388,23 +388,23 @@
<!-- ================================================================== -->
<!-- Compiles the source directory and creates a .jar file -->
<!-- ================================================================== -->
-
+
<target name="jar"
depends="compile"
description="--> generates the turbine.jar file (default)">
-
- <jar
+
+ <jar
jarfile="${build.dir}/${final.name}.jar"
basedir="${build.dest}"
excludes="**/package.html"/>
-
+
</target>
<!-- ================================================================== -->
<!-- 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}">
@@ -416,28 +416,99 @@
<!-- ================================================================== -->
<!-- jars the source directory -->
<!-- ================================================================== -->
-
+
<target name="jarsrc"
depends="prepare"
description="--> generates the turbine.src.jar file containing source
only">
-
- <jar
+
+ <jar
jarfile="${build.dir}/${final.name}.src.jar"
basedir="${build.src}"
excludes="**/package.html"/>
-
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- A N A K I A D O C U M E N T A T I O N -->
+ <!-- ================================================================== -->
+
+ <target
+ name="check_for_jdom">
+
+ <available
+ property="jdom.present"
+ classname="org.jdom.JDOMException">
+ <classpath>
+ <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>
+ The Jakarta-Site2 module is not present! Please check
+ to make sure that you have checked it out from CVS.
+
+ <http://jakarta.apache.org/site/jakarta-site2.html>
+ </echo>
+ </target>
+
+ <target
+ name="docs"
+ depends="docs-prepare-error"
+ description="==> generates the HTML documentation"
+ if="jdom.present">
+
+ <taskdef name="anakia"
+ classname="org.apache.velocity.anakia.AnakiaTask">
+ <classpath>
+ <fileset dir="${jakarta.site2}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ </taskdef>
+
+ <anakia
+ basedir="${docs.src}"
+ destdir="${docs.dest}/"
+ extension=".html" style="./site.vsl"
+ projectFile="stylesheets/project.xml"
+ excludes="**/stylesheets/** empty.xml"
+ includes="**/*.xml"
+ lastModifiedCheck="true"
+ templatePath="${jakarta.site2}/xdocs/stylesheets">
+ </anakia>
+
+ <copy todir="${docs.dest}/images" filtering="no">
+ <fileset dir="${docs.src}/images">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpeg"/>
+ <include name="**/*.jpg"/>
+ </fileset>
+ </copy>
+
+ <!-- In case we have CSS someday
+ <copy todir="${docs.dest}" filtering="no">
+ <fileset dir="${docs.src}">
+ <include name="**/*.css"/>
+ </fileset>
+ </copy>
+ -->
</target>
<!-- ================================================================== -->
<!-- Creates the API documentation -->
<!-- ================================================================== -->
-
+
<target name="javadocs"
depends="prepare"
description="--> generates the API documentation">
-
+
<mkdir dir="${javadoc.destdir}"/>
-
+
<javadoc
sourcepath="${build.src}"
packagenames="${package}.*,org.apache.fulcrum.*,org.apache.torque.*"
@@ -451,13 +522,13 @@
bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights
Reserved.">
<classpath refid="classpath"/>
</javadoc>
-
+
</target>
<!-- ================================================================== -->
<!-- Cleans up the build directory -->
<!-- ================================================================== -->
-
+
<target name="clean" description="--> cleans up the build directory">
<delete dir="${build.dir}"/>
</target>
@@ -465,25 +536,25 @@
<!-- ================================================================== -->
<!-- T E S T S -->
<!-- ================================================================== -->
-
+
<target name="test" depends="compile"
description="--> runs turbine unit tests">
<ant antfile="build-test.xml">
<property file="build.properties"/>
</ant>
-
+
</target>
<!-- ================================================================== -->
<!-- Create the Turbine SQL for all the supported DBs. -->
<!-- ================================================================== -->
-
+
<target name="turbine-sql"
depends="compile"
description="--> generates the Turbine SQL for all the supported DBs">
-
+
<ant antfile="build-turbine-sql.xml" dir="${basedir}"/>
-
+
</target>
</project>
1.5 +2 -2 jakarta-turbine-3/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/xdocs/changes.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- changes.xml 17 Jan 2002 16:51:33 -0000 1.4
+++ changes.xml 18 Jan 2002 13:28:31 -0000 1.5
@@ -37,9 +37,9 @@
to take advantage of that functionality during
initialization.
<p/>
- <a
href="http://cvs.apache.org/viewcvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ValveDefinition.java.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=u";>Reference</a>
+ <a
href="http://cvs.apache.org/viewcvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ValveDefinition.java.diff?r1=1.2&r2=1.3&sortby=date&diff_format=h";>Reference</a>
<br/>
- <a
href="http://cvs.apache.org/viewcvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=u";>Reference</a>
+ <a
href="http://cvs.apache.org/viewcvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TurbinePipeline.java.diff?r1=1.3&r2=1.4&sortby=date&diff_format=h";>Reference</a>
</li>
</ul>
1.1 jakarta-turbine-3/xdocs/index.xml
Index: index.xml
===================================================================
<?xml version="1.0"?>
<document>
<properties>
<author email="[EMAIL PROTECTED]">Martin Poeschl</author>
<title>Jakarta Turbine</title>
</properties>
<body>
<section name="Jakarta Turbine 3.0">
<p>
Turbine 3.0 is the next major release. Internally it will be very
different than Turbine 2.x, including a Catalina-style Pipeline
(through which fine-grained control of processing flow is
faciliated), and many other ehancements and
simplifications. Turbine 3.0 will not be a drop in replacement,
but the TDK is evolving to include migration tools which should
make the process relatively painless.
</p>
</section>
</body>
</document>
1.1 jakarta-turbine-3/xdocs/stylesheets/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Turbine" href="http://jakarta.apache.org/turbine/turbine-3/";>
<title>Turbine 3.x</title>
<logo href="/images/logo.gif">Turbine</logo>
<body>
<menu name="Torque">
<item name="Overview" href="/index.html"/>
<item name="Changes" href="/changes.html"/>
<item name="Testing" href="/core-testing.html"/>
</menu>
</body>
</project>
1.1 jakarta-turbine-3/xdocs/images/logo.gif
<<Binary file>>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
