geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r796570 - in /geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet: ./ annotation/ descriptor/ http/
Date Tue, 21 Jul 2009 22:30:27 GMT
Author: djencks
Date: Tue Jul 21 22:30:26 2009
New Revision: 796570

URL: http://svn.apache.org/viewvc?rev=796570&view=rev
Log:
Update to glassfish javadoc version of the servlet spec 3.0

Added:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
  (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
  (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
  (with props)
Removed:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/annotation/FilterMapping.java
Modified:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/Registration.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/ServletRegistration.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java

Modified: 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=796570&r1=796569&r2=796570&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/AsyncContext.java
Tue Jul 21 22:30:26 2009
@@ -44,7 +44,7 @@
 
     ServletResponse getResponse();
 
-    boolean hasOriginalRequestAndResonse();
+    boolean hasOriginalRequestAndResponse();
 
     void start(Runnable run);
 }

Modified: 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=796570&r1=796569&r2=796570&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/FilterRegistration.java
Tue Jul 21 22:30:26 2009
@@ -34,6 +34,10 @@
 
     void addMappingForUrlPatterns(EnumSet<DispatcherType> dispatcherTypes, boolean
isMatchAfter, String ... urlPatterns);
 
+    Iterable<String> getServletNameMappings();
+
+    Iterable<String> getUrlPatternMappings();
+
     public interface Dynamic extends FilterRegistration, Registration.Dynamic {
 
     }

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/Registration.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/Registration.java?rev=796570&r1=796569&r2=796570&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/Registration.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/Registration.java
Tue Jul 21 22:30:26 2009
@@ -54,12 +54,18 @@
      */
     String getName();
 
+    /**
+     * Set one init parameter
+     * @param name parameter name
+     * @param value parameter value
+     * @return true if init parameter was set, false if it was previously set.
+     */
     boolean setInitParameter(String name, String value);
 
     /**
      *
      * @param initParameters map of name-value paramters
-     * @return set of previously set parameter names
+     * @return set of previously set parameter names (i.e. those where setInitParameter would
have returned false)
      */
     Set<String> setInitParameters(Map<String, String> initParameters);
 

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=796570&r1=796569&r2=796570&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
Tue Jul 21 22:30:26 2009
@@ -22,11 +22,12 @@
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.EnumSet;
 import java.util.Enumeration;
-import java.util.Set;
-import java.util.Map;
 import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.descriptor.JspConfigDescriptor;
 
 
 /**
@@ -60,6 +61,10 @@
     /**
      * @since Servlet 3.0
      */
+    String ORDERED_LIGS = "javax.servlet.context.orderedLibs";
+    /**
+     * @since Servlet 3.0
+     */
     String TEMPDIR = "javax.servlet.context.tempdir";
 
     /**
@@ -682,19 +687,33 @@
      * @param sessionTrackingModes set of SessionTrackingModes for this web app
      * @since 3.0
      */
-    void setSessionTrackingModes(EnumSet<SessionTrackingMode> sessionTrackingModes);
+    void setSessionTrackingModes(Set<SessionTrackingMode> sessionTrackingModes);
 
     /**
      * @return the default session tracking modes
      * @since 3.0
      */
-    EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes();
+    Set<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();
+    Set<SessionTrackingMode> getEffectiveSessionTrackingModes();
+
+    /**
+     *
+     * @return the classloader for this web app
+     * @since 3.0
+     */
+    ClassLoader getClassLoader();
+
+    /**
+     * 
+     * @return jsp config aggregated from xml bits or null
+     * @since 3.0
+     */
+    JspConfigDescriptor getJspConfigDescriptor ();
 
 }
 

Modified: 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=796570&r1=796569&r2=796570&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRegistration.java
Tue Jul 21 22:30:26 2009
@@ -20,13 +20,22 @@
 
 package javax.servlet;
 
+import java.util.Set;
+
 /**
  * @version $Rev$ $Date$
  * @since 3.0
  */
 public interface ServletRegistration extends Registration {
 
-    void addMapping(String... urlPatterns);
+    /**
+     *
+     * @param urlPatterns patterns to map
+     * @return patterns already mapped to another servlet
+     */
+    Set<String> addMapping(String... urlPatterns);
+
+    Iterable<String> getMappings();
 
     public interface Dynamic extends ServletRegistration, Registration.Dynamic {
 

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java?rev=796570&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
Tue Jul 21 22:30:26 2009
@@ -0,0 +1,32 @@
+/*
+ * 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.descriptor;
+
+/**
+ * @version $Rev$ $Date$
+ * @since Servlet 3.0
+ */
+public interface JspConfigDescriptor {
+
+    Iterable<JspPropertyGroupDescriptor> getJspPropertyGroups();
+
+    Iterable<TaglibDescriptor> getTagLibs();
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java?rev=796570&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
Tue Jul 21 22:30:26 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.descriptor;
+
+/**
+ * @version $Rev$ $Date$
+ * @since Servlet 3.0
+ */
+public interface JspPropertyGroupDescriptor {
+
+    String getBuffer();
+
+    String getDefaultContextType();
+
+    String getDeferredSyntaxAllowedAsLiteral();
+
+    String getElIgnored();
+
+    String getErrorOnUndeclaredNamespace();
+
+    Iterable<String> getIncludedCodas();
+
+    Iterable<String> getIncludedPreludes();
+
+    String getIsXml();
+
+    String getPageEncoding();
+
+    String getScriptingInvalid();
+
+    String getTrimDirectiveWhitespace();
+
+    Iterable<String> getUrlPatterms();
+
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java?rev=796570&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
(added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
Tue Jul 21 22:30:26 2009
@@ -0,0 +1,33 @@
+/*
+ * 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.descriptor;
+
+/**
+ * @version $Rev$ $Date$
+ * @since Servlet 3.0
+ */
+public interface TaglibDescriptor {
+
+    String getTaglibLocation();
+
+    String getTablibURI();
+
+}

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

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

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

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java?rev=796570&r1=796569&r2=796570&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponse.java
Tue Jul 21 22:30:26 2009
@@ -484,7 +484,7 @@
      * @return all the header values
      * @since 3.0
      */
-    Iterable<String> getHeaders();
+    Iterable<String> getHeaders(String headerName);
 
     /**
      * @return current http status

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java?rev=796570&r1=796569&r2=796570&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/HttpServletResponseWrapper.java
Tue Jul 21 22:30:26 2009
@@ -109,8 +109,8 @@
         return getHttpServletResponse().getHeaderNames();
     }
 
-    public Iterable<String> getHeaders() {
-        return getHttpServletResponse().getHeaders();
+    public Iterable<String> getHeaders(String headerName) {
+        return getHttpServletResponse().getHeaders(headerName);
     }
 
     public int getStatus() {



Mime
View raw message