From 513e2f794ba735460384e0498d2e94a8fe2bed88 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 2 May 2004 08:20:59 +0000
Subject: [PATCH] Added new <code>maven.announcement.distributionUrl</code>
 property which specifies where the project jars can be downloaded from. If
 not specified, it defaults to
 <code>${maven.repo.remote}/${pom.groupId}/plugins</code>. Once this property
 makes it into the POM we'll remove it.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115153 13f79535-47bb-0310-9956-ffa450edef68
---
 announcement/plugin.jelly                          |  6 +++++-
 announcement/plugin.properties                     | 10 +++++++++-
 announcement/src/plugin-resources/announcement.jsl |  2 +-
 announcement/xdocs/changes.xml                     |  7 +++++++
 announcement/xdocs/properties.xml                  | 13 +++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/announcement/plugin.jelly b/announcement/plugin.jelly
index f72e735e..177e721e 100644
--- a/announcement/plugin.jelly
+++ b/announcement/plugin.jelly
@@ -39,7 +39,11 @@
     <util:file var="inputFile" name="${maven.docs.src}/changes.xml"/>
     <x:parse var="doc" xml="${inputFile}"/>
     
-    <maven:property var="versionVariable" name="maven.announcement.version" defaultValue="${pom.currentVersion}"/>
+    <maven:property var="versionVariable" name="maven.announcement.version" 
+        defaultValue="${pom.currentVersion}"/>
+
+    <maven:property var="distributionUrl" name="maven.announcement.distributionUrl" 
+        defaultValue="${maven.repo.remote}/${pom.groupId}/plugins"/>
   
     <jsl:stylesheet select="$doc">
       <jsl:template match="document/body/release">
diff --git a/announcement/plugin.properties b/announcement/plugin.properties
index 7212c569..1b9e6364 100644
--- a/announcement/plugin.properties
+++ b/announcement/plugin.properties
@@ -21,7 +21,15 @@
 # Version for which to create a release note. If not defined, it 
 # defaults to ${pom.currentVersion}.
 # For example:
-# maven.announcement.version = ${pom.version}
+# maven.announcement.version = ${pom.currentVersion}
 
 # Name and location of generated announcement file
 maven.announcement.file=${maven.build.dir}/announcement.txt
+
+# 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
diff --git a/announcement/src/plugin-resources/announcement.jsl b/announcement/src/plugin-resources/announcement.jsl
index 5b3135e4..29651d9c 100644
--- a/announcement/src/plugin-resources/announcement.jsl
+++ b/announcement/src/plugin-resources/announcement.jsl
@@ -110,7 +110,7 @@ maven plugin:download
 For a manual installation, you can download the ${pom.name} 
 here:
 
-${maven.repo.remote}/${pom.groupId}/plugins/${pom.artifactId}-${versionVariable}.jar
+${distributionUrl}/${pom.artifactId}-${versionVariable}.jar
 
 Have fun!
 -The development team
diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml
index 6d468fd1..f24b342a 100644
--- a/announcement/xdocs/changes.xml
+++ b/announcement/xdocs/changes.xml
@@ -25,6 +25,13 @@
   </properties>
   <body>
     <release version="1.1-SNAPSHOT" date="in CVS">
+      <action dev="vmassol" type="add">
+        Added new <code>maven.announcement.distributionUrl</code> property
+        which specifies where the project jars can be downloaded from. If
+        not specified, it defaults to
+        <code>${maven.repo.remote}/${pom.groupId}/plugins</code>. Once this
+        property makes it into the POM we'll remove it.
+      </action>
       <action dev="vmassol" type="update">
         The <code>maven.announcement.version</code> property does no longer
         needs to be defined. It defaults to <code>${pom.currentVersion}</code>
diff --git a/announcement/xdocs/properties.xml b/announcement/xdocs/properties.xml
index 1ca502af..93fcdae5 100644
--- a/announcement/xdocs/properties.xml
+++ b/announcement/xdocs/properties.xml
@@ -48,6 +48,19 @@
             <code>${maven.build.dir}/announcement.txt</code>
           </td>
         </tr>
+        <tr>
+          <td>maven.announcement.distributionUrl</td>
+          <td>Yes</td>
+          <td>
+            Distribution location. 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>
+          </td>
+        </tr>
       </table>
     </section>
   </body>