From continuum-commits-return-2547-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Thu Nov 16 13:52:52 2006 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 92799 invoked from network); 16 Nov 2006 13:52:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Nov 2006 13:52:52 -0000 Received: (qmail 46666 invoked by uid 500); 16 Nov 2006 13:53:02 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 46638 invoked by uid 500); 16 Nov 2006 13:53:02 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 46625 invoked by uid 99); 16 Nov 2006 13:53:02 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 05:53:02 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Nov 2006 05:52:51 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 27D7F1A9846; Thu, 16 Nov 2006 05:52:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r475736 - in /maven/continuum/trunk/continuum-core/src/main: java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java resources/org/apache/maven/continuum/notification/mail/templates/common.vm Date: Thu, 16 Nov 2006 13:52:19 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061116135220.27D7F1A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Thu Nov 16 05:52:18 2006 New Revision: 475736 URL: http://svn.apache.org/viewvc?view=rev&rev=475736 Log: Add changesSinceLastSuccess to mail notification Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java?view=diff&rev=475736&r1=475735&r2=475736 ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/notification/mail/MailContinuumNotifier.java Thu Nov 16 05:52:18 2006 @@ -16,6 +16,7 @@ * limitations under the License. */ +import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.configuration.ConfigurationService; import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; @@ -73,6 +74,11 @@ private ContinuumStore store; /** + * @plexus.requirement + */ + private Continuum continuum; + + /** * @plexus.configuration */ private MailSender mailSender; @@ -246,6 +252,9 @@ context.put( "build", build ); + context.put( "changesSinceLastSuccess", + continuum.getChangesSinceLastSuccess( project.getId(), build.getId() ) ); + context.put( "buildOutput", buildOutput ); context.put( "previousBuild", previousBuild ); @@ -460,7 +469,7 @@ } /** - * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String, java.util.Set, java.util.Properties) + * @see org.codehaus.plexus.notification.notifier.Notifier#sendNotification(java.lang.String,java.util.Set,java.util.Properties) */ public void sendNotification( String arg0, Set arg1, Properties arg2 ) throws NotificationException Modified: maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm?view=diff&rev=475736&r1=475735&r2=475736 ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm (original) +++ maven/continuum/trunk/continuum-core/src/main/resources/org/apache/maven/continuum/notification/mail/templates/common.vm Thu Nov 16 05:52:18 2006 @@ -65,7 +65,39 @@ #end #end #end +#if ( $changesSinceLastSuccess ) +**************************************************************************** +SCM Changes since last success: +**************************************************************************** +#if ( $changesSinceLastSuccess.changes.size() == 0 ) +No files changed +#else +#foreach ( $changeSet in $changesSinceLastSuccess ) +#if ($changeSet.author) +#set($author = $changeSet.author) +#else +#set($author = "no author") +#end +#set($date = $formatter.formatTimestamp($changeSet.date)) +#if (!$date) +#set($date = "no date") +#end +#if ($changeSet.comment) +#set($comment = $formatter.trim($changeSet.comment)) +#else +#set($comment = "no comment") +#end +Changed: $author @ $date +Comment: $comment +Files changed: +#foreach ( $file in $changeSet.files ) + $!file.name (#if ($file.revision) $file.revision #else no revision #end) +#end + +#end +#end +#end #if ( $build.modifiedDependencies ) **************************************************************************** Dependencies Changes: