geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r559697 - /geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
Date Thu, 26 Jul 2007 05:54:29 GMT
Author: djencks
Date: Wed Jul 25 22:54:28 2007
New Revision: 559697

URL: http://svn.apache.org/viewvc?view=rev&rev=559697
Log:
GERONIMO-3350 Better lists of jetty connector attributes

Modified:
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java?view=diff&rev=559697&r1=559696&r2=559697
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyManagerImpl.java
Wed Jul 25 22:54:28 2007
@@ -89,6 +89,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxIdleTimeMs", 30000,
"maxIdleTimeMs", Integer.class));
         CONNECTOR_ATTRIBUTES.put(HTTP_NIO, connectorAttributes);
@@ -100,8 +101,15 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxIdleTimeMs", 30000,
"maxIdleTimeMs", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("clientAuthRequested",
false, "clientAuthRequested", Boolean.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("clientAuthRequired",
false, "clientAuthRequired", Boolean.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("keyStore", "", "keyStore",
String.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("trustStore", "", "trustStore",
String.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("keyAlias", "", "keyAlias",
String.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("secureProtocol", "",
"secureProtocol", String.class));
         CONNECTOR_ATTRIBUTES.put(HTTPS_NIO, connectorAttributes);
 
         connectorAttributes = new ArrayList<ConnectorAttribute>();
@@ -111,6 +119,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxIdleTimeMs", 30000,
"maxIdleTimeMs", Integer.class));
         CONNECTOR_ATTRIBUTES.put(HTTP_BIO, connectorAttributes);
@@ -122,8 +131,15 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxIdleTimeMs", 30000,
"maxIdleTimeMs", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("clientAuthRequested",
false, "clientAuthRequested", Boolean.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("clientAuthRequired",
false, "clientAuthRequired", Boolean.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("keyStore", "", "keyStore",
String.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("trustStore", "", "trustStore",
String.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("keyAlias", "", "keyAlias",
String.class));
+        connectorAttributes.add(new ConnectorAttribute<String>("secureProtocol", "",
"secureProtocol", String.class));
         CONNECTOR_ATTRIBUTES.put(HTTPS_BIO, connectorAttributes);
 
         connectorAttributes = new ArrayList<ConnectorAttribute>();
@@ -133,6 +149,7 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxIdleTimeMs", 30000,
"maxIdleTimeMs", Integer.class));
         CONNECTOR_ATTRIBUTES.put(HTTP_BLOCKING_NIO, connectorAttributes);
@@ -144,7 +161,8 @@
         connectorAttributes.add(new ConnectorAttribute<Integer>("bufferSizeBytes",
8096, "Buffer size", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("acceptQueueSize",
10, "acceptQueueSize", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("lingerMillis", 30000,
"lingerMillis", Integer.class));
-//        connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
+        connectorAttributes.add(new ConnectorAttribute<Boolean>("tcpNoDelay", false,
"tcpNoDelay", Boolean.class));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("redirectPort", 8443,
"redirectPort", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxIdleTimeMs", 30000,
"maxIdleTimeMs", Integer.class));
         CONNECTOR_ATTRIBUTES.put(AJP_NIO, connectorAttributes);
 



Mime
View raw message