brett 2004/05/11 16:33:44
Modified: announcement plugin.properties project.xml
announcement/src/plugin-resources announcement.jsl
announcement/xdocs changes.xml
Log:
adjustments. Don't give plugin information if it isn't a plugin.
Revision Changes Path
1.9 +1 -0 maven-plugins/announcement/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/plugin.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.properties 2 May 2004 08:20:59 -0000 1.8
+++ plugin.properties 11 May 2004 23:33:44 -0000 1.9
@@ -33,3 +33,4 @@
# If not defined, it defaults to "${maven.repo.remote}/${pom.groupId}/plugins"
# For example:
# maven.announcement.distributionUrl = http//www.mysite.com/dist
+
1.18 +9 -0 maven-plugins/announcement/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 11 May 2004 15:36:23 -0000 1.17
+++ project.xml 11 May 2004 23:33:44 -0000 1.18
@@ -61,6 +61,15 @@
<role>Java Developer</role>
</roles>
</developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>f2 network</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
</developers>
<contributors>
<contributor>
1.12 +29 -24 maven-plugins/announcement/src/plugin-resources/announcement.jsl
Index: announcement.jsl
===================================================================
RCS file:
/home/cvs/maven-plugins/announcement/src/plugin-resources/announcement.jsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- announcement.jsl 2 May 2004 08:20:59 -0000 1.11
+++ announcement.jsl 11 May 2004 23:33:44 -0000 1.12
@@ -25,6 +25,7 @@
xmlns:j="jelly:core"
xmlns:jsl="jelly:jsl"
xmlns:x="jelly:xml"
+ xmlns:u="jelly:util"
xmlns:maven="jelly:maven"
xmlns="dummy" trim="true">
@@ -98,7 +99,9 @@
</j:forEach>
</j:if>
- <j:whitespace trim="false">
+ <!-- Nasty hack to detect a plugin until pom.type exists -->
+ <u:available file="${basedir}/plugin.jelly">
+ <j:whitespace trim="false">
To automatically install the plugin, type the following on a single line:
@@ -107,43 +110,45 @@
-DartifactId=${pom.artifactId}
-Dversion=${versionVariable}
-For a manual installation, you can download the ${pom.name}
-here:
-
+For a manual installation, you can download the plugin here:
${distributionUrl}/${pom.artifactId}-${versionVariable}.jar
+ </j:whitespace>
+ </u:available>
+ <j:whitespace trim="false">
Have fun!
--The development team
+-The ${pom.groupId} team
</j:whitespace>
-
</j:if>
</jsl:template>
<jsl:template match="action" trim="true">
- <x:set var="body" select="string(.)"/>
- <j:set var="counter" value=""/>
+ <x:set var="body" select="string(.)"/>
+ <j:set var="counter" value=""/>
- <j:set var="issue"><x:expr select="@issue"/></j:set>
- <j:set var="dueto"><x:expr select="@due-to"/></j:set>
+ <j:set var="issue"><x:expr select="@issue"/></j:set>
+ <j:set var="dueto"><x:expr select="@due-to"/></j:set>
- <j:set var="text" trim="true">
- ${body}<j:if test="${issue != ''}"> Fixes ${issue}.</j:if> <j:if
test="${dueto != ''}"><j:whitespace> Thanks to ${dueto}.</j:whitespace></j:if>
- </j:set>
+ <j:set var="text" trim="true">
+ ${body}
+ <j:if test="${issue != ''}"><j:whitespace> Issue:
${issue}.</j:whitespace></j:if>
+ <j:if test="${dueto != ''}"><j:whitespace> Thanks to
${dueto}.</j:whitespace></j:if>
+ </j:set>
- <j:forEach var="line" items="${formatter.format(text,75)}">
- <j:choose>
- <j:when test="${counter.length() == '0'}">
- <j:whitespace trim="false">
+ <j:forEach var="line" items="${formatter.format(text,75)}">
+ <j:choose>
+ <j:when test="${counter.length() == '0'}">
+ <j:whitespace trim="false">
o ${line}</j:whitespace>
- </j:when>
- <j:otherwise>
- <j:whitespace trim="false">
+ </j:when>
+ <j:otherwise>
+ <j:whitespace trim="false">
${line}</j:whitespace>
- </j:otherwise>
- </j:choose>
- <j:set var="counter" value="${counter}X"/>
- </j:forEach>
+ </j:otherwise>
+ </j:choose>
+ <j:set var="counter" value="${counter}X"/>
+ </j:forEach>
</jsl:template>
<jsl:template match="@*"/>
1.15 +5 -1 maven-plugins/announcement/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/xdocs/changes.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- changes.xml 2 May 2004 08:20:59 -0000 1.14
+++ changes.xml 11 May 2004 23:33:44 -0000 1.15
@@ -25,6 +25,10 @@
</properties>
<body>
<release version="1.1-SNAPSHOT" date="in CVS">
+ <action dev="brett" type="update">
+ Detect whether the project is a plugin or not by the existence of
plugin.jelly
+ in the project directory, and change the wording accordingly.
+ </action>
<action dev="vmassol" type="add">
Added new <code>maven.announcement.distributionUrl</code> property
which specifies where the project jars can be downloaded from. If
@@ -41,7 +45,7 @@
Improved web site documentation.
</action>
<action dev="vmassol" type="fix">
- Add a space after the "." of the "Fixes xxx." (which happens when
+ Add a space after the "." of the "Issue: xxx." (which happens when
you use the "issue" attribute in changes.xml).
</action>
<action dev="vmassol" type="add">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
