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:35:28 UTC
cvs commit: jakarta-cactus/anttasks .cvsignore build.properties.sample README build.xml
vmassol 2003/02/03 00:35:28
Modified: anttasks .cvsignore build.properties.sample README build.xml
Removed: anttasks/src/java/org/apache/cactus/ant
StopServerHelper.java StartServerTask.java
StartServerHelper.java EnhydraRun.java
StopServerTask.java ResinRun.java
AbstractServerRun.java RunServerTestsTask.java
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.3 +1 -0 jakarta-cactus/anttasks/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 20 Jul 2002 12:21:40 -0000 1.2
+++ .cvsignore 3 Feb 2003 08:35:28 -0000 1.3
@@ -1,4 +1,5 @@
build.properties
dist
target
+release
ant.bat
1.5 +9 -3 jakarta-cactus/anttasks/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/build.properties.sample,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.properties.sample 26 Dec 2002 13:11:50 -0000 1.4
+++ build.properties.sample 3 Feb 2003 08:35:28 -0000 1.5
@@ -20,8 +20,14 @@
# Optional properties
# -----------------------------------------------------------------------------
-# Dependancies for Checkstyle code auditing
-# If not specified here, the JARs must be present in ANTHOME/lib
+# Dependencies for Checkstyle code auditing. If not specified here, the JARs
+# must be present in ANTHOME/lib.
+
+# Location of all jars. Note: This is not a mandatory property. It is only
+# used here so that it can be reused when defining the location of all the jars
+# below. You do not have to put all the external jars in a single location.
+lib.repo = c:/apps/maven/repository
+
antlr.jar = ${lib.repo}/antlr/jars/antlr-2.7.1.jar
checkstyle.jar = ${lib.repo}/checkstyle/jars/checkstyle-2.4.jar
commons-beanutils.jar = ${lib.repo}/commons-beanutils/jars/commons-beanutils-1.5.jar
1.2 +4 -4 jakarta-cactus/anttasks/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README 24 Feb 2002 19:25:44 -0000 1.1
+++ README 3 Feb 2003 08:35:28 -0000 1.2
@@ -1,4 +1,4 @@
-This subproject contains custom Ant tasks useful for automating cactus unit
-testing.
-
-Note that all these tasks are generic and can be used without using Cactus.
\ No newline at end of file
+This subproject contains generic Ant tasks used in other subproject builds.
+Ideally these task should be found in the Ant project itself. Once Ant provides
+features to achieve the small goal as these task we will deprecate and remove
+them.
\ No newline at end of file
1.34 +50 -123 jakarta-cactus/anttasks/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/anttasks/build.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- build.xml 22 Jan 2003 14:34:30 -0000 1.33
+++ build.xml 3 Feb 2003 08:35:28 -0000 1.34
@@ -1,139 +1,65 @@
<?xml version="1.0"?>
<!DOCTYPE project [
- <!ENTITY common SYSTEM "file:../common.xml">
+ <!ENTITY common SYSTEM "file:../build-common.xml">
]>
<!--
=============================================================================
- Build file for the Cactus custom Ant tasks.
+ Build file for the Cactus Ant tasks.
- The following Ant tasks need to be available in your ant installation (i.e.
- the Ant task themselves and their dependent jars need to be put in
- ANT_HOME/lib) :
-
- checkstyle [OPTIONAL] Only needed for the "checkstyle" target
- which is used to check coding and
- naming conventions.
+ See build.properties.sample for mandatory and optional Ant properties that
+ need to be set prior to calling this build script.
This script should be started with the following command line :
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.
Note: basedir points to the main Cactus directory in order to have the same
base dir for all Cactus subprojects and thus be able to share
relative paths.
=============================================================================
-->
-<project name="Cactus Ant custom tasks" default="dist" basedir="..">
+<project name="Cactus Ant Tasks" default="dist" basedir="..">
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it) -->
- <property file="${basedir}/anttasks/build.properties" />
- <property file="${basedir}/build.properties" />
- <property file="${user.home}/build.properties" />
+ <!-- Base directory for all file related operations -->
+ <property name="base.dir" value="anttasks"/>
+
+ <!-- Include properties and targets common to the different subprojects -->
+ &common;
<!-- Global project properties -->
<property name="project.name.text" value="Cactus Ant tasks"/>
- <property name="project.name.file" value="cactus-ant"/>
- <property name="project.version" value="1.5dev"/>
-
- <!-- 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"/>
-
- <!--
- ========================================================================
- Base directory for all file related operations
- ========================================================================
- -->
- <property name="base.dir" location="anttasks"/>
-
- <!--
- ========================================================================
- Set the properties related to the source tree
- ========================================================================
- -->
- <!-- Source locations for the build -->
- <property name="src.dir" location="${base.dir}/src"/>
- <property name="src.java.dir" location="${src.dir}/java"/>
- <property name="build.dir" location="${base.dir}/."/>
-
- <!--
- ========================================================================
- Set the properties related to the target area
- ========================================================================
- -->
- <!-- Destination locations for the build -->
- <property name="target.dir" location="${base.dir}/target"/>
- <property name="target.classes.dir" location="${target.dir}/classes"/>
- <property name="target.classes.java.dir"
- location="${target.classes.dir}/java"/>
- <property name="target.doc.dir" location="${target.dir}/doc"/>
- <property name="target.doc.api.dir" location="${target.doc.dir}/api"/>
-
- <!-- Distribution directory, i.e. where the expanded distibutable files
- are located -->
- <property name="dist.dir" location="${base.dir}/dist"/>
- <property name="dist.lib.dir" location="${dist.dir}/lib"/>
- <property name="dist.doc.dir" location="${dist.dir}/doc"/>
- <property name="dist.doc.api.dir" location="${dist.doc.dir}/api"/>
-
- <!--
- ========================================================================
- Names of deliverables
- ========================================================================
- -->
-
- <!-- The custom task jar and helper classes -->
- <property name="anttasks.jar.name" value="${project.name.file}"/>
+ <property name="project.name.file" value="cactus-anttasks"/>
<!--
========================================================================
- Include common targets and properties
+ Initialize source, target and dist properties
========================================================================
-->
- &common;
+ <target name="properties">
- <!--
- ========================================================================
- Display configurable properties values
- ========================================================================
- -->
- <target name="display.properties">
+ <!-- Set the properties related to the source tree -->
+ <property name="src.dir" value="${base.dir}/src"/>
+ <property name="src.java.dir" value="${src.dir}/java"/>
+ <property name="build.dir" value="${base.dir}/."/>
- <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>
+ <!-- Set the properties related to the target area -->
+ <property name="target.classes.dir" value="${target.dir}/classes"/>
+ <property name="target.classes.java.dir"
+ value="${target.classes.dir}/java"/>
+ <property name="target.doc.dir" value="${target.dir}/doc"/>
+ <property name="target.doc.api.dir" value="${target.doc.dir}/api"/>
</target>
-
+
<!--
========================================================================
Initialize the build. Must be called by all targets
========================================================================
-->
- <target name="init" depends="display.properties">
-
- <tstamp/>
-
+ <target name="init" depends="init.common,properties">
</target>
<!--
@@ -146,7 +72,8 @@
<mkdir dir="${target.classes.java.dir}"/>
<javac srcdir="${src.java.dir}" destdir="${target.classes.java.dir}"
- deprecation="${deprecation}" optimize="${optimize}"/>
+ deprecation="${deprecation}" optimize="${optimize}"
+ debug="${debug}"/>
</target>
@@ -157,7 +84,7 @@
-->
<target name="jar" depends="compile" description="Generate the library jar">
- <jar jarfile="${target.dir}/${anttasks.jar.name}.jar">
+ <jar jarfile="${target.dir}/${cactus.anttasks.jar.name}.jar">
<manifest>
<section name="org/apache/cactus/ant/">
@@ -200,9 +127,7 @@
</target>
- <target name="doc"
- depends="doc.check"
- unless="doc.uptodate"
+ <target name="doc" depends="doc.check" unless="doc.uptodate"
description="Generates the API documentation">
<mkdir dir="${target.doc.api.dir}"/>
@@ -219,24 +144,23 @@
doctitle="${project.name.text} ${project.version}"
bottom="Copyright &copy; ${year} Apache Software Foundation.
All Rights Reserved.">
-
</javadoc>
</target>
<!--
========================================================================
- Generate the distributable files
+ Generate the artifacts
========================================================================
-->
<target name="dist" depends="jar,doc,checkstyle"
- description="Generate the distributable files">
+ description="Generate the project artifacts">
<mkdir dir="${dist.lib.dir}"/>
<mkdir dir="${dist.doc.api.dir}"/>
<copy todir="${dist.lib.dir}"
- file="${target.dir}/${anttasks.jar.name}.jar"/>
+ file="${target.dir}/${cactus.anttasks.jar.name}.jar"/>
<copy todir="${dist.doc.api.dir}">
<fileset dir="${target.doc.api.dir}"/>
</copy>
@@ -245,23 +169,10 @@
<!--
========================================================================
- Clean generated files (including distributables)
- ========================================================================
- -->
- <target name="clean" description="Clean all generated files">
-
- <delete dir="${target.dir}"/>
- <delete dir="${dist.dir}"/>
-
- </target>
-
- <!--
- ========================================================================
Perform a code audit using CheckStyle.
========================================================================
-->
- <target name="checkstyle"
- depends="init, init.checkstyle"
+ <target name="checkstyle" depends="init,init.checkstyle"
if="checkstyle.available"
description="Perform a code audit using Checkstyle">
@@ -281,6 +192,22 @@
<property key="checkstyle.header.file" file="./LICENSE.cactus"/>
</checkstyle>
+ </target>
+
+ <!--
+ ========================================================================
+ Generate the release
+ ========================================================================
+ -->
+ <target name="release" depends="clean,dist"
+ description="Generate the release files">
+
+ <mkdir dir="${release.dir}"/>
+
+ <zip destfile="${release.dir}/${main.release.name}.zip">
+ <zipfileset dir="${dist.dir}" prefix="${main.release.name}"/>
+ </zip>
+
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org