dion 2002/06/04 08:26:25
Modified: src/java/org/apache/maven/cvslib CvsChangeLogGenerator.java
src/templates/build/plugins/test build.xml
src/java/org/apache/maven/changelog ChangeLogEntry.java
ChangeLog.java ChangeLogFile.java
src/templates/build/plugins/core build-init.xml build.xml
Control.vm
src/templates/build/plugins/metrics build.xml
src/dvsl/gump convert-project.dvsl
. build-bootstrap.xml
src/templates/build/plugins/iutest build.xml
src/java/org/apache/maven/java JavaDocVisitor.java
src/java/org/apache/maven/transformer SourceTransformer.java
src/templates/build/plugins/j2ee build.xml
src/templates/build/plugins/reactor build.xml
src/templates/build/plugins/struts build.xml
src/templates/build/plugins/docs build.xml
Added: src/conf bootstrap-taskdefs.properties
Log:
- Converted core and bootstrap to using new parse less plugin process
- Fixed problem with gump converter dvsl
- Changed @todo tags to @tasks
Revision Changes Path
1.8 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/cvslib/CvsChangeLogGenerator.java
Index: CvsChangeLogGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/cvslib/CvsChangeLogGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CvsChangeLogGenerator.java 3 Jun 2002 21:43:40 -0000 1.7
+++ CvsChangeLogGenerator.java 4 Jun 2002 15:26:23 -0000 1.8
@@ -80,7 +80,7 @@
* A CVS implementation of the {@link org.apache.maven.changelog.ChangeLog}
* interface.
*
- * @todo Check CVS exists first by running cvs -version instead of current hack
+ * @task Check CVS exists first by running cvs -version instead of current hack
* @author Glenn McAllister
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeff Martin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
@@ -88,7 +88,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
* @version
- * $Id: CvsChangeLogGenerator.java,v 1.7 2002/06/03 21:43:40 glennm Exp $
+ * $Id: CvsChangeLogGenerator.java,v 1.8 2002/06/04 15:26:23 dion Exp $
*/
class CvsChangeLogGenerator
implements ChangeLogGenerator, ExecuteStreamHandler
1.3 +5 -2 jakarta-turbine-maven/src/templates/build/plugins/test/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/test/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 4 Jun 2002 07:17:36 -0000 1.2
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.3
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
1.5 +3 -3
jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLogEntry.java
Index: ChangeLogEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLogEntry.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLogEntry.java 27 May 2002 21:25:26 -0000 1.4
+++ ChangeLogEntry.java 4 Jun 2002 15:26:24 -0000 1.5
@@ -65,10 +65,10 @@
/**
* Change Log Entry - holds details about revisions to a file.
*
- * @todo add time of change to the entry
- * @todo investigate betwixt for toXML method
+ * @task add time of change to the entry
+ * @task investigate betwixt for toXML method
* @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
- * @version $Id: ChangeLogEntry.java,v 1.4 2002/05/27 21:25:26 glennm Exp $
+ * @version $Id: ChangeLogEntry.java,v 1.5 2002/06/04 15:26:24 dion Exp $
*/
public class ChangeLogEntry
{
1.6 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog.java 27 May 2002 23:26:06 -0000 1.5
+++ ChangeLog.java 4 Jun 2002 15:26:24 -0000 1.6
@@ -85,7 +85,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
- * @version $Id: ChangeLog.java,v 1.5 2002/05/27 23:26:06 dion Exp $
+ * @version $Id: ChangeLog.java,v 1.6 2002/06/04 15:26:24 dion Exp $
*/
public class ChangeLog extends ProjectExecutor
{
@@ -254,7 +254,7 @@
/**
* Set up list of developers mapping id to name.
- * @todo should be a facility on the maven project itself
+ * @task This should be a facility on the maven project itself
* @return a list of developers ids and names
*/
private Properties getUserList()
1.3 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLogFile.java
Index: ChangeLogFile.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/changelog/ChangeLogFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLogFile.java 27 May 2002 13:34:31 -0000 1.2
+++ ChangeLogFile.java 4 Jun 2002 15:26:24 -0000 1.3
@@ -59,9 +59,9 @@
/**
* A set of information about revisions of a file as returned by CVS's log
* command
- * @todo remove previous revision along with parser changes
+ * @task remove previous revision along with parser changes
* @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
- * @version $Id: ChangeLogFile.java,v 1.2 2002/05/27 13:34:31 dion Exp $
+ * @version $Id: ChangeLogFile.java,v 1.3 2002/06/04 15:26:24 dion Exp $
*/
public class ChangeLogFile
{
1.2 +30 -16
jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml
Index: build-init.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build-init.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-init.xml 3 Jun 2002 03:44:55 -0000 1.1
+++ build-init.xml 4 Jun 2002 15:26:24 -0000 1.2
@@ -6,7 +6,7 @@
Based on src/templates/build/build-init-target v1.37
author: dion
- version: $Id: build-init.xml,v 1.1 2002/06/03 03:44:55 dion Exp $
+ version: $Id: build-init.xml,v 1.2 2002/06/04 15:26:24 dion Exp $
-->
<project name="maven-init" default="verify-project">
@@ -129,10 +129,7 @@
</target>
- <target
- name="update-pom-check"
- unless="maven.pomChecked">
-
+ <target name="pom-check" unless="maven.pomChecked">
<!-- Here is where we need to add checks to see that the descriptor
is up-to-date. So we need to:
@@ -145,21 +142,19 @@
'maven.pomUpdateRequired' if the version of the POM is out of
sync with what Maven expects.
-->
-
- <update-pom-check
- projectDescriptor="project.xml"
- />
-
- <antcall target="callUpdateDescriptor"/>
-
+ <update-pom-check projectDescriptor="project.xml"/>
+ </target>
+
+ <target
+ name="update-pom-check"
+ depends="pom-check, callUpdateDescriptor">
</target>
<target
name="callUpdateDescriptor"
+ depends="update-descriptor"
if="maven.pomUpdateRequired">
- <antcall target="update-descriptor"/>
-
<format-pom
input="project.xml"
output="project.xml.formatted"
@@ -221,6 +216,7 @@
<target
name="checkUpdateDescriptor"
depends="updateDvslExists"
+ if="maven.fromVersion"
unless="maven.updateDvslExists">
<echo>
@@ -247,10 +243,28 @@
if="maven.toVersion">
</target>
+ <!-- the update is needed if the update dvsl exists and
+ maven.pomUpdateRequired is true
+ -->
+ <target name="checkUpdateDescriptorRequired" depends="checkUpdateDescriptor">
+ <condition property="updateDescriptorRequired">
+ <and>
+ <equals arg1="${maven.updateDvslExists}" arg2="true" />
+ <equals arg1="${maven.pomUpdateRequired}" arg2="true" />
+ <not>
+ <equals arg1="${maven.fromVersion}" arg2="$${maven.fromVersion}"/>
+ </not>
+ <not>
+ <equals arg1="${maven.toVersion}" arg2="$${maven.toVersion}"/>
+ </not>
+ </and>
+ </condition>
+ </target>
+
<target
name="update-descriptor"
depends="checkUpdateDescriptor"
- if="maven.updateDvslExists"
+ if="updateDescriptorRequired"
description="o Update Maven project descriptor">
<echo>
@@ -315,7 +329,7 @@
<target name="callback" depends="callback-check" if="maven.callback.ok">
<!-- not sure about exporting from callbacks yet.... -->
<maven-ant antfile="${buildFile}" target="${buildTarget}"
- inheritRefs="true" />
+ inheritRefs="true" inheritAll="true" />
</target>
1.11 +407 -92 jakarta-turbine-maven/src/templates/build/plugins/core/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 3 Jun 2002 20:51:02 -0000 1.10
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.11
@@ -1,8 +1,33 @@
<?xml version="1.0"?>
-<project name="$project.id" default="jar" basedir="$antBasedir">
+<project name="maven-core" default="jar" basedir="..">
- #parse("build.init.target")
+ <!-- ================================================================== -->
+ <!-- I N I T -->
+ <!-- ================================================================== -->
+ <target name="init">
+ <!-- Pick up tool default properties for maven.jars.list -->
+ <property file="${maven.home}/plugins/core/default.properties"/>
+
+ <!-- define maven classpath for the build -->
+ <path id="maven-classpath">
+ <fileset dir="${lib.repo}" includes="${maven.jars.list}" />
+ </path>
+
+ <!-- define maven taskdefs, as taskdefs are not yet inheritable -->
+ <taskdef resource="maven-taskdefs.properties">
+ <classpath refid="maven-classpath" />
+ </taskdef>
+
+ <!-- call common build file initialization to verify project, update jars
+ etc -->
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
+ </target>
<!-- ================================================================== -->
<!-- L O C A L I N I T -->
@@ -27,8 +52,32 @@
<target
name="env"
- depends="local-init,#callback("pre-env"),do-env,#callback("post-env")"/>
+ depends="local-init, pre-env-callback, do-env, post-env-callback"/>
+ <target name="pre-env-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-env.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-env.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-env.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-env-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-env.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-env.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-env.buildTarget" />
+ </maven-ant>
+ </target>
+
<target name="do-env">
<property name="maven.dependency.classpath" refid="maven.dependency.classpath"/>
@@ -46,11 +95,36 @@
<!-- ================================================================== -->
<!-- U P D A T E J A R S -->
<!-- ================================================================== -->
-
+ <!-- FIXME: Need project-properties and load-default-properties here -->
<target
name="update-jars"
description="o Update JARs required for building"
-
depends="project-properties,load-default-properties,#callback("pre-update-jars"),do-update-jars,#callback("post-update-jars")">
+ depends="local-init,
+ pre-update-jars-callback, do-update-jars, post-update-jars-callback">
+ </target>
+
+ <target name="pre-update-jars-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-update-jars.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-update-jars.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-update-jars.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-update-jars-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-update-jars.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-update-jars.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-update-jars.buildTarget" />
+ </maven-ant>
</target>
<target
@@ -61,11 +135,6 @@
<target
name="prepare.update.httpget">
- <taskdef
- name="httpget"
- className="org.apache.maven.UpdateResources">
- <classpath refid="maven-classpath"/>
- </taskdef>
</target>
<target
@@ -104,12 +173,6 @@
-->
<property file="${maven.home}/plugins/core/default.properties" />
- <taskdef
- name="maven-update-check"
- className="org.apache.maven.UpdateMavenCheck">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<maven-update-check/>
<echo>
@@ -120,7 +183,32 @@
<target
name="maven-update"
-
depends="maven-update-check,#callback("pre-maven-update"),do-maven-update,#callback("post-maven-update")"/>
+ depends="local-init, maven-update-check, pre-maven-update-callback,
+ do-maven-update, post-maven-update-callback"/>
+
+ <target name="pre-maven-update-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-maven-update.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-maven-update.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-maven-update.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-maven-update-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-maven-update.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-maven-update.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-maven-update.buildTarget" />
+ </maven-ant>
+ </target>
<target
name="do-maven-update"
@@ -165,7 +253,9 @@
/>
<!-- Run the little install/build.xml file -->
- <ant antfile="${maven.home}/install/build.xml"/>
+ <maven-ant antfile="${maven.home}/install/build.xml"
+ inhertRefs="true"
+ inheritAll="true"/>
<!-- Remove the update zip file -->
<delete file="${lib.repo}/${mavenUpdateZip}"/>
@@ -174,18 +264,37 @@
<target
name="validate-pom"
-
depends="local-init,#callback("pre-validate-pom"),do-validate-pom,#callback("post-validate-pom")"/>
+ depends="local-init, pre-validate-pom-callback, do-validate-pom,
+ post-validate-pom-callback"/>
+
+ <target name="pre-validate-pom-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-validate-pom.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-validate-pom.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-validate-pom.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-validate-pom-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-validate-pom.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-validate-pom.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-validate-pom.buildTarget" />
+ </maven-ant>
+ </target>
+
<target
name="do-validate-pom">
- <taskdef
- name="validate-pom" classname="org.apache.maven.XmlPomValidator">
- <classpath>
- <path refid="maven-classpath"/>
- </classpath>
- </taskdef>
-
<validate-pom
projectDescriptor="project.xml"
xmlSchema="${maven.home}/project.xsd"
@@ -230,9 +339,11 @@
</copy>
-->
- <ant
+ <maven-ant
antfile="${maven.delegatorBuildFile}"
target="${maven.prepareSourceTarget}"
+ inheritRefs="true"
+ inheritAll="true"
/>
<touch file="${maven.prepareSourceDirectory}/PREPARED"/>
@@ -245,18 +356,44 @@
<target
name="compile"
-
depends="local-init,#callback("pre-compile"),do-compile,#callback("post-compile")"
+ depends="local-init, pre-compile-callback, do-compile,
+ post-compile-callback"
description="o Compile project source code"/>
+ <target name="pre-compile-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-compile.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-compile.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-compile.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-compile-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-compile.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-compile.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-compile.buildTarget" />
+ </maven-ant>
+ </target>
+
<target
name="do-compile"
+ depends="compile-sources"
if="maven.sourcesPresent">
- <antcall target="compile-sources"/>
</target>
<target
name="compile-sources"
depends="env,prepare-sources,javac.compile,aspectj.compile"
+ if="maven.sourcesPresent"
description="o Compile project source code"/>
<!-- ================================================================== -->
@@ -334,29 +471,35 @@
<!-- ================================================================== -->
<target
name="check-source"
- depends="local-init, env, #callback("pre-check-source"), do-check-source,
#callback("post-check-source")"
+ depends="local-init, env, pre-check-source-callback, do-check-source,
+ post-check-source-callback"
description="o Check the source code for style violations"/>
- <target name="do-check-source" if="maven.sourcesPresent">
-
- <taskdef
- name="checkstyle"
- classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
+ <target name="pre-check-source-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-check-source.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-check-source.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-check-source.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-check-source-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-check-source.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-check-source.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-check-source.buildTarget" />
+ </maven-ant>
+ </target>
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath>
- <path refid="maven-classpath"/>
- </classpath>
- </taskdef>
-
- <taskdef name="filesetfrompath"
- classname="org.apache.maven.ant.FileSetFromPath">
- <classpath>
- <path refid="maven-classpath"/>
- </classpath>
- </taskdef>
+ <target name="do-check-source" if="maven.sourcesPresent">
<filesetfrompath pathid="maven.src.set"
filesetid="maven.sourceDirectories.fileset"
@@ -451,15 +594,43 @@
<target
name="jar"
- depends="compile,#callback("pre-jar"),do-jar,#callback("post-jar")"
+ depends="compile, pre-jar-callback, do-jar, post-jar-callback"
description="o Generates the ${project} JAR file (default)"
/>
+ <target name="pre-jar-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-jar.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-jar.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-jar.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-jar-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-jar.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-jar.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-jar.buildTarget" />
+ </maven-ant>
+ </target>
+
<target
name="do-jar"
depends="jar-resources">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="test"/>
+ <maven-ant antfile="${maven.home}/plugins/test/build.xml"
+ target="test"
+ inheritRefs="true"
+ inheritAll="true"
+ />
<jar
jarfile="${maven.build.dir}/${maven.final.name}.jar"
@@ -505,16 +676,40 @@
<target
name="dist"
-
depends="init,dist-check-tag,#callback("pre-dist"),do-dist,#callback("post-dist")"/>
+ depends="init, dist-check-tag, pre-dist-callback, do-dist,
+ post-dist-callback"/>
- <target name="do-dist" if="maven.tag">
-
- <antcall target="dist-checkout-sources"/>
+ <target name="pre-dist-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-dist.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-dist.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-dist.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-dist-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-dist.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-dist.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-dist.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="do-dist" depends="dist-checkout-sources" if="maven.tag">
</target>
<target
name="dist-checkout-sources"
+ if="maven.tag"
depends="local-init">
<!--
@@ -574,17 +769,39 @@
<target
name="dist-build"
-
depends="local-init,#callback("pre-dist-build"),do-dist-build,#callback("post-dist-build")"
+ depends="local-init, pre-dist-build-callback, do-dist-build,
+ post-dist-build-callback"
description="o Create source and binary distributions"/>
- <target name="do-dist-build">
+ <target name="pre-dist-build-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-dist-build.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-dist-build.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-dist-build.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-dist-build-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-dist-build.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-dist-build.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-dist-build.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="do-dist-build" depends="jar, javadocs">
<property name="maven.distDir"
value="${maven.distBuildDirectory}/${maven.final.name}"/>
<mkdir dir="${maven.distDir}"/>
- <antcall target="jar"/>
- <antcall target="javadocs"/>
-
<!-- B I N A R Y D I S T R I B U T I O N -->
<echo>
@@ -655,13 +872,6 @@
<copy todir="${maven.distDir}" file="build.xml"/>
- <taskdef name="filesetfrompath"
- classname="org.apache.maven.ant.FileSetFromPath">
- <classpath>
- <path refid="maven-classpath"/>
- </classpath>
- </taskdef>
-
<filesetfrompath pathid="maven.src.set"
filesetid="maven.sourceDirectories.fileset.dist"
includes="**/*.java,**/*.xml,**/*.properties"/>
@@ -700,23 +910,49 @@
<target
name="dist-check-tag"
unless="maven.versionid">
- <echo>
+ <fail>
+-------------------------------------------------------+
| The dist target will not execute correctly unless a |
| 'maven.versionid' property is provided, e.g. |
| ant maven:dist -Dmaven.versionid=b4 |
+-------------------------------------------------------+
- </echo>
+ </fail>
</target>
+
<!-- ================================================================== -->
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
<target
name="install-jar"
-
depends="jar,#callback("pre-install-jar"),do-install-jar,#callback("post-install-jar")"
+ depends="jar, pre-install-jar-callback, do-install-jar,
+ post-install-jar-callback"
description="o Installs JAR file in local ${lib.repo}"/>
+ <target name="pre-install-jar-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-install-jar.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-install-jar.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-install-jar.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-install-jar-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-install-jar.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-install-jar.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-install-jar.buildTarget" />
+ </maven-ant>
+ </target>
+
<target name="do-install-jar">
<copy file="${maven.build.dir}/${maven.final.name}.jar"
toDir="${lib.repo}"
@@ -735,18 +971,36 @@
<target
name="gump-descriptor"
-
depends="local-init,#callback("pre-gump-descriptor"),do-gump-descriptor,#callback("post-gump-descriptor")"
+ depends="local-init, pre-gump-descriptor-callback, do-gump-descriptor,
+ post-gump-descriptor-callback"
description="o Generate Gump descriptor from Maven descriptor"/>
+ <target name="pre-gump-descriptor-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-gump-descriptor.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-dump-descriptor.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-gump-descriptor.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-gump-descriptor-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-gump-descriptor.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-gump-descriptor.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-gump-descriptor.buildTarget" />
+ </maven-ant>
+ </target>
+
<target name="do-gump-descriptor">
- <taskdef
- name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath>
- <path refid="maven-classpath"/>
- </classpath>
- </taskdef>
-
<dvsl
basedir="."
destdir="./"
@@ -756,16 +1010,10 @@
out="gump.xml"
/>
- <taskdef
- name="gump-build"
- classname="org.apache.maven.BaseProjectTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<gump-build
controlTemplate="build-gump.xml"
outputDirectory="${basedir}"
- templatePath="${maven.home}/plugins/$plugin"
+ templatePath="${maven.home}/plugins/core"
outputFile="build-gump.xml"
projectDescriptor="project.xml"
/>
@@ -778,9 +1026,33 @@
<target
name="clean"
- depends="local-init,#callback("pre-clean"),do-clean,#callback("post-clean")"
+ depends="local-init, pre-clean-callback, do-clean, post-clean-callback"
description="o Cleans up the build directory"/>
+ <target name="pre-clean-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-clean.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-clean.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-clean.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-clean-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-clean.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-clean.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-clean.buildTarget" />
+ </maven-ant>
+ </target>
+
<target name="do-clean">
<echo message="Cleaning up ${maven.build.dir}"/>
<delete dir="${maven.build.dir}"/>
@@ -793,27 +1065,39 @@
<target
name="metrics">
- <ant antfile="${maven.home}/plugins/metrics/build.xml"/>
+ <maven-ant antfile="${maven.home}/plugins/metrics/build.xml"
+ inheritRefs="true"
+ inheritAll="true"/>
</target>
<target
name="test">
- <ant antfile="${maven.home}/plugins/test/build.xml"/>
+ <maven-ant antfile="${maven.home}/plugins/test/build.xml"
+ inheritRefs="true"
+ inheritAll="true"/>
</target>
<target
name="docs">
- <ant antfile="${maven.home}/plugins/docs/build.xml"/>
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml"
+ inheritRefs="true"
+ inheritAll="true"/>
</target>
<target
name="javadocs">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="javadocs"/>
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml"
+ target="javadocs"
+ inheritRefs="true"
+ inheritAll="true"/>
</target>
<target
name="deploy-site">
- <ant antfile="${maven.home}/plugins/docs/build.xml" target="deploy-site"/>
+ <maven-ant antfile="${maven.home}/plugins/docs/build.xml"
+ target="deploy-site"
+ inheritRefs="true"
+ inheritAll="true"/>
</target>
<!-- ================================================================== -->
@@ -822,7 +1106,32 @@
<target
name="announce"
-
depends="local-init,#callback("pre-announce"),do-announce,#callback("post-announce")"/>
+ depends="local-init, pre-announce-callback, do-announce,
+ post-announce-callback"/>
+
+ <target name="pre-announce-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.pre-announce.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.pre-announce.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.pre-announce.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-announce-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback">
+ <property name="buildFile"
+ value="${maven.core.callback.post-announce.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.core.callback.post-announce.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.core.callback.post-announce.buildTarget" />
+ </maven-ant>
+ </target>
<target
name="do-announce">
@@ -852,4 +1161,10 @@
</target>
+ <!-- ================================================================== -->
+ <!-- V E R I F Y - P R O J E C T -->
+ <!-- ================================================================== -->
+ <target name="verify-project" depends="local-init">
+ </target>
+
</project>
1.4 +0 -5
jakarta-turbine-maven/src/templates/build/plugins/core/Control.vm
Index: Control.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/core/Control.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Control.vm 3 Jun 2002 03:44:56 -0000 1.3
+++ Control.vm 4 Jun 2002 15:26:24 -0000 1.4
@@ -29,8 +29,3 @@
$delegators.put("validate-pom", "plugins/$plugin/build.xml")
$delegators.put("verify-project", "plugins/$plugin/build.xml")
-## -------------------------------------------------------
-## Make the list of callbacks
-## -------------------------------------------------------
-$callbacks.put( "$plugin", [ "pre-jar", "post-jar","pre-install-jar",
"post-install-jar", "pre-env", "post-env", "pre-clean", "post-clean", "pre-dist",
"post-dist", "pre-dist-build", "post-dist-build", "pre-deploy-dist",
"post-deploy-dist", "pre-gump-descriptor", "post-gump-descriptor", "pre-compile",
"post-compile", "pre-check-source", "post-check-source", "pre-update-jars",
"post-update-jars", "pre-announce", "post-announce", "pre-maven-update",
"post-maven-update", "pre-validate-pom", "post-validate-pom" ] )
-
1.4 +5 -2
jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/metrics/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 4 Jun 2002 07:44:50 -0000 1.3
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.4
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
1.19 +1 -1 jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl
Index: convert-project.dvsl
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/dvsl/gump/convert-project.dvsl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- convert-project.dvsl 12 May 2002 14:13:34 -0000 1.18
+++ convert-project.dvsl 4 Jun 2002 15:26:24 -0000 1.19
@@ -39,7 +39,7 @@
#end
#match("dependency")
- <depend project="$context.node.name"/>
+ <depend project="$context.node.id"/>
#end
#match("nagEmailAddress")
1.94 +3 -0 jakarta-turbine-maven/build-bootstrap.xml
Index: build-bootstrap.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/build-bootstrap.xml,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- build-bootstrap.xml 3 Jun 2002 03:44:55 -0000 1.93
+++ build-bootstrap.xml 4 Jun 2002 15:26:24 -0000 1.94
@@ -268,6 +268,9 @@
<copy file="${maven.conf.dir}/log4j.properties"
todir="${maven.bootstrap.classes}"/>
+ <copy file="${maven.conf.dir}/bootstrap-taskdefs.properties"
+ tofile="${maven.bootstrap.classes}/maven-taskdefs.properties"/>
+
<!--
After we have compiled the classes required to generate
the build system we need to make a temporary bootstrap
1.1 jakarta-turbine-maven/src/conf/bootstrap-taskdefs.properties
Index: bootstrap-taskdefs.properties
===================================================================
##
## A subset of the tasks defined by maven for use in the bootstrap
##
## author: dion
## version: $Id: bootstrap-taskdefs.properties,v 1.1 2002/06/04 15:26:24 dion Exp $
##
dvsl=org.apache.tools.dvsl.DVSLTask
format-pom=org.apache.maven.XmlPomFormatter
httpget=org.apache.maven.UpdateResources
maven-ant=org.apache.maven.ant.Ant
maven-update-check=org.apache.maven.UpdateMavenCheck
project-properties=org.apache.maven.ProjectProperties
update-pom-check=org.apache.maven.UpdatePomCheck
update-properties=org.apache.maven.UpdateProperties
validate-pom=org.apache.maven.XmlPomValidator
verify-project=org.apache.maven.ProjectVerifier
1.3 +8 -6
jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/iutest/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 3 Jun 2002 14:23:13 -0000 1.2
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.3
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
@@ -57,7 +60,7 @@
depends="iutest-init">
<!-- Make sure the core code is compiled -->
- <ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml" target="compile"/>
<mkdir dir="${maven.iutest.dest}"/>
<javac
@@ -99,10 +102,8 @@
<target
name="do-iutest"
+ depends="start-test"
if="maven.integrationUnitTestSourceDirectory">
-
- <antcall target="start-test"/>
-
</target>
<target name="post-iutest-callback">
@@ -119,6 +120,7 @@
<target
name="start-test"
+ if="maven.integrationUnitTestSourceDirectory"
depends="compile,prepare-tests-tomcat-40">
<taskdef
1.4 +1 -1
jakarta-turbine-maven/src/java/org/apache/maven/java/JavaDocVisitor.java
Index: JavaDocVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/java/JavaDocVisitor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaDocVisitor.java 14 May 2002 18:57:38 -0000 1.3
+++ JavaDocVisitor.java 4 Jun 2002 15:26:24 -0000 1.4
@@ -74,7 +74,7 @@
// The processing here is incorrect for general doclet production
// this is just a proof of concept and is specific for tags that
// are of the form @<tag> <arg1> <arg2>. So @param, @return and
- // @todo are covered, but a little handler is required for each
+ // @task are covered, but a little handler is required for each
// different type. I would like to be able to generate an
// XMLSchema from an a source file so that an XML representation
// of the object can be validated before coming into a system.
1.7 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java
Index: SourceTransformer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/transformer/SourceTransformer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SourceTransformer.java 30 May 2002 16:45:00 -0000 1.6
+++ SourceTransformer.java 4 Jun 2002 15:26:24 -0000 1.7
@@ -72,8 +72,8 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: SourceTransformer.java,v 1.6 2002/05/30 16:45:00 jvanzyl Exp $
- * @todo Get fileContentsToString() in the commons and break vel dep.
+ * @version $Id: SourceTransformer.java,v 1.7 2002/06/04 15:26:24 dion Exp $
+ * @task Get fileContentsToString() in the commons and break vel dep.
*/
public class SourceTransformer
extends Task
1.12 +5 -2 jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/j2ee/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 4 Jun 2002 04:45:00 -0000 1.11
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.12
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
1.3 +5 -2
jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/reactor/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 4 Jun 2002 04:54:13 -0000 1.2
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.3
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
1.6 +5 -2
jakarta-turbine-maven/src/templates/build/plugins/struts/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/struts/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 3 Jun 2002 13:44:00 -0000 1.5
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.6
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
1.8 +18 -6 jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml
Index: build.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/docs/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 4 Jun 2002 04:45:00 -0000 1.7
+++ build.xml 4 Jun 2002 15:26:24 -0000 1.8
@@ -22,8 +22,11 @@
<!-- call common build file initialization to verify project, update jars
etc -->
<maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
- target="verify-project" inheritAll="true" inheritRefs="true"
- exportAll="true"/>
+ target="verify-project"
+ inheritAll="true"
+ inheritRefs="true"
+ exportAll="true"
+ exportRefs="true"/>
</target>
<!-- ================================================================== -->
@@ -112,19 +115,28 @@
<target
name="jdepend-metrics"
description="o Generiates html from jdepend metrics">
- <ant antfile="${maven.home}/plugins/metrics/build.xml" target="jdepend-xml"/>
+ <maven-ant antfile="${maven.home}/plugins/metrics/build.xml"
+ target="jdepend-xml"
+ inheritRefs="true" inheritAll="true"
+ exportRefs="true" exportAll="true" />
</target>
<target
name="junit-report"
description="o Generates xdoc from junit test case runs">
- <ant antfile="${maven.home}/plugins/test/build.xml" target="junit-xml"/>
+ <maven-ant antfile="${maven.home}/plugins/test/build.xml"
+ target="junit-xml"
+ inheritRefs="true" inheritAll="true"
+ exportRefs="true" exportAll="true" />
</target>
<target
name="checkstyle-report"
description="o Generates html from checkstyle report">
- <ant antfile="${maven.home}/plugins/core/build.xml" target="check-source"/>
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml"
+ target="check-source"
+ inheritRefs="true" inheritAll="true"
+ exportRefs="true" exportAll="true" />
</target>
<!-- ================================================================== -->
@@ -534,7 +546,7 @@
<!-- FIXME: Using ${maven.docs.src} here causes the build to fail because
xalan constructs the path relative to the current directory
even if it is an absolute path. -->
- <arg value="xdocs/project.xml"/>
+ <arg value="xdocs/navigation.xml"/>
<arg value="-out"/>
<arg value="${maven.docs.dest}/project.fo"/>
<arg value="-xsl"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
