jvanzyl 2002/07/09 15:50:40
Modified: src/plugins/dist plugin.jelly
src/plugins/java plugin.jelly
src/plugins/site plugin.jelly
Log:
o Trying to use the <m:user-check/> taglib created in driver.jelly but
it's not working so far.
Revision Changes Path
1.6 +5 -18 jakarta-turbine-maven/src/plugins/dist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/dist/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 9 Jul 2002 18:19:12 -0000 1.5
+++ plugin.jelly 9 Jul 2002 22:50:40 -0000 1.6
@@ -2,7 +2,8 @@
<project
xmlns:j="jelly:core"
- xmlns:maven="jelly:maven">
+ xmlns:maven="jelly:maven"
+ xmlns:m="maven">
<!-- ================================================================== -->
<!-- D I S T R I B U T I O N S -->
@@ -129,23 +130,7 @@
<goal
name="dist:deploy">
- <j:set var="tmp" value="${maven.username}"/>
-
- <j:if test="${tmp.equals('USERNAME_NOT_SET')}">
-
- <fail message="">
-+------------------------------------------------------------------
-| ERROR!
-|
-| You must specify a maven username in order to deploy the site!
-| You can either set this property in your ~/build.properties
-| or specify one on the command line:
-|
-| maven -Dmaven.username=${user.name} deploy-site
-+------------------------------------------------------------------
- </fail>
-
- </j:if>
+ <m:user-check/>
<!--
@@ -189,6 +174,8 @@
<goal
name="dist:deploy-snapshot">
+
+ <m:user-check/>
<j:set var="maven.final.name" value="${snapshotSignature}"/>
<echo>Building snapshot distribution: ${maven.final.name}</echo>
1.15 +5 -21 jakarta-turbine-maven/src/plugins/java/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/java/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 9 Jul 2002 21:05:24 -0000 1.14
+++ plugin.jelly 9 Jul 2002 22:50:40 -0000 1.15
@@ -2,8 +2,9 @@
<project
xmlns:j="jelly:core"
- xmlns:maven="jelly:maven">
-
+ xmlns:maven="jelly:maven"
+ xmlns:m="maven">
+
<path id="maven.compile.src.set">
<pathelement location="${pom.build.SourceDirectory}"/>
</path>
@@ -172,28 +173,11 @@
name="jar:deploy-snapshot"
description="Create a snapshot jar, ie 'id-YYYYMMDD.buildnumber.jar'">
+ <m:user-check/>
+
<attainGoal name="jar:snapshot"/>
<property name="maven.jar.to.deploy" value="${maven.final.name}.jar"/>
-
-
- <j:set var="tmp" value="${maven.username}"/>
-
- <j:if test="${tmp.equals('USERNAME_NOT_SET')}">
-
- <fail message="">
-+------------------------------------------------------------------
-| ERROR!
-|
-| You must specify a maven username in order to deploy the site!
-| You can either set this property in your ~/build.properties
-| or specify one on the command line:
-|
-| maven -Dmaven.username=${user.name} deploy-site
-+------------------------------------------------------------------
- </fail>
-
- </j:if>
<!--
1.3 +4 -19 jakarta-turbine-maven/src/plugins/site/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins/site/plugin.jelly,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- plugin.jelly 9 Jul 2002 17:55:50 -0000 1.2
+++ plugin.jelly 9 Jul 2002 22:50:40 -0000 1.3
@@ -2,7 +2,8 @@
<project
xmlns:j="jelly:core"
- xmlns:maven="jelly:maven">
+ xmlns:maven="jelly:maven"
+ xmlns:m="maven">
<!-- ================================================================== -->
<!-- S I T E G E N E R A T I O N -->
@@ -36,24 +37,8 @@
<goal
name="site:deploy">
- <j:set var="tmp" value="${maven.username}"/>
-
- <j:if test="${tmp.equals('USERNAME_NOT_SET')}">
-
- <fail message="">
-+------------------------------------------------------------------
-| ERROR!
-|
-| You must specify a maven username in order to deploy the site!
-| You can either set this property in your ~/build.properties
-| or specify one on the command line:
-|
-| maven -Dmaven.username=${user.name} deploy-site
-+------------------------------------------------------------------
- </fail>
-
- </j:if>
-
+ <m:user-check/>
+
<!--
Generate the site documentation if it has not already been generated.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
