geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r524356 - in /geronimo/server/trunk: applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/webmanager/ applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/ modu...
Date Sat, 31 Mar 2007 02:32:11 GMT
Author: akulshreshtha
Date: Fri Mar 30 19:32:10 2007
New Revision: 524356

URL: http://svn.apache.org/viewvc?view=rev&rev=524356
Log:
GERONIMO-2898 Drop MinThread attribute of jetty connector from ConnectorPortlet
              Update JettySecureConnector interface

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java?view=diff&rev=524356&r1=524355&r2=524356
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/webmanager/ConnectorPortlet.java
Fri Mar 30 19:32:10 2007
@@ -101,21 +101,10 @@
             String host = actionRequest.getParameter("host");
             int port = Integer.parseInt(actionRequest.getParameter("port"));
             int maxThreads = Integer.parseInt(actionRequest.getParameter("maxThreads"));
-            Integer minThreads = getInteger(actionRequest, "minThreads");
             String displayName = actionRequest.getParameter("displayName");
             // Create and configure the connector
             WebConnector connector = PortletManager.createWebConnector(actionRequest, new
AbstractName(URI.create(managerURI)), new AbstractName(URI.create(containerURI)), displayName,
protocol, host, port);
             connector.setMaxThreads(maxThreads);
-            // todo: more configurable HTTP/Jetty values
-            if(server.equals(WEB_SERVER_JETTY)) {
-                if(minThreads != null) {
-                    setProperty(connector, "minThreads", minThreads);
-                }
-            } else if (server.equals(WEB_SERVER_TOMCAT)) {
-                //todo:   Any Tomcat specific processing?
-            } else {
-                //todo:   Handle "should not occur" condition
-            }
             if(protocol.equals(WebManager.PROTOCOL_HTTPS)) {
                 String keystoreType = actionRequest.getParameter("keystoreType");
                 String keystoreFile = actionRequest.getParameter("keystoreFile");
@@ -180,7 +169,6 @@
             String host = actionRequest.getParameter("host");
             int port = Integer.parseInt(actionRequest.getParameter("port"));
             int maxThreads = Integer.parseInt(actionRequest.getParameter("maxThreads"));
-            Integer minThreads = getInteger(actionRequest, "minThreads");
             String connectorURI = actionRequest.getParameter("connectorURI");
             // Identify and update the connector
             WebConnector connector = PortletManager.getWebConnector(actionRequest, new AbstractName(URI.create(connectorURI)));
@@ -188,17 +176,6 @@
                 connector.setHost(host);
                 connector.setPort(port);
                 connector.setMaxThreads(maxThreads);
-                if(server.equals(WEB_SERVER_JETTY)) {
-                    if(minThreads != null) {
-                        setProperty(connector,"minThreads",minThreads);
-                    }
-                    else if (server.equals(WEB_SERVER_TOMCAT)) {
-                        //todo:   Any Tomcat specific processing?
-                    }
-                    else {
-                        //todo:   Handle "should not occur" condition
-                    }
-                }
                 if(connector instanceof SecureConnector) {
                     String keystoreType = actionRequest.getParameter("keystoreType");
                     String keystoreFile = actionRequest.getParameter("keystoreFile");
@@ -334,7 +311,6 @@
                 String containerDisplayName = renderRequest.getParameter("containerDisplayName");
                 renderRequest.setAttribute("maxThreads", "50");
                 if(server.equals(WEB_SERVER_JETTY)) {
-                    renderRequest.setAttribute("minThreads", "10");
                     KeystoreManager mgr = PortletManager.getCurrentServer(renderRequest).getKeystoreManager();
                     KeystoreInstance[] stores = mgr.getUnlockedKeyStores();
                     String[] storeNames = new String[stores.length];
@@ -385,8 +361,6 @@
                     int maxThreads = connector.getMaxThreads();
                     renderRequest.setAttribute("maxThreads", Integer.toString(maxThreads));
                     if(server.equals(WEB_SERVER_JETTY)) {
-                        int minThreads = ((Number)getProperty(connector, "minThreads")).intValue();
-                        renderRequest.setAttribute("minThreads", String.valueOf(minThreads));
                         KeystoreManager mgr = PortletManager.getCurrentServer(renderRequest).getKeystoreManager();
                         KeystoreInstance[] stores = mgr.getUnlockedKeyStores();
                         String[] storeNames = new String[stores.length];

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp?view=diff&rev=524356&r1=524355&r2=524356
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTP.jsp
Fri Mar 30 19:32:10 2007
@@ -91,22 +91,6 @@
     <td><div align="right"></div></td>
     <td>The network port to bind to.</td>
   </tr>
-<!-- Min Threads Field (Jetty only) -->
-<c:if test="${server eq 'jetty'}">
-  <tr>
-    <td><div align="right">Min Threads: </div></td>
-    <td>
-      <input name="minThreads" type="text" size="3" value="${minThreads}">
-	</td>
-  </tr>
-  <tr>
-    <td><div align="right"></div></td>
-    <td>The minimum number of threads this connector should use to handle incoming
requests</td>
-  </tr>
-  <script language="JavaScript">
-    <portlet:namespace/>numericFields = <portlet:namespace/>numericFields.concat(new
Array("minThreads"));
-  </script>
-</c:if>
 <!-- Max Threads Field -->
   <tr>
     <td><div align="right">Max Threads: </div></td>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp?view=diff&rev=524356&r1=524355&r2=524356
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/webmanager/connector/editHTTPS.jsp
Fri Mar 30 19:32:10 2007
@@ -100,22 +100,6 @@
     <td><div align="right"></div></td>
     <td>The network port to bind to.</td>
   </tr>
-<!-- Min Threads Field (Jetty only) -->
-<c:if test="${server eq 'jetty'}">
-  <tr>
-    <td><div align="right">Min Threads: </div></td>
-    <td>
-      <input name="minThreads" type="text" size="3" value="${minThreads}">
-	</td>
-  </tr>
-  <tr>
-    <td><div align="right"></div></td>
-    <td>The minimum number of threads this connector should use to handle incoming
requests</td>
-  </tr>
-  <script language="JavaScript">
-    <portlet:namespace/>numericFields = <portlet:namespace/>numericFields.concat(new
Array("minThreads"));
-  </script>
-</c:if>
 <!-- Max Threads Field -->
   <tr>
     <td><div align="right">Max Threads: </div></td>

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java?view=diff&rev=524356&r1=524355&r2=524356
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettySecureConnector.java
Fri Mar 30 19:32:10 2007
@@ -22,9 +22,13 @@
  * @version $Rev$ $Date$
  */
 public interface JettySecureConnector extends SecureConnector {
+    
     public void setKeyStore(String keyStore);
+    public String getKeyStore();
 
     public void setTrustStore(String trustStore);
+    public String getTrustStore();
 
     public void setKeyAlias(String keyAlias);
+    public String getKeyAlias();
 }



Mime
View raw message