geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r743426 - /geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/
Date Wed, 11 Feb 2009 17:52:40 GMT
Author: djencks
Date: Wed Feb 11 17:52:39 2009
New Revision: 743426

URL: http://svn.apache.org/viewvc?rev=743426&view=rev
Log:
GERONIMO-4249 update servlet 3.0 spec to work with jetty trunk (updates from jetty spec javadoc)

Added:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
  (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
  (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
  (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
  (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
  (with props)
Modified:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java?rev=743426&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
Wed Feb 11 17:52:39 2009
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.servlet;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public interface AsyncContext {
+
+    String ASYNC_CONTEXT_PATH = "javax.servlet.async.context_path";
+    String ASYNC_PATH_INFO = "javax.servlet.async.path_info";
+    String ASYNC_QUERY_STRING = "javax.servlet.async.query_string";
+    String ASYNC_REQUEST_URI = "javax.servlet.async.request_uri";
+    String ASYNC_SERVLET_PATH = "javax.servlet.async.servlet_path";
+
+    void complete();
+
+    void dispatch();
+
+    void dispatch(ServletContext servletContext, String path);
+
+    ServletRequest getRequest();
+
+    ServletResponse getResponse();
+
+    boolean hasOriginalRequestAndResonse();
+
+    void start(Runnable run);
+}

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java?rev=743426&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
Wed Feb 11 17:52:39 2009
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.servlet;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public class AsyncEvent {
+
+    private final ServletRequest request;
+    private final ServletResponse response;
+
+    public AsyncEvent(ServletRequest request, ServletResponse response) {
+        this.request = request;
+        this.response = response;
+    }
+
+    public ServletRequest getRequest() {
+        return request;
+    }
+
+    public ServletResponse getResponse() {
+        return response;
+    }
+}

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncEvent.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java?rev=743426&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
Wed Feb 11 17:52:39 2009
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.servlet;
+
+import java.util.EventListener;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public interface AsyncListener extends EventListener {
+
+    void onComplete(AsyncEvent event);
+
+    void onTimeout(AsyncEvent event);
+}

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncListener.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java?rev=743426&r1=743425&r2=743426&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java
Wed Feb 11 17:52:39 2009
@@ -21,7 +21,7 @@
 package javax.servlet;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  * @since 3.0
  */
 public enum DispatcherType {
@@ -29,5 +29,6 @@
     ERROR,
     FORWARD,
     INCLUDE,
-    REQUEST
+    REQUEST,
+    ASYNC
 }

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java?rev=743426&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
Wed Feb 11 17:52:39 2009
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.servlet;
+
+import java.util.EnumSet;
+import java.util.Map;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public abstract class FilterRegistration {
+    protected String description;
+    protected boolean isAsyncSupported;
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setAsyncSupported(boolean asyncSupported) {
+        isAsyncSupported = asyncSupported;
+    }
+
+    public abstract void addMappingForServletNames(EnumSet<DispatcherType> dispatcherTypes,
boolean isMatchAfter, String ... servletNames);
+
+    public abstract void addMappingForUrlPatterns(EnumSet<DispatcherType> dispatcherTypes,
boolean isMatchAfter, String ... urlPatterns);
+
+    public abstract void setInitParameter(String name, String value);
+
+    public abstract void setInitParameters(Map<String, String> initParameters);
+
+}

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java?rev=743426&r1=743425&r2=743426&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
Wed Feb 11 17:52:39 2009
@@ -650,67 +650,88 @@
     /**
      * Add the specified servlet to the context
      * @param servletName servlet's name
-     * @param description description of servlet
      * @param className class name of servlet
-     * @param initParameters init parameters for servlet
-     * @param loadOnStartup load on startup order.
      * @throws IllegalArgumentException duplicate servletName
      * @throws IllegalStateException this method called after #initialize
+     * @return ServletRegistration allowing configuration of the servlet
      *
      * @since 3.0
      */
-    void addServlet(String servletName,
-                    String description,
-                    String className,
-                    Map<String, String> initParameters,
-                    int loadOnStartup) throws IllegalArgumentException, IllegalStateException;
+    ServletRegistration addServlet(String servletName,
+                    String className) throws IllegalArgumentException, IllegalStateException;
 
     /**
-     * Add the specified servlet mappings
-     * @param servletName name of servlet mapping applies to
-     * @param urlPatterns url patterns for the mapping
-     * @throws IllegalArgumentException if urlPatterns are null or empty
-     * @throws IllegalStateException if called after #initialize
+     * Fish out the servlet registration for a named servlet
+     * @param servletName name of the servlet you want to configure
+     * @return ServletRegistration for servlet you want
      *
      * @since 3.0
      */
-    void addServletMapping(String servletName,
-                           String[] urlPatterns) throws IllegalArgumentException, IllegalStateException;
+    ServletRegistration findServletRegistration(String servletName);
 
     /**
      * Add a filter to this context
      * @param filterName name of filter
-     * @param description description of filter
      * @param className class name of filter
-     * @param initParams init params for filter
      * @throws IllegalArgumentException duplicate filter name
      * @throws IllegalStateException if called after #initialise
+     * @return  FilterRegistration allowing configuration of filter
      *
      * @since 3.0
      */
-    void addFilter(String filterName,
-                   String description,
-                   String className,
-                   Map<String, String> initParams) throws IllegalArgumentException,
IllegalStateException;
+    FilterRegistration addFilter(String filterName,
+                   String className) throws IllegalArgumentException, IllegalStateException;
 
+    /**
+     *
+     * @param filterName Name of filter you want to configure
+     * @return FilterRegistration allowing configuration of filter
+     *
+     * @since 3.0
+     */
+    FilterRegistration findFilterRegistration(String filterName);
+
+    /**
+     *
+     * @param sessionCookieConfig configuration of session cookie
+     *
+     * @since 3.0
+     */
+    void setSessionCookieConfig(SessionCookieConfig sessionCookieConfig);
 
     /**
-     * Add a filter mapping to this context
-     * @param filterName name of filter mapping applies to
-     * @param urlPatterns url patterns for mapping
-     * @param servletNames servlet names for mapping
-     * @param dispatcherTypes dispatcher types for mapping
-     * @param isMatchAfter before or after xml or annotation specified filter mappings
-     * @throws IllegalArgumentException bad url patterns
-     * @throws IllegalStateException if called after #initialize
+     *
+     * @return configuration of session cookie
      *
      * @since 3.0
      */
-    void addFilterMapping(String filterName,
-                          String[] urlPatterns,
-                          String[] servletNames,
-                          EnumSet<DispatcherType> dispatcherTypes,
-                          boolean isMatchAfter) throws IllegalArgumentException, IllegalStateException;
+    SessionCookieConfig getSessionCookieConfig();
+
+    /**
+     *
+     * @param sessionTrackingModes set of SessionTrackingModes for this web app
+     *
+     * @since 3.0
+     */
+    void setSessionTrackingModes(EnumSet<SessionTrackingMode> sessionTrackingModes);
+
+    /**
+     *
+     * @return the default session tracking modes
+     *
+     * @since 3.0
+     */
+    EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes();
+
+    /**
+     *
+     * @return the actual session tracking modes.  These will be the default ones unless
they've been explicitly set.
+     *
+     * @since 3.0
+     */
+    EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes();
+
+    
 
 }
 

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java?rev=743426&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
Wed Feb 11 17:52:39 2009
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 javax.servlet;
+
+import java.util.Map;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public abstract class ServletRegistration {
+
+    protected String description;
+    protected boolean isAsyncSupported;
+    protected int loadOnStartup;
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public void setAsyncSupported(boolean asyncSupported) {
+        isAsyncSupported = asyncSupported;
+    }
+
+    public void setLoadOnStartup(int loadOnStartup) {
+        this.loadOnStartup = loadOnStartup;
+    }
+
+    public abstract void addMapping(String... urlPatterns);
+
+    public abstract void setInitParameter(String name, String value);
+
+    public abstract void setInitParameters(Map<String, String> initParameters);
+    
+}

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java?rev=743426&r1=743425&r2=743426&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java
Wed Feb 11 17:52:39 2009
@@ -608,66 +608,85 @@
      */
     ServletResponse getServletResponse();
 
-    /**
-      * complete a suspended request.
-      * @throws IllegalStateException
-      * @since 3.0
-      */
-    void complete() throws IllegalStateException;
-
-    /**
-     * Suspend request processing.  Must be called by a thread that is processing this request.
-     * @param timeoutMilliseconds new timeout period, in milliseconds
-     * @throws IllegalStateException if called by a thread not processing this request or
after error dispatch
-     * @since 3.0
-     * @see #complete
-     * @see #resume
-     */
-    void suspend(long timeoutMilliseconds) throws IllegalStateException;
-
-    /**
-     * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
-     * @throws IllegalStateException
-     * @since 3.0
-     * @see #complete
-     * @see #resume
-     */
-    void suspend() throws IllegalStateException;
-
-    /**
-     * Resume a suspended request 
-     * @throws IllegalStateException if the request is not suspended
-     * @since 3.0
-     * @see #suspend
-     */
-    void resume() throws IllegalStateException;
-
-    /**
-     *
-     * @return if the request is suspended
-     * @since 3.0
-     */
-    boolean isSuspended();
-
-    /**
-     *
-     * @return if the request is resumed
-     * @since 3.0
-     */
-    boolean isResumed();
-
-    /**
-     *
-     * @return if the request is timed out
-     * @since 3.0
-     */
-    boolean isTimeout();
-
-    /**
-     *
-     * @return if the request has never been suspended (or resumed)
-     * @since 3.0
-     */
-    boolean isInitial();
+    void addAsyncListener(AsyncListener listener);
+    
+    void addAsyncListener(AsyncListener listener, ServletRequest request, ServletResponse
response);
+
+    AsyncContext getAsyncContext();
+
+    boolean isAsyncStarted();
+
+    boolean isAsyncSupported();
+
+    void setAsyncTimeout(long timeout);
+
+    AsyncContext startAsync();
+
+    AsyncContext startAsync(ServletRequest request, ServletResponse response);
+
+    DispatcherType getDispatcherType();
+
+
+//    /**
+//      * complete a suspended request.
+//      * @throws IllegalStateException
+//      * @since 3.0
+//      */
+//    void complete() throws IllegalStateException;
+//
+//    /**
+//     * Suspend request processing.  Must be called by a thread that is processing this
request.
+//     * @param timeoutMilliseconds new timeout period, in milliseconds
+//     * @throws IllegalStateException if called by a thread not processing this request
or after error dispatch
+//     * @since 3.0
+//     * @see #complete
+//     * @see #resume
+//     */
+//    void suspend(long timeoutMilliseconds) throws IllegalStateException;
+//
+//    /**
+//     * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
+//     * @throws IllegalStateException
+//     * @since 3.0
+//     * @see #complete
+//     * @see #resume
+//     */
+//    void suspend() throws IllegalStateException;
+//
+//    /**
+//     * Resume a suspended request
+//     * @throws IllegalStateException if the request is not suspended
+//     * @since 3.0
+//     * @see #suspend
+//     */
+//    void resume() throws IllegalStateException;
+//
+//    /**
+//     *
+//     * @return if the request is suspended
+//     * @since 3.0
+//     */
+//    boolean isSuspended();
+//
+//    /**
+//     *
+//     * @return if the request is resumed
+//     * @since 3.0
+//     */
+//    boolean isResumed();
+//
+//    /**
+//     *
+//     * @return if the request is timed out
+//     * @since 3.0
+//     */
+//    boolean isTimeout();
+//
+//    /**
+//     *
+//     * @return if the request has never been suspended (or resumed)
+//     * @since 3.0
+//     */
+//    boolean isInitial();
 }
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java?rev=743426&r1=743425&r2=743426&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java
Wed Feb 11 17:52:39 2009
@@ -420,83 +420,119 @@
         return request.getServletResponse();
     }
 
-    /**
-     * complete a suspended request.
-     *
-     * @throws IllegalStateException
-     * @since 3.0
-     */
-    public void complete() throws IllegalStateException {
-        request.complete();
-    }
-
-    /**
-     * Suspend request processing.  Must be called by a thread that is processing this request.
-     *
-     * @param timeoutMilliseconds new timeout period, in milliseconds
-     * @throws IllegalStateException if called by a thread not processing this request or
after error dispatch
-     * @see #complete
-     * @see #resume
-     * @since 3.0
-     */
-    public void suspend(long timeoutMilliseconds) throws IllegalStateException {
-        request.suspend(timeoutMilliseconds);
-    }
-
-    /**
-     * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
-     *
-     * @throws IllegalStateException
-     * @see #complete
-     * @see #resume
-     * @since 3.0
-     */
-    public void suspend() throws IllegalStateException {
-        request.suspend();
-    }
-
-    /**
-     * Resume a suspended request
-     *
-     * @throws IllegalStateException if the request is not suspended
-     * @see #suspend
-     * @since 3.0
-     */
-    public void resume() throws IllegalStateException {
-        request.resume();
-    }
-
-    /**
-     * @return if the request is suspended
-     * @since 3.0
-     */
-    public boolean isSuspended() {
-        return request.isSuspended();
-    }
-
-    /**
-     * @return if the request is resumed
-     * @since 3.0
-     */
-    public boolean isResumed() {
-        return request.isResumed();
-    }
-
-    /**
-     * @return if the request is timed out
-     * @since 3.0
-     */
-    public boolean isTimeout() {
-        return request.isTimeout();
-    }
-
-    /**
-     * @return if the request has never been suspended (or resumed)
-     * @since 3.0
-     */
-    public boolean isInitial() {
-        return request.isInitial();
+    public void addAsyncListener(AsyncListener listener) {
+        request.addAsyncListener(listener);
     }
 
+    public void addAsyncListener(AsyncListener listener, ServletRequest request, ServletResponse
response) {
+        request.addAsyncListener(listener, request, response);
+    }
+
+    public AsyncContext getAsyncContext() {
+        return request.getAsyncContext();
+    }
+
+    public boolean isAsyncStarted() {
+        return request.isAsyncStarted();
+    }
+
+    public boolean isAsyncSupported() {
+        return request.isAsyncSupported();
+    }
+
+    public void setAsyncTimeout(long timeout) {
+        request.setAsyncTimeout(timeout);
+    }
+
+    public AsyncContext startAsync() {
+        return request.startAsync();
+    }
+
+    public AsyncContext startAsync(ServletRequest request, ServletResponse response) {
+        return request.startAsync(request, response);
+    }
+
+    public DispatcherType getDispatcherType() {
+        return request.getDispatcherType();
+    }
+
+//    /**
+//     * complete a suspended request.
+//     *
+//     * @throws IllegalStateException
+//     * @since 3.0
+//     */
+//    public void complete() throws IllegalStateException {
+//        request.complete();
+//    }
+//
+//    /**
+//     * Suspend request processing.  Must be called by a thread that is processing this
request.
+//     *
+//     * @param timeoutMilliseconds new timeout period, in milliseconds
+//     * @throws IllegalStateException if called by a thread not processing this request
or after error dispatch
+//     * @see #complete
+//     * @see #resume
+//     * @since 3.0
+//     */
+//    public void suspend(long timeoutMilliseconds) throws IllegalStateException {
+//        request.suspend(timeoutMilliseconds);
+//    }
+//
+//    /**
+//     * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
+//     *
+//     * @throws IllegalStateException
+//     * @see #complete
+//     * @see #resume
+//     * @since 3.0
+//     */
+//    public void suspend() throws IllegalStateException {
+//        request.suspend();
+//    }
+//
+//    /**
+//     * Resume a suspended request
+//     *
+//     * @throws IllegalStateException if the request is not suspended
+//     * @see #suspend
+//     * @since 3.0
+//     */
+//    public void resume() throws IllegalStateException {
+//        request.resume();
+//    }
+//
+//    /**
+//     * @return if the request is suspended
+//     * @since 3.0
+//     */
+//    public boolean isSuspended() {
+//        return request.isSuspended();
+//    }
+//
+//    /**
+//     * @return if the request is resumed
+//     * @since 3.0
+//     */
+//    public boolean isResumed() {
+//        return request.isResumed();
+//    }
+//
+//    /**
+//     * @return if the request is timed out
+//     * @since 3.0
+//     */
+//    public boolean isTimeout() {
+//        return request.isTimeout();
+//    }
+//
+//    /**
+//     * @return if the request has never been suspended (or resumed)
+//     * @since 3.0
+//     */
+//    public boolean isInitial() {
+//        return request.isInitial();
+//    }
+
 }
 



Mime
View raw message