You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/03/27 00:27:45 UTC
cvs commit: maven/src/plugins-build/checkstyle plugin.jelly
dion 2003/03/26 15:27:44
Modified: src/plugins-build/changes plugin.jelly
src/plugins-build/castor plugin.jelly
src/plugins-build/changelog plugin.jelly
src/plugins-build/checkstyle plugin.jelly
Log:
Explicity use ant name space. In prep for removal of jeez etc
Revision Changes Path
1.4 +6 -3 maven/src/plugins-build/changes/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changes/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 10 Mar 2003 13:11:07 -0000 1.3
+++ plugin.jelly 26 Mar 2003 23:27:44 -0000 1.4
@@ -2,12 +2,14 @@
<project
xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:util="jelly:util"
xmlns:doc="doc">
<goal name="maven-changes-plugin:register">
- <property name="maven.docs.src" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+ <ant:property name="maven.docs.src"
+ value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
<util:file var="changes" name="${maven.docs.src}/changes.xml"/>
<j:if test="${changes.exists()}">
<doc:registerReport
@@ -29,8 +31,9 @@
<goal
name="maven-changes-plugin:report"
description="Generate a changes report">
- <property name="maven.docs.src" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
-
+ <ant:property name="maven.docs.src"
+ value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}"/>
+
<doc:jsl
input="${maven.docs.src}/changes.xml"
output="changes-report.xml"
1.2 +9 -8 maven/src/plugins-build/castor/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/castor/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:44:50 -0000 1.1
+++ plugin.jelly 26 Mar 2003 23:27:44 -0000 1.2
@@ -1,5 +1,6 @@
<project
xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:castor="castor">
@@ -9,17 +10,17 @@
<define:taglib uri="castor">
<define:tag name="srcgen">
- <java
+ <ant:java
className="org.exolab.castor.builder.SourceGenerator"
failonerror="true">
- <arg value="-i${schema}"/>
- <arg value="-f"/>
- <arg value="-package${package}"/>
- <arg value="-types${types}"/>
- <arg value="-nomarshall"/>
- <arg value="-dest${generationDirectory}"/>
- </java>
+ <ant:arg value="-i${schema}"/>
+ <ant:arg value="-f"/>
+ <ant:arg value="-package${package}"/>
+ <ant:arg value="-types${types}"/>
+ <ant:arg value="-nomarshall"/>
+ <ant:arg value="-dest${generationDirectory}"/>
+ </ant:java>
</define:tag>
</define:taglib>
1.6 +3 -2 maven/src/plugins-build/changelog/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/changelog/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 27 Feb 2003 10:30:33 -0000 1.5
+++ plugin.jelly 26 Mar 2003 23:27:44 -0000 1.6
@@ -2,6 +2,7 @@
<project
xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
xmlns:define="jelly:define"
xmlns:changelog="changelog"
xmlns:doc="doc">
@@ -41,7 +42,7 @@
<j:when test="${maven.mode.online}">
<j:set var="_connection">${pom.repository.connection}</j:set>
<j:if test="${!empty(_connection)}">
- <echo>Generating the changelog report</echo>
+ <ant:echo>Generating the changelog report</ant:echo>
<changelog:changelog
basedir="${basedir}"
@@ -67,7 +68,7 @@
</j:if>
</j:when>
<j:otherwise>
- <echo>The Changelog is available in the online mode only.</echo>
+ <ant:echo>The Changelog is available in the online mode only.</ant:echo>
</j:otherwise>
</j:choose>
1.5 +17 -14 maven/src/plugins-build/checkstyle/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/checkstyle/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 23 Feb 2003 15:55:21 -0000 1.4
+++ plugin.jelly 26 Mar 2003 23:27:44 -0000 1.5
@@ -2,6 +2,7 @@
<project
xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
xmlns:util="jelly:util"
xmlns:doc="doc">
@@ -31,37 +32,39 @@
<j:if test="${sourcesPresent == 'true'}">
- <taskdef
+ <ant:taskdef
name="checkstyle"
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
- </taskdef>
+ </ant:taskdef>
<attainGoal name="checkstyle:determine-properties" />
<!-- 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}"/>
+ <ant:dirname property="maven.checkstyle.cache.dir"
+ file="${maven.checkstyle.cache.file}"/>
+ <ant:mkdir dir="${maven.checkstyle.cache.dir}"/>
- <echo>Using ${checkstyleProperties} for checkstyle ...</echo>
+ <ant:echo>Using ${checkstyleProperties} for checkstyle ...</ant:echo>
- <checkstyle
+ <ant:checkstyle
properties="${checkstyleProperties}"
failOnViolation="${maven.checkstyle.fail.on.violation}"
cacheFile="${maven.checkstyle.cache.file}">
- <fileset
+ <ant:fileset
dir="${pom.build.sourceDirectory}"
includes="${maven.checkstyle.includes}"
excludes="${maven.checkstyle.excludes}"/>
- <formatter type="xml" toFile="${maven.build.dir}/checkstyle-raw-report.xml"/>
+ <ant: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"/>
+ <ant:formatter type="plain"
+ toFile="${maven.build.dir}/checkstyle-raw-report.txt"/>
</j:when>
<j:otherwise>
- <formatter type="plain"/>
+ <ant:formatter type="plain"/>
</j:otherwise>
</j:choose>
- </checkstyle>
+ </ant:checkstyle>
<doc:jsl
input="${maven.build.dir}/checkstyle-raw-report.xml"
@@ -82,7 +85,7 @@
<attainGoal name="checkstyle:determine-properties" />
<j:scope>
- <property file="${checkstyleProperties}" />
+ <ant:property file="${checkstyleProperties}" />
<j:set var="headerFile" scope="parent">${checkstyle.header.file}</j:set>
</j:scope>
@@ -90,7 +93,7 @@
<j:choose>
<j:when test="${not(header.exists()) and not(empty(headerFile))}">
- <echo>
+ <ant:echo>
======================================================================
= W A R N I N G =
======================================================================
@@ -101,7 +104,7 @@
= A temporary solution is to create an empty LICENSE.txt file. =
= Though, we recommend that you edit this License. =
======================================================================
- </echo>
+ </ant:echo>
</j:when>
<j:otherwise>
<attainGoal name="checkstyle:report"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org