geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vamsic...@apache.org
Subject svn commit: r474861 - in /geronimo/server/branches/1.1/applications/console-standard/src: java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java webapp/WEB-INF/view/webmanager/connector/normal.jsp
Date Tue, 14 Nov 2006 16:37:01 GMT
Author: vamsic007
Date: Tue Nov 14 08:37:01 2006
New Revision: 474861

URL: http://svn.apache.org/viewvc?view=rev&rev=474861
Log:
GERONIMO-2565 User confirmation on attempting to stop a web connector through WebServer portlet

Modified:
    geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp

Modified: geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?view=diff&rev=474861&r1=474860&r2=474861
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
(original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Tue Nov 14 08:37:01 2006
@@ -494,6 +494,7 @@
             }
         }
         renderRequest.setAttribute("containers", all);
+        renderRequest.setAttribute("serverPort", new Integer(renderRequest.getServerPort()));
 
         if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
             normalView.include(renderRequest, renderResponse);

Modified: geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp?view=diff&rev=474861&r1=474860&r2=474861
==============================================================================
--- geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
(original)
+++ geronimo/server/branches/1.1/applications/console-standard/src/webapp/WEB-INF/view/webmanager/connector/normal.jsp
Tue Nov 14 08:37:01 2006
@@ -35,7 +35,9 @@
                  <portlet:param name="connectorURI" value="${info.connectorURI}" />
                  <portlet:param name="managerURI" value="${container.managerURI}" />
                  <portlet:param name="containerURI" value="${container.containerURI}"
/>
-               </portlet:actionURL>">stop</a>
+               </portlet:actionURL>"
+                 <c:if test="${info.port eq serverPort}"> onClick="return confirm('Console
application will not be available if ${info.displayName} is stopped.  Stop ${info.displayName}?');"</c:if>>
+                 stop</a>
                </c:when>
                <c:otherwise>
                <a href="<portlet:actionURL portletMode="view">



Mime
View raw message