You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ct...@apache.org on 2009/09/08 03:32:29 UTC
svn commit: r812315 - in /continuum/branches/continuum-1.3.x:
continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/
continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/
continuum-webapp/src/main...
Author: ctan
Date: Tue Sep 8 01:32:28 2009
New Revision: 812315
URL: http://svn.apache.org/viewvc?rev=812315&view=rev
Log:
[CONTINUUM-2355] fixed prepare build mail notification subject
Modified:
continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
continuum/branches/continuum-1.3.x/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=812315&r1=812314&r2=812315&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Tue Sep 8 01:32:28 2009
@@ -167,7 +167,7 @@
*
* @plexus.configuration
*/
- private String prepareBuildSubjectFormat = "[continuum] PREPARE BUILD ${state]";
+ private String prepareBuildSubjectFormat = "[continuum] PREPARE BUILD ${state]: ${projectScmRoot.projectGroup.name}";
// ----------------------------------------------------------------------
//
@@ -453,8 +453,6 @@
context.put( "reportUrl",
getReportUrl( projectScmRoot.getProjectGroup(), projectScmRoot, configurationService ) );
- context.put( "projectGroup", projectScmRoot.getProjectGroup() );
-
context.put( "projectScmRoot", projectScmRoot );
// TODO put other profile env var could be a security if they provide passwords ?
Modified: continuum/branches/continuum-1.3.x/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm?rev=812315&r1=812314&r2=812315&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm (original)
+++ continuum/branches/continuum-1.3.x/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm Tue Sep 8 01:32:28 2009
@@ -15,7 +15,7 @@
*#
Online report : $reportUrl
- Project Group: $projectGroup.name
+ Project Group: $projectScmRoot.projectGroup.name
SCM Root URL: $projectScmRoot.scmRootAddress
#if ($projectScmRoot.state == 4)
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=812315&r1=812314&r2=812315&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Tue Sep 8 01:32:28 2009
@@ -94,7 +94,7 @@
results in "[continuum] BUILD SUCCESSFUL: Hello World, Build Def - Nightly Test Build"
-->
<buildSubjectFormat>[continuum] BUILD ${state}: ${project.projectGroup.name} - ${project.name} - ${build.buildDefinition.description}</buildSubjectFormat>
- <prepareBuildSubjectFormat>[continuum] PREPARE BUILD ${state}: ${project.projectGroup.name}</prepareBuildSubjectFormat>
+ <prepareBuildSubjectFormat>[continuum] PREPARE BUILD ${state}: ${projectScmRoot.projectGroup.name}</prepareBuildSubjectFormat>
<includeBuildSummary>true</includeBuildSummary>
<includeTestSummary>true</includeTestSummary>
<includeBuildOutput>false</includeBuildOutput>