geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1027367 - in /geronimo/server/branches/2.2/plugins/jetty7: ./ geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ geronimo-jetty7/src/main/java/org/apa...
Date Tue, 26 Oct 2010 05:37:04 GMT
Author: genspring
Date: Tue Oct 26 05:37:03 2010
New Revision: 1027367

URL: http://svn.apache.org/viewvc?rev=1027367&view=rev
Log:
Upgrade jetty to 7.2.0.v20101020

Modified:
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/GeronimoServletHolder.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/WebAppContextWrapper.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/NoneAuthenticator.java
    geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
    geronimo/server/branches/2.2/plugins/jetty7/pom.xml

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionHandler.java
Tue Oct 26 05:37:03 2010
@@ -22,7 +22,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.geronimo.jetty7.AbstractPreHandler;
 import org.apache.geronimo.jetty7.PreHandler;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.server.Request;
@@ -39,13 +38,13 @@ public class ClusteredSessionHandler ext
             throw new IllegalArgumentException("chainedHandler is required");
         }
         this.chainedHandler = chainedHandler;
-        chainedHandler.setNextHandler(new ActualHandler());
 
         setSessionManager(sessionManager);
     }
     
-    @Override
-    public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse
response)
+
+    @Override    
+    public void doHandle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response)
             throws IOException, ServletException {
         setRequestedId(baseRequest, request);
         try {
@@ -53,19 +52,9 @@ public class ClusteredSessionHandler ext
         } catch (ServletException e) {
             throw (IOException) new IOException().initCause(e);
         }
-    }
-    
-    protected void doHandle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response)
-            throws IOException, ServletException {
-        super.handle(target, baseRequest, request, response);
+        
+        super.doHandle(target, baseRequest, request, response);
     }
 
-    private class ActualHandler extends AbstractPreHandler {
-
-        public void handle(String target, Request baseRequest, HttpServletRequest request,
HttpServletResponse response)
-                throws IOException, ServletException {
-            doHandle(target, baseRequest, request, response);
-        }
-    }
 
 }

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7-clustering-wadi/src/main/java/org/apache/geronimo/jetty7/cluster/ClusteredSessionManager.java
Tue Oct 26 05:37:03 2010
@@ -145,7 +145,8 @@ public class ClusteredSessionManager ext
         }
 
         protected ClusteredSession(org.apache.geronimo.clustering.Session session) {
-            super(System.currentTimeMillis(), session.getSessionId());
+
+            super(System.currentTimeMillis(), 0L, session.getSessionId());
             this.session = session;
             initValues();
         }

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/GeronimoServletHolder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/GeronimoServletHolder.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/GeronimoServletHolder.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/GeronimoServletHolder.java
Tue Oct 26 05:37:03 2010
@@ -18,19 +18,11 @@
 
 package org.apache.geronimo.jetty7;
 
-import java.io.IOException;
-
-import javax.security.auth.Subject;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import javax.servlet.Servlet;
 
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectorInstanceContext;
 import org.apache.geronimo.connector.outbound.connectiontracking.SharedConnectorInstanceContext;
 import org.apache.geronimo.jetty7.handler.IntegrationContext;
-import org.apache.geronimo.security.Callers;
-import org.apache.geronimo.security.ContextManager;
-import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.servlet.ServletHolder;
 
 /**
@@ -46,7 +38,7 @@ public class GeronimoServletHolder exten
         this.servletRegistration = servletRegistration;
     }
 
-    public synchronized Object newInstance() throws InstantiationException, IllegalAccessException
{
+    public synchronized Servlet newInstance() throws InstantiationException, IllegalAccessException
{
         return servletRegistration.newInstance(_className);
     }
 

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/JettyServletRegistration.java
Tue Oct 26 05:37:03 2010
@@ -18,8 +18,7 @@ package org.apache.geronimo.jetty7;
 
 import java.util.Set;
 
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
+import javax.servlet.Servlet;
 
 import org.apache.geronimo.jetty7.handler.IntegrationContext;
 import org.eclipse.jetty.servlet.ServletHandler;
@@ -38,7 +37,7 @@ public interface JettyServletRegistratio
 
     ClassLoader getWebClassLoader();
 
-    Object newInstance(String className) throws InstantiationException, IllegalAccessException;
+    Servlet newInstance(String className) throws InstantiationException, IllegalAccessException;
 
     void destroyInstance(Object o) throws Exception;
 

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/WebAppContextWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/WebAppContextWrapper.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/WebAppContextWrapper.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/WebAppContextWrapper.java
Tue Oct 26 05:37:03 2010
@@ -25,12 +25,14 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.naming.Context;
 import javax.security.auth.Subject;
+import javax.servlet.Servlet;
 import javax.transaction.TransactionManager;
 
 import org.apache.geronimo.connector.outbound.connectiontracking.TrackedConnectionAssociator;
@@ -239,7 +241,15 @@ public class WebAppContextWrapper implem
 
         //stuff from spec dd
         setDisplayName(displayName);
-        webAppContext.setInitParams(contextParamMap);
+        
+        if (contextParamMap != null && contextParamMap.size() > 0) {
+            
+            for (Entry<String, String> entry : contextParamMap.entrySet()) {
+
+                webAppContext.getServletContext().setInitParameter(entry.getKey(), entry.getValue());
+            }
+        }
+
         setListenerClassNames(listenerClassNames);
         webAppContext.setDistributable(distributable);
         webAppContext.setWelcomeFiles(welcomeFiles);
@@ -299,11 +309,11 @@ public class WebAppContextWrapper implem
         return integrationContext;
     }
 
-    public Object newInstance(String className) throws InstantiationException, IllegalAccessException
{
+    public Servlet newInstance(String className) throws InstantiationException, IllegalAccessException
{
         if (className == null) {
             throw new InstantiationException("no class loaded");
         }
-        return holder.newInstance(className, webClassLoader, componentContext);
+        return (Servlet)holder.newInstance(className, webClassLoader, componentContext);
     }
 
     public void destroyInstance(Object o) throws Exception {

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/connector/JettyConnector.java
Tue Oct 26 05:37:03 2010
@@ -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(0);
             // 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(0);
             stats.getConnectionsDurationImpl().setTotalTime(listener.getConnectionsDurationTotal());
             // requests per connection (connection requests)
-            stats.getConnectionsRequestImpl().setCurrent(listener.getConnectionsRequestsAve());
+            stats.getConnectionsRequestImpl().setCurrent(Double.doubleToLongBits(listener.getConnectionsRequestsMean()));
             stats.getConnectionsRequestImpl().setHighWaterMark(listener.getConnectionsRequestsMax());
-            stats.getConnectionsRequestImpl().setLowWaterMark(listener.getConnectionsRequestsMin());
+            stats.getConnectionsRequestImpl().setLowWaterMark(0);
         }
         return stats;
     }

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/handler/InjectionServletHandler.java
Tue Oct 26 05:37:03 2010
@@ -51,7 +51,6 @@ class InjectionServletHandler extends Se
                 
             }
         }
-        servlet = super.customizeServlet(servlet);
         processAnnotations(servlet);
         return servlet;
     }

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/NoneAuthenticator.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/NoneAuthenticator.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/NoneAuthenticator.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/security/auth/NoneAuthenticator.java
Tue Oct 26 05:37:03 2010
@@ -35,7 +35,8 @@ import org.eclipse.jetty.server.Authenti
  */
 public class NoneAuthenticator implements Authenticator {
 
-    public void setConfiguration(Configuration configuration) {
+    public void setConfiguration(AuthConfiguration configuration) {
+        
     }
 
     public String getAuthMethod() {
@@ -58,4 +59,6 @@ public class NoneAuthenticator implement
     public boolean secureResponse(ServletRequest request, ServletResponse response, boolean
mandatory, Authentication.User validatedUser) throws ServerAuthException {
         return true;
     }
+
+
 }

Modified: geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
(original)
+++ geronimo/server/branches/2.2/plugins/jetty7/geronimo-jetty7/src/test/java/org/apache/geronimo/jetty7/AbstractWebModuleTest.java
Tue Oct 26 05:37:03 2010
@@ -123,13 +123,15 @@ public class AbstractWebModuleTest exten
                     return true;
                 }
 
-                public void setConfiguration(Configuration configuration) {
-                }
-
                 public String getAuthMethod() {
                     return null;
                 }
 
+                public void setConfiguration(AuthConfiguration arg0) {
+
+                    
+                }
+
             }, loginService);
         }
         String contextPath = "/test";

Modified: geronimo/server/branches/2.2/plugins/jetty7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/jetty7/pom.xml?rev=1027367&r1=1027366&r2=1027367&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/jetty7/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/jetty7/pom.xml Tue Oct 26 05:37:03 2010
@@ -37,7 +37,7 @@
     </description>
 
     <properties>
-        <jettyVersion>7.0.0.v20091005</jettyVersion>
+        <jettyVersion>7.2.0.v20101020</jettyVersion>
     </properties>
 
     <dependencyManagement>



Mime
View raw message