geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1858615 [15/32] - in /geronimo/specs/branches/jakarta: geronimo-jakarta-jsp_spec/ geronimo-jakarta-jsp_spec/src/main/java/jakarta/servlet/jsp/ geronimo-jakarta-jsp_spec/src/main/java/jakarta/servlet/jsp/el/ geronimo-jakarta-jsp_spec/src/ma...
Date Sat, 04 May 2019 21:29:41 GMT
Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionAttributeListener.java Sat May  4 21:29:39 2019
@@ -1,50 +1,58 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 import java.util.EventListener;
 
 /**
- * This listener interface can be implemented in order to
- * get notifications of changes to the attribute lists of sessions within
- * this web application.
+ * This listener interface can be implemented in order to get notifications of
+ * changes to the attribute lists of sessions within this web application.
  *
- * @version $Rev$ $Date$
  * @since v 2.3
  */
-
 public interface HttpSessionAttributeListener extends EventListener {
+
     /**
-     * Notification that an attribute has been added to a session. Called after the attribute is added.
+     * Notification that an attribute has been added to a session. Called after
+     * the attribute is added.
+     * The default implementation is a NO-OP.
+     *
+     * @param se Information about the added attribute
      */
-    void attributeAdded(HttpSessionBindingEvent se);
+    public default void attributeAdded(HttpSessionBindingEvent se) {
+    }
 
     /**
-     * Notification that an attribute has been removed from a session. Called after the attribute is removed.
+     * Notification that an attribute has been removed from a session. Called
+     * after the attribute is removed.
+     * The default implementation is a NO-OP.
+     *
+     * @param se Information about the removed attribute
      */
-    void attributeRemoved(HttpSessionBindingEvent se);
+    public default void attributeRemoved(HttpSessionBindingEvent se) {
+    }
 
     /**
-     * Notification that an attribute has been replaced in a session. Called after the attribute is replaced.
+     * Notification that an attribute has been replaced in a session. Called
+     * after the attribute is replaced.
+     * The default implementation is a NO-OP.
+     *
+     * @param se Information about the replaced attribute
      */
-    void attributeReplaced(HttpSessionBindingEvent se);
-
+    public default void attributeReplaced(HttpSessionBindingEvent se) {
+    }
 }
-

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingEvent.java Sat May  4 21:29:39 2019
@@ -1,42 +1,41 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 /**
  * Events of this type are either sent to an object that implements
- * {@link HttpSessionBindingListener} when it is bound or
- * unbound from a session, or to a {@link HttpSessionAttributeListener}
- * that has been configured in the deployment descriptor when any attribute is
- * bound, unbound or replaced in a session.
- * <p/>
- * <p>The session binds the object by a call to
- * <code>HttpSession.setAttribute</code> and unbinds the object
- * by a call to <code>HttpSession.removeAttribute</code>.
+ * {@link HttpSessionBindingListener} when it is bound or unbound from a
+ * session, or to a {@link HttpSessionAttributeListener} that has been
+ * configured in the deployment descriptor when any attribute is bound, unbound
+ * or replaced in a session.
+ * <p>
+ * The session binds the object by a call to
+ * <code>HttpSession.setAttribute</code> and unbinds the object by a call to
+ * <code>HttpSession.removeAttribute</code>.
  *
- * @version $Rev$ $Date$
- * @see HttpSessionAttributeListener
  * @see HttpSession
  * @see HttpSessionBindingListener
+ * @see HttpSessionAttributeListener
  */
 public class HttpSessionBindingEvent extends HttpSessionEvent {
 
+    private static final long serialVersionUID = 1L;
+
     /* The name to which the object is being bound or unbound */
     private final String name;
 
@@ -44,75 +43,77 @@ public class HttpSessionBindingEvent ext
     private final Object value;
 
     /**
-     * Constructs an event that notifies an object that it
-     * has been bound to or unbound from a session.
-     * To receive the event, the object must implement
+     * Constructs an event that notifies an object that it has been bound to or
+     * unbound from a session. To receive the event, the object must implement
      * {@link HttpSessionBindingListener}.
      *
-     * @param session the session to which the object is bound or unbound
-     * @param name    the name with which the object is bound or unbound
-     * @see #getName
-     * @see #getSession
+     * @param session
+     *            the session to which the object is bound or unbound
+     * @param name
+     *            the name with which the object is bound or unbound
+     * @see #getName()
+     * @see #getSession()
      */
     public HttpSessionBindingEvent(HttpSession session, String name) {
         super(session);
         this.name = name;
-        value = null;
+        this.value = null;
     }
 
     /**
-     * Constructs an event that notifies an object that it
-     * has been bound to or unbound from a session.
-     * To receive the event, the object must implement
+     * Constructs an event that notifies an object that it has been bound to or
+     * unbound from a session. To receive the event, the object must implement
      * {@link HttpSessionBindingListener}.
      *
-     * @param session the session to which the object is bound or unbound
-     * @param name    the name with which the object is bound or unbound
-     * @see #getName
-     * @see #getSession
+     * @param session
+     *            the session to which the object is bound or unbound
+     * @param name
+     *            the name with which the object is bound or unbound
+     * @param value
+     *            the object that is bound or unbound
+     * @see #getName()
+     * @see #getSession()
+     * @see #getValue()
      */
-    public HttpSessionBindingEvent(HttpSession session, String name, Object value) {
+    public HttpSessionBindingEvent(HttpSession session, String name,
+            Object value) {
         super(session);
         this.name = name;
         this.value = value;
     }
 
     /**
-     * Return the session that changed.
+     * Get the session that changed.
+     * @return The session that changed
      */
+    @Override
     public HttpSession getSession() {
         return super.getSession();
     }
 
     /**
-     * Returns the name with which the attribute is bound to or
-     * unbound from the session.
+     * Returns the name with which the attribute is bound to or unbound from the
+     * session.
      *
-     * @return a string specifying the name with which
-     *         the object is bound to or unbound from
-     *         the session
+     * @return a string specifying the name with which the object is bound to or
+     *         unbound from the session
      */
     public String getName() {
         return name;
     }
 
     /**
-     * Returns the value of the attribute that has been added, removed or replaced.
-     * If the attribute was added (or bound), this is the value of the attribute. If the attribute was
-     * removed (or unbound), this is the value of the removed attribute. If the attribute was replaced, this
-     * is the old value of the attribute.
+     * Returns the value of the attribute that has been added, removed or
+     * replaced.
+     *
+     * @return If the attribute was added (or bound), this is the value of the
+     *         attribute. If the attribute was removed (or unbound), this is the
+     *         value of the removed attribute. If the attribute was replaced,
+     *         this is the old value of the attribute.
      *
      * @since 2.3
      */
     public Object getValue() {
         return this.value;
     }
-
 }
-
-
-
-
-
-
-

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionBindingListener.java Sat May  4 21:29:39 2019
@@ -1,58 +1,57 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 import java.util.EventListener;
 
 /**
- * Causes an object to be notified when it is bound to
- * or unbound from a session. The object is notified
- * by an {@link HttpSessionBindingEvent} object. This may be as a result
- * of a servlet programmer explicitly unbinding an attribute from a session,
- * due to a session being invalidated, or due to a session timing out.
+ * Causes an object to be notified when it is bound to or unbound from a
+ * session. The object is notified by an {@link HttpSessionBindingEvent} object.
+ * This may be as a result of a servlet programmer explicitly unbinding an
+ * attribute from a session, due to a session being invalidated, or due to a
+ * session timing out.
  *
- * @version $Rev$ $Date$
  * @see HttpSession
  * @see HttpSessionBindingEvent
  */
 public interface HttpSessionBindingListener extends EventListener {
+
     /**
-     * Notifies the object that it is being bound to
-     * a session and identifies the session.
+     * Notifies the object that it is being bound to a session and identifies
+     * the session.
+     * The default implementation is a NO-OP.
      *
-     * @param event the event that identifies the
-     *              session
+     * @param event
+     *            the event that identifies the session
      * @see #valueUnbound
      */
-    void valueBound(HttpSessionBindingEvent event);
-
+    public default void valueBound(HttpSessionBindingEvent event) {
+    }
 
     /**
-     * Notifies the object that it is being unbound
-     * from a session and identifies the session.
+     * Notifies the object that it is being unbound from a session and
+     * identifies the session.
+     * The default implementation is a NO-OP.
      *
-     * @param event the event that identifies
-     *              the session
+     * @param event
+     *            the event that identifies the session
      * @see #valueBound
      */
-    void valueUnbound(HttpSessionBindingEvent event);
-
+    public default void valueUnbound(HttpSessionBindingEvent event) {
+    }
 }
-

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionContext.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionContext.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionContext.java Sat May  4 21:29:39 2019
@@ -1,56 +1,54 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 import java.util.Enumeration;
 
 /**
- * @version $Rev$ $Date$
+ * Do not use.
+ * @deprecated As of Java(tm) Servlet API 2.1 for security reasons, with no
+ *             replacement. This interface will be removed in a future version
+ *             of this API.
  * @see HttpSession
  * @see HttpSessionBindingEvent
  * @see HttpSessionBindingListener
- * @deprecated As of Java(tm) Servlet API 2.1
- *             for security reasons, with no replacement.
- *             This interface will be removed in a future
- *             version of this API.
  */
+@Deprecated
 public interface HttpSessionContext {
 
     /**
-     * @deprecated As of Java Servlet API 2.1 with
-     *             no replacement. This method must
-     *             return null and will be removed in
-     *             a future version of this API.
+     * Do not use.
+     * @param sessionId Ignored
+     * @return Always <code>null</code>
+     * @deprecated As of Java Servlet API 2.1 with no replacement. This method
+     *             must return null and will be removed in a future version of
+     *             this API.
      */
-    HttpSession getSession(String sessionId);
+    @Deprecated
+    public HttpSession getSession(String sessionId);
 
     /**
-     * @deprecated As of Java Servlet API 2.1 with
-     *             no replacement. This method must return
-     *             an empty <code>Enumeration</code> and will be removed
-     *             in a future version of this API.
+     * Do not use.
+     * @return Always an empty Enumeration
+     * @deprecated As of Java Servlet API 2.1 with no replacement. This method
+     *             must return an empty <code>Enumeration</code> and will be
+     *             removed in a future version of this API.
      */
-    Enumeration<String> getIds();
+    @Deprecated
+    public Enumeration<String> getIds();
 }
-
-
-
-
-

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionEvent.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionEvent.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionEvent.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionEvent.java Sat May  4 21:29:39 2019
@@ -1,45 +1,45 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 /**
- * This is the class representing event notifications for
- * changes to sessions within a web application.
+ * This is the class representing event notifications for changes to sessions
+ * within a web application.
  *
- * @version $Rev$ $Date$
  * @since v 2.3
  */
 public class HttpSessionEvent extends java.util.EventObject {
+    private static final long serialVersionUID = 1L;
 
     /**
      * Construct a session event from the given source.
+     *
+     * @param source    The HTTP session where the change took place
      */
     public HttpSessionEvent(HttpSession source) {
         super(source);
     }
 
     /**
-     * Return the session that changed.
+     * Get the session that changed.
+     *
+     * @return The session that changed
      */
     public HttpSession getSession() {
         return (HttpSession) super.getSource();
     }
 }
-

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionIdListener.java Sat May  4 21:29:39 2019
@@ -1,47 +1,41 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 import java.util.EventListener;
 
 /**
- * Interface for receiving notification events about HttpSession id changes.
- * <p/>
- * In order to receive these notification events, the implementation class must be either declared in the deployment
- * descriptor of the web application, annotated with WebListener, or registered via one of the addListener methods
- * defined on ServletContext.
- * <p/>
- * The order in which implementations of this interface are invoked is unspecified.
- * 
+ * Implementations of this interface are notified when an {@link HttpSession}'s
+ * ID changes. To receive notification events, the implementation class must be
+ * configured in the deployment descriptor for the web application, annotated
+ * with {@link javax.servlet.annotation.WebListener} or registered by calling an
+ * addListener method on the {@link javax.servlet.ServletContext}.
+ *
+ * @see HttpSessionEvent
+ * @see HttpServletRequest#changeSessionId()
  * @since Servlet 3.1
  */
 public interface HttpSessionIdListener extends EventListener {
 
     /**
-     * Receives notification that session id has been changed in a session.
-     * 
-     * @param event
-     *            the HttpSessionBindingEvent containing the session and the name and (old) value of the attribute that
-     *            was replaced
-     * @param oldSessionId
-     *            the old session id
+     * Notification that a session ID has been changed.
+     *
+     * @param se the notification event
+     * @param oldSessionId the old session ID
      */
-    void sessionIdChanged(HttpSessionEvent event, String oldSessionId);
+    public void sessionIdChanged(HttpSessionEvent se, String oldSessionId);
 }

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionListener.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionListener.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpSessionListener.java Sat May  4 21:29:39 2019
@@ -1,52 +1,51 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 import java.util.EventListener;
 
 /**
- * Implementations of this interface are notified of changes to the
- * list of active sessions in a web application.
- * To receive notification events, the implementation class
- * must be configured in the deployment descriptor for the web application.
+ * Implementations of this interface are notified of changes to the list of
+ * active sessions in a web application. To receive notification events, the
+ * implementation class must be configured in the deployment descriptor for the
+ * web application.
  *
- * @version $Rev$ $Date$
  * @see HttpSessionEvent
  * @since v 2.3
  */
-
 public interface HttpSessionListener extends EventListener {
 
     /**
      * Notification that a session was created.
+     * The default implementation is a NO-OP.
      *
-     * @param se the notification event
+     * @param se
+     *            the notification event
      */
-    void sessionCreated(HttpSessionEvent se);
+    public default void sessionCreated(HttpSessionEvent se) {
+    }
 
     /**
      * Notification that a session is about to be invalidated.
+     * The default implementation is a NO-OP.
      *
-     * @param se the notification event
+     * @param se
+     *            the notification event
      */
-    void sessionDestroyed(HttpSessionEvent se);
-
+    public default void sessionDestroyed(HttpSessionEvent se) {
+    }
 }
-

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUpgradeHandler.java Sat May  4 21:29:39 2019
@@ -1,44 +1,42 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 /**
- * 
- * This interface encapsulates the upgrade protocol processing. A HttpUpgradeHandler implementation would allow the
- * servlet container to communicate with it.
- * 
+ * Interface between the HTTP upgrade process and the new protocol.
+ *
  * @since Servlet 3.1
  */
 public interface HttpUpgradeHandler {
 
     /**
-     * It is called when the client is disconnected.
+     * This method is called once the request/response pair where
+     * {@link HttpServletRequest#upgrade(Class)} is called has completed
+     * processing and is the point where control of the connection passes from
+     * the container to the {@link HttpUpgradeHandler}.
+     *
+     * @param connection    The connection that has been upgraded
+     *
+     * @since Servlet 3.1
      */
-    void destroy();
+    void init(WebConnection connection);
 
     /**
-     * It is called once the HTTP Upgrade process has been completed and the upgraded connection is ready to start using
-     * the new protocol.
-     * 
-     * @param wc
-     *            - the WebConnection object associated to this upgrade request
+     * This method is called after the upgraded connection has been closed.
      */
-    void init(WebConnection wc);
+    void destroy();
 }

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/HttpUtils.java Sat May  4 21:29:39 2019
@@ -1,54 +1,56 @@
 /*
- * 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.http;
+* 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.
+*/
 
-import javax.servlet.ServletInputStream;
+package jakarta.servlet.http;
 
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.ResourceBundle;
 import java.util.StringTokenizer;
-import java.io.IOException;
+
+import jakarta.servlet.ServletInputStream;
 
 /**
- * @version $Rev$ $Date$
- * @deprecated As of Java(tm) Servlet API 2.3.
- *             These methods were only useful
- *             with the default encoding and have been moved
- *             to the request interfaces.
+ * @deprecated            As of Java(tm) Servlet API 2.3.
+ *                        These methods were only useful
+ *                        with the default encoding and have been moved
+ *                        to the request interfaces.
  */
-
-
+@Deprecated
 public class HttpUtils {
 
     private static final String LSTRING_FILE =
-            "javax.servlet.http.LocalStrings";
-    private static ResourceBundle lStrings =
-            ResourceBundle.getBundle(LSTRING_FILE);
+        "javax.servlet.http.LocalStrings";
+    private static final ResourceBundle lStrings =
+        ResourceBundle.getBundle(LSTRING_FILE);
+
 
     /**
      * Constructs an empty <code>HttpUtils</code> object.
+     *
      */
     public HttpUtils() {
+        // NOOP
     }
 
+
     /**
+     *
      * Parses a query string passed from the client to the
      * server and builds a <code>HashTable</code> object
      * with key-value pairs.
@@ -56,34 +58,37 @@ public class HttpUtils {
      * packaged by the GET or POST method, that is, it
      * should have key-value pairs in the form <i>key=value</i>,
      * with each pair separated from the next by a &amp; character.
-     * <p/>
+     *
      * <p>A key can appear more than once in the query string
      * with different values. However, the key appears only once in
      * the hashtable, with its value being
      * an array of strings containing the multiple values sent
      * by the query string.
-     * <p/>
+     *
      * <p>The keys and values in the hashtable are stored in their
      * decoded form, so
      * any + characters are converted to spaces, and characters
      * sent in hexadecimal notation (like <i>%xx</i>) are
      * converted to ASCII characters.
      *
-     * @param s a string containing the query to be parsed
-     * @return a <code>HashTable</code> object built
-     *         from the parsed key-value pairs
-     * @throws IllegalArgumentException if the query string
-     *                                  is invalid
+     * @param s                a string containing the query to be parsed
+     *
+     * @return                a <code>HashTable</code> object built
+     *                         from the parsed key-value pairs
+     *
+     * @exception IllegalArgumentException        if the query string
+     *                                                is invalid
+     *
      */
-    static public Hashtable<String, String[]> parseQueryString(String s) {
+    public static Hashtable<String,String[]> parseQueryString(String s) {
 
-        String valArray[];
+        String valArray[] = null;
 
         if (s == null) {
             throw new IllegalArgumentException();
         }
-        Hashtable<String, String[]> ht = new Hashtable<String, String[]>();
-        StringBuffer sb = new StringBuffer();
+        Hashtable<String,String[]> ht = new Hashtable<>();
+        StringBuilder sb = new StringBuilder();
         StringTokenizer st = new StringTokenizer(s, "&");
         while (st.hasMoreTokens()) {
             String pair = st.nextToken();
@@ -94,11 +99,10 @@ public class HttpUtils {
                 throw new IllegalArgumentException();
             }
             String key = parseName(pair.substring(0, pos), sb);
-            String val = parseName(pair.substring(pos + 1, pair.length()), sb);
+            String val = parseName(pair.substring(pos+1, pair.length()), sb);
             if (ht.containsKey(key)) {
                 String oldVals[] = ht.get(key);
-                valArray = new String[oldVals.length + 1];
-                System.arraycopy(oldVals, 0, valArray, 0, oldVals.length);
+                valArray = Arrays.copyOf(oldVals, oldVals.length + 1);
                 valArray[oldVals.length] = val;
             } else {
                 valArray = new String[1];
@@ -109,163 +113,164 @@ public class HttpUtils {
         return ht;
     }
 
+
     /**
+     *
      * Parses data from an HTML form that the client sends to
      * the server using the HTTP POST method and the
      * <i>application/x-www-form-urlencoded</i> MIME type.
-     * <p/>
+     *
      * <p>The data sent by the POST method contains key-value
      * pairs. A key can appear more than once in the POST data
      * with different values. However, the key appears only once in
      * the hashtable, with its value being
      * an array of strings containing the multiple values sent
      * by the POST method.
-     * <p/>
+     *
      * <p>The keys and values in the hashtable are stored in their
      * decoded form, so
      * any + characters are converted to spaces, and characters
      * sent in hexadecimal notation (like <i>%xx</i>) are
      * converted to ASCII characters.
      *
-     * @param len an integer specifying the length,
-     *            in characters, of the
-     *            <code>ServletInputStream</code>
-     *            object that is also passed to this
-     *            method
-     * @param in  the <code>ServletInputStream</code>
-     *            object that contains the data sent
-     *            from the client
-     * @return a <code>HashTable</code> object built
-     *         from the parsed key-value pairs
-     * @throws IllegalArgumentException if the data
-     *                                  sent by the POST method is invalid
+     *
+     *
+     * @param len        an integer specifying the length,
+     *                        in characters, of the
+     *                        <code>ServletInputStream</code>
+     *                        object that is also passed to this
+     *                        method
+     *
+     * @param in        the <code>ServletInputStream</code>
+     *                        object that contains the data sent
+     *                        from the client
+     *
+     * @return                a <code>HashTable</code> object built
+     *                        from the parsed key-value pairs
+     *
+     *
+     * @exception IllegalArgumentException        if the data
+     *                        sent by the POST method is invalid
+     *
      */
-
-
-    static public Hashtable<String, String[]> parsePostData(int len,
-                                                            ServletInputStream in) {
+    public static Hashtable<String,String[]> parsePostData(int len,
+                                          ServletInputStream in) {
         // XXX
         // should a length of 0 be an IllegalArgumentException
 
-        if (len <= 0)
-            return new Hashtable<String, String[]>(); // cheap hack to return an empty hash
+        // cheap hack to return an empty hash
+        if (len <=0)
+            return new Hashtable<>();
 
         if (in == null) {
             throw new IllegalArgumentException();
         }
 
-        //
         // Make sure we read the entire POSTed body.
-        //
-        byte[] postedBytes = new byte[len];
+        byte[] postedBytes = new byte [len];
         try {
             int offset = 0;
 
             do {
-                int inputLen = in.read(postedBytes, offset, len - offset);
+                int inputLen = in.read (postedBytes, offset, len - offset);
                 if (inputLen <= 0) {
                     String msg = lStrings.getString("err.io.short_read");
-                    throw new IllegalArgumentException(msg);
+                    throw new IllegalArgumentException (msg);
                 }
                 offset += inputLen;
             } while ((len - offset) > 0);
 
         } catch (IOException e) {
-            throw new IllegalArgumentException(e.getMessage());
+            throw new IllegalArgumentException(e.getMessage(), e);
         }
 
         // XXX we shouldn't assume that the only kind of POST body
         // is FORM data encoded using ASCII or ISO Latin/1 ... or
         // that the body should always be treated as FORM data.
-        //
-
         try {
             String postedBody = new String(postedBytes, 0, len, "8859_1");
             return parseQueryString(postedBody);
         } catch (java.io.UnsupportedEncodingException e) {
             // XXX function should accept an encoding parameter & throw this
             // exception.  Otherwise throw something expected.
-            throw new IllegalArgumentException(e.getMessage());
+            throw new IllegalArgumentException(e.getMessage(), e);
         }
     }
 
 
     /*
-    * Parse a name in the query string.
-    */
-    static private String parseName(String s, StringBuffer sb) {
+     * Parse a name in the query string.
+     */
+    private static String parseName(String s, StringBuilder sb) {
         sb.setLength(0);
         for (int i = 0; i < s.length(); i++) {
             char c = s.charAt(i);
             switch (c) {
-                case '+':
-                    sb.append(' ');
-                    break;
-                case '%':
-                    try {
-                        sb.append((char) Integer.parseInt(s.substring(i + 1, i + 3),
-                                16));
-                        i += 2;
-                    } catch (NumberFormatException e) {
-                        // XXX
-                        // need to be more specific about illegal arg
-                        throw new IllegalArgumentException();
-                    } catch (StringIndexOutOfBoundsException e) {
-                        String rest = s.substring(i);
-                        sb.append(rest);
-                        if (rest.length() == 2)
-                            i++;
-                    }
-
-                    break;
-                default:
-                    sb.append(c);
-                    break;
+            case '+':
+                sb.append(' ');
+                break;
+            case '%':
+                try {
+                    sb.append((char) Integer.parseInt(s.substring(i+1, i+3),
+                                                      16));
+                    i += 2;
+                } catch (NumberFormatException e) {
+                    // XXX
+                    // need to be more specific about illegal arg
+                    throw new IllegalArgumentException();
+                } catch (StringIndexOutOfBoundsException e) {
+                    String rest  = s.substring(i);
+                    sb.append(rest);
+                    if (rest.length()==2)
+                        i++;
+                }
+
+                break;
+            default:
+                sb.append(c);
+                break;
             }
         }
         return sb.toString();
     }
 
+
     /**
+     *
      * Reconstructs the URL the client used to make the request,
      * using information in the <code>HttpServletRequest</code> object.
      * The returned URL contains a protocol, server name, port
      * number, and server path, but it does not include query
      * string parameters.
-     * <p/>
+     *
      * <p>Because this method returns a <code>StringBuffer</code>,
      * not a string, you can modify the URL easily, for example,
      * to append query parameters.
-     * <p/>
+     *
      * <p>This method is useful for creating redirect messages
      * and for reporting errors.
      *
-     * @param req a <code>HttpServletRequest</code> object
-     *            containing the client's request
-     * @return a <code>StringBuffer</code> object containing
-     *         the reconstructed URL
+     * @param req        a <code>HttpServletRequest</code> object
+     *                        containing the client's request
+     *
+     * @return                a <code>StringBuffer</code> object containing
+     *                        the reconstructed URL
+     *
      */
-    public static StringBuffer getRequestURL(HttpServletRequest req) {
-        StringBuffer url = new StringBuffer();
-        String scheme = req.getScheme();
-        int port = req.getServerPort();
+    public static StringBuffer getRequestURL (HttpServletRequest req) {
+        StringBuffer url = new StringBuffer ();
+        String scheme = req.getScheme ();
+        int port = req.getServerPort ();
         String urlPath = req.getRequestURI();
 
-        //String		servletPath = req.getServletPath ();
-        //String		pathInfo = req.getPathInfo ();
-
-        url.append(scheme);                // http, https
-        url.append("://");
-        url.append(req.getServerName());
-        if ((scheme.equals("http") && port != 80)
-                || (scheme.equals("https") && port != 443)) {
-            url.append(':');
-            url.append(req.getServerPort());
+        url.append (scheme);                // http, https
+        url.append ("://");
+        url.append (req.getServerName ());
+        if ((scheme.equals ("http") && port != 80) || (scheme.equals ("https") && port != 443)) {
+            url.append (':');
+            url.append (req.getServerPort ());
         }
-        //if (servletPath != null)
-        //    url.append (servletPath);
-        //if (pathInfo != null)
-        //    url.append (pathInfo);
+
         url.append(urlPath);
         return url;
     }

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/Part.java Sat May  4 21:29:39 2019
@@ -1,132 +1,137 @@
 /*
- * 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.http;
+* 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 jakarta.servlet.http;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collection;
 
 /**
- * multipart/form-data part or form item
+ * This class represents a part as uploaded to the server as part of a
+ * <code>multipart/form-data</code> request body. The part may represent either
+ * an uploaded file or form data.
  *
- * @version $Rev$ $Date$
- * @since 3.0
+ * @since Servlet 3.0
  */
 public interface Part {
 
     /**
-     * Deletes the underlying storage for a file item, including deleting any associated temporary disk file.
-     * 
-     * @throws IOException
-     *             if an error occurs.
-     */
-    void delete() throws IOException;
-
-    /**
-     * Gets the content type of this part.
-     * 
-     * @return The content type of this part.
+     * Obtain an <code>InputStream</code> that can be used to retrieve the
+     * contents of the file.
+     *
+     * @return An InputStream for the contents of the file
+     *
+     * @throws IOException if an I/O occurs while obtaining the stream
      */
-    String getContentType();
+    public InputStream getInputStream() throws IOException;
 
     /**
-     * Returns the value of the specified mime header as a String. If the Part did not include a header of the specified
-     * name, this method returns null. If there are multiple headers with the same name, this method returns the first
-     * header in the part. The header name is case insensitive. You can use this method with any request header.
-     * 
-     * @param headerName
-     *            a String specifying the header name
-     * @return a String containing the value of the requested header, or null if the part does not have a header of that
-     *         name
+     * Obtain the content type passed by the browser.
+     *
+     * @return The content type passed by the browser or <code>null</code> if
+     *         not defined.
      */
-    String getHeader(String headerName);
+    public String getContentType();
 
     /**
-     * Gets the header names of this Part.
-     * <p>
-     * Some servlet containers do not allow servlets to access headers using this method, in which case this method
-     * returns null
-     * <p/>
-     * Any changes to the returned Collection must not affect this Part.
-     * 
-     * @return a (possibly empty) Collection of the header names of this Part
-     */
-    Collection<String> getHeaderNames();
-
-    /**
-     * Gets the values of the Part header with the given name.
-     * <p/>
-     * Any changes to the returned Collection must not affect this Part.
-     * <p/>
-     * Part header names are case insensitive.
-     * 
-     * @param headerNamethe
-     *            header name whose values to return
-     * @return a (possibly empty) Collection of the values of the header with the given name
+     * Obtain the name of the field in the multipart form corresponding to this
+     * part.
+     *
+     * @return The name of the field in the multipart form corresponding to this
+     *         part.
      */
-    Collection<String> getHeaders(String headerName);
+    public String getName();
 
     /**
-     * Gets the content of this part as an InputStream
-     * 
-     * @return The content of this part as an InputStream
-     * @throws IOException
-     *             If an error occurs in retrieving the contet as an InputStream
+     * If this part represents an uploaded file, gets the file name submitted
+     * in the upload. Returns {@code null} if no file name is available or if
+     * this part is not a file upload.
+     *
+     * @return the submitted file name or {@code null}.
+     *
+     * @since Servlet 3.1
      */
-    InputStream getInputStream() throws IOException;
+    public String getSubmittedFileName();
 
     /**
-     * Gets the name of this part
-     * 
-     * @return The name of this part as a String
+     * Obtain the size of this part.
+     *
+     * @return The size of the part if bytes
+     */
+    public long getSize();
+
+    /**
+     * A convenience method to write an uploaded part to disk. The client code
+     * is not concerned with whether or not the part is stored in memory, or on
+     * disk in a temporary location. They just want to write the uploaded part
+     * to a file.
+     *
+     *  This method is not guaranteed to succeed if called more than once for
+     *  the same part. This allows a particular implementation to use, for
+     *  example, file renaming, where possible, rather than copying all of the
+     *  underlying data, thus gaining a significant performance benefit.
+     *
+     * @param fileName  The location into which the uploaded part should be
+     *                  stored. Relative locations are relative to {@link
+     *                  javax.servlet.MultipartConfigElement#getLocation()}
+     *
+     * @throws IOException if an I/O occurs while attempting to write the part
+     */
+    public void write(String fileName) throws IOException;
+
+    /**
+     * Deletes the underlying storage for a part, including deleting any
+     * associated temporary disk file. Although the container will delete this
+     * storage automatically this method can be used to ensure that this is done
+     * at an earlier time, thus preserving system resources.
+     * <p>
+     * Containers are only required to delete the associated storage when the
+     * Part instance is garbage collected. Apache Tomcat will delete the
+     * associated storage when the associated request has finished processing.
+     * Behaviour of other containers may be different.
+     *
+     * @throws IOException if an I/O occurs while attempting to delete the part
      */
-    String getName();
+    public void delete() throws IOException;
 
     /**
-     * Returns the size of this fille.
-     * 
-     * @return a long specifying the size of this part, in bytes.
+     * Obtains the value of the specified part header as a String. If there are
+     * multiple headers with the same name, this method returns the first header
+     * in the part. The header name is case insensitive.
+     *
+     * @param name  Header name
+     * @return      The header value or <code>null</code> if the header is not
+     *              present
      */
-    long getSize();
+    public String getHeader(String name);
 
     /**
-     * Gets the file name specified by the client.
-     * 
-     * @return the submitted file name
-     * @since Servlet 3.1
+     * Obtain all the values of the specified part header.
+     * @param name The name of the header of interest. The header name is case
+     *             insensitive.
+     * @return All the values of the specified part header. If the part did not
+     *         include any headers of the specified name, this method returns an
+     *         empty Collection.
      */
-    String getSubmittedFileName();
+    public Collection<String> getHeaders(String name);
 
     /**
-     * A convenience method to write this uploaded item to disk.
-     * <p/>
-     * This method is not guaranteed to succeed if called more than once for the same part. This allows a particular
-     * implementation to use, for example, file renaming, where possible, rather than copying all of the underlying
-     * data, thus gaining a significant performance benefit.
-     * 
-     * @param fileName
-     *            the name of the file to which the stream will be written. The file is created relative to the location
-     *            as specified in the MultipartConfig
-     * @throws IOException
-     *             if an error occurs.
+     * Get the header names provided for this part.
+     * @return a Collection of all the header names provided for this part.
      */
-    void write(String fileName) throws IOException;
-    
+    public Collection<String> getHeaderNames();
 }

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/WebConnection.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/WebConnection.java?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/WebConnection.java (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/java/jakarta/servlet/http/WebConnection.java Sat May  4 21:29:39 2019
@@ -1,53 +1,51 @@
 /*
- * 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
+ * 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
+ *     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.
+ * 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.http;
+package jakarta.servlet.http;
 
 import java.io.IOException;
 
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletOutputStream;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletOutputStream;
 
 /**
- * 
- * This interface encapsulates the connection for an upgrade request. It allows the protocol handler to send service
- * requests and status queries to the container.
- * 
+ * The interface used by a {@link HttpUpgradeHandler} to interact with an upgraded
+ * HTTP connection.
+ *
  * @since Servlet 3.1
  */
 public interface WebConnection extends AutoCloseable {
 
     /**
-     * Returns an input stream for this web connection.
-     * 
-     * @return a ServletInputStream for reading binary data
-     * @throws IOException
-     *             if an I/O error occurs
+     * Provides access to the {@link ServletInputStream} for reading data from
+     * the client.
+     *
+     * @return the input stream
+     *
+     * @throws IOException If an I/O occurs while obtaining the stream
      */
     ServletInputStream getInputStream() throws IOException;
 
     /**
-     * Returns an output stream for this web connection.
-     * 
-     * @return a ServletOutputStream for writing binary data
-     * @throws IOException
-     *             if an I/O error occurs
+     * Provides access to the {@link ServletOutputStream} for writing data to
+     * the client.
+     *
+     * @return the output stream
+     *
+     * @throws IOException If an I/O occurs while obtaining the stream
      */
     ServletOutputStream getOutputStream() throws IOException;
-}
+}
\ No newline at end of file

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings.properties?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings.properties (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings.properties Sat May  4 21:29:39 2019
@@ -1,29 +1,26 @@
-##
-## 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.
-##
+# 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.
 
-##
-## $Rev$ $Date$
-##
+err.not_iso8859_1=Not an ISO 8859-1 character: [{0}]
 
-# Default localized string information
-# Localized for Locale en_US
+httpConstraintElement.invalidRolesDeny=Roles may not be specified when using DENY
+
+httpMethodConstraintElement.invalidMethod=Invalid HTTP method
+
+wrapper.nullRequest=Request cannot be null
+wrapper.nullResponse=Response cannot be null
 
-err.not_iso8859_1=Not an ISO 8859-1 character: {0}
-value.true=true
 value.false=false
+value.true=true

Added: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_cs.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_cs.properties?rev=1858615&view=auto
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_cs.properties (added)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_cs.properties Sat May  4 21:29:39 2019
@@ -0,0 +1,16 @@
+# 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.
+
+httpMethodConstraintElement.invalidMethod=Neplatná HTTP metoda

Propchange: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_cs.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_de.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_de.properties?rev=1858615&view=auto
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_de.properties (added)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_de.properties Sat May  4 21:29:39 2019
@@ -0,0 +1,22 @@
+# 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.
+
+err.not_iso8859_1=Kein ISO 8859-1 Zeichen: [{0}]
+
+httpMethodConstraintElement.invalidMethod=Ungültige HTTP-Methode
+
+value.true=wahr
+
+wrapper.nullResponse=Der Response darf nicht 'null' sein

Propchange: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_es.properties?rev=1858615&view=auto
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_es.properties (added)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_es.properties Sat May  4 21:29:39 2019
@@ -0,0 +1,23 @@
+# 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.
+
+err.not_iso8859_1=No es un carácter ISO 8859-1: [{0}]
+
+httpConstraintElement.invalidRolesDeny=No se pueden especificar Roles al utilizar DENY (DENEGAR)
+
+httpMethodConstraintElement.invalidMethod=Método HTTP inválido
+
+value.false=false
+value.true=true

Propchange: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_es.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_fr.properties?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_fr.properties (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_fr.properties Sat May  4 21:29:39 2019
@@ -1,31 +1,26 @@
-##
-## 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.
-##
+# 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.
 
-##
-## $Rev$ $Date$
-##
+err.not_iso8859_1=[{0}] n''est pas un caractère ISO 8859-1
 
-# Default localized string information
-# Localized for Locale fr_FR
+httpConstraintElement.invalidRolesDeny=Des rôles ne peuvent pas être spécifiés lorsque DENY est utilisé
 
-err.not_iso8859_1={0} n''est pas un caractère ISO 8859-1
-value.true=true
-value.false=false 
+httpMethodConstraintElement.invalidMethod=Méthode HTTP invalide
 
+value.false=false
+value.true=true
 
+wrapper.nullRequest=La requête ne peut pas être null
+wrapper.nullResponse=La réponse ne peut pas être null

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ja.properties?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ja.properties (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ja.properties Sat May  4 21:29:39 2019
@@ -1,29 +1,26 @@
-##
-## 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.
-##
+# 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.
 
-##
-## $Rev$ $Date$
-##
+err.not_iso8859_1=ISO 8859-1 の文字ではありません: [{0}]
 
-# Default localized string information
-# Localized for Locale ja_JP
+httpConstraintElement.invalidRolesDeny=DENYを使用する場合、Roleを指定することはできません。
+
+httpMethodConstraintElement.invalidMethod=無効なHTTPメソッド
 
-err.not_iso8859_1=ISO 8859-1 \u306e\u6587\u5b57\u3067\u306f\u3042\u308a\u307e\u305b\u3093: {0}
-value.true=true
 value.false=false
+value.true=true
+
+wrapper.nullRequest=リクエストには null を指定できません。
+wrapper.nullResponse=レスポンスには null を指定できません。

Added: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ko.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ko.properties?rev=1858615&view=auto
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ko.properties (added)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ko.properties Sat May  4 21:29:39 2019
@@ -0,0 +1,26 @@
+# 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.
+
+err.not_iso8859_1=ISO 8859-1 문자가 아닙니다: [{0}]
+
+httpConstraintElement.invalidRolesDeny=DENY를 사용할 때에는 역할들이 지정될 수 없습니다.
+
+httpMethodConstraintElement.invalidMethod=유효하지 않은 HTTP 메소드
+
+value.false=false
+value.true=true
+
+wrapper.nullRequest=요청이 널이어서는 안됩니다.
+wrapper.nullResponse=응답이 널일 수는 없습니다.

Propchange: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_ko.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_zh_CN.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_zh_CN.properties?rev=1858615&view=auto
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_zh_CN.properties (added)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_zh_CN.properties Sat May  4 21:29:39 2019
@@ -0,0 +1,22 @@
+# 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.
+
+err.not_iso8859_1=不是ISO 8859-1字符:[{0}]
+
+httpConstraintElement.invalidRolesDeny=使用 DENY 时可能未指定角色
+
+httpMethodConstraintElement.invalidMethod=无效的HTTP.方法
+
+value.true=true

Propchange: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/LocalStrings_zh_CN.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/http/LocalStrings.properties
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/http/LocalStrings.properties?rev=1858615&r1=1858614&r2=1858615&view=diff
==============================================================================
--- geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/http/LocalStrings.properties (original)
+++ geronimo/specs/branches/jakarta/geronimo-jakarta-servlet_spec/src/main/resources/javax/servlet/http/LocalStrings.properties Sat May  4 21:29:39 2019
@@ -1,36 +1,27 @@
-##
-## 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.
-##
+# 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.
 
-##
-## $Rev$ $Date$
-##
-
-# Default localized string information
-# Localized for Locale en_US
-
-err.cookie_name_is_token=Cookie name \"{0}\" is a reserved token
-err.io.negativelength=Negative Length given in write method
+err.cookie_name_blank=Cookie name may not be null or zero length
+err.cookie_name_is_token=Cookie name [{0}] is a reserved token
+err.io.indexOutOfBounds=Invalid offset [{0}] and / or length [{1}] specified for array of size [{2}]
+err.io.nullArray=Null passed for byte array in write method
 err.io.short_read=Short Read
 
-http.method_not_implemented=Method {0} is not defined in RFC 2068 and is not supported by the Servlet API 
-
+http.method_delete_not_supported=HTTP method DELETE is not supported by this URL
 http.method_get_not_supported=HTTP method GET is not supported by this URL
+http.method_not_implemented=Method [{0}] is not implemented by this Servlet for this URI
 http.method_post_not_supported=HTTP method POST is not supported by this URL
 http.method_put_not_supported=HTTP method PUT is not supported by this URL
-http.method_delete_not_supported=Http method DELETE is not supported by this URL
+http.non_http=Non HTTP request or response



Mime
View raw message