continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r359873 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/ resources/ resources/META-INF/plexus/ resources/localization/ webapp/
Date Thu, 29 Dec 2005 18:53:33 GMT
Author: evenisse
Date: Thu Dec 29 10:53:21 2005
New Revision: 359873

URL: http://svn.apache.org/viewcvs?rev=359873&view=rev
Log:
Start notifiers screens

Added:
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
  (with props)
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
  (with props)
    maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java
  (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp   (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp   (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp   (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp   (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp   (with props)
    maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp   (with
props)
Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
    maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
Thu Dec 29 10:53:21 2005
@@ -0,0 +1,46 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import com.opensymphony.xwork.ActionSupport;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class AddNotifierAction
+    extends ActionSupport
+{
+    private int projectId;
+
+    private String notifierType;
+
+    public String execute()
+    {
+        return notifierType + "_" + INPUT;
+    }
+
+    public String doDefault()
+    {
+        return INPUT;
+    }
+
+    public void setNotifierType( String notifierType )
+    {
+        this.notifierType = notifierType;
+    }
+}

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
Thu Dec 29 10:53:21 2005
@@ -0,0 +1,93 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
+
+import com.opensymphony.xwork.ActionSupport;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class DeleteNotifierAction
+    extends ActionSupport
+{
+    private Continuum continuum;
+
+    private int projectId;
+
+    private int notifierId;
+
+    private String notifierType;
+
+    public String execute()
+    {
+        try
+        {
+            System.out.println( "DeleteNotifier" + projectId + " - " + notifierId);
+            continuum.removeNotifier( projectId, notifierId );
+            System.out.println( "DeleteNotifier2");
+        }
+        catch ( ContinuumException e )
+        {
+            addActionMessage( "Can't delete notifier (id=" + notifierId + ") for project
" + projectId + " : " + e.getMessage() );
+
+            e.printStackTrace();
+
+            return ERROR;
+        }
+
+        return SUCCESS;
+    }
+
+    public String doDefault()
+    {
+        return "delete";
+    }
+
+    public void setProjectId( int projectId )
+    {
+        this.projectId = projectId;
+    }
+
+    public int getProjectId()
+    {
+        return projectId;
+    }
+
+    public void setNotifierId( int notifierId )
+    {
+        this.notifierId = notifierId;
+    }
+
+    public int getNotifierId()
+    {
+        return notifierId;
+    }
+
+    public void setNotifierType( String notifierType )
+    {
+        this.notifierType = notifierType;
+    }
+
+    public String getNotifierType()
+    {
+        return notifierType;
+    }
+}

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java
(added)
+++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java
Thu Dec 29 10:53:21 2005
@@ -0,0 +1,129 @@
+package org.apache.maven.continuum.web.action;
+
+/*
+ * Copyright 2004-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.continuum.Continuum;
+import org.apache.maven.continuum.ContinuumException;
+import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.apache.maven.continuum.model.project.Project;
+
+import com.opensymphony.xwork.ActionSupport;
+
+/**
+ * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
+ * @version $Id$
+ */
+public class NotifierEditAction
+    extends ActionSupport
+{
+    private Continuum continuum;
+
+    private ProjectNotifier notifier;
+
+    private Project project;
+
+    private int projectId;
+
+    private int notifierId;
+
+    public String execute()
+    {
+        try
+        {
+            boolean isNew = false;
+
+            notifier = getNotifier();
+
+            if ( notifier == null || notifierId == 0 )
+            {
+                notifier = new ProjectNotifier();
+
+                isNew = true;
+            }
+
+            if ( !isNew )
+            {
+                //continuum.updateNotifier( projectId, notifier );
+            }
+            else
+            {
+                //continuum.addNotifier( projectId, notifier );
+            }
+        }
+        catch ( ContinuumException e )
+        {
+            addActionMessage( "Can't update notifier (id=" + notifierId + ") for project
" + projectId + " : " + e.getMessage() );
+
+            e.printStackTrace();
+
+            return ERROR;
+        }
+
+        return SUCCESS;
+    }
+
+    public String doDefault()
+    {
+        try
+        {
+            project = continuum.getProject( projectId );
+
+            notifier = getNotifier();
+        }
+        catch ( ContinuumException e )
+        {
+            addActionMessage( "Can't get notifier informations (id=" + notifierId + ") for
project " + projectId + " : " + e.getMessage() );
+
+            e.printStackTrace();
+
+            return ERROR;
+        }
+
+        return INPUT;
+    }
+
+    private ProjectNotifier getNotifier()
+        throws ContinuumException
+    {
+        return continuum.getNotifier( projectId, notifierId );
+    }
+
+    public Project getProject()
+    {
+        return project;
+    }
+
+    public int getProjectId()
+    {
+        return projectId;
+    }
+
+    public void setProjectId( int projectId )
+    {
+        this.projectId = projectId;
+    }
+
+    public int getNotifierId()
+    {
+        return notifierId;
+    }
+
+    public void setNotifierId( int notifierId )
+    {
+        this.notifierId = notifierId;
+    }
+}

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/NotifierEditAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml?rev=359873&r1=359872&r2=359873&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml
Thu Dec 29 10:53:21 2005
@@ -155,6 +155,23 @@
         </requirement>
       </requirements>
     </component>
+    <component>
+      <role>com.opensymphony.xwork.Action</role>
+      <role-hint>deleteNotifier</role-hint>
+      <implementation>org.apache.maven.continuum.web.action.DeleteNotifierAction</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.Continuum</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>com.opensymphony.xwork.Action</role>
+      <role-hint>addNotifier</role-hint>
+      <implementation>org.apache.maven.continuum.web.action.AddNotifierAction</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
 
     <!--
      | Components

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=359873&r1=359872&r2=359873&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Thu Dec 29 10:53:21 2005
@@ -195,6 +195,23 @@
 // ----------------------------------------------------------------------
 // Page: DeleteBuildDefinition
 // ----------------------------------------------------------------------
-deleteBuildDefinition.page.title = Continuum - Delete deleteBuildDefinition
-deleteBuildDefinition.section.title = Delete deleteBuildDefinition
+deleteBuildDefinition.page.title = Continuum - Delete Build Definition
+deleteBuildDefinition.section.title = Delete Build Definition
 deleteBuildDefinition.confirmation.message = Are you sure you want to delete the build definition
"{0}"?
+
+// ----------------------------------------------------------------------
+// Page: DeleteNotifier
+// ----------------------------------------------------------------------
+deleteNotifier.page.title = Continuum - Delete Notifier
+deleteNotifier.section.title = Delete Notifier
+deleteNotifier.confirmation.message = Are you sure you want to delete the {0} notifier "{1}"?
+
+// ----------------------------------------------------------------------
+// Page: Notifier
+// ----------------------------------------------------------------------
+notifier.page.add.title = Continuum - Add Notifier
+notifier.section.add.title = Add Notifier
+notifier.page.title = Continuum - Add/Edit {0} Notifier
+notifier.section.title = Add/Edit {0} Notifier
+notifier.type.label = Type
+

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml?rev=359873&r1=359872&r2=359873&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml Thu Dec 29 10:53:21
2005
@@ -104,7 +104,21 @@
         <action name="addBuildDefinition"
                 class="addBuildDefinition">
             <result name="input">buildDefinitionEdit.jsp</result>
+        </action>
+
+        <action name="deleteNotifier"
+                class="deleteNotifier">
+            <result name="delete">deleteNotifier.jsp</result>
             <result name="success" type="chain">projectView</result>
+        </action>
+
+        <action name="addNotifier"
+                class="addNotifier">
+            <result name="input">notifierSelectType.jsp</result>
+            <result name="mail_input">notifierMail.jsp</result>
+            <result name="irc_input">notifierIrc.jsp</result>
+            <result name="msn_input">notifierMsn.jsp</result>
+            <result name="jabber_input">notifierJabber.jsp</result>
         </action>
     </package>
 </xwork>

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp Thu Dec 29 10:53:21
2005
@@ -0,0 +1,32 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<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>
+        <ww:form action="deleteNotifier.action" method="post">
+            <ww:hidden name="notifierId"/>
+            <ww:hidden name="projectId"/>
+            <div class="functnbar3">
+            <input type="submit" value="<ww:text name="delete"/>"/>
+            <input type="button" name="Cancel" value="<ww:text name="cancel"/>"
onClick="history.back()"/>
+            </div>
+        </ww:form>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteNotifier.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp Thu Dec 29 10:53:21
2005
@@ -0,0 +1,25 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<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">
+        <h3>
+            <ww:text name="notifier.section.title">
+                <ww:param>IRC</ww:param>
+            </ww:text>
+        </h3>
+
+        <div class="axial">
+            IRC
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierIrc.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp Thu Dec 29 10:53:21
2005
@@ -0,0 +1,25 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<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">
+        <h3>
+            <ww:text name="notifier.section.title">
+                <ww:param>Jabber</ww:param>
+            </ww:text>
+        </h3>
+
+        <div class="axial">
+            Jabber
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierJabber.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp Thu Dec 29 10:53:21
2005
@@ -0,0 +1,25 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<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">
+        <h3>
+            <ww:text name="notifier.section.title">
+                <ww:param>Mail</ww:param>
+            </ww:text>
+        </h3>
+
+        <div class="axial">
+            Mail
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMail.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp Thu Dec 29 10:53:21
2005
@@ -0,0 +1,25 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<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">
+        <h3>
+            <ww:text name="notifier.section.title">
+                <ww:param>MSN</ww:param>
+            </ww:text>
+        </h3>
+
+        <div class="axial">
+            MSN
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierMsn.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp?rev=359873&view=auto
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp (added)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp Thu Dec
29 10:53:21 2005
@@ -0,0 +1,23 @@
+<%@ taglib uri="webwork" prefix="ww" %>
+<html>
+  <ww:i18n name="localization.Continuum">
+    <head>
+        <title><ww:text name="notifier.page.add.title"/></title>
+    </head>
+    <body>
+      <div id="axial" class="h3">
+        <h3><ww:text name="notifier.section.add.title"/></h3>
+
+        <div class="axial">
+          <ww:form action="addNotifier.action" method="post">
+            <input type="hidden" name="projectId" value="<ww:property value="projectId"/>"/>
+            <ww:select label="%{getText('notifier.type.label')}" name="notifierType"
+                       list="#{ 'mail' : 'Mail', 'irc' : 'IRC', 'jabber' : 'Jabber', 'msn'
: 'MSN'}"/>
+            <ww:hidden name="projectId"/>
+            <ww:submit value="%{getText('submit')}"/>
+          </ww:form>
+        </div>
+      </div>
+    </body>
+  </ww:i18n>
+</html>

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/continuum/trunk/continuum-webapp/src/main/webapp/notifierSelectType.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp?rev=359873&r1=359872&r2=359873&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Thu Dec 29 10:53:21
2005
@@ -65,7 +65,7 @@
           </ec:row>
         </ec:table>
         <div class="functnbar3">
-          <form method="post" action="addBuildDefinition!default.action">
+          <form method="post" action="addBuildDefinition.action">
               <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
               <input type="submit" name="addBuildDef" value="<ww:text name="add"/>"/>
           </form>
@@ -87,11 +87,19 @@
             <ec:column property="from" title="projectView.notifier.from" cell="org.apache.maven.continuum.web.view.projectview.NotifierFromCell"/>
             <ec:column property="actions" title="&nbsp;">
                 <c:if test="${!pageScope.notifier.fromProject}">
-                    <ww:text name="edit"/>&nbsp;<ww:text name="delete"/>
+                    <a href="${pageContext.request.contextPath}/NotifierEdit!default.action?projectId=<ww:property
value="project.id"/>&notifierId=${pageScope.notifier.id}"><ww:text name="edit"/></a>
+                    &nbsp;
+                    <a href="${pageContext.request.contextPath}/deleteNotifier!default.action?projectId=<ww:property
value="project.id"/>&notifierId=${pageScope.notifier.id}&notifierType=${pageScope.notifier.type}"><ww:text
name="delete"/></a>
                 </c:if>
             </ec:column>
           </ec:row>
         </ec:table>
+        <div class="functnbar3">
+          <form method="post" action="addNotifier!default.action">
+              <input type="hidden" name="projectId" value="<ww:property value="project.id"/>"/>
+              <input type="submit" name="addNotifier" value="<ww:text name="add"/>"/>
+          </form>
+        </div>
 
         <h3><ww:text name="projectView.dependencies"/></h3>
         <ww:set name="dependencies" value="project.dependencies" scope="request"/>



Mime
View raw message