svn commit: r356191 - in /geronimo/branches/1.0: configs/jetty/src/plan/plan.xml modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java

[gr...@apache.org]

Author: gregw
Date: Sun Dec 11 23:15:20 2005
New Revision: 356191

URL: http://svn.apache.org/viewcvs?rev=356191&view=rev
Log:
Added attributes to jetty connector for low threads, max idle time and low thread max idle time

Modified:
    geronimo/branches/1.0/configs/jetty/src/plan/plan.xml
    geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
    geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java

Modified: geronimo/branches/1.0/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/configs/jetty/src/plan/plan.xml?rev=356191&r1=356190&r2=356191&view=diff
==============================================================================
--- geronimo/branches/1.0/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.0/configs/jetty/src/plan/plan.xml Sun Dec 11 23:15:20 2005
@@ -72,6 +72,9 @@
         </reference>
         <attribute name="maxThreads">150</attribute>
         <attribute name="minThreads">25</attribute>
+        <attribute name="lowThreads">25</attribute>
+        <attribute name="maxIdleTimeMs">30000</attribute>
+        <attribute name="lowThreadsMaxIdleTimeMs">800</attribute>
     </gbean>
 
     <gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty.connector.AJP13Connector">

Modified: geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java?rev=356191&r1=356190&r2=356191&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java (original)
+++ geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebConnector.java Sun Dec 11 23:15:20 2005
@@ -42,4 +42,16 @@
     public int getIdlethreads();
 
     public String getDefaultScheme();
+
+    public void setMaxIdleTimeMs(int max);
+
+    public int getMaxIdleTimeMs();
+
+    public void setLowThreadsMaxIdleTimeMs(int max);
+
+    public int getLowThreadsMaxIdleTimeMs();
+
+    public void setLowThreads(int lowThreads);
+
+    public int getLowThreads();
 }

Modified: geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java?rev=356191&r1=356190&r2=356191&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java (original)
+++ geronimo/branches/1.0/modules/jetty/src/java/org/apache/geronimo/jetty/connector/JettyConnector.java Sun Dec 11 23:15:20 2005
@@ -123,6 +123,36 @@
       return ((ThreadedServer)listener).getMaxThreads();
     }
 
+    public void setMaxIdleTimeMs(int max) {
+        ((ThreadedServer)listener).setMaxIdleTimeMs(max);
+    }
+
+    public int getMaxIdleTimeMs() {
+      return ((ThreadedServer)listener).getMaxIdleTimeMs();
+    }
+
+    public void setLowThreadsMaxIdleTimeMs(int max) {
+      if (listener instanceof SocketListener)
+        ((SocketListener)listener).setLowResourcePersistTimeMs(max);
+    }
+
+    public int getLowThreadsMaxIdleTimeMs() {
+      if (listener instanceof SocketListener)
+        return ((SocketListener)listener).getLowResourcePersistTimeMs();
+      return -1;
+    }
+
+    public void setLowThreads(int lowThreads) {
+      if (listener instanceof SocketListener)
+        ((SocketListener)listener).setLowResources(lowThreads);
+    }
+
+    public int getLowThreads() {
+      if (listener instanceof SocketListener)
+        return ((SocketListener)listener).getLowResources();
+      return -1;
+    }
+
     public int getThreads() {
       return ((ThreadedServer)listener).getThreads();
     }
@@ -233,7 +263,7 @@
     static {
         GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Jetty HTTP Connector", JettyConnector.class);
         infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, JettyContainer.class, NameFactory.GERONIMO_SERVICE);
-        infoFactory.addInterface(JettyWebConnector.class, new String[]{"host", "port", "minThreads","maxThreads","bufferSizeBytes","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","connectUrl",},
+        infoFactory.addInterface(JettyWebConnector.class, new String[]{"host", "port", "minThreads","maxThreads","bufferSizeBytes","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","connectUrl","maxIdleTimeMs","lowThreads","lowThreadsMaxIdleTimeMs",},
                                                           new String[]{"host", "port", "redirectPort"});
         infoFactory.setConstructor(new String[] {"JettyContainer"});
         GBEAN_INFO = infoFactory.getBeanInfo();