continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcconn...@apache.org
Subject svn commit: r469244 [2/2] - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/notifier/ resources/ resources/org/apache/maven/continuum/web/action/notifier/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/components/
Date Mon, 30 Oct 2006 19:31:02 GMT
Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,40 @@
+<!DOCTYPE validators PUBLIC
+    "-//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>
+  </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"/-->
+    </field-validator>
+  </field>
+  <field name="login">
+    <field-validator type="required">
+      <message>Login is required</message>
+      <!--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>
+  </field>
+  <field name="address">
+    <field-validator type="required">
+      <message>Address is required</message>
+      <!--message key="jabberNotifier.address.required"/-->
+    </field-validator>
+  </field>
+</validators>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction-jabberProjectNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,5 @@
+jabberNotifier.host.required = Host is required
+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

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/JabberProjectNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,15 @@
+<!DOCTYPE validators PUBLIC
+    "-//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>
+  </field>
+</validators>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
Mon Oct 30 11:31:00 2006
@@ -0,0 +1 @@
+mailNotifier.address.required = Address is required
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,15 @@
+<!DOCTYPE validators PUBLIC
+    "-//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>
+  </field>
+</validators>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
Mon Oct 30 11:31:00 2006
@@ -0,0 +1 @@
+mailNotifier.address.required = Address is required
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,27 @@
+<!DOCTYPE validators PUBLIC
+    "-//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>
+  </field>
+  <field name="password">
+    <field-validator type="required">
+      <message>Password is required</message>
+      <!--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>
+  </field>
+</validators>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction-msnProjectGroupNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,3 @@
+msnNotifier.login.required = Login is required
+msnNotifier.password.required = Password is required
+msnNotifier.address.required = Address is required
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnGroupNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,27 @@
+<!DOCTYPE validators PUBLIC
+    "-//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>
+  </field>
+  <field name="password">
+    <field-validator type="required">
+      <message>Password is required</message>
+      <!--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>
+  </field>
+</validators>
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction-msnProjectNotifierSave-validation.xml
------------------------------------------------------------------------------
    svn:executable = *

Added: 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=auto&rev=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties
Mon Oct 30 11:31:00 2006
@@ -0,0 +1,3 @@
+msnNotifier.login.required = Login is required
+msnNotifier.password.required = Password is required
+msnNotifier.address.required = Address is required
\ No newline at end of file

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MsnProjectNotifierEditAction.properties
------------------------------------------------------------------------------
    svn:executable = *

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=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Mon Oct 30 11:31:00
2006
@@ -229,15 +229,14 @@
     </action>
 
     <!--
-    * notifier actions
+    * notifier actions :: Project
     -->
-    <action name="deleteNotifier" class="deleteNotifier">
+    <action name="deleteProjectNotifier" class="deleteProjectNotifier">
       <result name="delete">/WEB-INF/jsp/deleteNotifier.jsp</result>
       <result name="success" type="chain">projectView</result>
-      <result name="success_group" type="chain">projectGroupNotifier</result>
     </action>
 
-    <action name="addNotifier" class="addNotifier" method="doDefault">
+    <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>
@@ -245,53 +244,108 @@
       <result name="jabber_input">/WEB-INF/jsp/notifierJabber.jsp</result>
     </action>
         
-    <action name="editNotifier" class="addNotifier"> 
-      <result name="mail_input" type="chain">mailNotifierEdit</result>
-      <result name="irc_input" type="chain">ircNotifierEdit</result>
-      <result name="msn_input" type="chain">msnNotifierEdit</result>
-      <result name="jabber_input" type="chain">jabberNotifierEdit</result>
+    <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="mailNotifierEdit" class="mailNotifierEdit" method="edit">
+    <action name="mailProjectNotifierEdit" class="mailProjectNotifierEdit" method="edit">
       <result name="success">/WEB-INF/jsp/notifierMail.jsp</result>
     </action>
 
-    <action name="mailNotifierSave" class="mailNotifierEdit" method="save">
+    <action name="mailProjectNotifierSave" class="mailProjectNotifierEdit" method="save">
       <result name="input">/WEB-INF/jsp/notifierMail.jsp</result>
-      <result name="success" type="chain">projectView</result>      
-      <result name="success_group" type="chain">projectGroupNotifier</result>
+      <result name="success" type="chain">projectView</result>
     </action>
 
-    <action name="ircNotifierEdit" class="ircNotifierEdit" method="edit">
+    <action name="ircProjectNotifierEdit" class="ircProjectNotifierEdit" method="edit">
       <result name="success">/WEB-INF/jsp/notifierIrc.jsp</result>
     </action>
 
-    <action name="ircNotifierSave" class="ircNotifierEdit" method="save">
+    <action name="ircProjectNotifierSave" class="ircProjectNotifierEdit" method="save">
       <result name="input">/WEB-INF/jsp/notifierIrc.jsp</result>
       <result name="success" type="chain">projectView</result>
-      <result name="success_group" type="chain">projectGroupNotifier</result>
     </action>
 
-    <action name="jabberNotifierEdit" class="jabberNotifierEdit" method="edit">
+    <action name="jabberProjectNotifierEdit" class="jabberProjectNotifierEdit" method="edit">
       <result name="success">/WEB-INF/jsp/notifierJabber.jsp</result>
     </action>
 
-    <action name="jabberNotifierSave" class="jabberNotifierEdit" method="save">
+    <action name="jabberProjectNotifierSave" class="jabberProjectNotifierEdit" method="save">
       <result name="input">/WEB-INF/jsp/notifierJabber.jsp</result>
       <result name="success" type="chain">projectView</result>
-      <result name="success_group" type="chain">projectGroupNotifier</result>
     </action>
 
-    <action name="msnNotifierEdit" class="msnNotifierEdit" method="edit">
+    <action name="msnProjectNotifierEdit" class="msnProjectNotifierEdit" method="edit">
       <result name="success">/WEB-INF/jsp/notifierMsn.jsp</result>
     </action>
 
-    <action name="msnNotifierSave" class="msnNotifierEdit" method="save">
+    <action name="msnProjectNotifierSave" class="msnProjectNotifierEdit" method="save">
       <result name="input">/WEB-INF/jsp/notifierMsn.jsp</result>
       <result name="success" type="chain">projectView</result>
-      <result name="success_group" type="chain">projectGroupNotifier</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

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
Mon Oct 30 11:31:00 2006
@@ -19,10 +19,9 @@
       <ec:column property="events" title="projectView.notifier.events"/>
       <ec:column property="sender" title="projectView.notifier.from"/>      
       <ec:column property="editActions" title="Edit">
-
-        <!-- TODO: Fix WW action references for editing notifiers below -->
+        
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="editUrl" action="editNotifier" namespace="/">
+          <ww:url id="editUrl" action="editProjectGroupNotifier" namespace="/"  includeContext="false"
includeParams="none">
             <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
             <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
             <ww:param name="notifierType">${pageScope.projectGroupNotifierSummary.type}</ww:param>
@@ -37,7 +36,7 @@
       </ec:column>    
       <ec:column property="deleteActions" title="Remove">
         <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="removeUrl" action="deleteNotifier" namespace="/">
+          <ww:url id="removeUrl" action="deleteProjectGroupNotifier" namespace="/">
             <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
             <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
             <ww:param name="confirmed" value="false"/>
@@ -55,88 +54,8 @@
   </ec:table>
   <div class="functnbar3">
     <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-    <ww:form action="addNotifier" method="post">
-      <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
-      <ww:submit value="%{getText('add')}"/>
-    </ww:form>
-    </pss:ifAuthorized>
-  </div>
-
-  <h3>Project Notifiers</h3>
-  <ec:table items="projectNotifierSummaries"
-            var="projectNotifierSummary"
-            showExports="false"
-            showPagination="false"
-            showStatusBar="false"
-            filterable="false"
-            sortable="false">
-    <ec:row>
-      <ec:column property="type" title="projectView.notifier.type"/>
-      <ec:column property="recipient" title="projectView.notifier.recipient"/>
-      <ec:column property="events" title="projectView.notifier.events"/>
-      <ec:column property="sender" title="projectView.notifier.from"/>
-      <ec:column property="state" value="Enabled/Disabled" />
-     
-    </ec:row>
-  </ec:table>  
-</ww:i18n>
-<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
-<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
-<ww:i18n name="localization.Continuum">
-
-  <h3>Project Group Notifiers</h3>
-  <ec:table items="projectGroupNotifierSummaries"
-            var="projectGroupNotifierSummary"
-            showExports="false"
-            showPagination="false"
-            showStatusBar="false"
-            filterable="false"
-            sortable="false">
-    <ec:row>
-      <ec:column property="type" title="projectView.notifier.type"/>
-      <ec:column property="recipient" title="projectView.notifier.recipient"/>
-      <ec:column property="events" title="projectView.notifier.events"/>
-      <ec:column property="sender" title="projectView.notifier.from"/>      
-      <ec:column property="editActions" title="Edit">
-
-        <!-- TODO: Fix WW action references for editing notifiers below -->
-        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="editUrl" action="addNotifier" method="input" namespace="/">
-            <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
-            <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
-          </ww:url>
-          <ww:a href="%{editUrl}">
-              <img src="<ww:url value='/images/edit.gif'/>" alt="Edit" title="Edit"
border="0">
-          </ww:a>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
-          <img src="<ww:url value='/images/edit_disabled.gif'/>" alt="Edit" title="Edit"
border="0">
-        </pss:elseAuthorized>
-      </ec:column>    
-      <ec:column property="deleteActions" title="Remove">
-        <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-          <ww:url id="removeUrl" action="deleteNotifier" namespace="/">
-            <ww:param name="projectGroupId">${pageScope.projectGroupNotifierSummary.projectGroupId}</ww:param>
-            <ww:param name="notifierId">${pageScope.projectGroupNotifierSummary.id}</ww:param>
-            <ww:param name="confirmed" value="false"/>
-          </ww:url>
-        <ww:a href="%{removeUrl}">
-            <img src="<ww:url value='/images/delete.gif'/>" alt="Delete" title="Delete"
border="0">
-        </ww:a>
-        </pss:ifAuthorized>
-        <pss:elseAuthorized>
-          <img src="<ww:url value='/images/delete_disabled.gif'/>" alt="Delete"
title="Delete" border="0">
-        </pss:elseAuthorized>
-      </ec:column>      
-     
-    </ec:row>
-  </ec:table>
-  <div class="functnbar3">
-    <pss:ifAuthorized permission="continuum-modify-group" resource="${projectGroupName}">
-    <ww:form action="addNotifier" method="post">
+    <ww:url id="addUrl" action="addProjectGroupNotifier" namespace="/"  includeContext="false"
includeParams="none" />
+    <ww:form action="%{addUrl}" method="post">
       <input type="hidden" name="projectGroupId" value="<ww:property value="projectGroupId"/>"/>
       <ww:submit value="%{getText('add')}"/>
     </ww:form>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectNotifierSummaryComponent.jsp
Mon Oct 30 11:31:00 2006
@@ -9,16 +9,4 @@
 TODO: Implement Project Group Notifier Summary
 
 
-</ww:i18n>
-<%@ taglib uri="/webwork" prefix="ww" %>
-<%@ taglib uri="http://www.extremecomponents.org" prefix="ec" %>
-<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
-<%@ taglib uri="continuum" prefix="c1" %>
-<%@ taglib uri="/plexusSecuritySystem" prefix="pss" %>
-<ww:i18n name="localization.Continuum">
-
-
-TODO: Implement Project Group Notifier Summary
-
-
 </ww:i18n>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierIrc.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierIrc.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierIrc.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierIrc.jsp Mon
Oct 30 11:31:00 2006
@@ -11,6 +11,12 @@
     </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>
@@ -18,11 +24,11 @@
         </h3>
 
         <div class="axial">
-          <ww:form action="ircNotifierSave" method="post" validate="true">
+          <ww:form action="%{actionUrl}" method="post" validate="true">
             <ww:hidden name="notifierId"/>
             <ww:hidden name="projectId"/>
             <ww:hidden name="projectGroupId"/>
-            <ww:hidden name="notifierType"/>
+            <ww:hidden name="notifierType"/>            
             <table>
               <tbody>
                 <ww:textfield label="%{getText('notifier.irc.host.label')}" name="host"
required="true"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierJabber.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierJabber.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierJabber.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierJabber.jsp
Mon Oct 30 11:31:00 2006
@@ -11,6 +11,12 @@
     </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>
@@ -18,7 +24,7 @@
         </h3>
 
         <div class="axial">
-          <ww:form action="jabberNotifierSave" method="post" validate="true">
+          <ww:form action="%{actionUrl}" method="post" validate="true">
             <ww:hidden name="notifierId"/>
             <ww:hidden name="projectId"/>
             <ww:hidden name="projectGroupId"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMail.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMail.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMail.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMail.jsp Mon
Oct 30 11:31:00 2006
@@ -11,6 +11,13 @@
     </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>
@@ -18,7 +25,7 @@
         </h3>
 
         <div class="axial">
-          <ww:form action="mailNotifierSave" method="post" validate="true">
+          <ww:form action="%{actionUrl}" method="post" validate="true">
             <ww:hidden name="notifierId"/>
             <ww:hidden name="projectId"/>
             <ww:hidden name="projectGroupId"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMsn.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMsn.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMsn.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierMsn.jsp Mon
Oct 30 11:31:00 2006
@@ -11,6 +11,12 @@
     </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>
@@ -18,7 +24,7 @@
         </h3>
 
         <div class="axial">
-          <ww:form action="msnNotifierSave" method="post" validate="true">
+          <ww:form action="%{actionUrl}" method="post" validate="true">
             <ww:hidden name="notifierId"/>
             <ww:hidden name="projectId"/>
             <ww:hidden name="projectGroupId"/>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierSelectType.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierSelectType.jsp?view=diff&rev=469244&r1=469243&r2=469244
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierSelectType.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/notifierSelectType.jsp
Mon Oct 30 11:31:00 2006
@@ -7,12 +7,21 @@
     </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="addNotifier!execute" method="post">
+                
+          <ww:form action="%{actionUrl}" method="post">        
             <ww:hidden name="projectId"/>
-            <ww:hidden name="projectGroupId" />
+            <ww:hidden name="projectGroupId"/>
             <table>
               <tbody>
                 <ww:select label="%{getText('notifier.type.label')}" name="notifierType"



Mime
View raw message