From 7071f42f234a4ef2aadc04d1ad92002d632ed53e Mon Sep 17 00:00:00 2001
From: vmassol <vmassol@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 19 Feb 2005 15:30:27 +0000
Subject: [PATCH] Use the same default value for the
 <code>maven.cruisecontrol.mail.buildresultsurl</code> property than the one
 for <code>maven.cruisecontrol.buildresults.url</code>.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@154407 13f79535-47bb-0310-9956-ffa450edef68
---
 cruisecontrol/plugin.properties | 12 ++++++------
 cruisecontrol/xdocs/changes.xml |  5 +++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties
index 36060b4a..9bf3d9b9 100644
--- a/cruisecontrol/plugin.properties
+++ b/cruisecontrol/plugin.properties
@@ -50,6 +50,11 @@ maven.cruisecontrol.currentbuildstatus.filename=status.txt
 # TODO: Once the SCM plugin 1.5 is released, modify the first goal to be scm:update
 maven.cruisecontrol.goals=scm:update-project|clean test|site:deploy
 
+maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl
+maven.cruisecontrol.trigger.projects=
+maven.cruisecontrol.buildresults.site=${pom.url}/cruisecontrol
+maven.cruisecontrol.buildresults.url=${maven.cruisecontrol.buildresults.site}/buildresults/${pom.artifactId}
+
 maven.cruisecontrol.mail.host=localhost
 maven.cruisecontrol.mail.defaultsuffix=DEFAULT_SUFFIX_NOT_SET
 maven.cruisecontrol.mail.subjectprefix=[BUILD]
@@ -57,18 +62,13 @@ maven.cruisecontrol.mail.skipusers=false
 maven.cruisecontrol.mail.reportsuccess=always
 maven.cruisecontrol.mail.spamwhilebroken=false
 maven.cruisecontrol.mail.usemap=true
-maven.cruisecontrol.mail.buildresultsurl=
+maven.cruisecontrol.mail.buildresultsurl=${maven.cruisecontrol.buildresults.url}
 maven.cruisecontrol.mail.css=${maven.cruisecontrol.home}/reporting/jsp/webcontent/css/cruisecontrol.css
 maven.cruisecontrol.mail.xlsdir=${maven.cruisecontrol.home}/reporting/jsp/webcontent/xsl
 maven.cruisecontrol.mail.failureaddress=${pom.build.nagEmailAddress}
 maven.cruisecontrol.mail.successaddress=${pom.build.nagEmailAddress}
 maven.cruisecontrol.mail.maps=
 
-maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl
-maven.cruisecontrol.trigger.projects=
-maven.cruisecontrol.buildresults.site=${pom.url}/cruisecontrol
-maven.cruisecontrol.buildresults.url=${maven.cruisecontrol.buildresults.site}/buildresults/${pom.artifactId}
-
 #maven.cruisecontrol.ftp.targetHost=
 maven.cruisecontrol.ftp.targetUser=anonymous
 maven.cruisecontrol.ftp.targetPasswd=anonymous
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index a37a945e..fc1fa173 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -26,6 +26,11 @@
   </properties>
   <body>
     <release version="1.7" date="in SVN">
+      <action dev="vmassol" type="update">
+        Use the same default value for the 
+        <code>maven.cruisecontrol.mail.buildresultsurl</code> property
+        than the one for <code>maven.cruisecontrol.buildresults.url</code>.
+      </action>
       <action dev="vmassol" type="update">
         Modified default value of <code>maven.cruisecontrol.logs.mergedirectory</code>
         so that CC can aggregate JUnit test reports both for single project and