Return-Path: 
 <scm-return-13764-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 41340 invoked from network); 28 Jul 2006 13:18:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 28 Jul 2006 13:18:43 -0000
Received: (qmail 54436 invoked by uid 500); 28 Jul 2006 13:18:42 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 54416 invoked by uid 500); 28 Jul 2006 13:18:42 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 54405 invoked by uid 99); 28 Jul 2006 13:18:42 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2006 06:18:42 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2006 06:18:42 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 14CB41A981D; Fri, 28 Jul 2006 06:18:22 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r426499 - in /geronimo/sandbox/svkmerge/trunk: ./
 applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/
 applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/
Date: Fri, 28 Jul 2006 13:18:21 -0000
To: scm@geronimo.apache.org
From: jdillon@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060728131822.14CB41A981D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: jdillon
Date: Fri Jul 28 06:18:20 2006
New Revision: 426499

URL: http://svn.apache.org/viewvc?rev=426499&view=rev
Log:
 r548@Bliss (orig r425198):  jbohn | 2006-07-24 14:57:32 -0700
 GERONIMO-1182 Challenge on delete of connector from web console - thanks Vamsavardhana Reddy!

Modified:
    geronimo/sandbox/svkmerge/trunk/   (props changed)
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
    geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp

Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jul 28 06:18:20 2006
@@ -1,2 +1,2 @@
 13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:425082
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:425198

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java Fri Jul 28 06:18:20 2006
@@ -69,6 +69,12 @@
 
     public void processAction(ActionRequest actionRequest,
                               ActionResponse actionResponse) throws PortletException, IOException {
+        String submit = actionRequest.getParameter("submit");
+        if ("Cancel".equalsIgnoreCase(submit)) {
+            // User clicked on "Cancel" button in add/edit connector page
+            actionResponse.setRenderParameter("mode", "list");
+            return;
+        }
         String mode = actionRequest.getParameter("mode");
         String managerURI = actionRequest.getParameter("managerURI");
         String containerURI = actionRequest.getParameter("containerURI");

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp Fri Jul 28 06:18:20 2006
@@ -82,7 +82,11 @@
 <!-- Submit Button -->
   <tr>
     <td><div align="right"></div></td>
-    <td><input name="submit" type="submit" value="Save"></td>
+    <td>
+      <input name="submit" type="submit" value="Save">
+      <input name="reset" type="reset" value="Reset">
+      <input name="submit" type="submit" value="Cancel">
+    </td>    
   </tr>
 </table>
 </form>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp Fri Jul 28 06:18:20 2006
@@ -277,7 +277,11 @@
 <!-- Submit Button -->
   <tr>
     <td><div align="right"></div></td>
-    <td><input name="submit" type="submit" value="Save"></td>
+    <td>
+      <input name="submit" type="submit" value="Save">
+      <input name="reset" type="reset" value="Reset">
+      <input name="submit" type="submit" value="Cancel">
+    </td>    
   </tr>
 </table>
 </form>

Modified: geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?rev=426499&r1=426498&r2=426499&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp (original)
+++ geronimo/sandbox/svkmerge/trunk/applications/console/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp Fri Jul 28 06:18:20 2006
@@ -57,7 +57,7 @@
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
                  <portlet:param name="managerURI" value="${container.managerURI}" />
                  <portlet:param name="containerURI" value="${container.containerURI}" />
-               </portlet:actionURL>">delete</a>
+               </portlet:actionURL>" onClick="return confirm('Are you sure you want to delete ${info.displayName}?');">delete</a>
             </td>
             <td>${info.description}</td>
           </tr>