Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 62935 invoked from network); 4 Nov 2005 09:52:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Nov 2005 09:52:31 -0000 Received: (qmail 64545 invoked by uid 500); 4 Nov 2005 09:52:31 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 64531 invoked by uid 500); 4 Nov 2005 09:52:31 -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 64519 invoked by uid 99); 4 Nov 2005 09:52:31 -0000 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 [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 04 Nov 2005 01:52:30 -0800 Received: (qmail 62831 invoked by uid 65534); 4 Nov 2005 09:52:10 -0000 Message-ID: <20051104095210.62822.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r330771 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/ continuum-web/src/main/resources/forms/ cont... Date: Fri, 04 Nov 2005 09:52:07 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Nov 4 01:51:55 2005 New Revision: 330771 URL: http://svn.apache.org/viewcvs?rev=330771&view=rev Log: [CONTINUUM-406] Allow password identification for a nick Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationIrc.xml maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=330771&r1=330770&r2=330771&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Fri Nov 4 01:51:55 2005 @@ -746,7 +746,10 @@ !"sendOnError".equals( val ) && !"sendOnWarning".equals( val ) ) { - notifierProperties.setProperty( (String) key, val ); + if ( !StringUtils.isEmpty( val ) ) + { + notifierProperties.setProperty( (String) key, val ); + } } } } Modified: maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java?rev=330771&r1=330770&r2=330771&view=diff ============================================================================== --- maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java (original) +++ maven/continuum/trunk/continuum-notifiers/continuum-notifier-irc/src/main/java/org/apache/maven/continuum/notification/irc/IrcContinuumNotifier.java Fri Nov 4 01:51:55 2005 @@ -135,6 +135,13 @@ ircClient.setFullName( fullName ); } + String password = (String) configuration.get( "password" ); + + if ( !StringUtils.isEmpty( password ) ) + { + ircClient.setPassword( password ); + } + // ---------------------------------------------------------------------- // Send message // ---------------------------------------------------------------------- Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationIrc.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationIrc.xml?rev=330771&r1=330770&r2=330771&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationIrc.xml (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/forms/notificationIrc.xml Fri Nov 4 01:51:55 2005 @@ -62,6 +62,14 @@ irc.fullName.message + password + + + password + irc.password.label + irc.password.message + + sendOnSuccess Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=330771&r1=330770&r2=330771&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties Fri Nov 4 01:51:55 2005 @@ -214,6 +214,9 @@ irc.fullName.label = Full Name irc.fullName.message = Enter the full name of user +irc.password.label = Password +irc.password.message = Enter a password + // Jabber jabberNotificationTitle = Jabber Notification Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm?rev=330771&r1=330770&r2=330771&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/EditIrcNotifier.vm Fri Nov 4 01:51:55 2005 @@ -42,6 +42,12 @@ + Password + + + + + Send on success