You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jv...@apache.org on 2002/12/31 08:17:02 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/site plugin.jelly
jvanzyl 2002/12/30 23:17:02
Modified: src/plugins-build/castor plugin.jelly
src/plugins-build/changelog plugin.jelly plugin.properties
src/plugins-build/changelog/src/java/org/apache/maven/changelog
ChangeLog.java
src/plugins-build/checkstyle plugin.jelly
src/plugins-build/clover plugin.jelly
src/plugins-build/javadoc plugin.jelly plugin.properties
src/plugins-build/jbuilder plugin.jelly
src/plugins-build/jdepend plugin.jelly
src/plugins-build/junit-report plugin.jelly
src/plugins-build/jxr plugin.jelly plugin.properties
src/plugins-build/license plugin.jelly
src/plugins-build/pom plugin.jelly
src/plugins-build/site plugin.jelly
Removed: src/plugins-build/activity .cvsignore
developer-activity.dvsl file-activity.dvsl
maven.xml plugin.jelly plugin.properties
project.properties project.xml toolbox.props
src/plugins-build/activity/xdocs .cvsignore changes.xml
goals.xml index.xml navigation.xml properties.xml
src/plugins-build/cactus toolbox.props
src/plugins-build/checkstyle checkstyle.dvsl toolbox.props
src/plugins-build/jbuilder library.dvsl toolbox.props
src/plugins-build/jdepend jdepend.dvsl toolbox.props
src/plugins-build/junit-report junit.dvsl toolbox.props
Log:
o lots of reworking to get rid of dvsl and texen.
o start of making reports pluggable.
Revision Changes Path
1.2 +5 -5 jakarta-turbine-maven/src/plugins-build/castor/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/castor/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 3 Dec 2002 01:03:32 -0000 1.1
+++ plugin.jelly 31 Dec 2002 07:17:01 -0000 1.2
@@ -1,12 +1,12 @@
-<project xmlns:j="jelly:core" xmlns:define="jelly:define">
+<project
+ xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
+ xmlns:castor="castor">
<!-- ================================================================== -->
<!-- C A S T O R -->
<!-- ================================================================== -->
- <goal name="castor-init"
- description="Initialize castor tag library for later use">
-
<define:taglib uri="castor">
<define:tag name="srcgen">
<java
@@ -22,5 +22,5 @@
</java>
</define:tag>
</define:taglib>
- </goal>
+
</project>
1.14 +30 -22 jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/plugin.jelly,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.jelly 18 Dec 2002 15:23:27 -0000 1.13
+++ plugin.jelly 31 Dec 2002 07:17:01 -0000 1.14
@@ -1,35 +1,34 @@
<?xml version="1.0"?>
-<project
- xmlns:j="jelly:core"
+<project
+ xmlns:j="jelly:core"
xmlns:define="jelly:define"
- xmlns:changelog="changelog">
+ xmlns:changelog="changelog"
+ xmlns:doc="doc">
+
+ <define:taglib uri="changelog">
+ <define:jellybean
+ name="changelog"
+ className="org.apache.maven.changelog.ChangeLog"
+ method="doExecute"
+ />
+ </define:taglib>
<!-- ================================================================== -->
<!-- C H A N G E L O G R E P O R T -->
<!-- ================================================================== -->
- <goal name="changelog"
- description="Generate a changelog report"
- prereqs="changelog:generate"/>
-
- <goal name="changelog:generate"
- description="Generate a changelog report">
+ <goal
+ name="changelog"
+ description="Generate a changelog report">
<j:if test="${context.getVariable('maven.mode.online') == null}">
- <j:set var="maven.mode.online" value="true" />
+ <j:set var="maven.mode.online" value="true"/>
</j:if>
<j:choose>
<j:when test="${maven.mode.online}">
<j:set var="_connection">${pom.repository.connection}</j:set>
- <j:if test="${!empty(_connection)}">
- <define:taglib uri="changelog">
- <define:jellybean
- name="changelog"
- className="org.apache.maven.changelog.ChangeLog"
- method="doExecute"
- />
- </define:taglib>
+ <j:if test="${!empty(_connection)}">
<mkdir dir="${maven.gen.docs}"/>
@@ -37,19 +36,28 @@
basedir="${basedir}"
developers="${pom.developers}"
factory="${maven.changelog.factory}"
- output="${maven.gen.docs}/changelog.xml"
+ output="${maven.build.dir}/changelog.xml"
outputEncoding="${maven.docs.outputencoding}"
range="${maven.changelog.range}"
repositoryConnection="${pom.repository.connection}"
- />
+ />
+
+ <doc:jsl
+ input="${maven.build.dir}/changelog.xml"
+ output="changelog-report.xml"
+ stylesheet="${plugin.dir}/changelog.jsl"
+ encoding="${maven.docs.outputencoding}"
+ omitXmlDeclaration="true"
+ outputMode="xml"
+ prettyPrint="true"
+ />
+
</j:if>
</j:when>
-
<j:otherwise>
<echo>The Changelog is available in the online mode only.</echo>
</j:otherwise>
</j:choose>
</goal>
-
</project>
1.2 +3 -2 jakarta-turbine-maven/src/plugins-build/changelog/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/plugin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.properties 14 Jul 2002 19:09:05 -0000 1.1
+++ plugin.properties 31 Dec 2002 07:17:01 -0000 1.2
@@ -4,9 +4,10 @@
# CVS change log plugin.
# -------------------------------------------------------------------
+# These three don't belong here.
maven.build.dir = ${basedir}/target
maven.gen.docs = ${maven.build.dir}/generated-xdocs
+maven.docs.outputencoding = ISO-8859-1
-maven.changelog.range = 5
-maven.activitylog.range = 30
+maven.changelog.range = 30
maven.changelog.factory = org.apache.maven.cvslib.CvsChangeLogFactory
1.8 +2 -8 jakarta-turbine-maven/src/plugins-build/changelog/src/java/org/apache/maven/changelog/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/changelog/src/java/org/apache/maven/changelog/ChangeLog.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog.java 12 Oct 2002 05:59:37 -0000 1.7
+++ ChangeLog.java 31 Dec 2002 07:17:01 -0000 1.8
@@ -351,10 +351,6 @@
buffer.append("<?xml version=\"1.0\" encoding=\"")
.append(getOutputEncoding())
.append("\" ?>\n")
- .append("<document>\n")
- .append("<properties><title>Change Log</title></properties>\n")
- .append("<body>\n")
- .append("<section name=\"Change Log\"/>\n")
.append("<changelog>\n");
for (Iterator i = getEntries().iterator(); i.hasNext();)
@@ -362,9 +358,7 @@
buffer.append(((ChangeLogEntry) i.next()).toXML());
}
- buffer.append("</changelog>\n")
- .append("</body>\n")
- .append("</document>\n");
+ buffer.append("</changelog>\n");
return buffer.toString();
}
1.11 +70 -67 jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.jelly 7 Nov 2002 16:24:36 -0000 1.10
+++ plugin.jelly 31 Dec 2002 07:17:01 -0000 1.11
@@ -1,85 +1,88 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:dvsl="dvsl">
+<project
+ xmlns:j="jelly:core"
+ xmlns:doc="doc">
<!-- ================================================================== -->
<!-- C H E C K S T Y L E -->
<!-- ================================================================== -->
<goal name="checkstyle"
- description="Generate code convention conformance reports"
- prereqs="checkstyle:check-license-file"/>
+ description="Generate code convention conformance reports"
+ prereqs="checkstyle:check-license-file"/>
<goal
name="checkstyle:generate-report"
- prereqs="init-dvsl-tag"
description="Generate code convention conformance reports">
<j:if test="${sourcesPresent == 'true'}">
- <taskdef
- name="checkstyle"
- classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- </taskdef>
-
- <!--
-
- If an explicit properties file is set then use that. If one isn't then
- we will look for the maven.checkstyle.type property as there aren't going
- to be that many different formats: gnu, turbine, sun.
-
- -->
-
- <j:set var="checkstylePropertiesX" value="${maven.checkstyle.properties}X"/>
-
- <j:choose>
- <j:when test="${checkstylePropertiesX != 'X'}">
- <j:set var="checkstyleProperties" value="${maven.checkstyle.properties}"/>
- </j:when>
- <j:otherwise>
- <j:set var="checkstyleProperties" value="${plugin.dir}/${maven.checkstyle.format}-checkstyle.properties"/>
- </j:otherwise>
- </j:choose>
-
- <!-- Create the directory for the checkstyle cache in case it doesn't exist already -->
- <dirname property="maven.checkstyle.cache.dir" file="${maven.checkstyle.cache.file}"/>
- <mkdir dir="${maven.checkstyle.cache.dir}"/>
-
- <echo>Using ${checkstyleProperties} for checkstyle ...</echo>
-
- <checkstyle
- properties="${checkstyleProperties}"
- failOnViolation="${maven.checkstyle.fail.on.violation}"
- cacheFile="${maven.checkstyle.cache.file}" >
- <fileset dir="${pom.build.sourceDirectory}"
- includes="${maven.checkstyle.includes}"
- excludes="${maven.checkstyle.excludes}" />
- <formatter type="xml" toFile="${maven.build.dir}/checkstyle-raw-report.xml"/>
+ <taskdef
+ name="checkstyle"
+ classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+ </taskdef>
+
+ <!--
+
+ If an explicit properties file is set then use that. If one isn't then
+ we will look for the maven.checkstyle.type property as there aren't going
+ to be that many different formats: gnu, turbine, sun.
+
+ -->
+
+ <j:set var="checkstylePropertiesX" value="${maven.checkstyle.properties}X"/>
+
<j:choose>
- <j:when test="${maven.checkstyle.usefile}">
- <formatter type="plain" toFile="${maven.build.dir}/checkstyle-raw-report.txt"/>
+ <j:when test="${checkstylePropertiesX != 'X'}">
+ <j:set var="checkstyleProperties" value="${maven.checkstyle.properties}"/>
</j:when>
<j:otherwise>
- <formatter type="plain"/>
+ <j:set var="checkstyleProperties" value="${plugin.dir}/${maven.checkstyle.format}-checkstyle.properties"/>
</j:otherwise>
- </j:choose>
- </checkstyle>
+ </j:choose>
- <property name="maven.java.src.dir" value="${pom.build.sourceDirectory}"/>
- <dvsl:dvsl
- basedir="${basedir}"
- style="${plugin.dir}/checkstyle.dvsl"
- toolboxFile="${plugin.dir}/toolbox.props"
- in="${maven.build.dir}/checkstyle-raw-report.xml"
- out="${maven.gen.docs}/checkstyle-report.xml">
- </dvsl:dvsl>
+ <!-- Create the directory for the checkstyle cache in case it doesn't exist already -->
+ <dirname property="maven.checkstyle.cache.dir" file="${maven.checkstyle.cache.file}"/>
+ <mkdir dir="${maven.checkstyle.cache.dir}"/>
+
+ <echo>Using ${checkstyleProperties} for checkstyle ...</echo>
+
+ <checkstyle
+ properties="${checkstyleProperties}"
+ failOnViolation="${maven.checkstyle.fail.on.violation}"
+ cacheFile="${maven.checkstyle.cache.file}">
+ <fileset dir="${pom.build.sourceDirectory}"
+ includes="${maven.checkstyle.includes}"
+ excludes="${maven.checkstyle.excludes}"/>
+ <formatter type="xml" toFile="${maven.build.dir}/checkstyle-raw-report.xml"/>
+ <j:choose>
+ <j:when test="${maven.checkstyle.usefile}">
+ <formatter type="plain" toFile="${maven.build.dir}/checkstyle-raw-report.txt"/>
+ </j:when>
+ <j:otherwise>
+ <formatter type="plain"/>
+ </j:otherwise>
+ </j:choose>
+ </checkstyle>
+
+ <mkdir dir="${maven.gen.docs}"/>
+
+ <doc:jsl
+ input="${maven.build.dir}/checkstyle-raw-report.xml"
+ output="checkstyle-report.xml"
+ stylesheet="${plugin.dir}/checkstyle.jsl"
+ omitXmlDeclaration="true"
+ outputMode="xml"
+ prettyPrint="true"
+ />
</j:if>
</goal>
<goal name="checkstyle:check-license-file"
- description="Checks the existence of the LICENSE.txt file">
+ description="Checks the existence of the LICENSE.txt file">
<available file="${basedir}/LICENSE.txt"
property="maven.checkstyle.license.exists"/>
@@ -87,17 +90,17 @@
<j:choose>
<j:when test="${licenseExists == 'X'}">
- <echo>
- =======================================================================
- = W A R N I N G =
- =======================================================================
- = Your project doesn't contain any LICENSE.txt file. Checkstyle needs=
- = it to check the existence of the License in your source files. If =
- = it can't find this file, it throws an error. =
- = A temporary solution is to create an empty LICENSE.txt file. =
- = Though, we recommend that you edit this License. =
- =======================================================================
- </echo>
+ <echo>
+ =======================================================================
+ = W A R N I N G =
+ =======================================================================
+ = Your project doesn't contain any LICENSE.txt file. Checkstyle needs=
+ = it to check the existence of the License in your source files. If =
+ = it can't find this file, it throws an error. =
+ = A temporary solution is to create an empty LICENSE.txt file. =
+ = Though, we recommend that you edit this License. =
+ =======================================================================
+ </echo>
</j:when>
<j:when test="${maven.checkstyle.license.exists}">
1.8 +1 -2 jakarta-turbine-maven/src/plugins-build/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/clover/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 6 Dec 2002 16:32:25 -0000 1.7
+++ plugin.jelly 31 Dec 2002 07:17:01 -0000 1.8
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core"
- xmlns:maven="jelly:org.apache.maven.jelly.tags.project.MavenTagLibrary">
+<project xmlns:j="jelly:core" xmlns:maven="jelly:maven">
<path id="clover.classpath">
<pathelement path="${plugin.getDependencyPath('clover')}"/>
1.8 +2 -11 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 10 Oct 2002 10:25:23 -0000 1.7
+++ plugin.jelly 31 Dec 2002 07:17:01 -0000 1.8
@@ -2,8 +2,7 @@
<project xmlns:j="jelly:core"
xmlns:util="jelly:util"
- xmlns:define="jelly:define"
- xmlns:license="license">
+ xmlns:define="jelly:define">
<!-- ================================================================== -->
<!-- J A V A D O C S -->
@@ -52,7 +51,6 @@
<j:set var="maxMemory" value="${maven.javadoc.maxmemory}" />
- <attainGoal name="license:init-tag" />
<mkdir dir="${maven.build.dir}/javadoc/" />
<record name="${maven.build.dir}/javadoc/report.txt" action="start" />
@@ -82,14 +80,7 @@
</javadoc>
<record name="${maven.build.dir}/javadoc/report.txt" action="stop" />
- <license:license
- description="Javadoc Report"
- input="${maven.build.dir}/javadoc/report.txt"
- output="${maven.gen.docs}/javadoc.xml"
- outputEncoding="${maven.docs.outputencoding}"
- title="Javadoc"
- />
-
+
</j:if>
</goal>
1.5 +4 -1 jakarta-turbine-maven/src/plugins-build/javadoc/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/javadoc/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 1 Oct 2002 15:27:17 -0000 1.4
+++ plugin.properties 31 Dec 2002 07:17:01 -0000 1.5
@@ -5,10 +5,13 @@
# -------------------------------------------------------------------
maven.javadoc.author = true
-maven.javadoc.destdir = ${maven.docs.dest}/apidocs
+maven.javadoc.destdir = ${maven.build.dir}/docs/apidocs
maven.javadoc.links =
#maven.javadoc.maxmemory
maven.javadoc.private = false
maven.javadoc.stylesheet = ${plugin.dir}/stylesheet.css
maven.javadoc.use = true
maven.javadoc.version = true
+
+maven.docs.outputencoding = ISO-8859-1
+maven.gen.docs = ${maven.build.dest}/generated-xdocs
1.4 +16 -14 jakarta-turbine-maven/src/plugins-build/jbuilder/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jbuilder/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 16 Dec 2002 14:02:19 -0000 1.3
+++ plugin.jelly 31 Dec 2002 07:17:01 -0000 1.4
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:dvsl="dvsl">
+<project
+ xmlns:j="jelly:core"
+ xmlns:doc="doc">
<!--==================================================================-->
<!-- Generate JBuilder [id_project].library files -->
@@ -10,8 +12,7 @@
prereqs="jbuilder:generate-library, jbuilder:generate-project"/>
<goal name="jbuilder:generate-library"
- description="Generate JBuilder [id_project].library file"
- prereqs="init-dvsl-tag">
+ description="Generate JBuilder [id_project].library file">
<echo>Creating ${basedir}/${pom.id}.library ...</echo>
<j:file name="${basedir}/jbuilder_library.xml" prettyPrint="true" xmlns="dummy">
@@ -32,16 +33,17 @@
</j:forEach>
</classpath>
</j:file>
-
- <dvsl:dvsl
- basedir="${basedir}"
- style="${plugin.dir}/library.dvsl"
- toolboxFile="${plugin.dir}/toolbox.props"
- in="${basedir}/jbuilder_library.xml"
- out="${basedir}/${pom.id}.library"
- mavenProject = "${pom}">
- </dvsl:dvsl>
-
+
+ <doc:jsl
+ input="${basedir}/jbuilder_library.xml"
+ output="${basedir}/${pom.id}.library"
+ stylesheet="${plugin.dir}/library.jsl"
+ encoding="${maven.docs.outputencoding}"
+ omitXmlDeclaration="true"
+ outputMode="xml"
+ prettyPrint="true"
+ />
+
<delete file="${basedir}/jbuilder_library.xml"/>
</goal>
@@ -77,4 +79,4 @@
</goal>
-</project>
\ No newline at end of file
+</project>
1.4 +9 -9 jakarta-turbine-maven/src/plugins-build/jdepend/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jdepend/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 21 Jul 2002 04:01:56 -0000 1.3
+++ plugin.jelly 31 Dec 2002 07:17:02 -0000 1.4
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:dvsl="dvsl">
+<project xmlns:j="jelly:core" xmlns:doc="doc">
<!-- ================================================================== -->
<!-- J D E P E N D X M L T A R G E T -->
@@ -13,7 +13,6 @@
<!-- Should we deprecate it to use only "jdepend" ? -->
<goal
name="jdepend:generate-report"
- prereqs="init-dvsl-tag"
description="Generate a dependency report with JDepend">
<j:if test="${sourcesPresent == 'true'}">
@@ -31,13 +30,14 @@
</classpath>
</java>
- <dvsl:dvsl
- basedir="."
- style="${plugin.dir}/jdepend.dvsl"
- toolboxFile="${plugin.dir}/toolbox.props"
- in="${maven.build.dir}/jdepend-raw-report.xml"
- out="${maven.gen.docs}/jdepend-report.xml">
- </dvsl:dvsl>
+ <doc:jsl
+ input="${maven.build.dir}/jdepend-raw-report.xml"
+ output="jdepend-report.xml"
+ stylesheet="${plugin.dir}/jdepend.jsl"
+ omitXmlDeclaration="true"
+ outputMode="xml"
+ prettyPrint="true"
+ />
</j:if>
1.7 +13 -12 jakarta-turbine-maven/src/plugins-build/junit-report/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/junit-report/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 30 Nov 2002 00:38:51 -0000 1.6
+++ plugin.jelly 31 Dec 2002 07:17:02 -0000 1.7
@@ -1,6 +1,8 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:dvsl="dvsl">
+<project
+ xmlns:j="jelly:core"
+ xmlns:doc="doc">
<!-- ================================================================== -->
<!-- C R E A T E J U N I T X M L R E P O R T -->
@@ -14,7 +16,6 @@
<goal
name="junit-report:generate"
- prereqs="init-dvsl-tag"
description="Generate a report from the test results">
<j:if test="${unitTestSourcesPresent == 'true'}">
@@ -26,21 +27,21 @@
<mkdir dir="${maven.test.reportsDirectory}"/>
<!-- Consolidate the reports into a single -->
- <junitreport todir="${maven.test.reportsDirectory}">
+ <junitreport todir="${maven.build.dir}">
<fileset dir="${maven.test.reportsDirectory}">
<include name="TEST-*.xml"/>
</fileset>
</junitreport>
- <!-- Convert single report into an xdoc -->
- <dvsl:dvsl
- basedir="${basedir}"
- style="${plugin.dir}/junit.dvsl"
- toolboxFile="${plugin.dir}/toolbox.props"
- in="${maven.test.reportsDirectory}/TESTS-TestSuites.xml"
- out="${maven.gen.docs}/junit-report.xml">
- </dvsl:dvsl>
-
+ <doc:jsl
+ input="${maven.build.dir}/TESTS-TestSuites.xml"
+ output="junit-report.xml"
+ stylesheet="${plugin.dir}/junit.jsl"
+ omitXmlDeclaration="true"
+ outputMode="xml"
+ prettyPrint="true"
+ />
+
</j:if>
</goal>
1.6 +12 -9 jakarta-turbine-maven/src/plugins-build/jxr/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jxr/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 25 Nov 2002 06:00:41 -0000 1.5
+++ plugin.jelly 31 Dec 2002 07:17:02 -0000 1.6
@@ -1,6 +1,17 @@
<?xml version="1.0"?>
-<project xmlns:j="jelly:core" xmlns:jxr="jxr" xmlns:define="jelly:define">
+<project
+ xmlns:j="jelly:core"
+ xmlns:define="jelly:define"
+ xmlns:jxr="jxr">
+
+ <define:taglib uri="jxr">
+ <define:jellybean
+ name="jxr"
+ className="org.apache.maven.jxr.JxrBean"
+ method="xref"
+ />
+ </define:taglib>
<!-- ================================================================== -->
<!-- C R O S S R E F E R E N C E S O U R C E S -->
@@ -23,14 +34,6 @@
CodeTransform.java in o.a.m.jxr, this will be fixed. -->
<echo>${maven.sourcesPresent}</echo>
-
- <define:taglib uri="jxr">
- <define:jellybean
- name="jxr"
- className="org.apache.maven.jxr.JxrBean"
- method="xref"
- />
- </define:taglib>
<property
name="copyright"
1.5 +2 -0 jakarta-turbine-maven/src/plugins-build/jxr/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/jxr/plugin.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.properties 1 Dec 2002 04:37:55 -0000 1.4
+++ plugin.properties 31 Dec 2002 07:17:02 -0000 1.5
@@ -18,3 +18,5 @@
maven.jxr.destdir = ${maven.docs.dest}/xref
maven.jxr.stylesheet = ${plugin.dir}/stylesheet.css
maven.jxr.templateDir = ${plugin.dir}/templates
+
+maven.javadoc.destdir = ${maven.docs.dest}/apidocs
1.5 +8 -10 jakarta-turbine-maven/src/plugins-build/license/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/license/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 30 Nov 2002 00:59:49 -0000 1.4
+++ plugin.jelly 31 Dec 2002 07:17:02 -0000 1.5
@@ -5,6 +5,12 @@
xmlns:define="jelly:define"
xmlns:license="license">
+ <define:taglib uri="license">
+ <define:jellybean name="license"
+ className="org.apache.maven.license.LicenseTask"
+ method="doExecute" />
+ </define:taglib>
+
<!-- ================================================================== -->
<!-- L I C E N S E -->
<!-- ================================================================== -->
@@ -13,16 +19,8 @@
description="Generate a xml file from your license.txt"
prereqs="license:transfer"/>
- <goal name="license:init-tag"
- description="Initialize the license tag library for later use">
- <define:taglib uri="license">
- <define:jellybean name="license"
- className="org.apache.maven.license.LicenseTask"
- method="doExecute" />
- </define:taglib>
- </goal>
-
- <goal name="license:transfer" prereqs="license:init-tag"
+ <goal
+ name="license:transfer"
description="Generate a xml file from your license.txt">
<mkdir dir="${maven.gen.docs}"/>
1.9 +10 -44 jakarta-turbine-maven/src/plugins-build/pom/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/pom/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 30 Nov 2002 00:59:49 -0000 1.8
+++ plugin.jelly 31 Dec 2002 07:17:02 -0000 1.9
@@ -7,28 +7,26 @@
xmlns:x="jelly:xml"
xmlns:pom="pom">
+ <!-- set up validation tag library -->
+
+ <d:taglib uri="pom">
+ <d:jellybean
+ name="validate"
+ className="org.apache.maven.Validator"
+ method="execute"
+ />
+ </d:taglib>
+
<!-- default goal -->
<goal name="pom" description="Validate the Maven XML project descriptor"
prereqs="pom:validate" />
- <!-- set up validation tag library -->
- <goal name="pom:taglib" description="set up validation tag library">
- <d:taglib uri="pom">
- <d:jellybean
- name="validate"
- className="org.apache.maven.Validator"
- method="execute"
- />
- </d:taglib>
- </goal>
-
<!-- ================================================================== -->
<!-- V A L I D A T E P O M -->
<!-- ================================================================== -->
<goal
name="pom:validate"
- prereqs="pom:taglib"
description="Validate the Maven XML project descriptor">
<pom:validate
@@ -37,38 +35,6 @@
/>
<echo>POM is valid</echo>
-
- </goal>
-
- <!-- ================================================================== -->
- <!-- Validate POM using new Plugin mechanism -->
- <!-- (see http://www.apache.org/~jvanzyl/plugin.txt -->
- <!-- ================================================================== -->
-
- <goal name="pom:validate-new"
- description="Validate the Maven XML project descriptor (experimental)">
-
- <x:parse var="pom" xml="project.xml"/>
-
- <!-- Validate core Maven POM -->
- <x:set var="mavencore" select="$pom/project/*[name() != 'plugins']"/>
- <v:verifier uri="/../maven-project.xsd" var="coreschema"/>
- <v:validate var="resultflag" verifier="${coreschema}">
- <project>
- <x:expr select="$mavencore"/>
- </project>
- </v:validate>
-
- <!-- Validate POM extensions for plugins against plugins schemas -->
- <x:forEach select="$pom/project/plugins/plugin" var="plugin">
- <x:set var="pluginid" select="string($plugin/id)"/>
- <x:set var="pluginversion" select="string($plugin/version)"/>
- <v:verifier uri="/../plugins/${pluginid}-${pluginversion}/plugin.xsd"
- var="pluginschema"/>
- <v:validate var="resultflag" verifier="${pluginschema}">
- <x:expr select="$plugin"/>
- </v:validate>
- </x:forEach>
</goal>
1.8 +24 -5 jakarta-turbine-maven/src/plugins-build/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/site/plugin.jelly,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- plugin.jelly 29 Oct 2002 03:46:33 -0000 1.7
+++ plugin.jelly 31 Dec 2002 07:17:02 -0000 1.8
@@ -9,12 +9,8 @@
<!-- S I T E G E N E R A T I O N -->
<!-- ================================================================== -->
- <goal name="site"
- description="Generate the web site"
- prereqs="site:generate"/>
-
<goal
- name="site:generate"
+ name="site"
description="Generate the web site">
<attainGoal name="jdepend"/>
@@ -28,6 +24,29 @@
<attainGoal name="xdoc"/>
</goal>
+
+ <goal name="dyna-site">
+
+ <!--
+ |
+ | What we have listed are the ids of the plugins that can produce
+ | reports. So say we have:
+ |
+ | <reports>
+ |
+ | <report>maven-file-activity</report>
+ | <report>maven-developer-activity</report>
+ | </reports>
+ |
+ -->
+
+ <j:forEach var="report" items="${pom.reports}">
+ <j:set var="reportGoal" value="${report}:report"/>
+ <echo>Generating the ${report} ... </echo>
+ <attainGoal name="${reportGoal}"/>
+ </j:forEach>
+ </goal>
+
<!-- ================================================================== -->
<!-- S I T E D E P L O Y -->