geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r451924 [2/2] - in /geronimo/sandbox/javaee5: ./ assemblies-jee5/geronimo-jetty6-jee5/ configs-jee5/ configs-jee5/jetty6-clustering-builder-wadi/ configs-jee5/jetty6-clustering-builder-wadi/src/ configs-jee5/jetty6-clustering-builder-wadi/s...
Date Mon, 02 Oct 2006 09:06:50 GMT
Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHandler.java?view=auto&rev=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHandler.java
(added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyServletHandler.java
Mon Oct  2 02:06:48 2006
@@ -0,0 +1,74 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.jetty6;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.mortbay.jetty.servlet.ServletHandler;
+
+/**
+ * @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $
+ */
+public class JettyServletHandler extends ServletHandler {
+
+    private final PreHandler chainedHandler;
+    
+    public JettyServletHandler(PreHandler chainedHandler) {
+        if (null == chainedHandler) {
+            chainedHandler = new NoOpChainedHandler();
+        }
+        this.chainedHandler = chainedHandler;
+        chainedHandler.setNextHandler(new ActualJettyServletHandler());
+    }
+
+    @Override
+    public void handle(String target, HttpServletRequest request,HttpServletResponse response,
int type)
+        throws IOException {
+        try {
+            chainedHandler.handle(target, request, response, type);
+        } catch (ServletException e) {
+            throw (IOException) new IOException().initCause(e);
+        }
+    }
+
+    protected void doHandle(String target, HttpServletRequest request, HttpServletResponse
response, int type)
+        throws IOException {
+        super.handle(target, request, response, type);
+    }
+    
+    private class ActualJettyServletHandler extends AbstractPreHandler {
+
+        public void handle(String target, HttpServletRequest request, HttpServletResponse
response, int type)
+                throws IOException, ServletException {
+            doHandle(target, request, response, type);
+        }
+    }
+
+    private static class NoOpChainedHandler extends AbstractPreHandler {
+
+        public void handle(String target, HttpServletRequest request, HttpServletResponse
response, int type)
+                throws IOException, ServletException {
+            next.handle(target, request, response, type);
+        }
+    }
+    
+}

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java?view=diff&rev=451924&r1=451923&r2=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
(original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
Mon Oct  2 02:06:48 2006
@@ -132,6 +132,7 @@
             Map tagLibMap,
             int sessionTimeoutSeconds,
             SessionHandlerFactory handlerFactory,
+            PreHandlerFactory preHandlerFactory,
 
             String policyContextID,
             String securityRealmName,
@@ -165,7 +166,11 @@
 
             securityHandler.init(policyContextID, defaultPrincipal, checkedPermissions, excludedPermissions,
classLoader);
         }
-        this.webAppContext = new WebAppContext(securityHandler, sessionHandler, null, null);
+        
+        PreHandler preHandler = null == preHandlerFactory ? null : preHandlerFactory.createHandler();
+        ServletHandler servletHandler = new JettyServletHandler(preHandler);
+        
+        this.webAppContext = new WebAppContext(securityHandler, sessionHandler, servletHandler,
null);
         AbstractHandler next = sessionHandler;
         next = new ThreadClassloaderHandler(next, classLoader);
 
@@ -485,22 +490,9 @@
         }
     }
 
-//    private void doHandle(String pathInContext, String pathParams, HttpRequest httpRequest,
HttpResponse httpResponse)
-//            throws HttpException, IOException {
-//        super.handle(pathInContext, pathParams, httpRequest, httpResponse);
-//    }
-//
-//    private class EndHandleInterceptor implements HandleInterceptor {
-//
-//        public void handle(String pathInContext, String pathParams, HttpRequest httpRequest,
HttpResponse httpResponse,
-//                HandleInterceptor end) throws HttpException, IOException {
-//            doHandle(pathInContext, pathParams, httpRequest, httpResponse);
-//        }
-//    }
-
     public static final GBeanInfo GBEAN_INFO;
-    public static final String GBEAN_REF_WEB_APPLICATION_HANDLER_FACTORY = "SessionHandlerFactory";
-    public static final String GBEAN_REF_HANDLE_INTERCEPTOR = "HandleInterceptor";
+    public static final String GBEAN_REF_SESSION_HANDLER_FACTORY = "SessionHandlerFactory";
+    public static final String GBEAN_REF_PRE_HANDLER_FACTORY = "PreHandlerFactory";
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic("Jetty WebApplication
Context", JettyWebAppContext.class, NameFactory.WEB_MODULE);
@@ -520,9 +512,9 @@
         infoBuilder.addAttribute("realmName", String.class, true);
         infoBuilder.addAttribute("tagLibMap", Map.class, true);
         infoBuilder.addAttribute("sessionTimeoutSeconds", int.class, true);
-        infoBuilder.addReference(GBEAN_REF_WEB_APPLICATION_HANDLER_FACTORY, SessionHandlerFactory.class,
+        infoBuilder.addReference(GBEAN_REF_SESSION_HANDLER_FACTORY, SessionHandlerFactory.class,
                 NameFactory.GERONIMO_SERVICE);
-//        infoBuilder.addReference(GBEAN_REF_HANDLE_INTERCEPTOR, HandleInterceptor.class,
NameFactory.GERONIMO_SERVICE);
+        infoBuilder.addReference(GBEAN_REF_PRE_HANDLER_FACTORY, PreHandlerFactory.class,
NameFactory.GERONIMO_SERVICE);
 
         infoBuilder.addAttribute("componentContext", Map.class, true);
         infoBuilder.addAttribute("classLoader", ClassLoader.class, false);
@@ -578,8 +570,8 @@
                 "realmName",
                 "tagLibMap",
                 "sessionTimeoutSeconds",
-                GBEAN_REF_WEB_APPLICATION_HANDLER_FACTORY,
-//                GBEAN_REF_HANDLE_INTERCEPTOR,
+                GBEAN_REF_SESSION_HANDLER_FACTORY,
+                GBEAN_REF_PRE_HANDLER_FACTORY,
 
                 "policyContextID",
                 "securityRealmName",

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandler.java?view=auto&rev=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandler.java
(added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandler.java
Mon Oct  2 02:06:48 2006
@@ -0,0 +1,27 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.geronimo.jetty6;
+
+import org.mortbay.jetty.Handler;
+
+/**
+ * @version $Rev: 449059 $ $Date: 2006-09-23 05:23:09 +1000 (Sat, 23 Sep 2006) $
+ */
+public interface PreHandler extends Handler {
+    void setNextHandler(Handler next);
+}

Added: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandlerFactory.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandlerFactory.java?view=auto&rev=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandlerFactory.java
(added)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/PreHandlerFactory.java
Mon Oct  2 02:06:48 2006
@@ -0,0 +1,26 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.jetty6;
+
+
+/**
+ *
+ * @version $Rev$ $Date$
+ */
+public interface PreHandlerFactory {
+    PreHandler createHandler();
+}

Copied: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java
(from r449376, geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredHandleInterceptor.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java?view=diff&rev=451924&p1=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredHandleInterceptor.java&r1=449376&p2=geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java&r2=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredHandleInterceptor.java
(original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/AbstractClusteredPreHandler.java
Mon Oct  2 02:06:48 2006
@@ -24,25 +24,23 @@
 
 import org.apache.geronimo.clustering.ClusteredInvocation;
 import org.apache.geronimo.clustering.ClusteredInvocationException;
+import org.apache.geronimo.jetty6.AbstractPreHandler;
 import org.mortbay.jetty.Handler;
 import org.mortbay.jetty.HttpException;
 
 /**
  * @version $Rev$ $Date$
  */
-public abstract class AbstractClusteredHandleInterceptor implements Handler {
-
-    private final Handler next;
-
-    protected AbstractClusteredHandleInterceptor(Handler next) {
-        this.next = next;
-    }
+public abstract class AbstractClusteredPreHandler extends AbstractPreHandler {
 
     public void handle(String target, HttpServletRequest request, HttpServletResponse response,
int dispatch)
             throws IOException, ServletException {
-
-        ClusteredInvocation invocation =
-                newClusteredInvocation(target, request, response, dispatch, next);
+//        if (dispatch != Handler.REQUEST) {
+//            next.handle(target, request, response, dispatch);
+//            return;
+//        }
+//        
+        ClusteredInvocation invocation = newClusteredInvocation(target, request, response,
dispatch);
         try {
             invocation.invoke();
         } catch (ClusteredInvocationException e) {
@@ -58,7 +56,7 @@
     }
 
     protected abstract ClusteredInvocation newClusteredInvocation(String target,
-            HttpServletRequest request, HttpServletResponse response, int dispatch, Handler
next);
+            HttpServletRequest request, HttpServletResponse response, int dispatch);
 
 
     protected abstract class WebClusteredInvocation implements ClusteredInvocation {
@@ -66,14 +64,12 @@
         protected final HttpServletRequest request;
         protected final HttpServletResponse response;
         protected final int dispatch;
-        protected final Handler next;
 
-        protected WebClusteredInvocation(String target, HttpServletRequest request, HttpServletResponse
response, int dispatch, Handler next) {
+        protected WebClusteredInvocation(String target, HttpServletRequest request, HttpServletResponse
response, int dispatch) {
             this.target = target;
             this.request = request;
             this.response = response;
             this.dispatch = dispatch;
-            this.next = next;
             //TODO figure out if the normal SessionHandler will set the requestedSessionId
correctly.
             //My (djencks) guess is yes it will.
 //            GeronimoServletHttpRequest servletHttpRequest = (GeronimoServletHttpRequest)
request.getWrapper();
@@ -95,4 +91,5 @@
             return request.getRequestedSessionId();
         }
     }
+    
 }

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java?view=diff&rev=451924&r1=451923&r2=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
(original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/cluster/ClusteredSessionManager.java
Mon Oct  2 02:06:48 2006
@@ -16,24 +16,16 @@
  */
 package org.apache.geronimo.jetty6.cluster;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.Principal;
-import java.util.Enumeration;
-import java.util.Locale;
+import java.util.HashMap;
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
 
 import org.apache.geronimo.clustering.SessionAlreadyExistException;
 import org.apache.geronimo.clustering.SessionListener;
 import org.apache.geronimo.clustering.SessionManager;
 import org.mortbay.jetty.servlet.AbstractSessionManager;
+import org.mortbay.jetty.servlet.HashSessionIdManager;
 
 
 /**
@@ -41,22 +33,18 @@
  * @version $Rev$ $Date$
  */
 public class ClusteredSessionManager extends AbstractSessionManager {
-    private static final Object ALL_SESSION_PLACEHOLDER = new Object();
     
     private final SessionManager sessionManager;
+    private final Map<String, ClusteredSession> idToSession = new HashMap<String,
ClusteredSession>();
     
     public ClusteredSessionManager(SessionManager sessionManager) {
         this.sessionManager = sessionManager;
 
         String workerName = sessionManager.getNode().getName();
         workerName = workerName.replaceAll(" ", "");
-        //TODO what is this for?
-//        setWorkerName(workerName);
-        // implementation note: enables cross context session id such that a mock HttpServletRequest
having a defined 
-        // requestedSessionId attribute can be used to re-create an HttpSession with a defined
session ID in this
-        // manager.
-        //TODO what is equivalent in jetty6?
-//        setCrossContextSessionIDs(true);
+        HashSessionIdManager sessionIdManager = new HashSessionIdManager();
+        sessionIdManager.setWorkerName(workerName);
+        setMetaManager(sessionIdManager);
         
         sessionManager.registerListener(new MigrationListener());
 
@@ -64,6 +52,7 @@
         setMaxInactiveInterval(-1);
     }
 
+    @Override
     protected Session newSession(HttpServletRequest request) {
         return new ClusteredSession(request);
     }
@@ -71,283 +60,48 @@
     private class MigrationListener implements SessionListener {
         
         public void notifyInboundSessionMigration(org.apache.geronimo.clustering.Session
session) {
-            //TODO this is extremely broken.  jetty6 may need to expose a method like this
extracted from newHttpSession();
-//            synchronized(_sessionIdManager)
-//            {
-                synchronized(this)
-                {
-                    _sessions.put(session.getSessionId(),session);
-//                    _sessionIdManager.addSession(session);
-//                    if (_sessions.size() > this._maxSessions)
-//                        this._maxSessions = _sessions.size ();
-//                }
-            }
+            addSession(new ClusteredSession(session), false);
         }
         
         public void notifyOutboundSessionMigration(org.apache.geronimo.clustering.Session
session) {
-            //TODO as above, broken.  Presumably want a method exposed on AbstractSessionManager.
-            String sessionId = session.getSessionId();
-            synchronized (_sessions) {
-                _sessions.remove(sessionId);
+            ClusteredSession clusteredSession;
+            synchronized (idToSession) {
+                clusteredSession = (ClusteredSession) idToSession.remove(session.getSessionId());
 
             }
-
-//            synchronized (_sessions) {
-//                _sessions.remove(sessionId);
-//            }
+            if (null == clusteredSession) {
+                throw new AssertionError("Session [" + session + "] is undefined");
+            }
+            removeSession(clusteredSession, false);
         }
     }
 
     public class ClusteredSession extends Session {
-        private static final String FORCE_SET_VALUES = "$$$JETTY_FORCE_SET_VALUES$$$"; 
-
         private final org.apache.geronimo.clustering.Session session;
 
         protected ClusteredSession(HttpServletRequest request) {
             super(request);
-            
-            if (request instanceof RequestWithBoundSession) {
-                this.session = ((RequestWithBoundSession) request).session;
-                // implementation note: set a dummy attribute such that the underlying attribute
map is initialized
-                // with the state of the inbound session.
-                setAttribute(FORCE_SET_VALUES, FORCE_SET_VALUES);
-            } else {
-                try {
-                    this.session = sessionManager.createSession(getId());
-                } catch (SessionAlreadyExistException e) {
-                    throw (IllegalStateException) new IllegalStateException().initCause(e);
-                }
+            try {
+                this.session = sessionManager.createSession(getId());
+            } catch (SessionAlreadyExistException e) {
+                throw (IllegalStateException) new IllegalStateException().initCause(e);
+            }
+            synchronized (idToSession) {
+                idToSession.put(getId(), this);
+            }
+        }
+        
+        protected ClusteredSession(org.apache.geronimo.clustering.Session session) {
+            super(null, session.getSessionId());
+            this.session = session;
+            synchronized (idToSession) {
+                idToSession.put(getId(), this);
             }
         }
         
+        @Override
         protected Map newAttributeMap() {
             return session.getState();
         }
     }
 
-    /**
-     * Implementation note: this is a mock HttpServletRequest which is used to create an
HttpSession with the same
-     * session ID than the wrapped Session.
-     */
-    private class RequestWithBoundSession implements HttpServletRequest {
-        private final org.apache.geronimo.clustering.Session session;
-
-        public RequestWithBoundSession(org.apache.geronimo.clustering.Session session) {
-            this.session = session;
-        }
-
-        public void setAttribute(String arg0, Object arg1) {
-        }
-
-        public Object getAttribute(String arg0) {
-            return null;
-        }
-
-        public String getRequestedSessionId() {
-            return session.getSessionId();
-        }
-
-        public String getAuthType() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getContextPath() {
-            throw new UnsupportedOperationException();
-        }
-
-        public Cookie[] getCookies() {
-            throw new UnsupportedOperationException();
-        }
-
-        public long getDateHeader(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getHeader(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public Enumeration getHeaderNames() {
-            throw new UnsupportedOperationException();
-        }
-
-        public Enumeration getHeaders(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getIntHeader(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getMethod() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getPathInfo() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getPathTranslated() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getQueryString() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getRemoteUser() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getRequestURI() {
-            throw new UnsupportedOperationException();
-        }
-
-        public StringBuffer getRequestURL() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getServletPath() {
-            throw new UnsupportedOperationException();
-        }
-
-        public HttpSession getSession() {
-            throw new UnsupportedOperationException();
-        }
-
-        public HttpSession getSession(boolean arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public Principal getUserPrincipal() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isRequestedSessionIdFromCookie() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isRequestedSessionIdFromURL() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isRequestedSessionIdFromUrl() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isRequestedSessionIdValid() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isUserInRole(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public Enumeration getAttributeNames() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getCharacterEncoding() {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getContentLength() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getContentType() {
-            throw new UnsupportedOperationException();
-        }
-
-        public ServletInputStream getInputStream() throws IOException {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getLocalAddr() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getLocalName() {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getLocalPort() {
-            throw new UnsupportedOperationException();
-        }
-
-        public Locale getLocale() {
-            throw new UnsupportedOperationException();
-        }
-
-        public Enumeration getLocales() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getParameter(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public Map getParameterMap() {
-            throw new UnsupportedOperationException();
-        }
-
-        public Enumeration getParameterNames() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String[] getParameterValues(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getProtocol() {
-            throw new UnsupportedOperationException();
-        }
-
-        public BufferedReader getReader() throws IOException {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getRealPath(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getRemoteAddr() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getRemoteHost() {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getRemotePort() {
-            throw new UnsupportedOperationException();
-        }
-
-        public RequestDispatcher getRequestDispatcher(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getScheme() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String getServerName() {
-            throw new UnsupportedOperationException();
-        }
-
-        public int getServerPort() {
-            throw new UnsupportedOperationException();
-        }
-
-        public boolean isSecure() {
-            throw new UnsupportedOperationException();
-        }
-
-        public void removeAttribute(String arg0) {
-            throw new UnsupportedOperationException();
-        }
-
-        public void setCharacterEncoding(String arg0) throws UnsupportedEncodingException
{
-            throw new UnsupportedOperationException();
-        }
-    }
 }

Modified: geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java?view=diff&rev=451924&r1=451923&r2=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
(original)
+++ geronimo/sandbox/javaee5/modules-jee5/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/AbstractWebModuleTest.java
Mon Oct  2 02:06:48 2006
@@ -65,7 +65,7 @@
     protected SessionHandlerFactory sessionHandlerFactory = null;
 
     protected void setUpStaticContentServlet(JettyServletRegistration webModule) throws Exception
{
-        Map staticContentServletInitParams = new HashMap();
+        Map<String, String> staticContentServletInitParams = new HashMap<String,
String>();
         staticContentServletInitParams.put("acceptRanges", "true");
         staticContentServletInitParams.put("dirAllowed", "true");
         staticContentServletInitParams.put("putAllowed", "false");
@@ -107,6 +107,7 @@
                 null,
                 0,
                 sessionHandlerFactory,
+                null,
                 policyContextId,
                 securityRealmName,
                 defaultPrincipal,

Modified: geronimo/sandbox/javaee5/modules-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/modules-jee5/pom.xml?view=diff&rev=451924&r1=451923&r2=451924
==============================================================================
--- geronimo/sandbox/javaee5/modules-jee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/modules-jee5/pom.xml Mon Oct  2 02:06:48 2006
@@ -48,8 +48,10 @@
         <module>geronimo-transaction-jta11</module>
         <module>geronimo-persistence-jpa10</module>
         <module>geronimo-jetty6</module>
+        <module>geronimo-jetty6-clustering-wadi</module>
         <module>geronimo-web-2.5-builder</module>
         <module>geronimo-jetty6-builder</module>
+        <module>geronimo-jetty6-clustering-builder-wadi</module>
     </modules>
     
 </project>

Modified: geronimo/sandbox/javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/javaee5/pom.xml?view=diff&rev=451924&r1=451923&r2=451924
==============================================================================
--- geronimo/sandbox/javaee5/pom.xml (original)
+++ geronimo/sandbox/javaee5/pom.xml Mon Oct  2 02:06:48 2006
@@ -79,7 +79,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0.1</version>
             </dependency>
 
             <dependency>



Mime
View raw message