dion 2003/07/30 22:17:11
Modified: src/plugins-build/repository plugin.jelly
src/plugins-build/multiproject plugin.jelly
Log:
Use new param-check tag
See MAVEN-623
Revision Changes Path
1.22 +13 -13 maven/src/plugins-build/repository/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/repository/plugin.jelly,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plugin.jelly 9 Jul 2003 07:21:03 -0000 1.21
+++ plugin.jelly 31 Jul 2003 05:17:11 -0000 1.22
@@ -5,7 +5,7 @@
xmlns:define="jelly:define"
xmlns:dummy="dummy"
xmlns:j="jelly:core"
- xmlns:m="maven"
+ xmlns:maven="jelly:maven"
xmlns:repository="repository"
xmlns:u="jelly:util"
xmlns:x="jelly:xml">
@@ -121,7 +121,7 @@
! parse audit file
! run ssh to create each <groupId>/licenses directory.
!-->
- <m:param-check value="${directoryName}" fail="true" message="'directoryName'
must be specified"/>
+ <maven:param-check value="${directoryName}" fail="true"
message="'directoryName' must be specified"/>
<repository:parseAudit var="audit"/>
<!-- see if the user specified a starting project -->
<j:set var="processing" value="true" />
@@ -210,7 +210,7 @@
<!-- expects groupId to be set -->
<goal name="repository:audit-copy-license"
description="copy the license for the specified groupId to the repository">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<!--
! parse audit file
@@ -238,7 +238,7 @@
<goal name="repository:audit-generate-pom"
description="generate a pom for the groupId provided, based on the audit file">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<repository:parseAudit var="audit"/>
<x:forEach var="project" select="$audit/licenses/project">
@@ -279,7 +279,7 @@
<goal name="repository:create-project"
description="create a project, specified by groupId, in the repository">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<repository:exec>
cd ${maven.repo.central.directory};
@@ -299,7 +299,7 @@
<goal name="repository:delete-project"
description="delete a project, specified by groupId, in the repository">
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<repository:exec>
cd ${maven.repo.central.directory};
@@ -314,8 +314,8 @@
<goal name="repository:copy-snapshot-jar"
description="copy a snapshot jar, specified by groupId and artifact, to the
repository">
- <m:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<j:if test="${empty(artifactId)}">
<j:set var="artifactId">${groupId}</j:set>
@@ -348,8 +348,8 @@
<goal name="repository:copy-jar"
description="copy a jar, specified by groupId and artifact, to the repository">
- <m:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
<j:set var="type" value="jar" />
@@ -362,9 +362,9 @@
<goal name="repository:copy-artifact"
description="copy an artifact, specified by groupId, artifact and type, to the
repository">
- <m:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
- <m:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
- <m:param-check value="${type}" fail="true" message="'type' must be specified" />
+ <maven:param-check value="${artifact}" fail="true" message="'artifact' must be
specified"/>
+ <maven:param-check value="${groupId}" fail="true" message="'groupId' must be
specified"/>
+ <maven:param-check value="${type}" fail="true" message="'type' must be
specified" />
<j:set var="directory"
value="${maven.repo.central.directory}/${groupId}/${type}s/" />
<repository:exec command="mkdir -p ${directory}; chmod g+ws ${directory}; chgrp
${maven.repository.group} ${directory}"/>
1.22 +2 -3 maven/src/plugins-build/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.jelly,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plugin.jelly 28 Jul 2003 19:56:49 -0000 1.21
+++ plugin.jelly 31 Jul 2003 05:17:11 -0000 1.22
@@ -2,7 +2,6 @@
<project
xmlns:j="jelly:core"
- xmlns:m="maven"
xmlns:maven="jelly:maven"
xmlns:ant="jelly:ant"
xmlns:doc="doc"
@@ -175,9 +174,9 @@
<goal name="multiproject:goal"
description="Run a given goal on all projects">
- <m:param-check value="${goal}" fail="true">
+ <maven:param-check value="${goal}" fail="true">
A goal to run must be specified, e.g.
-maven -Dgoal=clean multiproject:goal</m:param-check>
+maven -Dgoal=clean multiproject:goal</maven:param-check>
<maven:reactor
basedir="${maven.multiproject.basedir}"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
