vmassol 01/04/09 01:42:01
Modified: cactus/docs/framework/xdocs ant.xml
Log:
updated to match latest build scripts
Revision Changes Path
1.2 +29 -43 jakarta-commons-sandbox/cactus/docs/framework/xdocs/ant.xml
Index: ant.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/cactus/docs/framework/xdocs/ant.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ant.xml 2001/03/31 20:22:38 1.1
+++ ant.xml 2001/04/09 08:42:00 1.2
@@ -439,11 +439,11 @@
<!-- Generic project properties -->
<property name="project.fullname" value="Cactus Sample"/>
- <property name="project.version" value="0.9"/>
- <property name="project.name" value="cactus-sample"/>
+ <property name="project.version" value="@version@"/>
+ <property name="project.name" value="commons-cactus-sample"/>
<!-- Miscellaneous settings -->
- <property name="year" value="2000-2001"/>
+ <property name="year" value="@year@"/>
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
<property name="deprecation" value="off"/>
@@ -456,7 +456,7 @@
<!-- Source locations for the build -->
<property name="src.dir" value="src"/>
<property name="src.java.dir" value="${src.dir}/share"/>
- <property name="src.java.servlet.dir" value="${src.dir}/servlet22"/>
+ <property name="src.java.servlet.dir" value="${src.dir}[EMAIL PROTECTED]@"/>
<property name="build.dir" value="build"/>
<property name="etc.dir" value="${build.dir}/etc"/>
<property name="lib.dir" value="lib"/>
@@ -472,6 +472,7 @@
<!-- Destination locations for the build (relative to the basedir as -->
<!-- specified in the basedir attribute of the project tag) -->
<property name="out.dir" value="out"/>
+ <property name="out.dist.dir" value="${out.dir}/dist"/>
<property name="out.lib.dir" value="${out.dir}/lib"/>
<property name="out.test.dir" value="${out.dir}/test"/>
<property name="out.src.dir" value="${out.dir}/src"/>
@@ -484,14 +485,13 @@
<!-- The Cactus Sample war file. This is the file that should be
used at runtime by end users (it excludes the test classes) -->
- <property name="final.war.name" value="${out.dir}/${project.name}-22.war"/>
+ <property name="final.war.name"
value="${out.dir}/${project.name}[EMAIL PROTECTED]@.war"/>
<!-- The full sources of Cactus Sample in a zip file -->
- <property name="final.src.name" value="${out.dir}/${project.name}-src-22.zip"/>
+ <property name="final.src.name"
value="${out.dir}/${project.name}[EMAIL PROTECTED]@.zip"/>
- <!-- The Cactus Sample documentation in a zip : javadoc + other
- READMEs. -->
- <property name="final.doc.name" value="${out.dir}/${project.name}-doc-22.zip"/>
+ <!-- The Cactus Sample documentation in a zip : javadoc -->
+ <property name="final.doc.name"
value="${out.dir}/${project.name}[EMAIL PROTECTED]@.zip"/>
<!--
========================================================================
@@ -514,9 +514,6 @@
<include name="**/*.xml"/>
<include name="**/*.properties"/>
- <!-- Other misc files -->
- <include name="**/license.apl"/>
-
</patternset>
<!-- All non java files in the src directory -->
@@ -527,9 +524,6 @@
<include name="**/*.xml"/>
<include name="**/*.properties"/>
- <!-- Other misc files -->
- <include name="**/license.apl"/>
-
</patternset>
]]></source>
@@ -557,20 +551,27 @@
in targets, if need be -->
<tstamp/>
- <echo message="------- ${project.fullname} ${project.version} -------"/>
+ <echo message="--------- ${project.fullname} ${project.version} ---------"/>
<echo message=""/>
<echo message="java.class.path = ${java.class.path}"/>
<echo message=""/>
<echo message="java.home = ${java.home}"/>
<echo message="user.home = ${user.home}"/>
+ <echo message=""/>
+ <echo message="basedir = ${basedir}"/>
+ <echo message=""/>
+ <echo message="servlet.jar = ${servlet.jar}"/>
+ <echo message="cactus.jar = ${cactus.jar}"/>
+ <echo message="junit.jar = ${junit.jar}"/>
+ <echo message="cactus.ant.jar = ${cactus.ant.jar}"/>
<!-- Filters -->
<filter token="version" value="${project.version}"/>
<filter token="year" value="${year}"/>
<!-- Initialize custom Ant task needed for running the server tests -->
- <taskdef name="runservertests" classname="cactus.ant.RunServerTestsTask">
+ <taskdef name="runservertests"
classname="org.apache.commons.cactus.ant.RunServerTestsTask">
<classpath>
<pathelement location="${cactus.ant.jar}"/>
<pathelement path="${java.class.path}"/>
@@ -707,9 +708,6 @@
<exclude name="**/*.xml"/>
<exclude name="**/*.properties"/>
- <!-- Misc files -->
- <exclude name="**/license.gpl"/>
-
<classpath>
<pathelement path="${java.class.path}"/>
<pathelement location="${servlet.jar}"/>
@@ -790,15 +788,15 @@
<javadoc
sourcepath="${out.src.dir}"
- packagenames="cactus.sample.*"
+ packagenames="org.apache.commons.cactus.sample.*"
destdir="${out.javadoc.dir}"
author="true"
public="true"
version="true"
use="true"
- windowtitle="${project.fullname} ${project.version} for Servlet 22 API"
- doctitle="${project.fullname} ${project.version} for Servlet 22 API"
- bottom="Copyright &copy; ${year} Vincent Massol.">
+ windowtitle="${project.fullname} ${project.version} for Servlet
@servlet.api@ API"
+ doctitle="${project.fullname} ${project.version} for Servlet
@servlet.api@ API"
+ bottom="Copyright &copy; ${year} Apache Software Foundation. All
Rights Reserved.">
<classpath>
<pathelement path="${java.class.path}"/>
@@ -843,9 +841,6 @@
<!-- Generate the documentation -->
<target name="doc" depends="prepare-doc">
- <!-- Add the README -->
- <copy file="README" tofile="${out.doc.dir}/README"/>
-
<!-- Create the zipped documentation -->
<zip zipfile="${final.doc.name}" basedir="${out.doc.dir}"/>
@@ -860,13 +855,14 @@
<!--
========================================================================
Generate the full documentation for a given Servlet API, i.e.
- web site + javadoc + README
+ web site + javadoc
========================================================================
-->
<!-- Preparation target for the doc target -->
<target name="prepare-doc" depends="javadoc">
<mkdir dir="${out.doc.dir}"/>
+ <mkdir dir="${out.doc.dir}/images"/>
<!-- Copy doc-book.xml to book.xml for defining the documentation web
site and replacing token filters (year) -->
@@ -874,15 +870,11 @@
<copy file="${xdoc.dir}/doc-book.xml" tofile="${xdoc.dir}/book.xml"
filtering="on"/>
- <!-- Copy non xml files -->
- <copy todir="${out.doc.dir}/files">
- <fileset dir="${xdoc.dir}/files"/>
+ <!-- Copy the images -->
+ <copy todir="${out.site.dir}/images">
+ <fileset dir="${xdoc.dir}/images"/>
</copy>
- <!-- Copy the version.txt file -->
- <copy file="${conf.dir}/version.txt"
- tofile="${out.doc.dir}/version.txt" filtering="on"/>
-
</target>
<!-- Generate the documentation -->
@@ -890,7 +882,7 @@
<!-- Generate the documentation web site -->
<stylebook book="${xdoc.dir}/book.xml"
- skinDirectory="${skin.dir}/xml.apache.org"
+ skinDirectory="${skin.dir}/jakarta.apache.org"
targetDirectory="${out.doc.dir}">
<classpath>
@@ -899,13 +891,6 @@
</stylebook>
-
- <!-- Add the README -->
- <copy file="README" tofile="${out.doc.dir}/README"/>
-
- <!-- Create the zipped documentation -->
- <zip zipfile="${final.doc.name}" basedir="${out.doc.dir}"/>
-
</target>
]]></source>
@@ -975,6 +960,7 @@
<target name="prepare-jar" depends="compile">
<mkdir dir="${out.conf.dir}"/>
+ <mkdir dir="${out.lib.dir}"/>
<!-- Copy the manifest in order to replace the version token filter -->
<copy todir="${out.conf.dir}" filtering="on">
