You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2005/11/04 10:52:07 UTC
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...
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 @@
<message-key>irc.fullName.message</message-key>
</element>
<element>
+ <id>password</id>
+ <validators>
+ </validators>
+ <type>password</type>
+ <label-key>irc.password.label</label-key>
+ <message-key>irc.password.message</message-key>
+ </element>
+ <element>
<id>sendOnSuccess</id>
<validators>
</validators>
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 @@
</td>
</tr>
<tr>
+ <th>Password</th>
+ <td>
+ <input type="password" name="password" value="$notifier.configuration.password" size="100"/>
+ </td>
+ </tr>
+ <tr>
<th>Send on success</th>
<td>
<input type="checkbox" name="sendOnSuccess" #if( $notifier.sendOnSuccess ) checked="checked" #end/>