geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r675701 - in /geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet: ./ http/annotation/ http/annotation/jaxrs/
Date Thu, 10 Jul 2008 19:49:52 GMT
Author: djencks
Date: Thu Jul 10 12:49:52 2008
New Revision: 675701

URL: http://svn.apache.org/viewvc?rev=675701&view=rev
Log:
implement the rest of the servlet 3.0 edr spec api from javadoc

Added:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionCookieConfig.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionTrackingMode.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/FilterMapping.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/InitParam.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/Servlet.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletContextListener.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletFilter.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/DELETE.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/GET.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HEAD.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HttpMethod.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/POST.java   (with props)
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/PUT.java   (with props)
Modified:
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestListener.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponse.java
    geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponseWrapper.java

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/DispatcherType.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public enum DispatcherType {
+
+    ERROR,
+    FORWARD,
+    INCLUDE,
+    REQUEST
+}

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

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

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

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletContext.java?rev=675701&r1=675700&r2=675701&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 Jul 10 12:49:52 2008
@@ -24,6 +24,8 @@
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Set;
+import java.util.Map;
+import java.util.EnumSet;
 
 
 /**
@@ -644,6 +646,72 @@
      */
     
     public String getServletContextName();
+
+    /**
+     * Add the specified servlet to the context
+     * @param servletName servlet's name
+     * @param description description of servlet
+     * @param className class name of servlet
+     * @param initParameters init parameters for servlet
+     * @param loadOnStartup load on startup order.
+     * @throws IllegalArgumentException duplicate servletName
+     * @throws IllegalStateException this method called after #initialize
+     *
+     * @since 3.0
+     */
+    void addServlet(String servletName,
+                    String description,
+                    String className,
+                    Map<String, String> initParameters,
+                    int loadOnStartup) throws IllegalArgumentException, IllegalStateException;
+
+    /**
+     * Add the specified servlet mappings
+     * @param servletName name of servlet mapping applies to
+     * @param urlPatterns url patterns for the mapping
+     * @throws IllegalArgumentException if urlPatterns are null or empty
+     * @throws IllegalStateException if called after #initialize
+     *
+     * @since 3.0
+     */
+    void addServletMapping(String servletName,
+                           String[] urlPatterns) throws IllegalArgumentException, IllegalStateException;
+
+    /**
+     * Add a filter to this context
+     * @param filterName name of filter
+     * @param description description of filter
+     * @param className class name of filter
+     * @param initParams init params for filter
+     * @throws IllegalArgumentException duplicate filter name
+     * @throws IllegalStateException if called after #initialise
+     *
+     * @since 3.0
+     */
+    void addFilter(String filterName,
+                   String description,
+                   String className,
+                   Map<String, String> initParams) throws IllegalArgumentException, IllegalStateException;
+
+
+    /**
+     * Add a filter mapping to this context
+     * @param filterName name of filter mapping applies to
+     * @param urlPatterns url patterns for mapping
+     * @param servletNames servlet names for mapping
+     * @param dispatcherTypes dispatcher types for mapping
+     * @param isMatchAfter before or after xml or annotation specified filter mappings
+     * @throws IllegalArgumentException bad url patterns
+     * @throws IllegalStateException if called after #initialize
+     *
+     * @since 3.0
+     */
+    void addFilterMapping(String filterName,
+                          String[] urlPatterns,
+                          String[] servletNames,
+                          EnumSet<DispatcherType> dispatcherTypes,
+                          boolean isMatchAfter) throws IllegalArgumentException, IllegalStateException;
+
 }
 
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java?rev=675701&r1=675700&r2=675701&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequest.java Thu Jul 10 12:49:52 2008
@@ -47,9 +47,6 @@
 
 public interface ServletRequest {
 
-
-
-
     /**
      *
      * Returns the value of the named attribute as an <code>Object</code>,
@@ -346,7 +343,7 @@
      * @return					a <code>BufferedReader</code>
      *						containing the body of the request	
      *
-     * @exception UnsupportedEncodingException 	if the character set encoding
+     * @exception java.io.UnsupportedEncodingException         if the character set encoding
      * 						used is not supported and the 
      *						text cannot be decoded
      *
@@ -597,5 +594,80 @@
      */
     public int getLocalPort();
 
+    /**
+     * Get the servlet context the request-response pair was last dispatched through.
+     * @return the latest ServletContext on the dispatch chain.
+     * @since 3.0
+     */
+    ServletContext getServletContext();
+
+    /**
+     * Gets the associated servlet response.
+     * @return the ServletResponse associated with this request.
+     * @since 3.0
+     */
+    ServletResponse getServletResponse();
+
+    /**
+      * complete a suspended request.
+      * @throws IllegalStateException
+      * @since 3.0
+      */
+    void complete() throws IllegalStateException;
+
+    /**
+     * Suspend request processing.  Must be called by a thread that is processing this request.
+     * @param timeoutMilliseconds new timeout period, in milliseconds
+     * @throws IllegalStateException if called by a thread not processing this request or after error dispatch
+     * @since 3.0
+     * @see #complete
+     * @see #resume
+     */
+    void suspend(long timeoutMilliseconds) throws IllegalStateException;
+
+    /**
+     * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
+     * @throws IllegalStateException
+     * @since 3.0
+     * @see #complete
+     * @see #resume
+     */
+    void suspend() throws IllegalStateException;
+
+    /**
+     * Resume a suspended request 
+     * @throws IllegalStateException if the request is not suspended
+     * @since 3.0
+     * @see #suspend
+     */
+    void resume() throws IllegalStateException;
+
+    /**
+     *
+     * @return if the request is suspended
+     * @since 3.0
+     */
+    boolean isSuspended();
+
+    /**
+     *
+     * @return if the request is resumed
+     * @since 3.0
+     */
+    boolean isResumed();
+
+    /**
+     *
+     * @return if the request is timed out
+     * @since 3.0
+     */
+    boolean isTimeout();
+
+    /**
+     *
+     * @return if the request has never been suspended (or resumed)
+     * @since 3.0
+     */
+    boolean isInitial();
 }
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestListener.java?rev=675701&r1=675700&r2=675701&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestListener.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestListener.java Thu Jul 10 12:49:52 2008
@@ -21,23 +21,52 @@
 
 import java.util.EventListener;
 
+/**
+ * A ServletRequestListener can be implemented by the developer
+ * interested in being notified of requests coming in and out of
+ * scope in a web component. A request is defined as coming into
+ * scope when it is about to enter the first servlet or filter
+ * in each web application, as going out of scope when it exits
+ * the last servlet or the first filter in the chain.
+ *
+ * @since Servlet 2.4
+ */
+
+
+public interface ServletRequestListener extends EventListener {
+
     /**
-     * A ServletRequestListener can be implemented by the developer
-     * interested in being notified of requests coming in and out of
-     * scope in a web component. A request is defined as coming into
-     * scope when it is about to enter the first servlet or filter
-     * in each web application, as going out of scope when it exits
-     * the last servlet or the first filter in the chain.
+     * The request is about to go out of scope of the web application.
      *
-     * @since Servlet 2.4
+     * @param sre event containing request
      */
+    public void requestDestroyed(ServletRequestEvent sre);
 
+    /**
+     * The request is about to come into scope of the web application.
+     *
+     * @param sre event containing request
+     */
+    public void requestInitialized(ServletRequestEvent sre);
 
-public interface ServletRequestListener extends EventListener {
+    /**
+     * Called after suspend
+     * @param sre event containing request
+     * @since 3.0
+     */
+    void requestSuspended(ServletRequestEvent sre);
 
-    /** The request is about to go out of scope of the web application. */
-    public void requestDestroyed ( ServletRequestEvent sre );
+    /**
+     * called before resume
+     * @param sre event containing request
+     * @since 3.0
+     */
+    void requestResumed(ServletRequestEvent sre);
 
-    /** The request is about to come into scope of the web application. */
-    public void requestInitialized ( ServletRequestEvent sre );
+    /**
+     * called after completion
+     * @param sre event containing request
+     * @since 3.0
+     */
+    void requestCompleted(ServletRequestEvent sre);
 }

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java?rev=675701&r1=675700&r2=675701&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletRequestWrapper.java Thu Jul 10 12:49:52 2008
@@ -399,6 +399,104 @@
     public int getLocalPort(){
         return this.request.getLocalPort();
     }
-    
+
+    /**
+     * Get the servlet context the request-response pair was last dispatched through.
+     *
+     * @return the latest ServletContext on the dispatch chain.
+     * @since 3.0
+     */
+    public ServletContext getServletContext() {
+        return request.getServletContext();
+    }
+
+    /**
+     * Gets the associated servlet response.
+     *
+     * @return the ServletResponse associated with this request.
+     * @since 3.0
+     */
+    public ServletResponse getServletResponse() {
+        return request.getServletResponse();
+    }
+
+    /**
+     * complete a suspended request.
+     *
+     * @throws IllegalStateException
+     * @since 3.0
+     */
+    public void complete() throws IllegalStateException {
+        request.complete();
+    }
+
+    /**
+     * Suspend request processing.  Must be called by a thread that is processing this request.
+     *
+     * @param timeoutMilliseconds new timeout period, in milliseconds
+     * @throws IllegalStateException if called by a thread not processing this request or after error dispatch
+     * @see #complete
+     * @see #resume
+     * @since 3.0
+     */
+    public void suspend(long timeoutMilliseconds) throws IllegalStateException {
+        request.suspend(timeoutMilliseconds);
+    }
+
+    /**
+     * Similar to suspend(timeoutMilliseconds) but with a container supplied timeout period.
+     *
+     * @throws IllegalStateException
+     * @see #complete
+     * @see #resume
+     * @since 3.0
+     */
+    public void suspend() throws IllegalStateException {
+        request.suspend();
+    }
+
+    /**
+     * Resume a suspended request
+     *
+     * @throws IllegalStateException if the request is not suspended
+     * @see #suspend
+     * @since 3.0
+     */
+    public void resume() throws IllegalStateException {
+        request.resume();
+    }
+
+    /**
+     * @return if the request is suspended
+     * @since 3.0
+     */
+    public boolean isSuspended() {
+        return request.isSuspended();
+    }
+
+    /**
+     * @return if the request is resumed
+     * @since 3.0
+     */
+    public boolean isResumed() {
+        return request.isResumed();
+    }
+
+    /**
+     * @return if the request is timed out
+     * @since 3.0
+     */
+    public boolean isTimeout() {
+        return request.isTimeout();
+    }
+
+    /**
+     * @return if the request has never been suspended (or resumed)
+     * @since 3.0
+     */
+    public boolean isInitial() {
+        return request.isInitial();
+    }
+
 }
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponse.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponse.java?rev=675701&r1=675700&r2=675701&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponse.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponse.java Thu Jul 10 12:49:52 2008
@@ -159,7 +159,7 @@
      * @return 		a <code>PrintWriter</code> object that 
      *			can return character data to the client 
      *
-     * @exception UnsupportedEncodingException
+     * @exception java.io.UnsupportedEncodingException
      *			if the character encoding returned
      *			by <code>getCharacterEncoding</code> cannot be used
      *
@@ -440,13 +440,30 @@
      * have no effect. If no locale has been specified,
      * the container's default locale is returned.
      * 
+     * @return locale specified for this response
      * @see 		#setLocale
-     *
      */
 
     public Locale getLocale();
 
+    /**
+     * Helper for suspend/resume: disables output
+     * @since 3.0
+     */
+    void disable();
+
+    /**
+     * Helper for suspend/resume: enables output
+     * @since 3.0
+     */
+    void enable();
 
+    /**
+     * Helper for suspend/resume, shows disabled state
+     * @return true if disable is most recent disable/enable call
+     * @since 3.0
+     */
+    boolean isDisabled();
 
 }
 

Modified: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponseWrapper.java?rev=675701&r1=675700&r2=675701&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponseWrapper.java (original)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/ServletResponseWrapper.java Thu Jul 10 12:49:52 2008
@@ -212,6 +212,34 @@
 	return this.response.getLocale();
     }
 
+    /**
+     * Helper for suspend/resume: disables output
+     *
+     * @since 3.0
+     */
+    public void disable() {
+        response.disable();
+    }
+
+    /**
+     * Helper for suspend/resume: enables output
+     *
+     * @since 3.0
+     */
+    public void enable() {
+        response.enable();
+    }
+
+    /**
+     * Helper for suspend/resume, shows disabled state
+     *
+     * @return true if disable is most recent disable/enable call
+     * @since 3.0
+     */
+    public boolean isDisabled() {
+        return response.isDisabled();
+    }
+
 
 }
 

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionCookieConfig.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionCookieConfig.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionCookieConfig.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionCookieConfig.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public class SessionCookieConfig {
+
+    private final String domain;
+    private final String path;
+    private final String comment;
+    private final boolean httpOnly;
+    private final boolean secure;
+
+    public SessionCookieConfig(String domain, String path, String comment, boolean httpOnly, boolean secure) {
+        this.domain = domain;
+        this.path = path;
+        this.comment = comment;
+        this.httpOnly = httpOnly;
+        this.secure = secure;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+
+    public boolean isHttpOnly() {
+        return httpOnly;
+    }
+
+    public boolean isSecure() {
+        return secure;
+    }
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionTrackingMode.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionTrackingMode.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionTrackingMode.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/SessionTrackingMode.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package javax.servlet;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+public enum SessionTrackingMode {
+
+    COOKIE,
+    SSL,
+    URL
+
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/FilterMapping.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/FilterMapping.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/FilterMapping.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/FilterMapping.java Thu Jul 10 12:49:52 2008
@@ -0,0 +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
+ *
+ *  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.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.servlet.DispatcherType;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value=ElementType.TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface FilterMapping {
+
+    String[] urlPattern();
+
+    String[] servletNames() default {};
+
+    DispatcherType[] dispatcherTypes() default {DispatcherType.REQUEST};
+    
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/InitParam.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/InitParam.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/InitParam.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/InitParam.java Thu Jul 10 12:49:52 2008
@@ -0,0 +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
+ *
+ *  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.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+
+@Target(value= ElementType.TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface InitParam {
+
+    String description() default "";
+
+    String name() default "";
+
+    String value() default "";
+    
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/Servlet.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/Servlet.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/Servlet.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/Servlet.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,46 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface Servlet {
+    String[] urlMappings();
+
+    String icon() default "";
+
+    InitParam[] initParams() default {};
+
+    int loadOnStartup() default -1;
+
+    String name() default "";
+    
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletContextListener.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletContextListener.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletContextListener.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,38 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface ServletContextListener {
+
+    String description() default "";
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletFilter.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletFilter.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletFilter.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/ServletFilter.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,46 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+public @interface ServletFilter {
+
+    String description() default "";
+
+    String displayName() default "";
+
+    String filterName() default "";
+
+    String icon() default "";
+
+    InitParam[] initParams() default {};
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/DELETE.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/DELETE.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/DELETE.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/DELETE.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.annotation.jaxrs;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.METHOD)
+@Retention(value= RetentionPolicy.RUNTIME)
+@HttpMethod(value="DELETE")
+public @interface DELETE {
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/GET.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/GET.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/GET.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/GET.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.annotation.jaxrs;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.METHOD)
+@Retention(value= RetentionPolicy.RUNTIME)
+@HttpMethod(value="GET")
+public @interface GET {
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HEAD.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HEAD.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HEAD.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HEAD.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.annotation.jaxrs;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.METHOD)
+@Retention(value= RetentionPolicy.RUNTIME)
+@HttpMethod(value="HEAD")
+public @interface HEAD {
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HttpMethod.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HttpMethod.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HttpMethod.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/HttpMethod.java Thu Jul 10 12:49:52 2008
@@ -0,0 +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
+ *
+ *  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.annotation.jaxrs;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Documented;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.ANNOTATION_TYPE)
+@Retention(value= RetentionPolicy.RUNTIME)
+@Documented
+public @interface HttpMethod {
+
+    String value();
+    
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/POST.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/POST.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/POST.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/POST.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.annotation.jaxrs;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.METHOD)
+@Retention(value= RetentionPolicy.RUNTIME)
+@HttpMethod(value="POST")
+public @interface POST {
+}

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

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

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

Added: geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/PUT.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/PUT.java?rev=675701&view=auto
==============================================================================
--- geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/PUT.java (added)
+++ geronimo/specs/trunk/geronimo-servlet_3.0_spec/src/main/java/javax/servlet/http/annotation/jaxrs/PUT.java Thu Jul 10 12:49:52 2008
@@ -0,0 +1,37 @@
+/*
+ * 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.annotation.jaxrs;
+
+import java.lang.annotation.Target;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * @version $Rev:$ $Date:$
+ * @since 3.0
+ */
+
+@Target(value= ElementType.METHOD)
+@Retention(value= RetentionPolicy.RUNTIME)
+@HttpMethod(value="PUT")
+public @interface PUT {
+}

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

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

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



Mime
View raw message