geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r901916 - in /geronimo/specs/trunk/geronimo-servlet_3.0_spec: ./ src/main/java/javax/servlet/ src/main/java/javax/servlet/descriptor/ src/main/java/javax/servlet/http/
Date Thu, 21 Jan 2010 23:12:17 GMT
Author: djencks
Date: Thu Jan 21 23:12:17 2010
New Revision: 901916

URL: http://svn.apache.org/viewvc?rev=901916&view=rev
Log:
Fix a bunch of discrepancies with tck signature tests

Modified:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
    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/HttpConstraintElement.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContainerInitializer.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/descriptor/JspConfigDescriptor.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/Cookie.java

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml?rev=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/pom.xml Thu Jan 21 23:12:17 2010
@@ -26,17 +26,17 @@
 
     <parent>
         <groupId>org.apache.geronimo.genesis</groupId>
-        <artifactId>genesis-java5-flava</artifactId>
+        <artifactId>genesis-java6-flava</artifactId>
         <version>2.0</version>
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
     <artifactId>geronimo-servlet_3.0_spec</artifactId>
     <packaging>bundle</packaging>
-    <name>Servlet 3.0 Early Access</name>
+    <name>Servlet 3.0</name>
     <version>1.0-SNAPSHOT</version>
 
-    <description>Servlet 3.0 (early access) API</description>
+    <description>Servlet 3.0 API</description>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
 

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=901916&r1=901915&r2=901916&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
Thu Jan 21 23:12:17 2010
@@ -20,8 +20,8 @@
 
 package javax.servlet;
 
+import java.util.Collection;
 import java.util.EnumSet;
-import java.util.Map;
 
 /**
  * @version $Rev$ $Date$
@@ -34,9 +34,9 @@
 
     void addMappingForUrlPatterns(EnumSet<DispatcherType> dispatcherTypes, boolean
isMatchAfter, String ... urlPatterns);
 
-    Iterable<String> getServletNameMappings();
+    Collection<String> getServletNameMappings();
 
-    Iterable<String> getUrlPatternMappings();
+    Collection<String> getUrlPatternMappings();
 
     public interface Dynamic extends FilterRegistration, Registration.Dynamic {
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java?rev=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/HttpConstraintElement.java
Thu Jan 21 23:12:17 2010
@@ -55,15 +55,15 @@
         this.transportGuarantee = transportGuarantee;
     }
 
-    ServletSecurity.EmptyRoleSemantic getEmptyRoleSemantic() {
+    public ServletSecurity.EmptyRoleSemantic getEmptyRoleSemantic() {
         return emptyRoleSemantic;
     }
 
-    String[] getRolesAllowed() {
+    public String[] getRolesAllowed() {
         return rolesAllowed;
     }
 
-    ServletSecurity.TransportGuarantee getTransportGuarantee() {
+    public ServletSecurity.TransportGuarantee getTransportGuarantee() {
         return transportGuarantee;
     }
 }

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContainerInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContainerInitializer.java?rev=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContainerInitializer.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContainerInitializer.java
Thu Jan 21 23:12:17 2010
@@ -28,6 +28,6 @@
  */
 public interface ServletContainerInitializer {
 
-    void onStartup(Set<Class<?>> classes, ServletContext ctx);
+    void onStartup(Set<Class<?>> classes, ServletContext ctx) throws ServletException;
 
 }

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=901916&r1=901915&r2=901916&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
Thu Jan 21 23:12:17 2010
@@ -26,7 +26,6 @@
 import java.util.EventListener;
 import java.util.Map;
 import java.util.Set;
-import java.util.EnumSet;
 
 import javax.servlet.descriptor.JspConfigDescriptor;
 
@@ -689,7 +688,7 @@
      * @param sessionTrackingModes enumset 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

Modified: 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=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspConfigDescriptor.java
Thu Jan 21 23:12:17 2010
@@ -20,13 +20,15 @@
 
 package javax.servlet.descriptor;
 
+import java.util.Collection;
+
 /**
  * @version $Rev$ $Date$
  * @since Servlet 3.0
  */
 public interface JspConfigDescriptor {
 
-    Iterable<JspPropertyGroupDescriptor> getJspPropertyGroups();
+    Collection<JspPropertyGroupDescriptor> getJspPropertyGroups();
 
-    Iterable<TaglibDescriptor> getTagLibs();
+    Collection<TaglibDescriptor> getTagLibs();
 }

Modified: 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=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
Thu Jan 21 23:12:17 2010
@@ -20,6 +20,8 @@
 
 package javax.servlet.descriptor;
 
+import java.util.Collection;
+
 /**
  * @version $Rev$ $Date$
  * @since Servlet 3.0
@@ -28,7 +30,7 @@
 
     String getBuffer();
 
-    String getDefaultContextType();
+    String getDefaultContentType();
 
     String getDeferredSyntaxAllowedAsLiteral();
 
@@ -36,9 +38,9 @@
 
     String getErrorOnUndeclaredNamespace();
 
-    Iterable<String> getIncludedCodas();
+    Collection<String> getIncludedCodas();
 
-    Iterable<String> getIncludedPreludes();
+    Collection<String> getIncludedPreludes();
 
     String getIsXml();
 
@@ -46,8 +48,8 @@
 
     String getScriptingInvalid();
 
-    String getTrimDirectiveWhitespace();
+    String getTrimDirectiveWhitespaces();
 
-    Iterable<String> getUrlPatterms();
+    Collection<String> getUrlPatterms();
 
 }

Modified: 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=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/descriptor/TaglibDescriptor.java
Thu Jan 21 23:12:17 2010
@@ -28,6 +28,6 @@
 
     String getTaglibLocation();
 
-    String getTablibURI();
+    String getTaglibURI();
 
 }

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/Cookie.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/Cookie.java?rev=901916&r1=901915&r2=901916&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/Cookie.java
(original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/Cookie.java
Thu Jan 21 23:12:17 2010
@@ -19,6 +19,7 @@
 
 package javax.servlet.http;
 
+import java.io.Serializable;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 
@@ -58,11 +59,8 @@
  * @version $Rev$ $Date$
  */
 
-// XXX would implement java.io.Serializable too, but can't do that
-// so long as sun.servlet.* must run on older JDK 1.02 JVMs which
-// don't include that support.
-
-public class Cookie implements Cloneable {
+public class Cookie implements Cloneable, Serializable {
+    private static final long serialVersionUID = -6454587001725327448L;
 
     private static final String LSTRING_FILE =
             "javax.servlet.http.LocalStrings";



Mime
View raw message