geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r922134 - in /geronimo/server/trunk/plugins: client/client/src/main/history/dependencies.xml jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/connector/JettyConnector.java jetty8/pom.xml
Date Fri, 12 Mar 2010 03:19:15 GMT
Author: kevan
Date: Fri Mar 12 03:19:13 2010
New Revision: 922134

URL: http://svn.apache.org/viewvc?rev=922134&view=rev
Log:
Update client dependencies to fix build failure

Modified:
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/connector/JettyConnector.java
    geronimo/server/trunk/plugins/jetty8/pom.xml

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=922134&r1=922133&r2=922134&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Fri Mar
12 03:19:13 2010
@@ -7,11 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.aries</groupId>
-        <artifactId>org.apache.aries.util</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.aries.jndi</groupId>
         <artifactId>org.apache.aries.jndi.core</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/connector/JettyConnector.java?rev=922134&r1=922133&r2=922134&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/connector/JettyConnector.java
(original)
+++ geronimo/server/trunk/plugins/jetty8/geronimo-jetty8/src/main/java/org/apache/geronimo/jetty8/connector/JettyConnector.java
Fri Mar 12 03:19:13 2010
@@ -87,10 +87,10 @@ public abstract class JettyConnector imp
     }
     
     public int getHeaderBufferSizeBytes() {
-        return listener.getHeaderBufferSize();
+        return listener.getRequestHeaderSize();
     }
     public void setHeaderBufferSizeBytes(int size) {
-        listener.setHeaderBufferSize(size);
+        listener.setRequestHeaderSize(size);
     }
 
     public abstract int getDefaultPort();
@@ -242,18 +242,18 @@ public abstract class JettyConnector imp
             // connections open
             stats.getOpenConnectionCountImpl().setCurrent(listener.getConnectionsOpen());
             stats.getOpenConnectionCountImpl().setHighWaterMark(listener.getConnectionsOpenMax());
-            stats.getOpenConnectionCountImpl().setLowWaterMark(listener.getConnectionsOpenMin());
+            //stats.getOpenConnectionCountImpl().setLowWaterMark(listener.getConnectionsOpenMin());
             // request count
             stats.getRequestCountImpl().setCount(listener.getRequests());
             // connections count and durations
             stats.getConnectionsDurationImpl().setCount(listener.getConnections());
             stats.getConnectionsDurationImpl().setMaxTime(listener.getConnectionsDurationMax());
-            stats.getConnectionsDurationImpl().setMinTime(listener.getConnectionsDurationMin());
+            //stats.getConnectionsDurationImpl().setMinTime(listener.getConnectionsDurationMin());
             stats.getConnectionsDurationImpl().setTotalTime(listener.getConnectionsDurationTotal());
             // requests per connection (connection requests)
-            stats.getConnectionsRequestImpl().setCurrent(listener.getConnectionsRequestsAve());
+            stats.getConnectionsRequestImpl().setCurrent((long)listener.getConnectionsRequestsMean());
             stats.getConnectionsRequestImpl().setHighWaterMark(listener.getConnectionsRequestsMax());
-            stats.getConnectionsRequestImpl().setLowWaterMark(listener.getConnectionsRequestsMin());
+            //stats.getConnectionsRequestImpl().setLowWaterMark(listener.getConnectionsRequestsMin());
         }
         return stats;
     }

Modified: geronimo/server/trunk/plugins/jetty8/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/pom.xml?rev=922134&r1=922133&r2=922134&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/pom.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/pom.xml Fri Mar 12 03:19:13 2010
@@ -34,7 +34,7 @@
     </description>
 
     <properties>
-        <jettyVersion>8.0.0.M0-SNAPSHOT</jettyVersion>
+        <jettyVersion>8.0.0.M0</jettyVersion>
     </properties>
 
     <dependencyManagement>



Mime
View raw message