donaldp 2003/02/28 19:18:41
Modified: . build.xml
Log:
styled
Revision Changes Path
1.208 +122 -125 avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-phoenix/build.xml,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- build.xml 1 Mar 2003 02:56:54 -0000 1.207
+++ build.xml 1 Mar 2003 03:18:41 -0000 1.208
@@ -99,12 +99,12 @@
<pathelement path="${converter.jar}"/>
<pathelement path="${mx4j.jar}"/>
<pathelement path="${mx4j-tools.jar}"/>
- <pathelement path="${java.class.path}" />
+ <pathelement path="${java.class.path}"/>
<fileset dir="${lib.dir}">
- <include name="**/*.jar" />
+ <include name="**/*.jar"/>
</fileset>
- <pathelement path="${target.classes}" />
+ <pathelement path="${target.classes}"/>
</path>
<path id="test.class.path">
@@ -207,7 +207,7 @@
<mkdir dir="${target.src}"/>
<copy todir="${target.src}">
<fileset dir="${compat.dir}">
- <include name="${constants.file}" />
+ <include name="${constants.file}"/>
</fileset>
<fileset dir="${java.dir}">
<include name="${container.constants.file}"/>
@@ -235,11 +235,11 @@
debug="${build.debug}"
optimize="${build.optimize}"
deprecation="${build.deprecation}">
- <classpath refid="project.class.path" />
- <src path="${target.src}" />
- <src path="${compat.dir}" />
+ <classpath refid="project.class.path"/>
+ <src path="${target.src}"/>
+ <src path="${compat.dir}"/>
<src path="${api.dir}"/>
- <exclude name="${constants.file}" />
+ <exclude name="${constants.file}"/>
<exclude name="${container.constants.file}"/>
<exclude name="org/apache/avalon/phoenix/frontends/PhoenixServlet.java"
unless="servlet.present"/>
<exclude
name="org/apache/avalon/phoenix/frontends/ComposableServlet.java"
unless="servlet.present"/>
@@ -251,14 +251,14 @@
<copy todir="${target.classes}">
<fileset dir="${java.dir}">
- <include name="**/*.properties" />
- <include name="**/*.xdt" />
+ <include name="**/*.properties"/>
+ <include name="**/*.xdt"/>
</fileset>
</copy>
<copy todir="${target.classes}/org/apache/avalon/phoenix/tools/">
<fileset dir="${src.dir}/schema">
- <include name="**/*.dtd" />
+ <include name="**/*.dtd"/>
</fileset>
</copy>
@@ -266,17 +266,17 @@
<target name="test-generate">
- <taskdef name="generatemeta"
classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
- <classpath refid="test.class.path" />
- </taskdef>
-
- <mkdir dir="${target.test-metagenerate}"/>
-
- <generatemeta dest="${target.test-metagenerate}">
- <fileset dir="src/test">
- <include name="**/*.java"/>
- </fileset>
- </generatemeta>
+ <taskdef name="generatemeta"
classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
+ <classpath refid="test.class.path"/>
+ </taskdef>
+
+ <mkdir dir="${target.test-metagenerate}"/>
+
+ <generatemeta dest="${target.test-metagenerate}">
+ <fileset dir="src/test">
+ <include name="**/*.java"/>
+ </fileset>
+ </generatemeta>
</target>
@@ -298,13 +298,13 @@
debug="${target.debug}"
optimize="${target.optimize}"
deprecation="${target.deprecation}">
- <classpath refid="test.class.path" />
- <src path="${test.dir}" />
+ <classpath refid="test.class.path"/>
+ <src path="${test.dir}"/>
</javac>
<copy todir="${target.testclasses}">
<fileset dir="${test.dir}">
- <exclude name="**/*.java" />
+ <exclude name="**/*.java"/>
</fileset>
</copy>
@@ -336,13 +336,13 @@
<mkdir dir="${target.metagenerate}"/>
<taskdef name="generatemeta"
classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
- <classpath refid="project.class.path" />
+ <classpath refid="project.class.path"/>
</taskdef>
<generatemeta dest="${target.metagenerate}">
- <fileset dir="${java.dir}">
- <include name="**/*.java"/>
- </fileset>
+ <fileset dir="${java.dir}">
+ <include name="**/*.java"/>
+ </fileset>
</generatemeta>
</target>
@@ -375,14 +375,14 @@
</jar>
<jar jarfile="${target.lib}/phoenix-engine.jar">
- <fileset dir="${target.classes}" >
+ <fileset dir="${target.classes}">
<include name="org/apache/avalon/phoenix/engine/**"/>
<include name="org/apache/avalon/phoenix/frontends/**"/>
<include name="org/apache/avalon/phoenix/components/**"/>
<include name="org/apache/avalon/phoenix/interfaces/**"/>
<exclude name="org/apache/avalon/phoenix/launcher/**"/>
</fileset>
- <fileset dir="${target.metagenerate}" >
+ <fileset dir="${target.metagenerate}">
<include name="org/apache/avalon/phoenix/engine/**"/>
<include name="org/apache/avalon/phoenix/frontends/**"/>
<include name="org/apache/avalon/phoenix/components/**"/>
@@ -409,10 +409,8 @@
<include name="org/apache/avalon/phoenix/containerkit/**"/>
</jar>
-
</target>
-
<target name="checkstyle" if="do.checkstyle" description="Checkstyle">
<!-- this invocation of checkstyle requires that checkstyle be downloaded
and setup -->
@@ -523,22 +521,22 @@
<fileset dir="${lib.dir}/deploy/lib"/>
</copy>
- <delete dir="${target.mx}"/>
- <unzip src="${mx4j-tools.jar}" dest="${target.mx}"/>
- <property name="strings_en.xml"
value="${target.mx}/mx4j/adaptor/http/xsl/strings_en.xml"/>
- <replace file="${strings_en.xml}" token="MX4J/Http Adaptor" value="Apache's
Phoenix Server"/>
- <replace file="${strings_en.xml}" token="mx4jlogo" value="phoenixlogo"/>
- <replace file="${strings_en.xml}" token="MX4J logo" value="Phoenix Logo"/>
- <replace file="${strings_en.xml}" token="JMX Management Console"
value="Avalon-Phoenix Management Console"/>
- <replace file="${strings_en.xml}" token="logo.gif" value="phoenix.gif"/>
- <replace file="${strings_en.xml}" token="common.phoenix.gif"
value="common.logo.gif"/>
- <replace file="${strings_en.xml}" token="100" value=""/>
- <replace file="${strings_en.xml}" token="50" value=""/>
- <replace file="${strings_en.xml}" token="mx4j.sourceforge.net"
value="jakarta.apache.org/avalon/phoenix"/>
- <replace file="${target.mx}/mx4j/adaptor/http/xsl/stylesheet.css"
token="183,187,184" value="white"/>
+ <delete dir="${target.mx}"/>
+ <unzip src="${mx4j-tools.jar}" dest="${target.mx}"/>
+ <property name="strings_en.xml"
value="${target.mx}/mx4j/adaptor/http/xsl/strings_en.xml"/>
+ <replace file="${strings_en.xml}" token="MX4J/Http Adaptor" value="Apache's
Phoenix Server"/>
+ <replace file="${strings_en.xml}" token="mx4jlogo" value="phoenixlogo"/>
+ <replace file="${strings_en.xml}" token="MX4J logo" value="Phoenix Logo"/>
+ <replace file="${strings_en.xml}" token="JMX Management Console"
value="Avalon-Phoenix Management Console"/>
+ <replace file="${strings_en.xml}" token="logo.gif" value="phoenix.gif"/>
+ <replace file="${strings_en.xml}" token="common.phoenix.gif"
value="common.logo.gif"/>
+ <replace file="${strings_en.xml}" token="100" value=""/>
+ <replace file="${strings_en.xml}" token="50" value=""/>
+ <replace file="${strings_en.xml}" token="mx4j.sourceforge.net"
value="jakarta.apache.org/avalon/phoenix"/>
+ <replace file="${target.mx}/mx4j/adaptor/http/xsl/stylesheet.css"
token="183,187,184" value="white"/>
<copy file="src/logos/phoenix.gif"
todir="${target.mx}/mx4j/adaptor/http/xsl"/>
- <zip destfile="${target.lib}/mx4j-tools.jar" basedir="${target.mx}"/>
+ <zip destfile="${target.lib}/mx4j-tools.jar" basedir="${target.mx}"/>
<copy file="${mx4j.jar}" todir="${bin.dist.bin}/lib"/>
<copy file="${target.lib}/mx4j-tools.jar" todir="${bin.dist.bin}/lib"/>
@@ -549,11 +547,11 @@
<copy file="${script.dir}/run.sh" todir="${bin.dist.bin}"/>
<copy file="${script.dir}/phoenix.sh" todir="${bin.dist.bin}"/>
- <chmod dir="${bin.dist.dir}" perm="go-rwx" />
+ <chmod dir="${bin.dist.dir}" perm="go-rwx"/>
<chmod file="${bin.dist.bin}/*.sh" perm="u+x"/>
<chmod file="${bin.dist.bin}/*.bat" perm="u-x"/>
- <fixcrlf srcdir="${bin.dist.dir}" includes="**/*.bat" eol="crlf" />
- <fixcrlf srcdir="${bin.dist.dir}" includes="**/*.sh" eol="lf" />
+ <fixcrlf srcdir="${bin.dist.dir}" includes="**/*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${bin.dist.dir}" includes="**/*.sh" eol="lf"/>
</target>
@@ -571,14 +569,14 @@
<chmod file="${bin.dist.bin}/wrapper" perm="u+x"/>
<copy file="${conf.dir}/wrapper.conf" todir="${bin.dist.conf}"/>
- <fixcrlf srcdir="${bin.dist.conf}" includes="wrapper.conf" eol="lf" />
+ <fixcrlf srcdir="${bin.dist.conf}" includes="wrapper.conf" eol="lf"/>
</target>
<target name="install"
depends="dist-lite-wrapper,install-check-phoenix"
description="Install phoenix into phoenix.home">
- <mkdir dir="${phoenix.home}" />
+ <mkdir dir="${phoenix.home}"/>
<copy todir="${phoenix.home}">
<fileset dir="${bin.dist.dir}"/>
@@ -590,7 +588,7 @@
</target>
<target name="install-check-phoenix" unless="phoenix.home">
- <fail message="phoenix.home not specified." />
+ <fail message="phoenix.home not specified."/>
</target>
<!-- Create the distribution -->
@@ -621,17 +619,17 @@
</copy>
<echo file="${bin.dist.tools}/readme.txt" append="false">
-These are tools useful for build-time only.
-You can delete the tools/ dir for a runtime install of Phoenix.
+ These are tools useful for build-time only.
+ You can delete the tools/ dir for a runtime install of Phoenix.
-phoenix-metagenerate.jar needs to be used with qdox-1.0.jar
- See http://cvs.apache.org/viewcvs/avalon-apps/demo/target.xml for usage
- See http://jakarta.apache.org/avalon/phoenix/mx/index.html for documentation
-
-phoenix-punit.jar needs to be used with phoenix-containerkit-1.0.jar
- See
http://cvs.apache.org/viewcvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test/
- for usage.
- See http://jakarta.apache.org/avalon/phoenix/punit/index.html for documentation
+ phoenix-metagenerate.jar needs to be used with qdox-1.0.jar
+ See http://cvs.apache.org/viewcvs/avalon-apps/demo/target.xml for usage
+ See http://jakarta.apache.org/avalon/phoenix/mx/index.html for
documentation
+
+ phoenix-punit.jar needs to be used with phoenix-containerkit-1.0.jar
+ See
http://cvs.apache.org/viewcvs/avalon-phoenix/src/test/org/apache/avalon/phoenix/tools/punit/test/
+ for usage.
+ See http://jakarta.apache.org/avalon/phoenix/punit/index.html for
documentation
</echo>
<filter token="version" value="${version}"/>
@@ -644,7 +642,7 @@
</fileset>
</copy>
- <chmod dir="${bin.dist.dir}" perm="go-rwx" />
+ <chmod dir="${bin.dist.dir}" perm="go-rwx"/>
</target>
@@ -657,7 +655,7 @@
<property name="src.dist.lib" value="${src.dist.dir}/lib"/>
<property name="src.dist.tools" value="${src.dist.dir}/tools"/>
- <mkdir dir="${src.dist.dir}" />
+ <mkdir dir="${src.dist.dir}"/>
<mkdir dir="${src.dist.docs}"/>
<mkdir dir="${src.dist.javadocs}"/>
@@ -717,7 +715,7 @@
</copy>
<fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
- <chmod dir="${src.dist.dir}" perm="go-rwx" />
+ <chmod dir="${src.dist.dir}" perm="go-rwx"/>
</target>
@@ -727,7 +725,7 @@
<mkdir dir="${dist.base}"/>
<antcall target="bin-dist">
- <param name="bin.dist.dir" value="${dist.name}" />
+ <param name="bin.dist.dir" value="${dist.name}"/>
</antcall>
<!-- Two readme files to ensure directories are untarred -->
@@ -742,10 +740,10 @@
</echo>
<zip zipfile="${dist.base}/${dist.name}-bin.zip">
- <fileset dir="${dist.name}/..">
- <include name="${dist.name}/**"/>
- <exclude name="${dist.name}/lib/bsh*.jar"/>
- </fileset>
+ <fileset dir="${dist.name}/..">
+ <include name="${dist.name}/**"/>
+ <exclude name="${dist.name}/lib/bsh*.jar"/>
+ </fileset>
</zip>
<tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
@@ -764,17 +762,17 @@
<delete file="${dist.base}/${dist.name}-bin.tar"/>
- <delete dir="${dist.name}" />
+ <delete dir="${dist.name}"/>
<antcall target="src-dist">
- <param name="src.dist.dir" value="${dist.name}" />
+ <param name="src.dist.dir" value="${dist.name}"/>
</antcall>
<zip zipfile="${dist.base}/${dist.name}-src.zip"
basedir="${dist.name}/.."
includes="${dist.name}/**"/>
- <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
+ <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar">
<tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
<include name="${dist.name}/**"/>
</tarfileset>
@@ -784,7 +782,7 @@
src="${dist.base}/${dist.name}-src.tar"/>
<delete file="${dist.base}/${dist.name}-src.tar"/>
- <delete dir="${dist.name}" />
+ <delete dir="${dist.name}"/>
</target>
@@ -811,8 +809,8 @@
<!-- Cleans up build and distribution directories -->
<target name="clean" description="cleans up the created directories">
- <delete dir="${target.dir}" />
- <delete dir="${bin.dist.dir}" />
+ <delete dir="${target.dir}"/>
+ <delete dir="${bin.dist.dir}"/>
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
<fileset dir="." includes="velocity.log*"/>
@@ -821,7 +819,7 @@
<!-- Cleans absolutely everything up -->
<target name="distclean" depends="clean" description="cleans up all generated
files and directories">
- <delete dir="${dist.base}" />
+ <delete dir="${dist.base}"/>
<delete>
<fileset dir="." includes="jakarta-news.xml"/>
<fileset dir="." includes="Announcement.txt"/>
@@ -829,30 +827,30 @@
</target>
- <!-- Create the API documentation -->
- <target name="javadocs">
+ <!-- Create the API documentation -->
+ <target name="javadocs">
- <delete dir="${target.javadocs}"/>
- <mkdir dir="${target.javadocs}"/>
+ <delete dir="${target.javadocs}"/>
+ <mkdir dir="${target.javadocs}"/>
- <javadoc packagenames="org.apache.*"
- sourcepath="${java.dir}:${compat.dir}:${api.dir}"
- destdir="${target.javadocs}">
- <classpath refid="project.class.path" />
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-doctitle" value="${Name}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom"
- value=""Copyright © 2001 Apache Jakarta Project. All
Rights Reserved.""/>
- <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
- <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
- </doclet>
- </javadoc>
+ <javadoc packagenames="org.apache.*"
+ sourcepath="${java.dir}:${compat.dir}:${api.dir}"
+ destdir="${target.javadocs}">
+ <classpath refid="project.class.path"/>
+ <doclet name="com.sun.tools.doclets.standard.Standard">
+ <param name="-author"/>
+ <param name="-version"/>
+ <param name="-doctitle" value="${Name}"/>
+ <param name="-windowtitle" value="${Name} API"/>
+ <param name="-bottom"
+ value=""Copyright © 2001 Apache Jakarta Project. All
Rights Reserved.""/>
+ <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
+ <param name="-link"
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+ <param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
+ </doclet>
+ </javadoc>
- </target>
+ </target>
<!-- Create the announcements and HEADER.html -->
@@ -867,42 +865,41 @@
<filter token="release" value="${release}"/>
<filter token="short-version" value="${short.version}"/>
- <mkdir dir="${target.dir}" />
- <mkdir dir="${dist.base}" />
+ <mkdir dir="${target.dir}"/>
+ <mkdir dir="${dist.base}"/>
<copy todir="${target.dir}" filtering="on">
- <mapper type="flatten"/>
- <fileset dir=".">
- <include name="${phoenix.tools.dir}/announcement.xml"/>
- <include name="status.xml"/>
- </fileset>
+ <mapper type="flatten"/>
+ <fileset dir=".">
+ <include name="${phoenix.tools.dir}/announcement.xml"/>
+ <include name="status.xml"/>
+ </fileset>
</copy>
- <style style="${status2changes}" in="${target.dir}/status.xml"
- out="${target.dir}/changes.xml"/>
- <style style="${announce2txt}" in="${target.dir}/announcement.xml"
- out="Announcement.txt"/>
+ <style style="${status2changes}" in="${target.dir}/status.xml"
+ out="${target.dir}/changes.xml"/>
+ <style style="${announce2txt}" in="${target.dir}/announcement.xml"
+ out="Announcement.txt"/>
<style style="${announce2header}" in="${target.dir}/announcement.xml"
- out="${dist.base}/HEADER.html"/>
+ out="${dist.base}/HEADER.html"/>
<style style="${announce2readme}" in="${target.dir}/announcement.xml"
- out="${dist.base}/README.html"/>
- <style style="${announce2site}" in="${target.dir}/announcement.xml"
- out="jakarta-news.xml"/>
-
- </target>
+ out="${dist.base}/README.html"/>
+ <style style="${announce2site}" in="${target.dir}/announcement.xml"
+ out="jakarta-news.xml"/>
+ </target>
<target name="site-all"
- depends="site,javadocs"
- description="Update site directory">
+ depends="site,javadocs"
+ description="Update site directory">
+
+ <copy todir="${target.docs}/api" filtering="off">
+ <fileset dir="${target.javadocs}"/>
+ </copy>
- <copy todir="${target.docs}/api" filtering="off">
- <fileset dir="${target.javadocs}"/>
- </copy>
-
- <copy todir="../avalon-site/docs/phoenix" filtering="off">
- <fileset dir="${target.docs}"/>
- </copy>
+ <copy todir="../avalon-site/docs/phoenix" filtering="off">
+ <fileset dir="${target.docs}"/>
+ </copy>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
