You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/02/03 09:40:57 UTC
cvs commit: jakarta-cactus build-common.xml README gump.xml build.properties.sample build.xml .cvsignore common.xml build-admin.xml
vmassol 2003/02/03 00:40:57
Modified: . README gump.xml build.properties.sample build.xml
.cvsignore
Added: . build-common.xml
Removed: . common.xml build-admin.xml
Log:
Major refactoring of the build systems and directory layout:
* Factorized common build parts into build-common.xml and normalized the builds
* Added "release" target to all builds
* Moved the sample-servlet and sample-jetty to samples/servlet and samples/jetty
* Moved the web site upload to the documentation build
* Simplified to the extreme the main Cactus build.xml and removed the build-admin.xml scripts
* Removed some Ant tasks that were in anttasks/ as they are now in the Ant Petal
* Some other cosmetic changes
* Added scripts for Tomcat 3.x (However, I get a strange error while running Tomcat 3.3.1. Not sure why yet (some flushbuffer() jasper error))
* WL 7.x script has been tested and works (for JDK < 1.4)
Several issues/todos remain:
* The Gump build is probably not working at all (I'll correct it as I receive Gump email notifications of errors)
* The Clover report is currently broken (i.e. not generated)
* The sample-jetty needs to be put in line with the new build system and use the new Ant Petal
* Pb of order in Sample Servlet test cases (one of the test must run before the other but this is not currently possible with the Ant Petal)
* WL 6.x script needs to be tested
Revision Changes Path
1.7 +3 -10 jakarta-cactus/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-cactus/README,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- README 15 Oct 2002 20:22:18 -0000 1.6
+++ README 3 Feb 2003 08:40:56 -0000 1.7
@@ -1,16 +1,9 @@
Instructions for building/using Cactus
--------------------------------------
-All documentation is located in the doc/ directory (file index.html). Make
-sure you read the Getting Started guide first.
-
-You can also check the online web site
-(http://jakarta.apache.org/cactus) which contains the most up to date
-information.
-
-If you are building Cactus from sources, detailed instructions can be found
-at http://jakarta.apache.org/cactus/howto_build.html
+All documentation is available online at http://jakarta.apache.org/cactus. You
+can also download packaged documentation (zip file) on
+http://jakarta.apache.org/cactus/downloads.html
Thank you.
-
The Cactus Team
1.41 +179 -160 jakarta-cactus/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/gump.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- gump.xml 31 Jan 2003 11:23:52 -0000 1.40
+++ gump.xml 3 Feb 2003 08:40:56 -0000 1.41
@@ -8,59 +8,41 @@
<url href="http://jakarta.apache.org/cactus/"/>
<description>
- Unit test framework for server-side java code
+ Unit test framework for server-side java code
</description>
<cvs repository="jakarta"/>
+ <!-- Note: The order of the projects is important as they depend upon
+ each other -->
+
<!--
========================================================================
- Build the Cactus Ant Custom Tasks
+ Build the Cactus Ant Tasks
========================================================================
-->
- <project name="jakarta-cactus-ant">
+ <project name="jakarta-cactus-anttasks">
<package>org.apache.cactus.ant</package>
- <ant buildfile="anttasks/build.xml" target="dist"/>
+ <ant buildfile="anttasks/build.xml" target="release">
+ <property name="project.version" value="@@DATE@@"/>
+ </ant>
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<option project="checkstyle" inherit="runtime"/>
<home nested="anttasks/dist"/>
- <jar name="lib/cactus-ant.jar"/>
- <javadoc nested="anttasks/dist/doc/api"
- title="Cactus Custom Ant tasks API"/>
-
- <nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
- </project>
-
- <!--
- ========================================================================
- Build the Cactus Documentation
- ========================================================================
- -->
- <project name="jakarta-cactus-documentation">
-
- <!-- Create the directories that are added using the <work> tag below so
- that JVM do not drop these directories from the CLASSPATH
- (apparently some do) -->
- <mkdir dir="documentation/target/classes/java"/>
-
- <ant buildfile="documentation/build.xml" target="dist"/>
-
- <depend project="jakarta-ant" inherit="runtime"/>
- <depend project="xml-xerces"/>
- <depend project="xml-xalan2"/>
+ <jar name="lib/cactus-anttasks.jar"/>
+ <javadoc nested="anttasks/dist/doc/api" title="Cactus Ant tasks API"/>
- <work nested="documentation/target/classes/java"/>
-
- <javadoc nested="documentation/dist/doc" title="Cactus Documentation"/>
+ <deliver fromdir="anttasks/release" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
@@ -72,9 +54,11 @@
<package>org.apache.cactus</package>
- <ant buildfile="framework/build.xml" target="dist">
+ <ant buildfile="framework/build.xml" target="release">
+
+ <property name="project.version" value="@@DATE@@"/>
- <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
+ <depend property="cactus.anttasks.jar" project="jakarta-cactus-anttasks"/>
<depend property="j2ee.jar" project="jakarta-servletapi"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
<depend property="commons.logging.jar" project="commons-logging" id="all"/>
@@ -94,101 +78,90 @@
<work nested="framework/target-12/classes/test"/>
<home nested="framework/dist-12"/>
- <jar name="lib/cactus.jar"/>
+ <jar name="lib/cactus-framework.jar"/>
<javadoc nested="framework/dist-12/doc/api"
- title="Cactus Framework for J2EE 1.2 API"/>
+ title="Cactus Framework for J2EE 1.2 API"/>
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
========================================================================
- Build the Cactus Servlet Sample for J2EE 1.2
+ Build the Cactus Framework for J2EE 1.3
========================================================================
-->
- <project name="jakarta-cactus-sample-servlet-12">
+ <project name="jakarta-cactus-framework-13">
- <!-- Create the directories that are added using the <work> tag below so
- that JVM do not drop these directories from the CLASSPATH
- (apparently some do) -->
- <mkdir dir="sample-servlet/target-12/sample/target/classes/java"/>
- <mkdir dir="sample-servlet/target-12/sample/target/classes/cactus"/>
- <mkdir dir="sample-servlet/target-12/sample/target/conf/client"/>
+ <package>org.apache.cactus</package>
- <ant buildfile="sample-servlet/build.xml" target="dist">
+ <ant buildfile="framework/build.xml" target="release">
- <depend property="j2ee.jar" project="jakarta-servletapi"/>
+ <property name="project.version" value="@@DATE@@"/>
+
+ <depend property="cactus.anttasks.jar" project="jakarta-cactus-anttasks"/>
+ <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
<depend property="commons.logging.jar" project="commons-logging" id="all"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
<depend property="junit.jar" project="junit"/>
- <depend property="jstl.jar" project="jakarta-taglibs-standard" id="jstl"/>
- <depend property="standard.jar" project="jakarta-taglibs-standard"
- id="standard"/>
- <depend property="cactus.framework.jar" project="jakarta-cactus-framework-12"/>
- <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
- <property name="test.port" value="8082"/>
- <property name="tomcat.home.33" reference="home" project="jakarta-tomcat"/>
</ant>
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="aspectj"/>
- <depend project="jakarta-tomcat" inherit="runtime"/>
+ <option project="checkstyle" inherit="runtime"/>
- <work nested="sample-servlet/target-12/sample/target/classes/java"/>
- <work nested="sample-servlet/target-12/sample/target/classes/cactus"/>
- <work nested="sample-servlet/target-12/sample/target/conf/client"/>
+ <work nested="framework/target-13/classes/java"/>
+ <work nested="framework/target-13/classes/test"/>
- <jar name="sample-servlet/dist-12/bin/sample-servlet.zip"/>
+ <home nested="framework/dist-13"/>
+ <jar name="lib/cactus-framework.jar"/>
+ <javadoc nested="framework/dist-13/doc/api"
+ title="Cactus Framework for J2EE 1.3 API"/>
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
========================================================================
- Build the Cactus Framework for J2EE 1.3
+ Build the Cactus Ant Petal for J2EE 1.2
========================================================================
-->
- <project name="jakarta-cactus-framework-13">
+ <project name="jakarta-cactus-petal-ant-12">
- <package>org.apache.cactus</package>
+ <ant buildfile="petals/ant/build.xml" target="release">
- <ant buildfile="framework/build.xml" target="dist">
+ <property name="project.version" value="@@DATE@@"/>
- <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
- <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
+ <depend property="j2ee.jar" project="jakarta-servletapi"/>
+ <depend property="servlet.jar" project="jakarta-servletapi"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
<depend property="commons.logging.jar" project="commons-logging" id="all"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
<depend property="junit.jar" project="junit"/>
+ <depend property="cactus.framework.jar" project="jakarta-cactus-framework-12"/>
+ <depend property="cactus.anttasks.jar" project="jakarta-cactus-anttasks"/>
</ant>
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
<depend project="aspectj"/>
- <option project="checkstyle" inherit="runtime"/>
-
- <work nested="framework/target-13/classes/java"/>
- <work nested="framework/target-13/classes/test"/>
-
- <home nested="framework/dist-13"/>
- <jar name="lib/cactus.jar"/>
- <javadoc nested="framework/dist-13/doc/api"
- title="Cactus Framework for J2EE 1.3 API"/>
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
- </project>
+ to="cactus-dev@jakarta.apache.org"/>
+ </project>
+
<!--
========================================================================
Build the Cactus Ant Petal for J2EE 1.3
@@ -196,9 +169,12 @@
-->
<project name="jakarta-cactus-petal-ant-13">
- <ant buildfile="petals/ant/build.xml" target="dist">
+ <ant buildfile="petals/ant/build.xml" target="release">
+
+ <property name="project.version" value="@@DATE@@"/>
<depend property="j2ee.jar" project="jakarta-servletapi-4"/>
+ <depend property="servlet.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
<depend property="commons.logging.jar" project="commons-logging" id="all"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
@@ -206,7 +182,7 @@
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
<depend property="junit.jar" project="junit"/>
<depend property="cactus.framework.jar" project="jakarta-cactus-framework-13"/>
- <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
+ <depend property="cactus.anttasks.jar" project="jakarta-cactus-anttasks"/>
</ant>
@@ -215,166 +191,209 @@
<depend project="aspectj"/>
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
========================================================================
- Build the Cactus Servlet Sample for J2EE 1.3
+ Build the Cactus Eclipse Petal for J2EE 1.2
========================================================================
-->
- <project name="jakarta-cactus-sample-servlet-13">
+
+ <!-- Not ready yet. Need to find out how to get the Eclipse jars in Gump -->
+
+ <!--
+ ========================================================================
+ Build the Cactus Eclipse Petal for J2EE 1.3
+ ========================================================================
+ -->
+
+ <!-- Not ready yet. Need to find out how to get the Eclipse jars in Gump -->
+
+ <!--
+ ========================================================================
+ Build the Cactus Servlet Sample for J2EE 1.2
+ ========================================================================
+ -->
+ <project name="jakarta-cactus-sample-servlet-12">
<!-- Create the directories that are added using the <work> tag below so
that JVM do not drop these directories from the CLASSPATH
(apparently some do) -->
- <mkdir dir="sample-servlet/target-13/sample/target/classes/java"/>
- <mkdir dir="sample-servlet/target-13/sample/target/classes/cactus"/>
- <mkdir dir="sample-servlet/target-13/sample/target/conf/client"/>
+ <mkdir dir="samples/servlet/target-12/sample/target/classes/java"/>
+ <mkdir dir="samples/servlet/target-12/sample/target/classes/cactus"/>
+ <mkdir dir="samples/servlet/target-12/sample/target/conf/client"/>
- <ant buildfile="sample-servlet/build.xml" target="dist">
+ <ant buildfile="sample-servlet/build.xml" target="release">
- <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
+ <property name="project.version" value="@@DATE@@"/>
+
+ <depend property="j2ee.jar" project="jakarta-servletapi"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
- <depend property="commons.logging.jar" project="commons-logging" id="all"/>
+ <depend property="commons.logging.jar" project="commons-logging"
+ id="all"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
<depend property="junit.jar" project="junit"/>
- <depend property="jstl.jar" project="jakarta-taglibs-standard" id="jstl"/>
+ <depend property="jstl.jar" project="jakarta-taglibs-standard"
+ id="jstl"/>
<depend property="standard.jar" project="jakarta-taglibs-standard"
id="standard"/>
- <depend property="cactus.framework.jar" project="jakarta-cactus-framework-13"/>
- <depend property="cactus.ant.jar" project="jakarta-cactus-ant"/>
- <property name="test.port" value="8082"/>
- <property name="tomcat.home.40" reference="home" project="jakarta-tomcat-4.0"/>
+ <depend property="cactus.framework.jar"
+ project="jakarta-cactus-framework-12"/>
+ <depend property="cactus.anttasks.jar"
+ project="jakarta-cactus-anttasks"/>
+ <property name="cactus.port" value="8082"/>
+ <property name="cactus.home.tomcat3x" reference="home" project="jakarta-tomcat"/>
</ant>
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
- <depend project="jakarta-tomcat-4.0" inherit="runtime"/>
+ <depend project="jakarta-tomcat" inherit="runtime"/>
<depend project="aspectj"/>
- <work nested="sample-servlet/target-13/sample/target/classes/java"/>
- <work nested="sample-servlet/target-13/sample/target/classes/cactus"/>
- <work nested="sample-servlet/target-13/sample/target/conf/client"/>
+ <work nested="samples/servlet/target-13/sample/target/classes/java"/>
+ <work nested="samples/servlet/target-13/sample/target/classes/cactus"/>
+ <work nested="samples/servlet/target-13/sample/target/conf/client"/>
- <jar name="sample-servlet/dist-13/bin/sample-servlet.zip"/>
+ <jar name="samples/servlet/dist-13/bin/cactus-sample-servlet"/>
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
========================================================================
- Build the Cactus distribution for J2EE 1.2
+ Build the Cactus Servlet Sample for J2EE 1.3
========================================================================
-->
- <project name="jakarta-cactus-distribution-12">
+ <project name="jakarta-cactus-sample-servlet-13">
+
+ <!-- Create the directories that are added using the <work> tag below so
+ that JVM do not drop these directories from the CLASSPATH
+ (apparently some do) -->
+ <mkdir dir="samples/servlet/target-13/sample/target/classes/java"/>
+ <mkdir dir="samples/servlet/target-13/sample/target/classes/cactus"/>
+ <mkdir dir="samples/servlet/target-13/sample/target/conf/client"/>
- <ant buildfile="build.xml" target="gump">
+ <ant buildfile="sample-servlet/build.xml" target="release">
- <depend property="j2ee.jar" project="jakarta-servletapi"/>
- <depend property="servlet.jar" project="jakarta-servletapi"/>
+ <property name="project.version" value="@@DATE@@"/>
+
+ <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
<depend property="log4j.jar" project="jakarta-log4j"/>
- <depend property="commons.logging.jar" project="commons-logging" id="all"/>
+ <depend property="commons.logging.jar" project="commons-logging"
+ id="all"/>
<depend property="commons.httpclient.jar" project="commons-httpclient"/>
<depend property="httpunit.jar" project="httpunit"/>
<depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
<depend property="junit.jar" project="junit"/>
- <depend property="jstl.jar" project="jakarta-taglibs-standard" id="jstl"/>
+ <depend property="jstl.jar" project="jakarta-taglibs-standard"
+ id="jstl"/>
<depend property="standard.jar" project="jakarta-taglibs-standard"
id="standard"/>
- <property name="release.dir" value="release-12"/>
+ <depend property="cactus.framework.jar"
+ project="jakarta-cactus-framework-13"/>
+ <depend property="cactus.anttasks.jar"
+ project="jakarta-cactus-anttasks"/>
+ <property name="cactus.port" value="8082"/>
+ <property name="cactus.home.tomcat4x" project="jakarta-tomcat-4.0"
+ reference="home"/>
</ant>
-
+
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
+ <depend project="jakarta-tomcat-4.0" inherit="runtime"/>
+ <depend project="aspectj"/>
- <depend project="jakarta-cactus-ant"/>
- <depend project="jakarta-cactus-documentation"/>
- <depend project="jakarta-cactus-framework-12"/>
- <depend project="jakarta-cactus-sample-servlet-12"/>
+ <work nested="samples/servlet/target-13/sample/target/classes/java"/>
+ <work nested="samples/servlet/target-13/sample/target/classes/cactus"/>
+ <work nested="samples/servlet/target-13/sample/target/conf/client"/>
- <deliver fromdir="release-12" tosite="jakarta.apache.org"
- todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
+ <jar name="samples/servlet/dist-13/bin/cactus-sample-servlet"/>
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
========================================================================
- Build the Cactus distribution for J2EE 1.3
+ Build the Cactus Documentation
========================================================================
-->
- <project name="jakarta-cactus-distribution-13">
-
- <ant buildfile="build.xml" target="gump">
+ <project name="jakarta-cactus-documentation">
- <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
- <depend property="servlet.jar" project="jakarta-servletapi-4"/>
- <depend property="log4j.jar" project="jakarta-log4j"/>
- <depend property="commons.logging.jar" project="commons-logging" id="all"/>
- <depend property="commons.httpclient.jar" project="commons-httpclient"/>
- <depend property="httpunit.jar" project="httpunit"/>
- <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
- <depend property="junit.jar" project="junit"/>
- <depend property="jstl.jar" project="jakarta-taglibs-standard" id="jstl"/>
- <depend property="standard.jar" project="jakarta-taglibs-standard"
- id="standard"/>
- <property name="release.dir" value="release-13"/>
+ <!-- Create the directories that are added using the <work> tag below so
+ that JVM do not drop these directories from the CLASSPATH
+ (apparently some do) -->
+ <mkdir dir="documentation/target/classes/java"/>
+ <ant buildfile="documentation/build.xml" target="release">
+ <property name="project.version" value="@@DATE@@"/>
</ant>
<depend project="jakarta-ant" inherit="runtime"/>
<depend project="xml-xerces"/>
+ <depend project="xml-xalan2"/>
- <depend project="jakarta-cactus-ant"/>
- <depend project="jakarta-cactus-documentation"/>
- <depend project="jakarta-cactus-framework-13"/>
- <depend project="jakarta-cactus-sample-servlet-13"/>
+ <work nested="documentation/target/classes/java"/>
- <deliver fromdir="release-13" tosite="jakarta.apache.org"
- todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
+ <javadoc nested="documentation/dist/doc" title="Cactus Documentation"/>
+
+ <deliver fromdir="documentation/release" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
<nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
+ to="cactus-dev@jakarta.apache.org"/>
+
</project>
<!--
========================================================================
- Build the Cactus source distribution
+ Cactus Releases for J2EE API 1.2. Only release if the Cactus Sample
+ Servlet project has succeeded.
========================================================================
-->
- <project name="jakarta-cactus-distribution-src">
+ <project name="jakarta-cactus-release-12">
- <ant buildfile="build.xml" target="gump.src">
+ <jar name="samples/servlet/release-12/jakarta-cactus-sample-servlet-@@DATE@@.zip"/>
- <depend property="j2ee.jar" project="jakarta-servletapi-4"/>
- <depend property="servlet.jar" project="jakarta-servletapi-4"/>
- <depend property="log4j.jar" project="jakarta-log4j"/>
- <depend property="commons.logging.jar" project="commons-logging" id="all"/>
- <depend property="commons.httpclient.jar" project="commons-httpclient"/>
- <depend property="httpunit.jar" project="httpunit"/>
- <depend property="aspectjrt.jar" project="aspectj" id="aspectjrt"/>
- <depend property="junit.jar" project="junit"/>
- <depend property="jstl.jar" project="jakarta-taglibs-standard" id="jstl"/>
- <depend property="standard.jar" project="jakarta-taglibs-standard"
- id="standard"/>
+ <deliver fromdir="framework/release-12" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
- </ant>
+ <deliver fromdir="petals/ant/release-12" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
- <depend project="jakarta-ant" inherit="runtime"/>
- <depend project="xml-xerces"/>
+ <deliver fromdir="samples/servlet/release-12" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
- <deliver fromdir="release" tosite="jakarta.apache.org"
- todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
+ </project>
+
+ <!--
+ ========================================================================
+ Cactus Releases for J2EE API 1.3. Only release if the Cactus Sample
+ Servlet project has succeeded.
+ ========================================================================
+ -->
+ <project name="jakarta-cactus-release-13">
+
+ <jar name="samples/servlet/release-13/jakarta-cactus-sample-servlet-@@DATE@@.zip"/>
+
+ <deliver fromdir="framework/release-13" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
+
+ <deliver fromdir="petals/ant/release-13" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
+
+ <deliver fromdir="samples/servlet/release-13" tosite="jakarta.apache.org"
+ todir="builds/jakarta-cactus/nightly/@@DATE@@/" />
- <nag from="Vincent Massol <vmassol@apache.org>"
- to="cactus-dev@jakarta.apache.org"/>
</project>
</module>
1.39 +71 -52 jakarta-cactus/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.properties.sample 25 Jan 2003 17:07:15 -0000 1.38
+++ build.properties.sample 3 Feb 2003 08:40:56 -0000 1.39
@@ -6,6 +6,9 @@
# and rename this file to "build.properties" in the same directory that
# contains the "build.xml" file.
#
+# This file contains the aggregated list of properties needed by the different
+# Cactus subprojects.
+#
# $Id$
# -----------------------------------------------------------------------------
@@ -13,7 +16,7 @@
# build.xml file is located.
# -----------------------------------------------------------------------------
-# Mandatory properties
+# Mandatory properties shared by several subprojects
# -----------------------------------------------------------------------------
# Location of all jars. Note: This is not a mandatory property. It is only
@@ -56,14 +59,41 @@
standard.jar = ${lib.repo}/taglibs/jars/standard-1.0.2.jar
# -----------------------------------------------------------------------------
-# Optional properties
+# Mandatory properties for the Eclipse plugin only
# -----------------------------------------------------------------------------
-# Locations J2EE APIs for the "all" target (which builds the Cactus framework
-# for both APIs)
+# Location of Eclipse.
+eclipse.home = D:/dev/eclipse-M4
+
+# Locations of Eclipse dependent plugin jars
+
+# Example for Eclipse 2.1 M4 - Windows platform
+eclipse.junit.jar = ${eclipse.home}/plugins/org.junit/junit.jar
+eclipse.core.boot.jar = ${eclipse.home}/plugins/org.eclipse.core.boot_2.1.0/boot.jar
+eclipse.core.resources.jar = ${eclipse.home}/plugins/org.eclipse.core.resources_2.1.0/resources.jar
+eclipse.core.runtime.jar = ${eclipse.home}/plugins/org.eclipse.core.runtime_2.1.0/runtime.jar
+eclipse.debug.core.jar = ${eclipse.home}/plugins/org.eclipse.debug.core_2.1.0/dtcore.jar
+eclipse.debug.ui.jar = ${eclipse.home}/plugins/org.eclipse.debug.ui_2.1.0/dtui.jar
+eclipse.jdt.core.jar = ${eclipse.home}/plugins/org.eclipse.jdt.core_2.1.0/jdtcore.jar
+eclipse.jdt.junit.jar = ${eclipse.home}/plugins/org.eclipse.jdt.junit_2.1.0/junitsupport.jar
+eclipse.jdt.launching.jar = ${eclipse.home}/plugins/org.eclipse.jdt.launching_2.1.0/launching.jar
+eclipse.swt.jar = ${eclipse.home}/plugins/org.eclipse.swt.win32_2.1.0/ws/win32/swt.jar
+eclipse.jface.jar = ${eclipse.home}/plugins/org.eclipse.jface_2.1.0/jface.jar
+eclipse.ant.core.jar = ${eclipse.home}/plugins/org.eclipse.ant.core_2.1.0/antsupport.jar
+eclipse.ui.workbench.jar = ${eclipse.home}/plugins/org.eclipse.ui.workbench_2.1.0/workbench.jar
+
+# -----------------------------------------------------------------------------
+# Optional properties for the main Cactus build
+# -----------------------------------------------------------------------------
+
+# Locations J2EE APIs for the "*.all" targets
j2ee.12.jar = ${lib.repo}/j2ee/jars/j2ee-1.2.jar
j2ee.13.jar = ${lib.repo}/j2ee/jars/j2ee-1.3.jar
+# -----------------------------------------------------------------------------
+# Optional properties share by several subprojects
+# -----------------------------------------------------------------------------
+
# The location of the AspectJ tools jar
# If not specified here, the jar must be present in ANTHOME/lib
aspectj-tools.jar = ${lib.repo}/aspectj/jars/aspectj-tools-1.0.6.jar
@@ -80,44 +110,6 @@
commons-collections.jar = ${lib.repo}/commons-collections/jars/commons-collections-2.1.jar
regexp.jar = ${lib.repo}/regexp/jars/regexp-1.2.jar
-# The port to use for starting the servers during unit testing. If not
-# sepcified, it defaults to port 8080.
-#test.port = 8081
-
-# Servlet engine locations for the tests
-
-# Note: If you don't want to run the test on a given servlet engine, just
-# comment it's home property. For example, if you don't want to run the
-# tests on the Resin 1.2, comment the "resin.home.12" property.
-
-#resin.home.12 = xxx
-#tomcat.home.32 = c:/Apps/jakarta-tomcat-3.2.4
-#weblogic.home.51 = xxx
-#orion.home.15 = c:/Apps/orion-1.5.4
-#orion.home.16 = c:/Apps/orion-1.6.0
-#resin.home.20 = c:/Apps/resin-2.1.4
-#tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.4
-#resin.home.13 = xxx
-#tomcat.home.33 = c:/Apps/jakarta-tomcat-3.3.1
-#jboss.home.3x = c:/Apps/jboss-3.0.4
-
-# Note: Enhydra 3.3.1 does not seem to support BASIC authentication as defined
-# in the Servlet spec. and thus the tests which involve security are failing.
-# All other tests work fine. This is a limitation of Enhydra.
-#enhydra.home.31 = c:/Apps/enhydra3.1.1b1
-
-# Note: weblogic.home.61 is the location of BEA Home and NOT the location of
-# wlserver6.1, inside the bea home directory.
-#weblogic.home.61 = c:/Apps/bea
-
-# Note: weblogic.home.70 is the location of BEA Home and NOT the location of
-# wlserver7.0, inside the bea home directory.
-#weblogic.home.70 = c:/bea
-
-# Note: There seems to be a bug in Orion 1.4 preventing it to run correctly
-# the testSendUserData() test. It runs fine in Orion 1.5 though.
-#orion.home.14 = xxx
-
# Should we instrument our code with Clover (test coverage tool) ?
# Comment out to disable Clover (setting the property to false will have no
# effect).
@@ -127,17 +119,44 @@
clover.jar = ${lib.repo}/clover/jars/clover-0.6b.jar
# -----------------------------------------------------------------------------
-# Optional properties used by the build-admin.xml Ant build script only
+# Optional properties for the Servlet Sample subproject
# -----------------------------------------------------------------------------
-# j2ee.12.jar and j2ee.13.jar must be defined when running build-admin.xml
-# (they should be defined above in the optional section).
+# The port to use for starting the servers during unit testing. If not
+# specified, it defaults to port 8080.
+#cactus.port = 8081
+
+# Servlet engine locations for the tests
+
+# Note: If you don't want to run the test on a given servlet engine, just
+# comment it's home property. For example, if you don't want to run the
+# tests on the Resin 2.x, comment the "cactus.home.resin2x" property.
+
+#cactus.home.resin2x = c:/Apps/resin-2.1.6
+#cactus.home.tomcat3x = c:/Apps/jakarta-tomcat-3.3.1a
+cactus.home.tomcat4x = c:/Apps/jakarta-tomcat-4.1.18
+#cactus.home.orion1x = c:/Apps/orion-1.6.0
+#cactus.home.jboss3x = c:/Apps/jboss-3.0.4
+
+# Note: cactus.home.weblogic6x is the location of BEA Home and NOT the
+# location of wlserver6.x, inside the bea home directory.
+#cactus.home.weblogic6x = c:/Apps/bea
-# Username to use when connection to jakarta.apache.org
-admin.jakarta.username=vmassol
+# Note: cactus.home.weblogic7x is the location of BEA Home and NOT the
+# location of weblogic7xx, inside the bea home directory.
+#cactus.home.weblogic7x = c:/Apps/bea
+
+# -----------------------------------------------------------------------------
+# Optional properties for the Servlet Documentation subproject
+# -----------------------------------------------------------------------------
-# Executable to perform remote copy of files
-admin.scp = scp
+# Decide whether or not to include the javadoc from the other subprojects in
+# the web site. This is an option useful for reducing web site build time as
+# javadoc do not need to be always updated. Uncomment to activate inclusion
+# of javadoc.
+#javadoc.include = true
-# Executable to perform remote login to Jakarta web site
-admin.ssh = ssh
+# Properties needed to upload the documentation to the Cactus web site
+#jakarta.username = vmassol
+#scp = pscp
+#ssh = tortoisePlink
1.39 +48 -589 jakarta-cactus/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/build.xml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- build.xml 30 Jan 2003 16:31:41 -0000 1.38
+++ build.xml 3 Feb 2003 08:40:56 -0000 1.39
@@ -3,7 +3,7 @@
<!--
=============================================================================
Master build file for building all Cactus components (the Ant tasks,
- the framework itself, the documentation, the samples).
+ the framework itself, the Petals, the documentation, the samples, etc).
See build.properties.sample for details of mandatory and optional
properties to set.
@@ -12,637 +12,96 @@
ant <target>
- Run "ant -projecthelp" to get a list of available targets. The default
- target is "dist"
+ Run "ant -projecthelp" to get a list of available targets.
=============================================================================
-->
-<project name="Master Cactus Build" default="dist" basedir=".">
+<project name="Master Cactus Build" default="release" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
- <property file="build.properties" />
+ <property file="${basedir}/build.properties" />
<property file="${user.home}/build.properties" />
- <!-- Global project properties -->
- <property name="project.name.text" value="Cactus"/>
- <property name="project.name.file" value="cactus"/>
- <property name="project.version" value="1.5dev"/>
-
- <!-- Prefix to add to all distributable files -->
- <property name="project.prefix" value="jakarta-"/>
-
- <property name="year" value="2000-2003"/>
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
- <property name="deprecation" value="off"/>
-
- <!--
- ========================================================================
- Set the properties related to the target tree
- Note: These properties are defined in a target as some need the
- j2ee.api property to be set
- ========================================================================
- -->
- <target name="properties.target">
-
- <property name="target.dir" value="target-${j2ee.api}"/>
- <property name="target.lib.dir" value="${target.dir}/lib"/>
-
- </target>
-
- <!--
- ========================================================================
- Set the properties related to the distribution tree
- Note: These properties are defined in a target as some need the
- j2ee.api property to be set
- ========================================================================
- -->
- <target name="properties.distribution">
-
- <property name="dist.dir" value="dist-${j2ee.api}"/>
- <property name="dist.lib.dir" value="${dist.dir}/lib"/>
- <property name="dist.doc.dir" value="${dist.dir}/doc"/>
- <property name="dist.doc.api.dir" value="${dist.doc.dir}/api"/>
- <property name="dist.web.dir" value="${dist.dir}/web"/>
- <property name="dist.sample.servlet.dir"
- value="${dist.dir}/sample-servlet"/>
-
- </target>
-
- <!-- Release directory, i.e. where the zipped distribution is located -->
- <property name="release.dir" value="release"/>
-
- <!--
- ========================================================================
- Display configurable properties values
- ========================================================================
- -->
- <target name="display.properties">
-
- <echo message="----- ${project.name.text} ${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="ant.home = ${ant.home}"/>
- <echo message=""/>
- <echo message="commons.logging.jar = ${commons.logging.jar}"/>
- <echo message="commons.httpclient.jar = ${commons.httpclient.jar}"/>
- <echo message="httpunit.jar = ${httpunit.jar}"/>
- <echo message="junit.jar = ${junit.jar}"/>
- <echo message="aspectjrt.jar = ${aspectjrt.jar}"/>
- <echo message="log4j.jar = ${log4j.jar}"/>
- <echo message="jstl.jar = ${jstl.jar}"/>
- <echo message="standard.jar = ${standard.jar}"/>
- <echo message=""/>
- <echo message="j2ee.jar = ${j2ee.jar}"/>
- <echo message="servlet.jar = ${servlet.jar}"/>
- <echo message=""/>
- <echo message="clover.enable (optional) = ${clover.enable}"/>
- <echo message=""/>
-
- </target>
-
- <!--
- ========================================================================
- Verify that all mandatory properties have been set
- ========================================================================
- -->
- <target name="check.properties">
-
- <condition property="properties.ok">
- <and>
- <available file="${servlet.jar}"/>
- <available file="${j2ee.jar}"/>
- <available file="${log4j.jar}"/>
- <available file="${commons.logging.jar}"/>
- <available file="${commons.httpclient.jar}"/>
- <available file="${httpunit.jar}"/>
- <available file="${junit.jar}"/>
- <available file="${aspectjrt.jar}"/>
- <available file="${jstl.jar}"/>
- <available file="${standard.jar}"/>
- </and>
- </condition>
-
- <fail message="Missing property or property pointing to an invalid file (check your build.properties file)"
- unless="properties.ok"/>
-
- </target>
-
- <!--
- ========================================================================
- Find out the J2EE API version
- ========================================================================
- -->
- <target name="check.j2ee.version">
-
- <condition property="j2ee.api" value="13">
- <available classname="javax.servlet.Filter"
- classpath="${j2ee.jar}"/>
- </condition>
-
- <condition property="j2ee.api" value="12">
- <available classname="javax.servlet.Servlet"
- classpath="${j2ee.jar}"/>
- </condition>
-
- <fail message="Unsupported J2EE version" unless="j2ee.api"/>
-
- <echo message="j2ee.api = ${j2ee.api}"/>
-
- </target>
-
- <!--
- ========================================================================
- Load all dynamic properties
- ========================================================================
- -->
- <target name="load.properties"
- depends="check.j2ee.version,properties.target,properties.distribution"/>
-
<!--
========================================================================
- Initialize the build. Must be called by all targets
+ Generate the release files for all the Cactus subprojects
========================================================================
-->
- <target name="init"
- depends="display.properties,check.properties,load.properties">
-
- <tstamp/>
-
- </target>
-
- <!--
- ========================================================================
- Generate the distributable files
- ========================================================================
- -->
-
- <!-- Run Cactus Ant tasks dist target -->
- <target name="run.anttasks" depends="init">
-
- <ant target="dist" antfile="anttasks/build.xml"
- inheritAll="false">
-
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
-
- </ant>
-
- </target>
-
- <!-- Run Cactus Framework dist target -->
- <target name="run.framework" depends="init, run.anttasks">
-
- <ant target="dist" antfile="framework/build.xml"
- inheritAll="false">
-
- <!-- j2ee.jar property is needed here as it is overriden in the
- build-admin.xml and we need to propagate it -->
- <property name="j2ee.jar" value="${j2ee.jar}"/>
- <property file="build.properties"/>
- <property file="${user.home}/build.properties"/>
-
- </ant>
-
- </target>
-
- <!-- Run Ant Petal dist target -->
- <target name="run.petal.ant" depends="init, run.framework">
-
- <ant target="dist" antfile="petals/ant/build.xml"
- inheritAll="false">
-
- <property file="build.properties"/>
- <property file="${user.home}/build.properties"/>
-
- </ant>
-
- </target>
-
- <!-- Run Eclipse Petal dist target -->
- <target name="run.petal.eclipse" depends="init, run.framework">
-
- <ant target="dist" antfile="petals/eclipse/build.xml"
- inheritAll="false">
-
- <property file="build.properties"/>
- <property file="${user.home}/build.properties"/>
-
- </ant>
-
- </target>
-
- <!-- Run Cactus Servlet Sample dist target -->
- <target name="run.sample-servlet" depends="run.anttasks,run.framework">
-
- <ant target="dist" antfile="sample-servlet/build.xml"
- inheritAll="false">
-
- <!-- j2ee.jar property is needed here as it is overriden in the
- build-admin.xml and we need to propagate it -->
- <property name="j2ee.jar" value="${j2ee.jar}"/>
- <property file="build.properties"/>
- <property file="${user.home}/build.properties"/>
+ <target name="release" depends="clean">
+ <ant antfile="anttasks/build.xml" inheritAll="false"
+ target="release"/>
+ <ant antfile="framework/build.xml" inheritAll="false"
+ target="release"/>
+ <ant antfile="petals/ant/build.xml" inheritAll="false"
+ target="release"/>
+ <ant antfile="petals/eclipse/build.xml" inheritAll="false"
+ target="release"/>
+ <ant antfile="samples/servlet/build.xml" inheritAll="false"
+ target="release"/>
+ <ant antfile="documentation/build.xml" inheritAll="false"
+ target="release">
+ <property name="javadoc.include" value="true"/>
</ant>
</target>
-
- <!-- Run Documentation dist target -->
- <target name="run.documentation">
-
- <ant target="dist" antfile="documentation/build.xml"
- inheritAll="false">
-
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
-
- </ant>
-
- </target>
-
- <!-- Generate clover report -->
- <target name="run.clover" depends="run.framework,run.sample-servlet"
- if="clover.enable">
-
- <!-- Clover will read this file to generate the report -->
- <property name="clover.initstring"
- location="${target.dir}/clover-coverage.db"/>
- <echo message="clover.initstring = ${clover.initstring}"/>
-
- <java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter">
-
- <arg value="--outputdir"/>
- <arg path="${dist.doc.dir}/clover-${j2ee.api}"/>
- <arg value="--showSrc"/>
- <arg value="--initstring"/>
- <arg path="${clover.initstring}"/>
- <arg value="--title"/>
- <arg value="'Cactus ${project.version} for J2EE API ${j2ee.api}'"/>
-
- </java>
-
- </target>
-
- <!-- Run the dist target of all dependent projects -->
- <target name="run"
- depends="run.anttasks,run.framework,run.petal.ant,run.sample-servlet,run.documentation,run.clover">
- </target>
-
+
<!--
========================================================================
- Package all generated distributables from all subprojects into the
- main distribution area.
+ Clean all generated files by all Cactus subprojects.
========================================================================
- -->
- <target name="package.anttasks" depends="init">
-
- <!-- Rename the jars to suffix them with the version number -->
- <mkdir dir="${dist.lib.dir}"/>
- <copy tofile="${dist.lib.dir}/cactus-ant-${project.version}.jar"
- file="anttasks/dist/lib/cactus-ant.jar"/>
-
- </target>
-
- <target name="package.framework" depends="init">
-
- <!-- Rename the jars to suffix them with the version number -->
- <mkdir dir="${dist.lib.dir}"/>
- <copy tofile="${dist.lib.dir}/cactus-${project.version}.jar"
- file="framework/dist-${j2ee.api}/lib/cactus.jar"/>
-
- <mkdir dir="${dist.web.dir}"/>
- <copy todir="${dist.web.dir}">
- <fileset dir="framework/dist-${j2ee.api}/web"/>
- </copy>
-
- </target>
-
- <target name="package.sample-servlet" depends="init">
-
- <mkdir dir="${dist.sample.servlet.dir}"/>
- <unzip src="sample-servlet/dist-${j2ee.api}/bin/sample-servlet.zip"
- dest="${dist.sample.servlet.dir}"/>
-
- </target>
-
- <target name="package.documentation.clover.yes" if="clover.enable">
-
- <mkdir dir="${dist.doc.dir}"/>
- <copy tofile="${dist.doc.dir}/participating/coverage.html"
- file="documentation/dist/doc/participating/coverage_${j2ee.api}.html"/>
-
- </target>
-
- <target name="package.documentation.clover.no" unless="clover.enable">
-
- <mkdir dir="${dist.doc.dir}"/>
- <copy tofile="${dist.doc.dir}/participating/coverage.html"
- file="documentation/dist/doc/participating/coverage_empty.html"/>
-
- </target>
-
- <target name="package.documentation"
- depends="init,package.documentation.clover.yes,package.documentation.clover.no">
-
- <mkdir dir="${dist.doc.dir}"/>
- <copy todir="${dist.doc.dir}">
- <fileset dir="documentation/dist/doc">
- <exclude name="**/javadoc*.html"/>
- <exclude name="**/coverage*.html"/>
- </fileset>
- </copy>
- <copy tofile="${dist.doc.dir}/javadoc.html"
- file="documentation/dist/doc/javadoc_${j2ee.api}.html"/>
-
- <!-- copy javadoc -->
- <copy todir="${dist.doc.api.dir}/anttasks">
- <fileset dir="anttasks/dist/doc/api"/>
- </copy>
- <copy todir="${dist.doc.api.dir}/framework-${j2ee.api}">
- <fileset dir="framework/dist-${j2ee.api}/doc/api"/>
- </copy>
+ -->
+ <target name="clean">
- </target>
+ <ant antfile="anttasks/build.xml" inheritAll="false"
+ target="clean"/>
+ <ant antfile="framework/build.xml" inheritAll="false"
+ target="clean"/>
+ <ant antfile="petals/ant/build.xml" inheritAll="false"
+ target="clean"/>
+ <ant antfile="petals/eclipse/build.xml" inheritAll="false"
+ target="clean"/>
+ <ant antfile="samples/servlet/build.xml" inheritAll="false"
+ target="clean"/>
+ <ant antfile="documentation/build.xml" inheritAll="false"
+ target="clean"/>
- <target name="package"
- depends="package.anttasks,package.framework,package.sample-servlet,package.documentation">
</target>
<!--
========================================================================
- Make the distribution.
- ========================================================================
- -->
- <target name="dist" depends="run,package">
- </target>
-
- <!--
- ========================================================================
- Clean generated files (including distributables)
+ Generate the release files for all the Cactus subprojects and for
+ all supported J2EE APIs.
========================================================================
-->
- <target name="clean.anttasks" depends="init">
-
- <ant target="clean" antfile="anttasks/build.xml"
- inheritAll="false">
-
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
-
- </ant>
-
- </target>
-
- <target name="clean.framework" depends="init">
-
- <ant target="clean" antfile="framework/build.xml"
- inheritAll="false">
-
- <!-- j2ee.jar property is needed here as it is overriden in the
- build-admin.xml and we need to propagate it -->
- <property name="j2ee.jar" value="${j2ee.jar}"/>
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
-
- </ant>
-
- </target>
-
- <target name="clean.petal.ant" depends="clean.anttasks,clean.framework">
-
- <ant target="clean" antfile="petals/ant/build.xml"
- inheritAll="false">
-
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
-
- </ant>
-
- </target>
-
- <target name="clean.sample-servlet" depends="clean.anttasks,clean.framework">
-
- <ant target="clean" antfile="sample-servlet/build.xml"
- inheritAll="false">
-
- <!-- j2ee.jar property is needed here as it is overriden in the
- build-admin.xml and we need to propagate it -->
- <property name="j2ee.jar" value="${j2ee.jar}"/>
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
+ <target name="release.all">
+ <ant inheritAll="false" target="release">
+ <property name="j2ee.jar" value="${j2ee.12.jar}"/>
</ant>
- </target>
-
- <target name="clean.documentation" depends="clean.anttasks">
-
- <ant target="clean" antfile="documentation/build.xml"
- inheritAll="false">
-
- <property file="build.properties" />
- <property file="${user.home}/build.properties" />
-
+ <ant inheritAll="false" target="release">
+ <property name="j2ee.jar" value="${j2ee.13.jar}"/>
</ant>
</target>
- <target name="clean.cactus" depends="init">
-
- <delete dir="${target.dir}"/>
- <delete dir="${dist.dir}"/>
-
- </target>
-
- <target name="clean"
- depends="clean.cactus,clean.anttasks,clean.framework,clean.petal.ant,clean.sample-servlet,clean.documentation"
- description="Clean all generated files">
- </target>
-
<!--
========================================================================
- Clean all, for all J2EE APIs
+ Clean all generated files by all Cactus subprojects and for all
+ supported J2EE APIs.
========================================================================
-->
- <target name="clean.all"
- description="Clean all generated files (for all J2EE APIs)">
-
- <echo message="j2ee.12.jar = ${j2ee.12.jar}"/>
- <echo message="j2ee.13.jar = ${j2ee.13.jar}"/>
+ <target name="clean.all">
- <ant target="clean" inheritAll="false">
+ <ant inheritAll="false" target="clean">
<property name="j2ee.jar" value="${j2ee.12.jar}"/>
</ant>
- <ant target="clean" inheritAll="false">
+ <ant inheritAll="false" target="clean">
<property name="j2ee.jar" value="${j2ee.13.jar}"/>
</ant>
-
- </target>
-
- <!--
- ========================================================================
- Common script for both "release" and "gump" targets. Must only be
- called by "release" or "gump" target as it needs the following
- properties defined before calling it :
-
- cactus.release.name
-
- ========================================================================
- -->
- <target name="release.common" depends="init">
-
- <mkdir dir="${target.lib.dir}"/>
- <mkdir dir="${release.dir}"/>
-
- <!-- Copy external libraries in a tmp directory for them to be included
- in the distribution -->
- <copy todir="${target.lib.dir}" file="${log4j.jar}"/>
- <copy todir="${target.lib.dir}" file="${commons.logging.jar}"/>
- <copy todir="${target.lib.dir}" file="${commons.httpclient.jar}"/>
- <copy todir="${target.lib.dir}" file="${httpunit.jar}"/>
- <copy todir="${target.lib.dir}" file="${junit.jar}"/>
- <copy todir="${target.lib.dir}" file="${aspectjrt.jar}"/>
- <copy todir="${target.lib.dir}" file="${servlet.jar}"/>
- <copy todir="${target.lib.dir}" file="${jstl.jar}"/>
- <copy todir="${target.lib.dir}" file="${standard.jar}"/>
-
- <zip zipfile="${release.dir}/${cactus.release.name}.zip">
-
- <zipfileset dir="${dist.dir}" prefix="${cactus.release.name}"/>
-
- <!-- Add the external libraries to the zip (except the j2ee.jar one
- as it is already present in containers -->
- <zipfileset dir="${target.lib.dir}" prefix="${cactus.release.name}/lib">
- <include name="*.jar"/>
- </zipfileset>
-
- <!-- Add the licenses -->
- <zipfileset dir="." prefix="${cactus.release.name}">
- <include name="LICENSE.*"/>
- </zipfileset>
- </zip>
-
- </target>
-
- <!--
- ========================================================================
- Generate a full release (i.e. the zipped release file)
- ========================================================================
- -->
- <target name="release.prepare" depends="init">
-
- <!-- For a release, the suffix is the version -->
- <property name="project.suffix" value="-${project.version}"/>
-
- <!-- Name of full release -->
- <property name="cactus.release.name"
- value="${project.prefix}${project.name.file}-${j2ee.api}${project.suffix}"/>
-
- </target>
-
- <target name="release" depends="release.prepare,clean,dist,release.common"
- description="Generate a release">
- </target>
-
- <!--
- ========================================================================
- Generate a nightly gump release (i.e. the zipped release file).
- Note: Our Gump scripts builds all sub projects separately (see
- gump.xml) and thus we only need to package the distribution but there
- is no need to actually run the dependent projects as they have already
- been run by Gump at this stage.
- ========================================================================
- -->
- <target name="gump.prepare" depends="init">
-
- <!-- Sets the date for the release prefix : YYYYMMDD -->
- <tstamp/>
-
- <!-- Suffix to add to all distributable files -->
- <property name="project.suffix" value="-${DSTAMP}"/>
-
- <!-- Name of nightly release -->
- <property name="cactus.release.name"
- value="${project.prefix}${project.name.file}-${j2ee.api}${project.suffix}"/>
-
- </target>
-
- <target name="gump" depends="gump.prepare,package,release.common"
- description="Generate a nightly gump release">
- </target>
-
- <!--
- ========================================================================
- Common target for both "release.src" and "gump.src".
- ========================================================================
- -->
- <target name="release.src.common" depends="init">
-
- <mkdir dir="${release.dir}"/>
-
- <zip zipfile="${release.dir}/${cactus.release.src.name}.zip">
-
- <zipfileset dir="." prefix="${cactus.release.src.name}">
- <exclude name="**/target*/**"/>
- <exclude name="**/dist*/**"/>
- <exclude name="**/release/**"/>
- <exclude name="**/misc/**"/>
- <exclude name="**/*.log"/>
- <exclude name="**/build.properties"/>
- <exclude name="**/ant.bat"/>
- <exclude name="**/.*"/>
- </zipfileset>
-
- </zip>
-
- </target>
-
- <!--
- ========================================================================
- Generate the source distributable.
- ========================================================================
- -->
- <target name="release.src.prepare" depends="init">
-
- <!-- For a release, the suffix is the version -->
- <property name="project.suffix" value="-${project.version}"/>
-
- <!-- Name of full src release -->
- <property name="cactus.release.src.name"
- value="${project.prefix}${project.name.file}-src${project.suffix}"/>
-
- </target>
-
- <target name="release.src" depends="release.src.prepare,release.src.common"
- description="Generate release sources">
- </target>
-
- <!--
- ========================================================================
- Generate the source nightly build distributable.
- ========================================================================
- -->
- <target name="gump.src.prepare" depends="init">
-
- <!-- Sets the date for the release prefix : YYYYMMDD -->
- <tstamp/>
-
- <!-- Suffix to add to all distributable files -->
- <property name="project.suffix" value="-${DSTAMP}"/>
-
- <!-- Name of nightly src release -->
- <property name="cactus.release.src.name"
- value="${project.prefix}${project.name.file}-src${project.suffix}"/>
-
- </target>
-
- <target name="gump.src" depends="gump.src.prepare,release.src.common"
- description="Generate nightly gump sources">
+
</target>
</project>
1.11 +1 -0 jakarta-cactus/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-cactus/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 22 Aug 2002 20:37:03 -0000 1.10
+++ .cvsignore 3 Feb 2003 08:40:56 -0000 1.11
@@ -13,3 +13,4 @@
cactus_client.log
cactus_server.log
target
+bin
1.1 jakarta-cactus/build-common.xml
Index: build-common.xml
===================================================================
<!--
=============================================================================
Build file used by the different Cactus subprojects. It contains common
Ant properties and common useful targets.
The following properties need to be defined prior to include this scriptlet
in your build script:
base.dir Base directory for all file related operations. Ex:
"framework" for the Framework subproject
=============================================================================
-->
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it) -->
<property file="${basedir}/${base.dir}/build.properties" />
<property file="${basedir}/build.properties" />
<property file="${user.home}/build.properties" />
<!-- Project version -->
<property name="project.version" value="1.5dev"/>
<property name="project.version.previous" value="1.4.1"/>
<!-- Prefix to add to all distributable files -->
<property name="project.prefix" value="jakarta"/>
<!--
========================================================================
Default values for properties not defined in build.properties or in
a higher level calling Ant script
========================================================================
-->
<property name="year" value="2000-2003"/>
<property name="debug" value="on"/>
<property name="optimize" value="off"/>
<property name="deprecation" value="off"/>
<!--
========================================================================
Set the properties related to the target area
========================================================================
-->
<target name="init.properties.target.j2ee" if="j2ee.api">
<property name="target.dir" value="${base.dir}/target-${j2ee.api}"/>
</target>
<target name="init.properties.target.noj2ee" unless="j2ee.api">
<property name="target.dir" value="${base.dir}/target"/>
</target>
<target name="init.properties.target"
depends="init.properties.target.j2ee,init.properties.target.noj2ee"/>
<!--
========================================================================
Set the properties related to the dist area
========================================================================
-->
<target name="init.properties.dist.j2ee" if="j2ee.api">
<property name="dist.dir" value="${base.dir}/dist-${j2ee.api}"/>
</target>
<target name="init.properties.dist.noj2ee" unless="j2ee.api">
<property name="dist.dir" value="${base.dir}/dist"/>
</target>
<target name="init.properties.dist"
depends="init.properties.dist.j2ee,init.properties.dist.noj2ee">
<property name="dist.lib.dir" value="${dist.dir}/lib"/>
<property name="dist.bin.dir" value="${dist.dir}/bin"/>
<property name="dist.doc.dir" value="${dist.dir}/doc"/>
<property name="dist.doc.api.dir" value="${dist.doc.dir}/api"/>
<property name="dist.web.dir" value="${dist.dir}/web"/>
</target>
<!--
========================================================================
Set the properties related to the produced artifacts
========================================================================
-->
<target name="init.properties.artifact">
<!-- The location of the Cactus Ant tasks jar -->
<property name="cactus.anttasks.jar.name" value="cactus-anttasks"/>
<property name="cactus.anttasks.jar"
location="anttasks/dist/lib/${cactus.anttasks.jar.name}.jar"/>
<!-- The location of the Cactus framework jar -->
<property name="cactus.framework.jar.name" value="cactus-framework"/>
<property name="cactus.framework.jar"
value="framework/dist-${j2ee.api}/lib/${cactus.framework.jar.name}.jar"/>
<!-- The location of the Clover(ed) Cactus framework jar -->
<property name="cactus.framework.clover.jar.name"
value="${cactus.framework.jar.name}-clover"/>
<property name="cactus.framework.clover.jar"
value="framework/dist-${j2ee.api}/lib/${cactus.framework.clover.jar.name}.jar"/>
<!-- The location of the web files generated by the Cactus framework
(i.e. the JSP Redirector) -->
<property name="cactus.framework.web"
value="framework/dist-${j2ee.api}/web"/>
<!-- The Ant Petal jar and helper classes -->
<property name="cactus.antpetal.jar.name" value="cactus-petal-ant"/>
<property name="cactus.antpetal.jar"
value="petals/ant/dist-${j2ee.api}/lib/${cactus.antpetal.jar.name}.jar"/>
<property name="cactus.antpetal.bin"
value="petals/ant/dist-${j2ee.api}/bin/${cactus.antpetal.jar.name}"/>
</target>
<!--
========================================================================
Set the properties related to the release area
========================================================================
-->
<target name="init.properties.release.j2ee" if="j2ee.api">
<property name="release.dir" value="${base.dir}/release-${j2ee.api}"/>
<property name="main.release.name"
value="${project.prefix}-${project.name.file}-${j2ee.api}-${project.version}"/>
</target>
<target name="init.properties.release.noj2ee" unless="j2ee.api">
<property name="release.dir" value="${base.dir}/release"/>
<property name="main.release.name"
value="${project.prefix}-${project.name.file}-${project.version}"/>
</target>
<target name="init.properties.release"
depends="init.properties.release.j2ee,init.properties.release.noj2ee"/>
<!--
========================================================================
Display configurable properties values
========================================================================
-->
<target name="init.display">
<echo>----- ${project.name.text} ${project.version} -----</echo>
<echo></echo>
<echo>java.class.path = ${java.class.path}"</echo>
<echo></echo>
<echo>java.home = ${java.home}</echo>
<echo>user.home = ${user.home}</echo>
<echo>ant.home = ${ant.home}</echo>
<echo></echo>
</target>
<!--
========================================================================
Decide if the current project being built depends on the J2EE API
version or not.
========================================================================
-->
<target name="init.j2ee.dependent">
<condition property="j2ee.dependent" value="true">
<or>
<equals arg1="${base.dir}" arg2="framework"/>
<equals arg1="${base.dir}" arg2="samples/servlet"/>
<equals arg1="${base.dir}" arg2="samples/jetty"/>
<equals arg1="${base.dir}" arg2="petals/ant"/>
<equals arg1="${base.dir}" arg2="petals/eclipse"/>
</or>
</condition>
</target>
<!--
========================================================================
Find out the J2EE API version
========================================================================
-->
<target name="init.j2ee.find" if="j2ee.dependent">
<condition property="j2ee.api" value="13">
<available classname="javax.servlet.Filter">
<classpath>
<pathelement location="${j2ee.jar}"/>
</classpath>
</available>
</condition>
<condition property="j2ee.api" value="12">
<available classname="javax.servlet.Servlet">
<classpath>
<pathelement location="${j2ee.jar}"/>
</classpath>
</available>
</condition>
<fail message="Unsupported J2EE version" unless="j2ee.api"/>
<echo message="j2ee.api = ${j2ee.api}"/>
</target>
<!--
========================================================================
Set J2EE related properties
========================================================================
-->
<target name="init.j2ee" depends="init.j2ee.dependent,init.j2ee.find"/>
<!--
========================================================================
Load all properties
========================================================================
-->
<target name="init.properties"
depends="init.j2ee,init.properties.target,init.properties.dist,
init.properties.release,init.properties.artifact"/>
<!--
========================================================================
Initialize the build. Must be called by all targets
========================================================================
-->
<target name="init.common" depends="init.properties,init.display">
<tstamp/>
<condition property="offline">
<or>
<isset property="offline"/>
<not>
<http url="http://jakarta.apache.org/"/>
</not>
</or>
</condition>
<!-- Filters -->
<filter token="version" value="${project.version}"/>
<filter token="year" value="${year}"/>
<filter token="today" value="${TODAY}"/>
</target>
<!--
========================================================================
Initialize Checkstyle.
========================================================================
-->
<target name="init.checkstyle.check">
<path id="checkstyle.classpath">
<pathelement location="${antlr.jar}"/>
<pathelement location="${checkstyle.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${regexp.jar}"/>
<!-- Includes system classpath for jars that are in ANT_HOME/lib
such as aspectrt.jar, etc -->
<pathelement path="${java.class.path}"/>
</path>
<condition property="checkstyle.available">
<and>
<available
classname="antlr.Parser"
classpathref="checkstyle.classpath"/>
<available
classname="org.apache.commons.collections.CollectionUtils"
classpathref="checkstyle.classpath"/>
<available
classname="org.apache.commons.logging.Log"
classpathref="checkstyle.classpath"/>
<available
classname="org.apache.commons.beanutils.BeanUtils"
classpathref="checkstyle.classpath"/>
<available
classname="org.apache.regexp.RE"
classpathref="checkstyle.classpath"/>
<available
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"
classpathref="checkstyle.classpath"/>
</and>
</condition>
</target>
<target name="init.checkstyle"
depends="init.checkstyle.check"
if="checkstyle.available">
<taskdef resource="checkstyletask.properties"
classpathref="checkstyle.classpath"/>
</target>
<!--
========================================================================
Clean generated files (including distributables)
========================================================================
-->
<target name="clean" depends="init.properties"
description="Clean all generated files">
<delete dir="${target.dir}"/>
<delete dir="${dist.dir}"/>
<delete dir="${release.dir}"/>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org