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 2006/12/20 10:47:56 UTC
svn commit: r489003 - in /maven/continuum/trunk/continuum-webapp/src/main:
resources/ resources/org/apache/maven/continuum/web/action/notifier/
webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/notifier/
Author: evenisse
Date: Wed Dec 20 01:47:54 2006
New Revision: 489003
URL: http://svn.apache.org/viewvc?view=rev&rev=489003
Log:
[CONTINUUM-1074] Add form validation of 'Add/Edit Notifier' page
Submitted by: Franz Allan Valencia See
Added:
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (with props)
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp (with props)
Removed:
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/deleteNotifier.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierIrc.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierJabber.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMail.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMsn.jsp
maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierSelectType.jsp
Modified:
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml
maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties
maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcGroupNotifierEditAction-ircProjectGroupNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,26 +2,21 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
<validators>
<field name="host">
- <field-validator type="required">
- <message>Host is required</message>
- <!--message key="ircNotifier.host.required"/-->
+ <field-validator type="requiredstring">
+ <message key="ircNotifier.host.required"/>
</field-validator>
</field>
<field name="port">
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9])]]></param>
- <message>Port must be an integer</message>
- <!--message key="ircNotifier.port.invalid"/-->
+ <message key="ircNotifier.port.invalid"/>
</field-validator>
</field>
<field name="channel">
- <field-validator type="required">
- <message>Channel is required</message>
- <!--message key="ircNotifier.channel.required"/-->
+ <field-validator type="requiredstring">
+ <message key="ircNotifier.channel.required"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/IrcProjectNotifierEditAction-ircProjectNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,26 +2,21 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
<validators>
<field name="host">
- <field-validator type="required">
- <message>Host is required</message>
- <!--message key="ircNotifier.host.required"/-->
+ <field-validator type="requiredstring">
+ <message key="ircNotifier.host.required"/>
</field-validator>
</field>
<field name="port">
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9])]]></param>
- <message>Port must be an integer</message>
- <!--message key="ircNotifier.port.invalid"/-->
+ <message key="ircNotifier.port.invalid"/>
</field-validator>
</field>
<field name="channel">
- <field-validator type="required">
- <message>Channel is required</message>
- <!--message key="ircNotifier.channel.required"/-->
+ <field-validator type="requiredstring">
+ <message key="ircNotifier.channel.required"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction-jabberProjectGroupNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,39 +2,34 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
-
<validators>
<field name="host">
- <field-validator type="required">
- <message>Host is required</message>
- <!--message key="jabberNotifier.host.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.host.required"/>
</field-validator>
</field>
<field name="port">
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9])]]></param>
- <message>Port must be an integer</message>
- <!--message key="jabberNotifier.port.invalid"/-->
+ <message key="jabberNotifier.port.invalid"/>
</field-validator>
</field>
<field name="login">
- <field-validator type="required">
- <message>Login is required</message>
- <!--message key="jabberNotifier.login.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.login.required"/>
</field-validator>
</field>
<field name="password">
- <field-validator type="required">
- <message>Password is required</message>
- <!--message key="jabberNotifier.password.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.password.required"/>
</field-validator>
</field>
<field name="address">
- <field-validator type="required">
- <message>Address is required</message>
- <!--message key="jabberNotifier.address.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.address.required"/>
+ </field-validator>
+ <field-validator type="email">
+ <message key="jabberNotifier.address.invalid"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberGroupNotifierEditAction.properties Wed Dec 20 01:47:54 2006
@@ -2,4 +2,5 @@
jabberNotifier.port.invalid = Port must be an integer
jabberNotifier.login.required = Login is required
jabberNotifier.password.required = Password is required
-jabberNotifier.address.required = Address is required
\ No newline at end of file
+jabberNotifier.address.required = Address is required
+jabberNotifier.address.invalid = Address is invalid
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,39 +2,34 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
-
<validators>
<field name="host">
- <field-validator type="required">
- <message>Host is required</message>
- <!--message key="jabberNotifier.host.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.host.required"/>
</field-validator>
</field>
<field name="port">
<field-validator type="regex">
<param name="expression"><![CDATA[([0-9])]]></param>
- <message>Port must be an integer</message>
- <!--message key="jabberNotifier.port.invalid"/-->
+ <message key="jabberNotifier.port.invalid"/>
</field-validator>
</field>
<field name="login">
- <field-validator type="required">
- <message>Login is required</message>
- <!--message key="jabberNotifier.login.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.login.required"/>
</field-validator>
</field>
<field name="password">
- <field-validator type="required">
- <message>Password is required</message>
- <!--message key="jabberNotifier.password.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.password.required"/>
</field-validator>
</field>
<field name="address">
- <field-validator type="required">
- <message>Address is required</message>
- <!--message key="jabberNotifier.address.required"/-->
+ <field-validator type="requiredstring">
+ <message key="jabberNotifier.address.required"/>
+ </field-validator>
+ <field-validator type="email">
+ <message key="jabberNotifier.address.invalid"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties Wed Dec 20 01:47:54 2006
@@ -2,4 +2,5 @@
jabberNotifier.port.invalid = Port must be an integer
jabberNotifier.login.required = Login is required
jabberNotifier.password.required = Password is required
-jabberNotifier.address.required = Address is required
\ No newline at end of file
+jabberNotifier.address.required = Address is required
+jabberNotifier.address.invalid = Address is invalid
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,14 +2,13 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
-
<validators>
<field name="address">
- <field-validator type="required">
- <message>Address is required</message>
- <!--message key="mailNotifier.address.required"/-->
+ <field-validator type="requiredstring">
+ <message key="mailNotifier.address.required"/>
+ </field-validator>
+ <field-validator type="email">
+ <message key="mailNotifier.address.invalid"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties Wed Dec 20 01:47:54 2006
@@ -1 +1,2 @@
-mailNotifier.address.required = Address is required
\ No newline at end of file
+mailNotifier.address.required = Address is required
+mailNotifier.address.invalid = Address is invalid
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,14 +2,13 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
-
<validators>
<field name="address">
- <field-validator type="required">
- <message>Address is required</message>
- <!--message key="mailNotifier.address.required"/-->
+ <field-validator type="requiredstring">
+ <message key="mailNotifier.address.required"/>
+ </field-validator>
+ <field-validator type="email">
+ <message key="mailNotifier.address.invalid"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties Wed Dec 20 01:47:54 2006
@@ -1 +1,2 @@
-mailNotifier.address.required = Address is required
\ No newline at end of file
+mailNotifier.address.required = Address is required
+mailNotifier.address.invalid = Address is invalid
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,26 +2,23 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
-
<validators>
<field name="login">
- <field-validator type="required">
- <message>Login is required</message>
- <!--message key="jabberNotifier.login.required"/-->
+ <field-validator type="requiredstring">
+ <message key="msnNotifier.login.required"/>
</field-validator>
</field>
<field name="password">
- <field-validator type="required">
- <message>Password is required</message>
- <!--message key="jabberNotifier.password.required"/-->
+ <field-validator type="requiredstring">
+ <message key="msnNotifier.password.required"/>
</field-validator>
</field>
<field name="address">
- <field-validator type="required">
- <message>Address is required</message>
- <!--message key="jabberNotifier.address.required"/-->
+ <field-validator type="requiredstring">
+ <message key="msnNotifier.address.required"/>
+ </field-validator>
+ <field-validator type="email">
+ <message key="msnNotifier.address.invalid"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties Wed Dec 20 01:47:54 2006
@@ -1,3 +1,4 @@
msnNotifier.login.required = Login is required
msnNotifier.password.required = Password is required
-msnNotifier.address.required = Address is required
\ No newline at end of file
+msnNotifier.address.required = Address is required
+msnNotifier.address.invalid = Address is invalid
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml Wed Dec 20 01:47:54 2006
@@ -2,26 +2,23 @@
"-//OpenSymphony Group//XWork Validator 1.0.2//EN"
"http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-<!-- TODO: there was a problem with getting the message values from the properties file so
- the error messages were just specified here -->
-
<validators>
<field name="login">
- <field-validator type="required">
- <message>Login is required</message>
- <!--message key="jabberNotifier.login.required"/-->
+ <field-validator type="requiredstring">
+ <message key="msnNotifier.login.required"/>
</field-validator>
</field>
<field name="password">
- <field-validator type="required">
- <message>Password is required</message>
- <!--message key="jabberNotifier.password.required"/-->
+ <field-validator type="requiredstring">
+ <message key="msnNotifier.password.required"/>
</field-validator>
</field>
<field name="address">
- <field-validator type="required">
- <message>Address is required</message>
- <!--message key="jabberNotifier.address.required"/-->
+ <field-validator type="requiredstring">
+ <message key="msnNotifier.address.required"/>
+ </field-validator>
+ <field-validator type="email">
+ <message key="msnNotifier.address.invalid"/>
</field-validator>
</field>
-</validators>
\ No newline at end of file
+</validators>
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties Wed Dec 20 01:47:54 2006
@@ -1,3 +1,4 @@
msnNotifier.login.required = Login is required
msnNotifier.password.required = Password is required
-msnNotifier.address.required = Address is required
\ No newline at end of file
+msnNotifier.address.required = Address is required
+msnNotifier.address.invalid = Address is invalid
Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?view=diff&rev=489003&r1=489002&r2=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Wed Dec 20 01:47:54 2006
@@ -32,7 +32,7 @@
<param name="excludeMethods">input,back,cancel,browse,edit</param>
</interceptor-ref>
</interceptor-stack>
-
+
<interceptor-stack name="unconfiguredContinuumStack">
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="exception-logging"/>
@@ -261,125 +261,6 @@
</action>
<!--
- * notifier actions :: Project
- -->
- <action name="deleteProjectNotifier" class="deleteProjectNotifier">
- <result name="delete">/WEB-INF/jsp/deleteNotifier.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="addProjectNotifier" class="addProjectNotifier" method="doDefault">
- <result name="input">/WEB-INF/jsp/notifierSelectType.jsp</result>
- <result name="mail_input">/WEB-INF/jsp/notifierMail.jsp</result>
- <result name="irc_input">/WEB-INF/jsp/notifierIrc.jsp</result>
- <result name="msn_input">/WEB-INF/jsp/notifierMsn.jsp</result>
- <result name="jabber_input">/WEB-INF/jsp/notifierJabber.jsp</result>
- </action>
-
- <action name="editProjectNotifier" class="addProjectNotifier">
- <result name="mail_input" type="chain">mailProjectNotifierEdit</result>
- <result name="irc_input" type="chain">ircProjectNotifierEdit</result>
- <result name="msn_input" type="chain">msnProjectNotifierEdit</result>
- <result name="jabber_input" type="chain">jabberProjectNotifierEdit</result>
- </action>
-
- <action name="mailProjectNotifierEdit" class="mailProjectNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierMail.jsp</result>
- </action>
-
- <action name="mailProjectNotifierSave" class="mailProjectNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierMail.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="ircProjectNotifierEdit" class="ircProjectNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierIrc.jsp</result>
- </action>
-
- <action name="ircProjectNotifierSave" class="ircProjectNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierIrc.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="jabberProjectNotifierEdit" class="jabberProjectNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierJabber.jsp</result>
- </action>
-
- <action name="jabberProjectNotifierSave" class="jabberProjectNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierJabber.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <action name="msnProjectNotifierEdit" class="msnProjectNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierMsn.jsp</result>
- </action>
-
- <action name="msnProjectNotifierSave" class="msnProjectNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierMsn.jsp</result>
- <result name="success" type="chain">projectView</result>
- </action>
-
- <!--
- * notifier actions :: Project Group
- -->
-
- <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
- <result name="delete">/WEB-INF/jsp/deleteNotifier.jsp</result>
- <result name="success" type="chain">projectGroupNotifier</result>
- </action>
-
- <action name="addProjectGroupNotifier" class="addGroupNotifier" method="doDefault">
- <result name="input">/WEB-INF/jsp/notifierSelectType.jsp</result>
- <result name="mail_input">/WEB-INF/jsp/notifierMail.jsp</result>
- <result name="irc_input">/WEB-INF/jsp/notifierIrc.jsp</result>
- <result name="msn_input">/WEB-INF/jsp/notifierMsn.jsp</result>
- <result name="jabber_input">/WEB-INF/jsp/notifierJabber.jsp</result>
- </action>
-
- <action name="editProjectGroupNotifier" class="addGroupNotifier">
- <result name="mail_input" type="chain">mailProjectGroupNotifierEdit</result>
- <result name="irc_input" type="chain">ircProjectGroupNotifierEdit</result>
- <result name="msn_input" type="chain">msnProjectGroupNotifierEdit</result>
- <result name="jabber_input" type="chain">jabberProjectGroupNotifierEdit</result>
- </action>
-
- <action name="mailProjectGroupNotifierEdit" class="mailGroupNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierMail.jsp</result>
- </action>
-
- <action name="mailProjectGroupNotifierSave" class="mailGroupNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierMail.jsp</result>
- <result name="success" type="chain">projectGroupNotifier</result>
- </action>
-
- <action name="ircProjectGroupNotifierEdit" class="ircGroupNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierIrc.jsp</result>
- </action>
-
- <action name="ircProjectGroupNotifierSave" class="ircGroupNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierIrc.jsp</result>
- <result name="success" type="chain">projectGroupNotifier</result>
- </action>
-
- <action name="jabberProjectGroupNotifierEdit" class="jabberGroupNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierJabber.jsp</result>
- </action>
-
- <action name="jabberProjectGroupNotifierSave" class="jabberGroupNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierJabber.jsp</result>
- <result name="success" type="chain">projectGroupNotifier</result>
- </action>
-
- <action name="msnProjectGroupNotifierEdit" class="msnGroupNotifierEdit" method="edit">
- <result name="success">/WEB-INF/jsp/notifierMsn.jsp</result>
- </action>
-
- <action name="msnProjectGroupNotifierSave" class="msnGroupNotifierEdit" method="save">
- <result name="input">/WEB-INF/jsp/notifierMsn.jsp</result>
- <result name="success" type="chain">projectGroupNotifier</result>
- </action>
-
- <!--
* build results, test reporting, working copy actions
-->
<action name="buildResults" class="buildResults">
@@ -583,6 +464,128 @@
<action name="projectGroupNotifierSummary" class="notifierSummary" method="summarizeForProjectGroup">
<result name="success">/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp</result>
<result name="error">/WEB-INF/jsp/components/failureComponent.jsp</result>
+ </action>
+
+ </package>
+
+ <package name="notifier" extends="default">
+ <!--
+ * notifier actions :: Project
+ -->
+ <action name="deleteProjectNotifier" class="deleteProjectNotifier">
+ <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="addProjectNotifier" class="addProjectNotifier" method="doDefault">
+ <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
+ <result name="mail_input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
+ <result name="irc_input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
+ <result name="msn_input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
+ <result name="jabber_input">/WEB-INF/jsp/notifier/notifierJabber.jsp</result>
+ </action>
+
+ <action name="editProjectNotifier" class="addProjectNotifier">
+ <result name="mail_input" type="chain">mailProjectNotifierEdit</result>
+ <result name="irc_input" type="chain">ircProjectNotifierEdit</result>
+ <result name="msn_input" type="chain">msnProjectNotifierEdit</result>
+ <result name="jabber_input" type="chain">jabberProjectNotifierEdit</result>
+ </action>
+
+ <action name="mailProjectNotifierEdit" class="mailProjectNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
+ </action>
+
+ <action name="mailProjectNotifierSave" class="mailProjectNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="ircProjectNotifierEdit" class="ircProjectNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
+ </action>
+
+ <action name="ircProjectNotifierSave" class="ircProjectNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="jabberProjectNotifierEdit" class="jabberProjectNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierJabber.jsp</result>
+ </action>
+
+ <action name="jabberProjectNotifierSave" class="jabberProjectNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierJabber.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <action name="msnProjectNotifierEdit" class="msnProjectNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
+ </action>
+
+ <action name="msnProjectNotifierSave" class="msnProjectNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
+ <result name="success" type="chain">projectView</result>
+ </action>
+
+ <!--
+ * notifier actions :: Project Group
+ -->
+
+ <action name="deleteProjectGroupNotifier" class="deleteGroupNotifier">
+ <result name="delete">/WEB-INF/jsp/notifier/deleteNotifier.jsp</result>
+ <result name="success" type="chain">projectGroupNotifier</result>
+ </action>
+
+ <action name="addProjectGroupNotifier" class="addGroupNotifier" method="doDefault">
+ <result name="input">/WEB-INF/jsp/notifier/notifierSelectType.jsp</result>
+ <result name="mail_input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
+ <result name="irc_input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
+ <result name="msn_input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
+ <result name="jabber_input">/WEB-INF/jsp/notifier/notifierJabber.jsp</result>
+ </action>
+
+ <action name="editProjectGroupNotifier" class="addGroupNotifier">
+ <result name="mail_input" type="chain">mailProjectGroupNotifierEdit</result>
+ <result name="irc_input" type="chain">ircProjectGroupNotifierEdit</result>
+ <result name="msn_input" type="chain">msnProjectGroupNotifierEdit</result>
+ <result name="jabber_input" type="chain">jabberProjectGroupNotifierEdit</result>
+ </action>
+
+ <action name="mailProjectGroupNotifierEdit" class="mailGroupNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
+ </action>
+
+ <action name="mailProjectGroupNotifierSave" class="mailGroupNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierMail.jsp</result>
+ <result name="success" type="chain">projectGroupNotifier</result>
+ </action>
+
+ <action name="ircProjectGroupNotifierEdit" class="ircGroupNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
+ </action>
+
+ <action name="ircProjectGroupNotifierSave" class="ircGroupNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierIrc.jsp</result>
+ <result name="success" type="chain">projectGroupNotifier</result>
+ </action>
+
+ <action name="jabberProjectGroupNotifierEdit" class="jabberGroupNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierJabber.jsp</result>
+ </action>
+
+ <action name="jabberProjectGroupNotifierSave" class="jabberGroupNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierJabber.jsp</result>
+ <result name="success" type="chain">projectGroupNotifier</result>
+ </action>
+
+ <action name="msnProjectGroupNotifierEdit" class="msnGroupNotifierEdit" method="edit">
+ <result name="success">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
+ </action>
+
+ <action name="msnProjectGroupNotifierSave" class="msnGroupNotifierEdit" method="save">
+ <result name="input">/WEB-INF/jsp/notifier/notifierMsn.jsp</result>
+ <result name="success" type="chain">projectGroupNotifier</result>
</action>
</package>
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp?view=auto&rev=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp Wed Dec 20 01:47:54 2006
@@ -0,0 +1,42 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="deleteNotifier.page.title"/></title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <h3><ww:text name="deleteNotifier.section.title"/></h3>
+
+ <div class="warningmessage">
+ <p>
+ <strong>
+ <ww:text name="deleteNotifier.confirmation.message">
+ <ww:param><ww:property value="notifierType"/></ww:param>
+ <ww:param><ww:property value="notifierId"/></ww:param>
+ </ww:text>
+ </strong>
+ </p>
+ </div>
+ <div class="functnbar3">
+ <ww:if test="${projectId == -1}">
+ <ww:form action="deleteProjectGroupNotifier.action" method="post">
+ <ww:hidden name="notifierId"/>
+ <ww:hidden name="projectGroupId" />
+ <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ </ww:form>
+ </ww:if>
+ <ww:else>
+ <ww:form action="deleteProjectNotifier.action" method="post">
+ <ww:hidden name="notifierId"/>
+ <ww:hidden name="projectId"/>
+ <ww:hidden name="projectGroupId" />
+ <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
+ </ww:form>
+ </ww:else>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/deleteNotifier.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp?view=auto&rev=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp Wed Dec 20 01:47:54 2006
@@ -0,0 +1,54 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title>
+ <ww:text name="notifier.page.title">
+ <ww:param>IRC</ww:param>
+ </ww:text>
+ </title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <ww:if test="${projectId > 0}">
+ <ww:url id="actionUrl" action="ircProjectNotifierSave" includeContext="false" includeParams="none" />
+ </ww:if>
+ <ww:else>
+ <ww:url id="actionUrl" action="ircProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+ </ww:else>
+ <h3>
+ <ww:text name="notifier.section.title">
+ <ww:param>IRC</ww:param>
+ </ww:text>
+ </h3>
+
+ <div class="axial">
+ <ww:form action="%{actionUrl}" method="post" validate="true">
+ <ww:hidden name="notifierId"/>
+ <ww:hidden name="projectId"/>
+ <ww:hidden name="projectGroupId"/>
+ <ww:hidden name="notifierType"/>
+ <table>
+ <tbody>
+ <ww:textfield label="%{getText('notifier.irc.host.label')}" name="host" required="true"/>
+ <ww:textfield label="%{getText('notifier.irc.port.label')}" name="port"/>
+ <ww:textfield label="%{getText('notifier.irc.channel.label')}" name="channel" required="true"/>
+ <ww:textfield label="%{getText('notifier.irc.nick.label')}" name="nick"/>
+ <ww:textfield label="%{getText('notifier.irc.fullName.label')}" name="fullName"/>
+ <ww:password label="%{getText('notifier.irc.password.label')}" name="password"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+ </tbody>
+ </table>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierIrc.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp?view=auto&rev=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp Wed Dec 20 01:47:54 2006
@@ -0,0 +1,56 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title>
+ <ww:text name="notifier.page.title">
+ <ww:param>Jabber</ww:param>
+ </ww:text>
+ </title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <ww:if test="${projectId > 0}">
+ <ww:url id="actionUrl" action="jabberProjectNotifierSave" includeContext="false" includeParams="none" />
+ </ww:if>
+ <ww:else>
+ <ww:url id="actionUrl" action="jabberProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+ </ww:else>
+ <h3>
+ <ww:text name="notifier.section.title">
+ <ww:param>Jabber</ww:param>
+ </ww:text>
+ </h3>
+
+ <div class="axial">
+ <ww:form action="%{actionUrl}" method="post" validate="true">
+ <ww:hidden name="notifierId"/>
+ <ww:hidden name="projectId"/>
+ <ww:hidden name="projectGroupId"/>
+ <ww:hidden name="notifierType"/>
+ <table>
+ <tbody>
+ <ww:textfield label="%{getText('notifier.jabber.host.label')}" name="host" required="true"/>
+ <ww:textfield label="%{getText('notifier.jabber.port.label')}" name="port"/>
+ <ww:textfield label="%{getText('notifier.jabber.login.label')}" name="login" required="true"/>
+ <ww:password label="%{getText('notifier.jabber.password.label')}" name="password" required="true"/>
+ <ww:textfield label="%{getText('notifier.jabber.domainName.label')}" name="domainName"/>
+ <ww:textfield label="%{getText('notifier.jabber.address.label')}" name="address" required="true"/>
+ <ww:checkbox label="%{getText('notifier.jabber.isSslConnection.label')}" name="sslConnection" value="sslConnection" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.jabber.isGroup.label')}" name="group" value="group" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+ </tbody>
+ </table>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierJabber.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp?view=auto&rev=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp Wed Dec 20 01:47:54 2006
@@ -0,0 +1,50 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title>
+ <ww:text name="notifier.page.title">
+ <ww:param>Mail</ww:param>
+ </ww:text>
+ </title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <ww:if test="${projectId > 0}">
+ <ww:url id="actionUrl" action="mailProjectNotifierSave" includeContext="false" includeParams="none" />
+ </ww:if>
+ <ww:else>
+ <ww:url id="actionUrl" action="mailProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+ </ww:else>
+
+ <h3>
+ <ww:text name="notifier.section.title">
+ <ww:param>Mail</ww:param>
+ </ww:text>
+ </h3>
+
+ <div class="axial">
+ <ww:form action="%{actionUrl}" method="post" validate="true">
+ <ww:hidden name="notifierId"/>
+ <ww:hidden name="projectId"/>
+ <ww:hidden name="projectGroupId"/>
+ <ww:hidden name="notifierType"/>
+ <table>
+ <tbody>
+ <ww:textfield label="%{getText('notifier.mail.recipient.label')}" name="address" required="true" />
+ <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+ </tbody>
+ </table>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMail.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp?view=auto&rev=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp Wed Dec 20 01:47:54 2006
@@ -0,0 +1,51 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title>
+ <ww:text name="notifier.page.title">
+ <ww:param>MSN</ww:param>
+ </ww:text>
+ </title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+ <ww:if test="${projectId > 0}">
+ <ww:url id="actionUrl" action="msnProjectNotifierSave" includeContext="false" includeParams="none" />
+ </ww:if>
+ <ww:else>
+ <ww:url id="actionUrl" action="msnProjectGroupNotifierSave" includeContext="false" includeParams="none"/>
+ </ww:else>
+ <h3>
+ <ww:text name="notifier.section.title">
+ <ww:param>MSN</ww:param>
+ </ww:text>
+ </h3>
+
+ <div class="axial">
+ <ww:form action="%{actionUrl}" method="post" validate="true">
+ <ww:hidden name="notifierId"/>
+ <ww:hidden name="projectId"/>
+ <ww:hidden name="projectGroupId"/>
+ <ww:hidden name="notifierType"/>
+ <table>
+ <tbody>
+ <ww:textfield label="%{getText('notifier.msn.login.label')}" name="login" required="true"/>
+ <ww:password label="%{getText('notifier.msn.password.label')}" name="password" required="true"/>
+ <ww:textfield label="%{getText('notifier.msn.address.label')}" name="address" required="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnSuccess')}" name="sendOnSuccess" value="sendOnSuccess" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnFailure')}" name="sendOnFailure" value="sendOnFailure" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnError')}" name="sendOnError" value="sendOnError" fieldValue="true"/>
+ <ww:checkbox label="%{getText('notifier.event.sendOnWarning')}" name="sendOnWarning" value="sendOnWarning" fieldValue="true"/>
+ </tbody>
+ </table>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierMsn.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp?view=auto&rev=489003
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp Wed Dec 20 01:47:54 2006
@@ -0,0 +1,39 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<%@ taglib uri="continuum" prefix="c1" %>
+<html>
+ <ww:i18n name="localization.Continuum">
+ <head>
+ <title><ww:text name="notifier.page.add.title"/></title>
+ </head>
+ <body>
+ <div id="axial" class="h3">
+
+ <ww:if test="${projectId > 0}">
+ <ww:url id="actionUrl" value="addProjectNotifier!execute" includeParams="none" />
+ </ww:if>
+ <ww:else>
+ <ww:url id="actionUrl" value="addProjectGroupNotifier!execute" includeParams="none" />
+ </ww:else>
+
+ <h3><ww:text name="notifier.section.add.title"/></h3>
+
+ <div class="axial">
+
+ <ww:form action="%{actionUrl}" method="post">
+ <ww:hidden name="projectId"/>
+ <ww:hidden name="projectGroupId"/>
+ <table>
+ <tbody>
+ <ww:select label="%{getText('notifier.type.label')}" name="notifierType"
+ list="#@java.util.LinkedHashMap@{'mail':'Mail', 'irc':'IRC', 'jabber':'Jabber', 'msn':'MSN'}"/>
+ </tbody>
+ </table>
+ <div class="functnbar3">
+ <c1:submitcancel value="%{getText('submit')}" cancel="%{getText('cancel')}"/>
+ </div>
+ </ww:form>
+ </div>
+ </div>
+ </body>
+ </ww:i18n>
+</html>
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifier/notifierSelectType.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"