dion 2002/06/03 21:45:00
Modified: src/templates/build/plugins/j2ee build.xml
src/templates/build/plugins/docs Control.vm build.xml
Log:
- Moved docs to parse-less build.xml
- Changed <ant> calls in j2ee/build.xml to <maven-ant>
Revision Changes Path
1.11 +4 -1 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 3 Jun 2002 13:44:00 -0000 1.10
+++ build.xml 4 Jun 2002 04:45:00 -0000 1.11
@@ -97,7 +97,10 @@
<!-- build the war file from the various sources -->
<target name="war-build">
<!-- make sure the source is compiled -->
- <ant antfile="${maven.home}/plugins/core/build.xml" target="jar" />
+ <maven-ant antfile="${maven.home}/plugins/core/build.xml"
+ inheritRefs="true"
+ inheritAll="true"
+ target="jar" />
<echo>Building WAR ${maven.j2ee.war.name}</echo>
1.3 +1 -1
jakarta-turbine-maven/src/templates/build/plugins/docs/Control.vm
Index: Control.vm
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/templates/build/plugins/docs/Control.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Control.vm 27 May 2002 21:25:27 -0000 1.2
+++ Control.vm 4 Jun 2002 04:45:00 -0000 1.3
@@ -25,5 +25,5 @@
## -------------------------------------------------------
## Make the list of callbacks
## -------------------------------------------------------
-$callbacks.put( "$plugin", ["pre-site", "post-site", "pre-fo", "post-fo",
"pre-pdf", "post-pdf", "pre-docs", "post-docs", "pre-docs-quick", "post-docs-quick",
"pre-deploy-site", "post-deploy-site", "pre-cross-ref", "post-cross-ref",
"pre-change-log", "post-change-log", "pre-activity-log", "post-activity-log",
"pre-task-list", "post-task-list", "pre-javadocs", "post-javadocs" ] )
+##$callbacks.put( "$plugin", ["pre-site", "post-site", "pre-fo", "post-fo",
"pre-pdf", "post-pdf", "pre-docs", "post-docs", "pre-docs-quick", "post-docs-quick",
"pre-deploy-site", "post-deploy-site", "pre-cross-ref", "post-cross-ref",
"pre-change-log", "post-change-log", "pre-activity-log", "post-activity-log",
"pre-task-list", "post-task-list", "pre-javadocs", "post-javadocs" ] )
1.7 +309 -53 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 4 Jun 2002 02:35:02 -0000 1.6
+++ build.xml 4 Jun 2002 04:45:00 -0000 1.7
@@ -1,8 +1,30 @@
<?xml version="1.0"?>
-<project name="$project.id" default="docs" basedir="$antBasedir">
+<project name="maven-docs" default="docs" 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"/>
+ </target>
<!-- ================================================================== -->
<!-- L O C A L I N I T -->
@@ -25,16 +47,68 @@
<target
name="docs"
- depends="local-init, #callback("pre-docs"),jdepend-metrics, junit-report,
checkstyle-report, change-log, activity-log, task-list, generate-xdocs,
docs:site,#callback("post-docs")"
+ depends="local-init, pre-docs-callback, jdepend-metrics, junit-report,
+ checkstyle-report, change-log, activity-log, task-list, generate-xdocs,
+ docs:site, post-docs-callback"
description="o Generate html project documentation xdoc sources">
</target>
+
+ <target name="pre-docs-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-docs.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-docs.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-docs.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-docs-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-docs.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-docs.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-docs.buildTarget" />
+ </maven-ant>
+ </target>
<target
name="docs-quick"
- depends="local-init, #callback("pre-docs-quick"),generate-xdocs, docs:site,
#callback("post-docs-quick")"
+ depends="local-init, pre-docs-quick-callback,generate-xdocs, docs:site,
+ post-docs-quick-callback"
description="o Generates documentation that are quickly generated.">
</target>
+ <target name="pre-docs-quick-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-docs-quick.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-docs-quick.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-docs-quick.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-docs-quick-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-docs-quick.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-docs-quick.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-docs-quick.buildTarget" />
+ </maven-ant>
+ </target>
+
+
<target
name="jdepend-metrics"
description="o Generiates html from jdepend metrics">
@@ -59,7 +133,31 @@
<target
name="cross-ref"
-
depends="local-init,#callback("pre-cross-ref"),do-cross-ref,#callback("post-cross-ref")"/>
+
depends="local-init,pre-cross-ref-callback,do-cross-ref,post-cross-ref-callback"/>
+
+ <target name="pre-cross-ref-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-cross-ref.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-cross-ref.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-cross-ref.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-cross-ref-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-cross-ref.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-cross-ref.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-cross-ref.buildTarget" />
+ </maven-ant>
+ </target>
<target
name="do-cross-ref"
@@ -67,12 +165,6 @@
<!-- If the 'startDir' attribute changes we need to update
CodeTransform.java in o.a.m.jxr, this will be fixed. -->
- <taskdef
- name="jxr"
- classname="org.apache.maven.Jxr">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<echo>${maven.sourcesPresent}</echo>
<jxr
@@ -93,15 +185,34 @@
<!-- ================================================================== -->
<target name="task-list"
-
depends="local-init,#callback("pre-task-list"),do-task-list,#callback("post-task-list")"/>
+ depends="local-init, pre-task-list-callback, do-task-list,
+ post-task-list-callback"/>
- <target name="do-task-list">
+ <target name="pre-task-list-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-task-list.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-task-list.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-task-list.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-task-list-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-task-list.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-task-list.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-task-list.buildTarget" />
+ </maven-ant>
+ </target>
- <taskdef
- name="task-parser"
- classname="org.apache.maven.tasklist.TaskListExecutor">
- <classpath refid="maven-classpath"/>
- </taskdef>
+ <target name="do-task-list">
<task-parser
projectDescriptor="project.xml"
@@ -118,16 +229,34 @@
<target
name="change-log"
-
depends="local-init,#callback("pre-change-log"),do-change-log,#callback("post-change-log")"/>
+ depends="local-init, pre-change-log-callback, do-change-log,
+ post-change-log-callback"/>
- <target name="do-change-log">
+ <target name="pre-change-log-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-change-log.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-change-log.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-change-log.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-change-log-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-change-log.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-change-log.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-change-log.buildTarget" />
+ </maven-ant>
+ </target>
- <taskdef
- name="change-log"
- classname="org.apache.maven.changelog.ChangeLog">
- <classpath refid="maven-classpath"/>
- <classpath refid="maven.dependency.classpath"/>
- </taskdef>
+ <target name="do-change-log">
<change-log
projectDescriptor="project.xml"
@@ -145,16 +274,34 @@
<target
name="activity-log"
-
depends="local-init,#callback("pre-activity-log"),do-activity-log,#callback("post-activity-log")"/>
+ depends="local-init, pre-activity-log-callback, do-activity-log,
+ post-activity-log-callback"/>
- <target name="do-activity-log">
+ <target name="pre-activity-log-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-activity-log.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-activity-log.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-activity-log.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-activity-log-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-activity-log.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-activity-log.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-activity-log.buildTarget" />
+ </maven-ant>
+ </target>
- <taskdef
- name="change-log"
- classname="org.apache.maven.changelog.ChangeLog">
- <classpath refid="maven-classpath"/>
- <classpath refid="maven.dependency.classpath"/>
- </taskdef>
+ <target name="do-activity-log">
<change-log
projectDescriptor="project.xml"
@@ -164,11 +311,6 @@
factory="${maven.changelog.factory}"
/>
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
-
<!-- Transform the activity log into developer activity first -->
<dvsl
basedir="${maven.build.dir}"
@@ -209,10 +351,6 @@
depends="local-init"
description="o Generates xdocs for site based on project descriptor" >
- <taskdef name="create-xdocs" classname="org.apache.maven.BaseProjectTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
<create-xdocs
controlTemplate="Control.vm"
outputDirectory="${maven.gen.docs}"
@@ -231,11 +369,6 @@
depends="local-init"
description="o Generate html project documentation xdoc sources">
- <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
- <classpath refid="maven-classpath"/>
- </taskdef>
-
-
<!-- Transform the auto-generated xdocs first -->
<dvsl
basedir="${maven.gen.docs}"
@@ -360,9 +493,33 @@
<target
name="fo"
- depends="local-init,#callback("pre-fo"),do-fo,#callback("post-fo")"
+ depends="local-init, pre-fo-callback, do-fo, post-fo-callback"
description="o Generate XSL:FO project documentation"/>
+ <target name="pre-fo-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-fo.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-fo.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-fo.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-fo-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-fo.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-fo.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-fo.buildTarget" />
+ </maven-ant>
+ </target>
+
<target name="do-fo">
<mkdir dir="${maven.docs.dest}"/>
@@ -391,9 +548,33 @@
<target
name="pdf"
- depends="fo,#callback("pre-pdf"),do-pdf,#callback("post-pdf")"
+ depends="fo, pre-pdf-callback, do-pdf, post-pdf-callback"
description="o Generate PDF project documentation"/>
+ <target name="pre-pdf-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-pdf.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-pdf.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-pdf.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-pdf-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-pdf.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-pdf.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-pdf.buildTarget" />
+ </maven-ant>
+ </target>
+
<target name="do-pdf">
<java classname="org.apache.fop.apps.Fop" fork="yes">
@@ -415,8 +596,32 @@
<target
name="site"
- depends="local-init,#callback("pre-site"),do-site,#callback("post-site")"/>
+ depends="local-init, pre-site-callback, do-site, post-site-callback"/>
+ <target name="pre-site-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-site.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-site.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-site.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-site-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-site.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-site.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-site.buildTarget" />
+ </maven-ant>
+ </target>
+
<target
name="do-site"
depends="docs,javadocs,cross-ref"/>
@@ -444,8 +649,34 @@
<target
name="deploy-site"
-
depends="check-maven-username,site,#callback("pre-deploy-site"),do-deploy-site,#callback("post-deploy-site")"/>
+ depends="check-maven-username, site, pre-deploy-site-callback,
+ do-deploy-site, post-deploy-site-callback"/>
+
+ <target name="pre-deploy-site-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-deploy-site.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-deploy-site.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-deploy-site.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-deploy-site-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-deploy-site.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-deploy-site.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-deploy-site.buildTarget" />
+ </maven-ant>
+ </target>
+
<target
name="do-deploy-site"
if="maven.username">
@@ -481,8 +712,33 @@
<target
name="javadocs"
-
depends="local-init,#callback("pre-javadocs"),do-javadocs,#callback("post-javadocs")"
+ depends="local-init, pre-javadocs-callback, do-javadocs,
+ post-javadocs-callback"
description="o Generates the Javadoc API documentation"/>
+
+ <target name="pre-javadocs-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.pre-javadocs.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.pre-javadocs.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.pre-javadocs.buildTarget" />
+ </maven-ant>
+ </target>
+
+ <target name="post-javadocs-callback">
+ <maven-ant antfile="${maven.home}/plugins/core/build-init.xml"
+ target="callback" inheritAll="true" inheritRefs="true">
+ <property name="buildFile"
+ value="${maven.docs.callback.post-javadocs.buildFile}" />
+ <property name="buildTarget"
+ value="${maven.docs.callback.post-javadocs.buildTarget}" />
+ <property name="buildTargetName"
+ value="maven.docs.callback.post-javadocs.buildTarget" />
+ </maven-ant>
+ </target>
<target
name="do-javadocs"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
