continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject svn commit: r812316 - in /continuum/trunk: 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/resources/META-INF...
Date Tue, 08 Sep 2009 01:37:23 GMT
Author: ctan
Date: Tue Sep  8 01:37:22 2009
New Revision: 812316

URL: http://svn.apache.org/viewvc?rev=812316&view=rev
Log:
[CONTINUUM-2355] fixed prepare build mail notification subject
merge -r 812314:812315 of 1.3.x branch

Modified:
    continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
    continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm
    continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?rev=812316&r1=812315&r2=812316&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
(original)
+++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java
Tue Sep  8 01:37:22 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/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm?rev=812316&r1=812315&r2=812316&view=diff
==============================================================================
--- continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm
(original)
+++ continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/PrepareBuildComplete.vm
Tue Sep  8 01:37:22 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/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml?rev=812316&r1=812315&r2=812316&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/application.xml Tue
Sep  8 01:37:22 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>



Mime
View raw message