You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/05/29 08:39:59 UTC
cvs commit: jakarta-commons-sandbox/messenger build.xml
jstrachan 02/05/28 23:39:59
Modified: messenger build.xml
Log:
patched the dist target to use maven's dist-build
Revision Changes Path
1.31 +181 -286 jakarta-commons-sandbox/messenger/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/messenger/build.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- build.xml 22 May 2002 14:49:16 -0000 1.30
+++ build.xml 29 May 2002 06:39:59 -0000 1.31
@@ -2,7 +2,7 @@
<!--
"messenger" component of the Jakarta Commons Subproject
- $Id: build.xml,v 1.30 2002/05/22 14:49:16 jstrachan Exp $
+ $Id: build.xml,v 1.31 2002/05/29 06:39:59 jstrachan Exp $
-->
<!-- ========== Initialize Properties ===================================== -->
@@ -20,149 +20,187 @@
<!-- Set default values for the build -->
<property file="project.properties" />
-<!-- maven:start -->
-
-<!-- ======================================================== -->
-<!-- D E L E G A T O R S -->
-<!-- ======================================================== -->
-
-<target name="maven:gump-descriptor">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
-</target>
-
-<target name="maven:maven-update">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
-</target>
-
-<target name="maven:update-jars">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
-</target>
-
-<target name="maven:jar">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
-</target>
-
-<target name="maven:docs-quick">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
-</target>
-
-<target name="maven:run-singletest">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
-</target>
-
-<target name="maven:compile">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
-</target>
-
-<target name="maven:fo">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
-</target>
-
-<target name="maven:cvs-change-log">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
-</target>
-
-<target name="maven:war">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
-</target>
-
-<target name="maven:generate-reactor">
- <ant antfile="${maven.home}/plugins/reactor/build.xml" target="generate-reactor"/>
-</target>
-
-<target name="maven:cross-ref">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
-</target>
-
-<target name="maven:deploy-site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
-</target>
-
-<target name="maven:ear">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
-</target>
-
-<target name="maven:install-jar">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
-</target>
-
-<target name="maven:task-list">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
-</target>
-
-<target name="maven:docs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
-</target>
-
-<target name="maven:site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
-</target>
-
-<target name="maven:deploy-dist">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
-</target>
-
-<target name="maven:javadocs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
-</target>
-
-<target name="maven:announce">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
-</target>
-
-<target name="maven:check-source">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
-</target>
-
-<target name="maven:dist">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
-</target>
-
-<target name="maven:dist-build">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
-</target>
-
-<target name="maven:metrics">
- <ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
-</target>
-
-<target name="maven:clean">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
-</target>
-
-<target name="maven:env">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
-</target>
-
-<target name="maven:test">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
-</target>
-
-<target name="maven:pdf">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
-</target>
-
-<target name="maven:iutest">
- <ant antfile="${maven.home}/plugins/iutest/build.xml" target="iutest"/>
-</target>
-
-<target name="maven:activity-log">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
-</target>
-
-<target name="maven:verify-project">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
-</target>
-
-<target name="maven:validate-pom">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
-</target>
-
-<target name="maven:validate-war">
- <ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
-</target>
+ <!-- maven:start -->
+
+ <!-- ================================================================== -->
+ <!-- D E F I N E A N T T A S K S -->
+ <!-- ================================================================== -->
+ <taskdef
+ name="maven-ant"
+ classname="org.apache.maven.ant.Ant">
+ <classpath>
+ <pathelement location="${lib.repo}/maven.jar"/>
+ </classpath>
+ </taskdef>
+
+
+ <!-- ================================================================== -->
+ <!-- D E L E G A T O R S -->
+ <!-- ================================================================== -->
+
+ <target name="maven:gump-descriptor">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="gump-descriptor"/>
+ </target>
+
+ <target name="maven:maven-update">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="maven-update"/>
+ </target>
+
+ <target name="maven:update-jars">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="update-jars"/>
+ </target>
+
+ <target name="maven:jar">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="jar"/>
+ </target>
+
+ <target name="maven:docs-quick">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="docs-quick"/>
+ </target>
+
+ <target name="maven:run-singletest">
+ <maven-ant antfile="${maven.home}/plugins/test/build.xml" target="run-singletest"/>
+ </target>
+
+ <target name="maven:compile">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
+ </target>
+
+ <target name="maven:jar-resources">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="jar-resources"/>
+ </target>
+
+ <target name="maven:fo">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="fo"/>
+ </target>
+
+ <target name="maven:cvs-change-log">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="cvs-change-log"/>
+ </target>
+
+ <target name="maven:war">
+ <maven-ant antfile="${maven.home}/plugins/j2ee/build.xml" target="war"/>
+ </target>
+
+ <target name="maven:generate-reactor">
+ <maven-ant antfile="${maven.home}/plugins/reactor/build.xml" target="generate-reactor"/>
+ </target>
+
+ <target name="maven:cross-ref">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="cross-ref"/>
+ </target>
+
+ <target name="maven:deploy-site">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
+ </target>
+
+ <target name="maven:ear">
+ <maven-ant antfile="${maven.home}/plugins/j2ee/build.xml" target="ear"/>
+ </target>
+
+ <target name="maven:install-jar">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="install-jar"/>
+ </target>
+
+ <target name="maven:task-list">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="task-list"/>
+ </target>
+
+ <target name="maven:docs">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="docs"/>
+ </target>
+
+ <target name="maven:site">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="site"/>
+ </target>
+
+ <target name="maven:deploy-dist">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="deploy-dist"/>
+ </target>
+
+ <target name="maven:javadocs">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
+ </target>
+
+ <target name="maven:announce">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="announce"/>
+ </target>
+
+ <target name="maven:check-source">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
+ </target>
+
+ <target name="maven:dist">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="dist"/>
+ </target>
+
+ <target name="maven:dist-build">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="dist-build"/>
+ </target>
+
+ <target name="maven:metrics">
+ <maven-ant antfile="${maven.home}/plugins/metrics/build.xml" target="metrics"/>
+ </target>
+
+ <target name="maven:clean">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="clean"/>
+ </target>
+
+ <target name="maven:env">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="env"/>
+ </target>
+
+ <target name="maven:test">
+ <maven-ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
+ </target>
+
+ <target name="maven:pdf">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="pdf"/>
+ </target>
+
+ <target name="maven:iutest">
+ <maven-ant antfile="${maven.home}/plugins/uitest/build.xml" target="iutest"/>
+ </target>
+
+ <target name="maven:activity-log">
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml" target="activity-log"/>
+ </target>
+
+ <target name="maven:verify-project">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="verify-project"/>
+ </target>
+
+ <target name="maven:validate-pom">
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="validate-pom"/>
+ </target>
+
+ <target name="maven:validate-war">
+ <maven-ant antfile="${maven.home}/plugins/j2ee/build.xml" target="validate-war"/>
+ </target>
+
+
+ <!-- maven:end -->
+
+<!-- ========== Helper Targets ============================================ -->
+
+ <target name="clean" depends="maven:clean">
+ <delete file="velocity.log"/>
+ </target>
+
+
+ <target name="compile" depends="maven:compile, maven:jar-resources">
+ <path id="test.classpath">
+ <pathelement path="${maven.build.dest}"/>
+ <path refid="maven.dependency.classpath"/>
+ </path>
+ </target>
+
+ <target name="compile.test" depends="compile"/>
+ <target name="test" depends="maven:test"/>
+ <target name="dist" depends="maven:dist-build"/>
+ <target name="site" depends="maven:site"/>
+
-<!-- maven:end -->
<!-- ========== External Dependencies ===================================== -->
@@ -328,151 +366,8 @@
<property name="test.runner" value="junit.textui.TestRunner"/>
-<!-- ========== Executable Targets ======================================== -->
-
-
- <target name="init"
- description="Initialize and evaluate conditionals">
- <echo message="-------- ${component.name} ${component.version} --------"/>
- <filter token="name" value="${component.name}"/>
- <filter token="package" value="${component.package}"/>
- <filter token="version" value="${component.version}"/>
- </target>
-
-
- <target name="prepare" depends="init"
- description="Prepare build directory">
- <mkdir dir="${build.home}"/>
- <mkdir dir="${build.home}/classes"/>
- <mkdir dir="${build.home}/conf"/>
- <mkdir dir="${build.home}/tests"/>
- </target>
-
-
- <target name="static" depends="prepare"
- description="Copy static files to build directory">
- <tstamp/>
- <copy todir="${build.home}/conf" filtering="on">
- <fileset dir="${conf.home}" includes="*.MF"/>
- </copy>
- </target>
-
-
- <target name="compile" depends="static"
- description="Compile shareable components">
- <javac srcdir="${source.home}"
- destdir="${build.home}/classes"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="compile.classpath"/>
- </javac>
- <copy todir="${build.home}/classes" filtering="on">
- <fileset dir="${source.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
-
- <target name="compile.tests" depends="compile"
- description="Compile unit test cases">
- <javac srcdir="${test.home}"
- destdir="${build.home}/tests"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
- <classpath refid="test.classpath"/>
- </javac>
- <copy todir="${build.home}/tests" filtering="on">
- <fileset dir="${test.home}" excludes="**/*.java"/>
- </copy>
- </target>
-
-
- <target name="clean"
- description="Clean build and distribution directories">
- <delete dir="${build.home}"/>
- <delete dir="${dist.home}"/>
- <delete dir="${build.webapp}"/>
- </target>
-
-
- <target name="all" depends="clean,compile"
- description="Clean and compile all components"/>
-
-
- <target name="javadoc" depends="compile"
- description="Create component Javadoc documentation">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${dist.home}/docs"/>
- <mkdir dir="${dist.home}/docs/api"/>
- <javadoc sourcepath="${source.home}"
- destdir="${dist.home}/docs/api"
- packagenames="org.apache.commons.*"
- author="true"
- private="true"
- version="true"
- doctitle="<h1>${component.title}</h1>"
- windowtitle="${component.title} (Version ${component.version})"
- bottom="Copyright (c) 2001-2002 - Apache Software Foundation">
- <classpath refid="compile.classpath"/>
- <link offline="true" packagelistLoc="${commons-beanutils.api}"
- href="http://jakarta.apache.org/commons/beanutils/api/"/>
- <link offline="true" packagelistLoc="${commons-collections.api}"
- href="http://jakarta.apache.org/commons/collections/api/"/>
- <link offline="true" packagelistLoc="${commons-logging.api}"
- href="http://jakarta.apache.org/commons/logging/api/"/>
- <link offline="true" packagelistLoc="${commons-digester.api}"
- href="http://jakarta.apache.org/commons/digester/api/"/>
- <link offline="true" packagelistLoc="${jdk.api}"
- href="http://java.sun.com/products/jdk/1.3/docs/api"/>
- <link offline="true" packagelistLoc="${j2ee.api}"
- href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
- <link offline="true" packagelistLoc="${jaxp.api}"
- href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
- </javadoc>
- </target>
-
-
- <target name="dist" depends="compile,javadoc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
- <copy file="../LICENSE"
- todir="${dist.home}"/>
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
- <antcall target="jar"/>
- </target>
-
-
- <target name="jar" depends="compile"
- description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
- <copy file="../LICENSE"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/commons-${component.name}.jar"
- basedir="${build.home}/classes"
- manifest="${build.home}/conf/MANIFEST.MF"/>
- </target>
-
-
- <target name="install-jar" depends="jar"
- description="--> Installs jar file in ${lib.repo}">
- <copy todir="${lib.repo}" filtering="no">
- <fileset dir="${dist.home}">
- <include name="commons-${component.name}.jar"/>
- </fileset>
- </copy>
- </target>
-
<!-- ========== Unit Test Targets ========================================= -->
-
-
- <target name="test" depends="compile.tests,
- test.messenger"
- description="Run all unit test cases">
- </target>
<target name="test.messenger" depends="compile.tests">
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>