From 12358df269ffdeaf9a8c041241e68b8fb2783613 Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 1 Nov 2004 09:26:00 +0000
Subject: [PATCH] Added new maven.announcement.repo.remote property and
 refactored existing maven.announcement.distributionUrl property to use it.

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

diff --git a/announcement/plugin.jelly b/announcement/plugin.jelly
index 9341cf8a..2e754f1f 100644
--- a/announcement/plugin.jelly
+++ b/announcement/plugin.jelly
@@ -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>
diff --git a/announcement/plugin.properties b/announcement/plugin.properties
index 4814bffa..29e775a2 100644
--- a/announcement/plugin.properties
+++ b/announcement/plugin.properties
@@ -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
diff --git a/announcement/src/plugin-resources/announcement.jsl b/announcement/src/plugin-resources/announcement.jsl
index 5f9c453d..104e2529 100644
--- a/announcement/src/plugin-resources/announcement.jsl
+++ b/announcement/src/plugin-resources/announcement.jsl
@@ -106,13 +106,13 @@ Changes in this version include:</j:whitespace>
 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"> 
diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml
index bc0ccd1c..9d4c7924 100644
--- a/announcement/xdocs/changes.xml
+++ b/announcement/xdocs/changes.xml
@@ -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">
diff --git a/announcement/xdocs/properties.xml b/announcement/xdocs/properties.xml
index 220a08a3..b4e47836 100644
--- a/announcement/xdocs/properties.xml
+++ b/announcement/xdocs/properties.xml
@@ -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>