vmassol 2004/11/01 01:26:00
Modified: announcement/xdocs changes.xml properties.xml
announcement/src/plugin-resources announcement.jsl
announcement plugin.jelly plugin.properties
Log:
Added new maven.announcement.repo.remote property and refactored existing
maven.announcement.distributionUrl property to use it.
Revision Changes Path
1.28 +3 -1 maven-plugins/announcement/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/xdocs/changes.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- changes.xml 31 Oct 2004 12:33:25 -0000 1.27
+++ changes.xml 1 Nov 2004 09:26:00 -0000 1.28
@@ -27,7 +27,9 @@
<release version="1.4-SNAPSHOT" date="in CVS">
<action dev="vmassol" type="add" issue="MPANNOUNCEMENT-16">
Add information about the Maven remote repo to use in the generated
download
- instructions.
+ instructions. Added a <code>maven.announcement.repo.remote</code> property
+ that can be used to specify from which Maven remote repository the artifact
+ for this project can be found.
</action>
</release>
<release version="1.3" date="2004-08-10">
1.12 +14 -3 maven-plugins/announcement/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/xdocs/properties.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- properties.xml 7 Aug 2004 16:00:27 -0000 1.11
+++ properties.xml 1 Nov 2004 09:26:00 -0000 1.12
@@ -50,16 +50,27 @@
</td>
</tr>
<tr>
- <td>maven.announcement.distributionUrl</td>
+ <td>maven.announcement.repo.remote</td>
<td>Yes</td>
<td>
- Distribution location. For now, this property does not exist in
+ Specify from which Maven remote repository the artifact for this
+ project can be found. For now, this property does not exist in
the POM (there's only a distributionSite and distributionDirectory
which don't map to anything for the web). We'll need to remove this
property once it makes it into the POM.
</td>
<td>
- <code>${maven.repo.remote}/${pom.groupId}/plugins</code>
+ <code>${maven.repo.remote}</code>
+ </td>
+ </tr>
+ <tr>
+ <td>maven.announcement.distributionUrl</td>
+ <td>Yes</td>
+ <td>
+ Distribution location.
+ </td>
+ <td>
+ <code>${maven.announcement.repo.remote}/${pom.groupId}/plugins</code>
</td>
</tr>
<tr>
1.15 +3 -3 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- announcement.jsl 31 Oct 2004 12:33:25 -0000 1.14
+++ announcement.jsl 1 Nov 2004 09:26:00 -0000 1.15
@@ -106,13 +106,13 @@
To automatically install the plugin, type the following on a single line:
maven plugin:download
- -Dmaven.repo.remote=${maven.repo.remote}
- -DgroupId=${pom.groupId}
+ -Dmaven.repo.remote=${maven.announcement.repo.remote}
+ -DgroupId=${pom.groupId}
-DartifactId=${pom.artifactId}
-Dversion=${versionVariable}
For a manual installation, you can download the plugin here:
-${distributionUrl}/${pom.artifactId}-${versionVariable}.jar
+${maven.announcement.distributionUrl}/${pom.artifactId}-${versionVariable}.jar
</j:whitespace>
</u:available>
<j:whitespace trim="false">
1.15 +0 -3 maven-plugins/announcement/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/plugin.jelly,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- plugin.jelly 9 Aug 2004 17:30:43 -0000 1.14
+++ plugin.jelly 1 Nov 2004 09:26:00 -0000 1.15
@@ -57,9 +57,6 @@
<util:file var="inputFile" name="${maven.docs.src}/changes.xml"/>
- <maven:property var="distributionUrl" name="maven.announcement.distributionUrl"
- defaultValue="${maven.repo.remote}/${pom.groupId}/plugins"/>
-
<j:useBean var="stringUtils" class="org.apache.commons.lang.StringUtils"/>
</goal>
1.14 +8 -7 maven-plugins/announcement/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/announcement/plugin.properties,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plugin.properties 7 Aug 2004 16:00:27 -0000 1.13
+++ plugin.properties 1 Nov 2004 09:26:00 -0000 1.14
@@ -23,13 +23,14 @@
# For example:
# maven.announcement.version = ${pom.currentVersion}
-# Distribution location. For now, this property does not exist in the
-# POM (there's only a distributionSite and distributionDirectory which
-# doesn't map to anything for the web). We'll need to remove this
-# property once it makes it into the POM.
-# If not defined, it defaults to "${maven.repo.remote}/${pom.groupId}/plugins"
-# For example:
-# maven.announcement.distributionUrl = http//www.mysite.com/dist
+# Remote repository where the artifact is distributed. For now, this
+# property does not exist in the POM (there's only a distributionSite and
+# distributionDirectory which doesn't map to anything for the web). We'll
+# need to remove this property once it makes it into the POM.
+maven.announcement.repo.remote = ${maven.repo.remote}
+
+# Distribution location.
+maven.announcement.distributionUrl =
${maven.announcement.repo.remote}/${pom.groupId}/plugins
# Stylesheet to use to generate the text announcement
maven.announcement.stylesheet.path = ${plugin.resources}/announcement.jsl
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
