You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/10/22 22:55:03 UTC
svn commit: r1187778 [2/6] - in /tomcat/trunk/java/javax: annotation/
annotation/security/ ejb/ el/ persistence/ servlet/ servlet/annotation/
servlet/descriptor/ servlet/http/ servlet/jsp/ servlet/jsp/el/
servlet/jsp/resources/ servlet/jsp/tagext/ serv...
Modified: tomcat/trunk/java/javax/servlet/Servlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/Servlet.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/Servlet.java (original)
+++ tomcat/trunk/java/javax/servlet/Servlet.java Sat Oct 22 20:54:57 2011
@@ -21,17 +21,17 @@ import java.io.IOException;
/**
* Defines methods that all servlets must implement.
- *
+ *
* <p>
* A servlet is a small Java program that runs within a Web server. Servlets
* receive and respond to requests from Web clients, usually across HTTP, the
* HyperText Transfer Protocol.
- *
+ *
* <p>
* To implement this interface, you can write a generic servlet that extends
* <code>javax.servlet.GenericServlet</code> or an HTTP servlet that extends
* <code>javax.servlet.http.HttpServlet</code>.
- *
+ *
* <p>
* This interface defines methods to initialize a servlet, to service requests,
* and to remove a servlet from the server. These are known as life-cycle
@@ -43,16 +43,16 @@ import java.io.IOException;
* <li>The servlet is taken out of service, then destroyed with the
* <code>destroy</code> method, then garbage collected and finalized.
* </ol>
- *
+ *
* <p>
* In addition to the life-cycle methods, this interface provides the
* <code>getServletConfig</code> method, which the servlet can use to get any
* startup information, and the <code>getServletInfo</code> method, which allows
* the servlet to return basic information about itself, such as author,
* version, and copyright.
- *
+ *
* @version $Version$
- *
+ *
* @see GenericServlet
* @see javax.servlet.http.HttpServlet
*/
@@ -61,12 +61,12 @@ public interface Servlet {
/**
* Called by the servlet container to indicate to a servlet that the servlet
* is being placed into service.
- *
+ *
* <p>
* The servlet container calls the <code>init</code> method exactly once
* after instantiating the servlet. The <code>init</code> method must
* complete successfully before the servlet can receive any requests.
- *
+ *
* <p>
* The servlet container cannot place the servlet into service if the
* <code>init</code> method
@@ -74,36 +74,36 @@ public interface Servlet {
* <li>Throws a <code>ServletException</code>
* <li>Does not return within a time period defined by the Web server
* </ol>
- *
- *
+ *
+ *
* @param config
* a <code>ServletConfig</code> object containing the servlet's
* configuration and initialization parameters
- *
+ *
* @exception ServletException
* if an exception has occurred that interferes with the
* servlet's normal operation
- *
+ *
* @see UnavailableException
* @see #getServletConfig
*/
public void init(ServletConfig config) throws ServletException;
/**
- *
+ *
* Returns a {@link ServletConfig} object, which contains initialization and
* startup parameters for this servlet. The <code>ServletConfig</code>
* object returned is the one passed to the <code>init</code> method.
- *
+ *
* <p>
* Implementations of this interface are responsible for storing the
* <code>ServletConfig</code> object so that this method can return it. The
* {@link GenericServlet} class, which implements this interface, already
* does this.
- *
+ *
* @return the <code>ServletConfig</code> object that initializes this
* servlet
- *
+ *
* @see #init
*/
public ServletConfig getServletConfig();
@@ -111,16 +111,16 @@ public interface Servlet {
/**
* Called by the servlet container to allow the servlet to respond to a
* request.
- *
+ *
* <p>
* This method is only called after the servlet's <code>init()</code> method
* has completed successfully.
- *
+ *
* <p>
* The status code of the response always should be set for a servlet that
* throws or sends an error.
- *
- *
+ *
+ *
* <p>
* Servlets typically run inside multithreaded servlet containers that can
* handle multiple requests concurrently. Developers must be aware to
@@ -130,20 +130,20 @@ public interface Servlet {
* href
* ="http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html">
* the Java tutorial on multi-threaded programming</a>.
- *
- *
+ *
+ *
* @param req
* the <code>ServletRequest</code> object that contains the
* client's request
- *
+ *
* @param res
* the <code>ServletResponse</code> object that contains the
* servlet's response
- *
+ *
* @exception ServletException
* if an exception occurs that interferes with the servlet's
* normal operation
- *
+ *
* @exception IOException
* if an input or output exception occurs
*/
@@ -153,11 +153,11 @@ public interface Servlet {
/**
* Returns information about the servlet, such as author, version, and
* copyright.
- *
+ *
* <p>
* The string that this method returns should be plain text and not markup
* of any kind (such as HTML, XML, etc.).
- *
+ *
* @return a <code>String</code> containing servlet information
*/
public String getServletInfo();
@@ -169,7 +169,7 @@ public interface Servlet {
* after a timeout period has passed. After the servlet container calls this
* method, it will not call the <code>service</code> method again on this
* servlet.
- *
+ *
* <p>
* This method gives the servlet an opportunity to clean up any resources
* that are being held (for example, memory, file handles, threads) and make
Modified: tomcat/trunk/java/javax/servlet/ServletConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletConfig.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletConfig.java Sat Oct 22 20:54:57 2011
@@ -29,7 +29,7 @@ public interface ServletConfig {
* server administration, assigned in the web application deployment
* descriptor, or for an unregistered (and thus unnamed) servlet instance it
* will be the servlet's class name.
- *
+ *
* @return the name of the servlet instance
*/
public String getServletName();
@@ -37,7 +37,7 @@ public interface ServletConfig {
/**
* Returns a reference to the {@link ServletContext} in which the caller is
* executing.
- *
+ *
* @return a {@link ServletContext} object, used by the caller to interact
* with its servlet container
* @see ServletContext
@@ -48,7 +48,7 @@ public interface ServletConfig {
* Returns a <code>String</code> containing the value of the named
* initialization parameter, or <code>null</code> if the parameter does not
* exist.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the
* initialization parameter
@@ -61,7 +61,7 @@ public interface ServletConfig {
* Returns the names of the servlet's initialization parameters as an
* <code>Enumeration</code> of <code>String</code> objects, or an empty
* <code>Enumeration</code> if the servlet has no initialization parameters.
- *
+ *
* @return an <code>Enumeration</code> of <code>String</code> objects
* containing the names of the servlet's initialization parameters
*/
Modified: tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContainerInitializer.java Sat Oct 22 20:54:57 2011
@@ -24,9 +24,9 @@ import java.util.Set;
* TODO SERVLET3 - Add comments
*/
public interface ServletContainerInitializer {
-
+
/**
- *
+ *
* @param c
* @param ctx
* @throws ServletException
Modified: tomcat/trunk/java/javax/servlet/ServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContext.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContext.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContext.java Sat Oct 22 20:54:57 2011
@@ -45,7 +45,7 @@ import javax.servlet.descriptor.JspConfi
* The <code>ServletContext</code> object is contained within the
* {@link ServletConfig} object, which the Web server provides the servlet when
* the servlet is initialized.
- *
+ *
* @author Various
* @version $Version$
* @see Servlet#getServletConfig
@@ -72,7 +72,7 @@ public interface ServletContext {
* <p>
* In a security conscious environment, the servlet container may return
* <code>null</code> for a given URL.
- *
+ *
* @param uripath
* a <code>String</code> specifying the context path of another
* web application in the container.
@@ -89,7 +89,7 @@ public interface ServletContext {
* Returns the major version of the Java Servlet API that this servlet
* container supports. All implementations that comply with Version 3.0 must
* have this method return the integer 3.
- *
+ *
* @return 3
*/
public int getMajorVersion();
@@ -98,7 +98,7 @@ public interface ServletContext {
* Returns the minor version of the Servlet API that this servlet container
* supports. All implementations that comply with Version 3.0 must have this
* method return the integer 0.
- *
+ *
* @return 0
*/
public int getMinorVersion();
@@ -123,7 +123,7 @@ public interface ServletContext {
* of the servlet container, and may be specified in a web application
* deployment descriptor. Common MIME types are <code>"text/html"</code> and
* <code>"image/gif"</code>.
- *
+ *
* @param file
* a <code>String</code> specifying the name of a file
* @return a <code>String</code> specifying the file's MIME type
@@ -150,7 +150,7 @@ public interface ServletContext {
* "/customer/", "/WEB-INF/"}<br>
* getResourcePaths("/catalog/") returns {"/catalog/index.html",
* "/catalog/products.html", "/catalog/offers/"}.<br>
- *
+ *
* @param path
* the partial path used to match the resources, which must start
* with a /
@@ -188,7 +188,7 @@ public interface ServletContext {
* This method has a different purpose than
* <code>java.lang.Class.getResource</code>, which looks up resources based
* on a class loader. This method does not use class loaders.
- *
+ *
* @param path
* a <code>String</code> specifying the path to the resource
* @return the resource located at the named path, or <code>null</code> if
@@ -218,7 +218,7 @@ public interface ServletContext {
* <code>java.lang.Class.getResourceAsStream</code>, which uses a class
* loader. This method allows servlet containers to make a resource
* available to a servlet from any location, without using a class loader.
- *
+ *
* @param path
* a <code>String</code> specifying the path to the resource
* @return the <code>InputStream</code> returned to the servlet, or
@@ -237,7 +237,7 @@ public interface ServletContext {
* <code>RequestDispatcher</code> for resources in foreign contexts. This
* method returns <code>null</code> if the <code>ServletContext</code>
* cannot return a <code>RequestDispatcher</code>.
- *
+ *
* @param path
* a <code>String</code> specifying the pathname to the resource
* @return a <code>RequestDispatcher</code> object that acts as a wrapper for
@@ -260,7 +260,7 @@ public interface ServletContext {
* <p>
* This method returns <code>null</code> if the <code>ServletContext</code>
* cannot return a <code>RequestDispatcher</code> for any reason.
- *
+ *
* @param name
* a <code>String</code> specifying the name of a servlet to wrap
* @return a <code>RequestDispatcher</code> object that acts as a wrapper for
@@ -323,7 +323,7 @@ public interface ServletContext {
* Writes the specified message to a servlet log file, usually an event log.
* The name and type of the servlet log file is specific to the servlet
* container.
- *
+ *
* @param msg
* a <code>String</code> specifying the message to be written to
* the log file
@@ -347,7 +347,7 @@ public interface ServletContext {
* <code>Throwable</code> exception to the servlet log file. The name and
* type of the servlet log file is specific to the servlet container,
* usually an event log.
- *
+ *
* @param message
* a <code>String</code> that describes the error or exception
* @param throwable
@@ -368,7 +368,7 @@ public interface ServletContext {
* servlet container cannot translate the virtual path to a real path for
* any reason (such as when the content is being made available from a
* <code>.war</code> archive).
- *
+ *
* @param path
* a <code>String</code> specifying a virtual path
* @return a <code>String</code> specifying the real path, or null if the
@@ -388,7 +388,7 @@ public interface ServletContext {
* The servlet container may return other optional information after the
* primary string in parentheses, for example,
* <code>JavaServer Web Dev Kit/1.0 (JDK 1.1.6; Windows NT 4.0 x86)</code>.
- *
+ *
* @return a <code>String</code> containing at least the servlet container
* name and version number
*/
@@ -402,7 +402,7 @@ public interface ServletContext {
* This method can make available configuration information useful to an
* entire "web application". For example, it can provide a webmaster's email
* address or the name of a system that holds critical data.
- *
+ *
* @param name
* a <code>String</code> containing the name of the parameter
* whose value is requested
@@ -416,7 +416,7 @@ public interface ServletContext {
* Returns the names of the context's initialization parameters as an
* <code>Enumeration</code> of <code>String</code> objects, or an empty
* <code>Enumeration</code> if the context has no initialization parameters.
- *
+ *
* @return an <code>Enumeration</code> of <code>String</code> objects
* containing the names of the context's initialization parameters
* @see ServletConfig#getInitParameter
@@ -446,7 +446,7 @@ public interface ServletContext {
* subclass. Attribute names should follow the same convention as package
* names. The Java Servlet API specification reserves names matching
* <code>java.*</code>, <code>javax.*</code>, and <code>sun.*</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @return an <code>Object</code> containing the value of the attribute, or
@@ -459,7 +459,7 @@ public interface ServletContext {
* Returns an <code>Enumeration</code> containing the attribute names
* available within this servlet context. Use the {@link #getAttribute}
* method with an attribute name to get the value of an attribute.
- *
+ *
* @return an <code>Enumeration</code> of attribute names
* @see #getAttribute
*/
@@ -479,7 +479,7 @@ public interface ServletContext {
* Attribute names should follow the same convention as package names. The
* Java Servlet API specification reserves names matching
* <code>java.*</code>, <code>javax.*</code>, and <code>sun.*</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @param object
@@ -494,7 +494,7 @@ public interface ServletContext {
* <p>
* If listeners are configured on the <code>ServletContext</code> the
* container notifies them accordingly.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute to
* be removed
@@ -505,7 +505,7 @@ public interface ServletContext {
* Returns the name of this web application corresponding to this
* ServletContext as specified in the deployment descriptor for this web
* application by the display-name element.
- *
+ *
* @return The name of the web application or null if no name has been
* declared in the deployment descriptor.
* @since Servlet 2.3
Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeEvent.java Sat Oct 22 20:54:57 2011
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* This is the event class for notifications about changes to the attributes of
* the servlet context of a web application.
- *
+ *
* @see ServletContextAttributeListener
* @since v 2.3
*/
Modified: tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextAttributeListener.java Sat Oct 22 20:54:57 2011
@@ -23,7 +23,7 @@ import java.util.EventListener;
* attribute list on the servlet context of a web application. To receive
* notification events, the implementation class must be configured in the
* deployment descriptor for the web application.
- *
+ *
* @see ServletContextAttributeEvent
* @since v 2.3
*/
Modified: tomcat/trunk/java/javax/servlet/ServletContextEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextEvent.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextEvent.java Sat Oct 22 20:54:57 2011
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* This is the event class for notifications about changes to the servlet
* context of a web application.
- *
+ *
* @see ServletContextListener
* @since v 2.3
*/
@@ -29,7 +29,7 @@ public class ServletContextEvent extends
/**
* Construct a ServletContextEvent from the given context.
- *
+ *
* @param source
* - the ServletContext that is sending the event.
*/
@@ -39,7 +39,7 @@ public class ServletContextEvent extends
/**
* Return the ServletContext that changed.
- *
+ *
* @return the ServletContext that sent the event.
*/
public ServletContext getServletContext() {
Modified: tomcat/trunk/java/javax/servlet/ServletContextListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletContextListener.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletContextListener.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletContextListener.java Sat Oct 22 20:54:57 2011
@@ -23,13 +23,13 @@ import java.util.EventListener;
* servlet context of the web application they are part of. To receive
* notification events, the implementation class must be configured in the
* deployment descriptor for the web application.
- *
+ *
* @see ServletContextEvent
* @since v 2.3
*/
public interface ServletContextListener extends EventListener {
-
+
/**
** Notification that the web application initialization process is starting.
* All ServletContextListeners are notified of context initialization before
Modified: tomcat/trunk/java/javax/servlet/ServletException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletException.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletException.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletException.java Sat Oct 22 20:54:57 2011
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* Defines a general exception a servlet can throw when it encounters
* difficulty.
- *
+ *
* @author Various
* @version $Version$
*/
@@ -37,7 +37,7 @@ public class ServletException extends Ex
/**
* Constructs a new servlet exception with the specified message. The
* message can be written to the server log and/or displayed for the user.
- *
+ *
* @param message
* a <code>String</code> specifying the text of the exception
* message
@@ -50,7 +50,7 @@ public class ServletException extends Ex
* Constructs a new servlet exception when the servlet needs to throw an
* exception and include a message about the "root cause" exception that
* interfered with its normal operation, including a description message.
- *
+ *
* @param message
* a <code>String</code> containing the text of the exception
* message
@@ -73,7 +73,7 @@ public class ServletException extends Ex
* <code>Throwable</code> exception to get a localized exception message.
* When subclassing <code>ServletException</code>, this method can be
* overridden to create an exception message designed for a specific locale.
- *
+ *
* @param rootCause
* the <code>Throwable</code> exception that interfered with the
* servlet's normal operation, making the servlet exception
@@ -85,7 +85,7 @@ public class ServletException extends Ex
/**
* Returns the exception that caused this servlet exception.
- *
+ *
* @return the <code>Throwable</code> that caused this servlet exception
*/
public Throwable getRootCause() {
Modified: tomcat/trunk/java/javax/servlet/ServletInputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletInputStream.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletInputStream.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletInputStream.java Sat Oct 22 20:54:57 2011
@@ -31,7 +31,7 @@ import java.io.InputStream;
* <p>
* This is an abstract class that a servlet container implements. Subclasses of
* this class must implement the <code>java.io.InputStream.read()</code> method.
- *
+ *
* @author Various
* @version $Version$
* @see ServletRequest
@@ -52,7 +52,7 @@ public abstract class ServletInputStream
* <p>
* This method returns -1 if it reaches the end of the input stream before
* reading the maximum number of bytes.
- *
+ *
* @param b
* an array of bytes into which data is read
* @param off
Modified: tomcat/trunk/java/javax/servlet/ServletOutputStream.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletOutputStream.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletOutputStream.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletOutputStream.java Sat Oct 22 20:54:57 2011
@@ -30,7 +30,7 @@ import java.util.ResourceBundle;
* This is an abstract class that the servlet container implements. Subclasses
* of this class must implement the <code>java.io.OutputStream.write(int)</code>
* method.
- *
+ *
* @author Various
* @version $Version$
* @see ServletResponse
@@ -50,7 +50,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>String</code> to the client, without a carriage
* return-line feed (CRLF) character at the end.
- *
+ *
* @param s
* the <code>String</code> to send to the client
* @exception IOException
@@ -83,7 +83,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>boolean</code> value to the client, with no carriage
* return-line feed (CRLF) character at the end.
- *
+ *
* @param b
* the <code>boolean</code> value to send to the client
* @exception IOException
@@ -102,7 +102,7 @@ public abstract class ServletOutputStrea
/**
* Writes a character to the client, with no carriage return-line feed
* (CRLF) at the end.
- *
+ *
* @param c
* the character to send to the client
* @exception IOException
@@ -115,7 +115,7 @@ public abstract class ServletOutputStrea
/**
* Writes an int to the client, with no carriage return-line feed (CRLF) at
* the end.
- *
+ *
* @param i
* the int to send to the client
* @exception IOException
@@ -128,7 +128,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>long</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
- *
+ *
* @param l
* the <code>long</code> value to send to the client
* @exception IOException
@@ -141,7 +141,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>float</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
- *
+ *
* @param f
* the <code>float</code> value to send to the client
* @exception IOException
@@ -154,7 +154,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>double</code> value to the client, with no carriage
* return-line feed (CRLF) at the end.
- *
+ *
* @param d
* the <code>double</code> value to send to the client
* @exception IOException
@@ -166,7 +166,7 @@ public abstract class ServletOutputStrea
/**
* Writes a carriage return-line feed (CRLF) to the client.
- *
+ *
* @exception IOException
* if an input or output exception occurred
*/
@@ -177,7 +177,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>String</code> to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param s
* the <code>String</code> to write to the client
* @exception IOException
@@ -191,7 +191,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>boolean</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param b
* the <code>boolean</code> value to write to the client
* @exception IOException
@@ -205,7 +205,7 @@ public abstract class ServletOutputStrea
/**
* Writes a character to the client, followed by a carriage return-line feed
* (CRLF).
- *
+ *
* @param c
* the character to write to the client
* @exception IOException
@@ -219,7 +219,7 @@ public abstract class ServletOutputStrea
/**
* Writes an int to the client, followed by a carriage return-line feed
* (CRLF) character.
- *
+ *
* @param i
* the int to write to the client
* @exception IOException
@@ -233,7 +233,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>long</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param l
* the <code>long</code> value to write to the client
* @exception IOException
@@ -247,7 +247,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>float</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param f
* the <code>float</code> value to write to the client
* @exception IOException
@@ -261,7 +261,7 @@ public abstract class ServletOutputStrea
/**
* Writes a <code>double</code> value to the client, followed by a carriage
* return-line feed (CRLF).
- *
+ *
* @param d
* the <code>double</code> value to write to the client
* @exception IOException
Modified: tomcat/trunk/java/javax/servlet/ServletRegistration.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRegistration.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRegistration.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRegistration.java Sat Oct 22 20:54:57 2011
@@ -25,9 +25,9 @@ import java.util.Set;
* TODO SERVLET3 - Add comments
*/
public interface ServletRegistration extends Registration {
-
+
/**
- *
+ *
* @param urlPatterns
* @return TODO
* @throws IllegalArgumentException if urlPattern is null or empty
@@ -35,11 +35,11 @@ public interface ServletRegistration ext
* already been initialised
*/
public Set<String> addMapping(String... urlPatterns);
-
+
public Collection<String> getMappings();
-
+
public String getRunAsRole();
-
+
public static interface Dynamic
extends ServletRegistration, Registration.Dynamic {
public void setLoadOnStartup(int loadOnStartup);
Modified: tomcat/trunk/java/javax/servlet/ServletRequest.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequest.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequest.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequest.java Sat Oct 22 20:54:57 2011
@@ -32,7 +32,7 @@ import java.util.Map;
* <code>ServletRequest</code> can provide additional protocol-specific data
* (for example, HTTP data is provided by
* {@link javax.servlet.http.HttpServletRequest}.
- *
+ *
* @author Various
* @version $Version$
* @see javax.servlet.http.HttpServletRequest
@@ -55,7 +55,7 @@ public interface ServletRequest {
* Attribute names should follow the same conventions as package names. This
* specification reserves names matching <code>java.*</code>,
* <code>javax.*</code>, and <code>sun.*</code>.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @return an <code>Object</code> containing the value of the attribute, or
@@ -68,7 +68,7 @@ public interface ServletRequest {
* attributes available to this request. This method returns an empty
* <code>Enumeration</code> if the request has no attributes available to
* it.
- *
+ *
* @return an <code>Enumeration</code> of strings containing the names of the
* request's attributes
*/
@@ -78,7 +78,7 @@ public interface ServletRequest {
* Returns the name of the character encoding used in the body of this
* request. This method returns <code>null</code> if the request does not
* specify a character encoding
- *
+ *
* @return a <code>String</code> containing the name of the character
* encoding, or <code>null</code> if the request does not specify a
* character encoding
@@ -89,7 +89,7 @@ public interface ServletRequest {
* Overrides the name of the character encoding used in the body of this
* request. This method must be called prior to reading request parameters
* or reading input using getReader().
- *
+ *
* @param env
* a <code>String</code> containing the name of the character
* encoding.
@@ -103,7 +103,7 @@ public interface ServletRequest {
* Returns the length, in bytes, of the request body and made available by
* the input stream, or -1 if the length is not known. For HTTP servlets,
* same as the value of the CGI variable CONTENT_LENGTH.
- *
+ *
* @return an integer containing the length of the request body or -1 if the
* length is not known
*/
@@ -113,7 +113,7 @@ public interface ServletRequest {
* Returns the MIME type of the body of the request, or <code>null</code> if
* the type is not known. For HTTP servlets, same as the value of the CGI
* variable CONTENT_TYPE.
- *
+ *
* @return a <code>String</code> containing the name of the MIME type of the
* request, or null if the type is not known
*/
@@ -123,7 +123,7 @@ public interface ServletRequest {
* Retrieves the body of the request as binary data using a
* {@link ServletInputStream}. Either this method or {@link #getReader} may
* be called to read the body, not both.
- *
+ *
* @return a {@link ServletInputStream} object containing the body of the
* request
* @exception IllegalStateException
@@ -152,7 +152,7 @@ public interface ServletRequest {
* an HTTP POST request, then reading the body directly via
* {@link #getInputStream} or {@link #getReader} can interfere with the
* execution of this method.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the parameter
* @return a <code>String</code> representing the single value of the
@@ -166,7 +166,7 @@ public interface ServletRequest {
* containing the names of the parameters contained in this request. If the
* request has no parameters, the method returns an empty
* <code>Enumeration</code>.
- *
+ *
* @return an <code>Enumeration</code> of <code>String</code> objects, each
* <code>String</code> containing the name of a request parameter;
* or an empty <code>Enumeration</code> if the request has no
@@ -180,7 +180,7 @@ public interface ServletRequest {
* parameter does not exist.
* <p>
* If the parameter has a single value, the array has a length of 1.
- *
+ *
* @param name
* a <code>String</code> containing the name of the parameter
* whose value is requested
@@ -195,7 +195,7 @@ public interface ServletRequest {
* parameters are extra information sent with the request. For HTTP
* servlets, parameters are contained in the query string or posted form
* data.
- *
+ *
* @return an immutable java.util.Map containing parameter names as keys and
* parameter values as map values. The keys in the parameter map are
* of type String. The values in the parameter map are of type
@@ -208,7 +208,7 @@ public interface ServletRequest {
* <i>protocol/majorVersion.minorVersion</i>, for example, HTTP/1.1. For
* HTTP servlets, the value returned is the same as the value of the CGI
* variable <code>SERVER_PROTOCOL</code>.
- *
+ *
* @return a <code>String</code> containing the protocol name and version
* number
*/
@@ -218,7 +218,7 @@ public interface ServletRequest {
* Returns the name of the scheme used to make this request, for example,
* <code>http</code>, <code>https</code>, or <code>ftp</code>. Different
* schemes have different rules for constructing URLs, as noted in RFC 1738.
- *
+ *
* @return a <code>String</code> containing the name of the scheme used to
* make this request
*/
@@ -228,7 +228,7 @@ public interface ServletRequest {
* Returns the host name of the server to which the request was sent. It is
* the value of the part before ":" in the <code>Host</code> header value,
* if any, or the resolved server name, or the server IP address.
- *
+ *
* @return a <code>String</code> containing the name of the server
*/
public String getServerName();
@@ -237,7 +237,7 @@ public interface ServletRequest {
* Returns the port number to which the request was sent. It is the value of
* the part after ":" in the <code>Host</code> header value, if any, or the
* server port where the client connection was accepted on.
- *
+ *
* @return an integer specifying the port number
*/
public int getServerPort();
@@ -247,7 +247,7 @@ public interface ServletRequest {
* <code>BufferedReader</code>. The reader translates the character data
* according to the character encoding used on the body. Either this method
* or {@link #getInputStream} may be called to read the body, not both.
- *
+ *
* @return a <code>BufferedReader</code> containing the body of the request
* @exception java.io.UnsupportedEncodingException
* if the character set encoding used is not supported and
@@ -265,7 +265,7 @@ public interface ServletRequest {
* Returns the Internet Protocol (IP) address of the client or last proxy
* that sent the request. For HTTP servlets, same as the value of the CGI
* variable <code>REMOTE_ADDR</code>.
- *
+ *
* @return a <code>String</code> containing the IP address of the client
* that sent the request
*/
@@ -277,7 +277,7 @@ public interface ServletRequest {
* hostname (to improve performance), this method returns the dotted-string
* form of the IP address. For HTTP servlets, same as the value of the CGI
* variable <code>REMOTE_HOST</code>.
- *
+ *
* @return a <code>String</code> containing the fully qualified name of the
* client
*/
@@ -297,7 +297,7 @@ public interface ServletRequest {
* in a different web application by <code>RequestDispatcher</code>, the
* object set by this method may not be correctly retrieved in the caller
* servlet.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute
* @param o
@@ -313,7 +313,7 @@ public interface ServletRequest {
* Attribute names should follow the same conventions as package names.
* Names beginning with <code>java.*</code>, <code>javax.*</code>, and
* <code>com.sun.*</code>, are reserved for use by Sun Microsystems.
- *
+ *
* @param name
* a <code>String</code> specifying the name of the attribute to
* remove
@@ -325,7 +325,7 @@ public interface ServletRequest {
* content in, based on the Accept-Language header. If the client request
* doesn't provide an Accept-Language header, this method returns the
* default locale for the server.
- *
+ *
* @return the preferred <code>Locale</code> for the client
*/
public Locale getLocale();
@@ -337,7 +337,7 @@ public interface ServletRequest {
* header. If the client request doesn't provide an Accept-Language header,
* this method returns an <code>Enumeration</code> containing one
* <code>Locale</code>, the default locale for the server.
- *
+ *
* @return an <code>Enumeration</code> of preferred <code>Locale</code>
* objects for the client
*/
@@ -346,7 +346,7 @@ public interface ServletRequest {
/**
* Returns a boolean indicating whether this request was made using a secure
* channel, such as HTTPS.
- *
+ *
* @return a boolean indicating if the request was made using a secure
* channel
*/
@@ -367,7 +367,7 @@ public interface ServletRequest {
* The difference between this method and
* {@link ServletContext#getRequestDispatcher} is that this method can take
* a relative path.
- *
+ *
* @param path
* a <code>String</code> specifying the pathname to the resource.
* If it is relative, it must be relative against the current
@@ -391,7 +391,7 @@ public interface ServletRequest {
/**
* Returns the Internet Protocol (IP) source port of the client or last
* proxy that sent the request.
- *
+ *
* @return an integer specifying the port number
* @since 2.4
*/
@@ -400,7 +400,7 @@ public interface ServletRequest {
/**
* Returns the host name of the Internet Protocol (IP) interface on which
* the request was received.
- *
+ *
* @return a <code>String</code> containing the host name of the IP on which
* the request was received.
* @since 2.4
@@ -410,7 +410,7 @@ public interface ServletRequest {
/**
* Returns the Internet Protocol (IP) address of the interface on which the
* request was received.
- *
+ *
* @return a <code>String</code> containing the IP address on which the
* request was received.
* @since 2.4
@@ -420,7 +420,7 @@ public interface ServletRequest {
/**
* Returns the Internet Protocol (IP) port number of the interface on which
* the request was received.
- *
+ *
* @return an integer specifying the port number
* @since 2.4
*/
Modified: tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestAttributeEvent.java Sat Oct 22 20:54:57 2011
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* This is the event class for notifications of changes to the attributes of the
* servlet request in an application.
- *
+ *
* @see ServletRequestAttributeListener
* @since Servlet 2.4
*/
@@ -33,7 +33,7 @@ public class ServletRequestAttributeEven
* Construct a ServletRequestAttributeEvent giving the servlet context of
* this web application, the ServletRequest whose attributes are changing
* and the name and value of the attribute.
- *
+ *
* @param sc
* the ServletContext that is sending the event.
* @param request
@@ -52,7 +52,7 @@ public class ServletRequestAttributeEven
/**
* Return the name of the attribute that changed on the ServletRequest.
- *
+ *
* @return the name of the changed request attribute
*/
public String getName() {
@@ -64,7 +64,7 @@ public class ServletRequestAttributeEven
* replaced. If the attribute was added, this is the value of the attribute.
* If the attribute was removed, this is the value of the removed attribute.
* If the attribute was replaced, this is the old value of the attribute.
- *
+ *
* @return the value of the changed request attribute
*/
public Object getValue() {
Modified: tomcat/trunk/java/javax/servlet/ServletRequestEvent.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestEvent.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestEvent.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestEvent.java Sat Oct 22 20:54:57 2011
@@ -19,7 +19,7 @@ package javax.servlet;
/**
* Events of this kind indicate lifecycle events for a ServletRequest. The
* source of the event is the ServletContext of this web application.
- *
+ *
* @see ServletRequestListener
* @since Servlet 2.4
*/
@@ -31,7 +31,7 @@ public class ServletRequestEvent extends
/**
* Construct a ServletRequestEvent for the given ServletContext and
* ServletRequest.
- *
+ *
* @param sc
* the ServletContext of the web application.
* @param request
Modified: tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletRequestWrapper.java Sat Oct 22 20:54:57 2011
@@ -27,7 +27,7 @@ import java.util.Map;
* be subclassed by developers wishing to adapt the request to a Servlet. This
* class implements the Wrapper or Decorator pattern. Methods default to calling
* through to the wrapped request object.
- *
+ *
* @since v 2.3
* @see javax.servlet.ServletRequest
*/
@@ -36,7 +36,7 @@ public class ServletRequestWrapper imple
/**
* Creates a ServletRequest adaptor wrapping the given request object.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the request is null
*/
@@ -56,7 +56,7 @@ public class ServletRequestWrapper imple
/**
* Sets the request object being wrapped.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the request is null.
*/
@@ -287,7 +287,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getRealPath(String path)
* on the wrapped request object.
- *
+ *
* @deprecated As of Version 3.0 of the Java Servlet API
*/
@Override
@@ -300,7 +300,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getRemotePort() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -311,7 +311,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getLocalName() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -322,7 +322,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getLocalAddr() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -333,7 +333,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getLocalPort() on the
* wrapped request object.
- *
+ *
* @since 2.4
*/
@Override
@@ -344,7 +344,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getServletContext() on
* the wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -355,7 +355,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return startAsync() on the
* wrapped request object.
- *
+ *
* @throws java.lang.IllegalStateException
* @since Servlet 3.0
*/
@@ -367,7 +367,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return startAsync(Runnable) on
* the wrapped request object.
- *
+ *
* @param servletRequest
* @param servletResponse
* @throws java.lang.IllegalStateException
@@ -382,7 +382,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return isAsyncStarted() on the
* wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -393,7 +393,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return isAsyncSupported() on
* the wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -404,7 +404,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to return getAsyncContext() on the
* wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
@@ -445,7 +445,7 @@ public class ServletRequestWrapper imple
/**
* The default behavior of this method is to call getDispatcherType() on the
* wrapped request object.
- *
+ *
* @since Servlet 3.0
*/
@Override
Modified: tomcat/trunk/java/javax/servlet/ServletResponse.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletResponse.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletResponse.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletResponse.java Sat Oct 22 20:54:57 2011
@@ -44,7 +44,7 @@ import java.util.Locale;
* See the Internet RFCs such as <a href="http://www.ietf.org/rfc/rfc2045.txt">
* RFC 2045</a> for more information on MIME. Protocols such as SMTP and HTTP
* define profiles of MIME, and those standards are still evolving.
- *
+ *
* @author Various
* @version $Version$
* @see ServletOutputStream
@@ -64,7 +64,7 @@ public interface ServletResponse {
* <p>
* See RFC 2047 (http://www.ietf.org/rfc/rfc2047.txt) for more information
* about character encoding and MIME.
- *
+ *
* @return a <code>String</code> specifying the name of the character
* encoding, for example, <code>UTF-8</code>
*/
@@ -79,7 +79,7 @@ public interface ServletResponse {
* specified as described in {@link #getCharacterEncoding}, the charset
* parameter is included in the string returned. If no character encoding
* has been specified, the charset parameter is omitted.
- *
+ *
* @return a <code>String</code> specifying the content type, for example,
* <code>text/html; charset=UTF-8</code>, or null
* @since 2.4
@@ -93,7 +93,7 @@ public interface ServletResponse {
* Calling flush() on the ServletOutputStream commits the response. Either
* this method or {@link #getWriter} may be called to write the body, not
* both.
- *
+ *
* @return a {@link ServletOutputStream} for writing binary data
* @exception IllegalStateException
* if the <code>getWriter</code> method has been called on
@@ -117,7 +117,7 @@ public interface ServletResponse {
* <p>
* Either this method or {@link #getOutputStream} may be called to write the
* body, not both.
- *
+ *
* @return a <code>PrintWriter</code> object that can return character data
* to the client
* @exception java.io.UnsupportedEncodingException
@@ -154,7 +154,7 @@ public interface ServletResponse {
* the character encoding cannot be communicated via HTTP headers if the
* servlet does not specify a content type; however, it is still used to
* encode text written via the servlet response's writer.
- *
+ *
* @param charset
* a String specifying only the character set defined by IANA
* Character Sets
@@ -167,7 +167,7 @@ public interface ServletResponse {
/**
* Sets the length of the content body in the response In HTTP servlets,
* this method sets the HTTP Content-Length header.
- *
+ *
* @param len
* an integer specifying the length of the content being returned
* to the client; sets the Content-Length header
@@ -192,7 +192,7 @@ public interface ServletResponse {
* used for the servlet response's writer to the client if the protocol
* provides a way for doing so. In the case of HTTP, the
* <code>Content-Type</code> header is used.
- *
+ *
* @param type
* a <code>String</code> specifying the MIME type of the content
* @see #setLocale
@@ -215,7 +215,7 @@ public interface ServletResponse {
* This method must be called before any response body content is written;
* if content has been written or the response object has been committed,
* this method throws an <code>IllegalStateException</code>.
- *
+ *
* @param size
* the preferred buffer size
* @exception IllegalStateException
@@ -230,7 +230,7 @@ public interface ServletResponse {
/**
* Returns the actual buffer size used for the response. If no buffering is
* used, this method returns 0.
- *
+ *
* @return the actual buffer size used
* @see #setBufferSize
* @see #flushBuffer
@@ -243,7 +243,7 @@ public interface ServletResponse {
* Forces any content in the buffer to be written to the client. A call to
* this method automatically commits the response, meaning the status code
* and headers will be written.
- *
+ *
* @see #setBufferSize
* @see #getBufferSize
* @see #isCommitted
@@ -255,7 +255,7 @@ public interface ServletResponse {
* Clears the content of the underlying buffer in the response without
* clearing headers or status code. If the response has been committed, this
* method throws an <code>IllegalStateException</code>.
- *
+ *
* @see #setBufferSize
* @see #getBufferSize
* @see #isCommitted
@@ -267,7 +267,7 @@ public interface ServletResponse {
/**
* Returns a boolean indicating if the response has been committed. A
* committed response has already had its status code and headers written.
- *
+ *
* @return a boolean indicating if the response has been committed
* @see #setBufferSize
* @see #getBufferSize
@@ -280,7 +280,7 @@ public interface ServletResponse {
* Clears any data that exists in the buffer as well as the status code and
* headers. If the response has been committed, this method throws an
* <code>IllegalStateException</code>.
- *
+ *
* @exception IllegalStateException
* if the response has already been committed
* @see #setBufferSize
@@ -317,7 +317,7 @@ public interface ServletResponse {
* the character encoding cannot be communicated via HTTP headers if the
* servlet does not specify a content type; however, it is still used to
* encode text written via the servlet response's writer.
- *
+ *
* @param loc
* the locale of the response
* @see #getLocale
@@ -331,7 +331,7 @@ public interface ServletResponse {
* {@link #setLocale} method. Calls made to <code>setLocale</code> after the
* response is committed have no effect. If no locale has been specified,
* the container's default locale is returned.
- *
+ *
* @see #setLocale
*/
public Locale getLocale();
Modified: tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletResponseWrapper.java Sat Oct 22 20:54:57 2011
@@ -25,7 +25,7 @@ import java.util.Locale;
* can be subclassed by developers wishing to adapt the response from a Servlet.
* This class implements the Wrapper or Decorator pattern. Methods default to
* calling through to the wrapped response object.
- *
+ *
* @author Various
* @version $Version$
* @since v 2.3
@@ -36,7 +36,7 @@ public class ServletResponseWrapper impl
/**
* Creates a ServletResponse adaptor wrapping the given response object.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the response is null.
*/
@@ -56,7 +56,7 @@ public class ServletResponseWrapper impl
/**
* Sets the response being wrapped.
- *
+ *
* @throws java.lang.IllegalArgumentException
* if the response is null.
*/
@@ -70,7 +70,7 @@ public class ServletResponseWrapper impl
/**
* The default behavior of this method is to call
* setCharacterEncoding(String charset) on the wrapped response object.
- *
+ *
* @since 2.4
*/
@Override
@@ -126,7 +126,7 @@ public class ServletResponseWrapper impl
/**
* The default behavior of this method is to return getContentType() on the
* wrapped response object.
- *
+ *
* @since 2.4
*/
@Override
Modified: tomcat/trunk/java/javax/servlet/ServletSecurityElement.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/ServletSecurityElement.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/ServletSecurityElement.java (original)
+++ tomcat/trunk/java/javax/servlet/ServletSecurityElement.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -26,12 +26,12 @@ import javax.servlet.annotation.HttpMeth
import javax.servlet.annotation.ServletSecurity;
/**
- *
+ *
* @since Servlet 3.0
* TODO SERVLET3 - Add comments
*/
public class ServletSecurityElement extends HttpConstraintElement {
-
+
private final Map<String,HttpMethodConstraintElement> methodConstraints =
new HashMap<String,HttpMethodConstraintElement>();
@@ -41,8 +41,8 @@ public class ServletSecurityElement exte
public ServletSecurityElement() {
super();
}
-
-
+
+
/**
* Use specific constraints for specified methods and default
* HttpConstraintElement for all other methods.
@@ -55,7 +55,7 @@ public class ServletSecurityElement exte
super();
addHttpMethodConstraints(httpMethodConstraints);
}
-
+
/**
* Use specified HttpConstraintElement.
* @param httpConstraintElement
@@ -63,7 +63,7 @@ public class ServletSecurityElement exte
public ServletSecurityElement(HttpConstraintElement httpConstraintElement) {
this (httpConstraintElement, null);
}
-
+
/**
* Use specified HttpConstraintElement as default and specific constraints
* for specified methods.
@@ -78,7 +78,7 @@ public class ServletSecurityElement exte
httpConstraintElement.getRolesAllowed());
addHttpMethodConstraints(httpMethodConstraints);
}
-
+
/**
* Create from an annotation.
* @param annotation
@@ -88,7 +88,7 @@ public class ServletSecurityElement exte
this(new HttpConstraintElement(annotation.value().value(),
annotation.value().transportGuarantee(),
annotation.value().rolesAllowed()));
-
+
List<HttpMethodConstraintElement> l =
new ArrayList<HttpMethodConstraintElement>();
HttpMethodConstraint[] constraints = annotation.httpMethodConstraints();
@@ -105,15 +105,15 @@ public class ServletSecurityElement exte
}
addHttpMethodConstraints(l);
}
-
+
public Collection<HttpMethodConstraintElement> getHttpMethodConstraints() {
return methodConstraints.values();
}
-
+
public Collection<String> getMethodNames() {
return methodConstraints.keySet();
}
-
+
private void addHttpMethodConstraints(
Collection<HttpMethodConstraintElement> httpMethodConstraints) {
if (httpMethodConstraints == null) {
Modified: tomcat/trunk/java/javax/servlet/SessionCookieConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SessionCookieConfig.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/SessionCookieConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/SessionCookieConfig.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -17,75 +17,75 @@
package javax.servlet;
/**
- *
+ *
* @since Servlet 3.0
* $Id$
* TODO SERVLET3 - Add comments
*/
public interface SessionCookieConfig {
-
+
/**
- *
+ *
* @param name
* @throws IllegalStateException
*/
public void setName(String name);
-
+
public String getName();
-
+
/**
- *
+ *
* @param domain
* @throws IllegalStateException
*/
public void setDomain(String domain);
-
+
public String getDomain();
-
+
/**
- *
+ *
* @param path
* @throws IllegalStateException
*/
public void setPath(String path);
-
+
public String getPath();
-
+
/**
- *
+ *
* @param comment
* @throws IllegalStateException
*/
public void setComment(String comment);
-
+
public String getComment();
-
+
/**
- *
+ *
* @param httpOnly
* @throws IllegalStateException
*/
public void setHttpOnly(boolean httpOnly);
-
+
public boolean isHttpOnly();
-
+
/**
- *
+ *
* @param secure
* @throws IllegalStateException
*/
public void setSecure(boolean secure);
-
+
public boolean isSecure();
/**
* Sets the maximum age.
- *
+ *
* @param MaxAge the maximum age to set
* @throws IllegalStateException
*/
public void setMaxAge(int MaxAge);
-
+
public int getMaxAge();
-
+
}
Modified: tomcat/trunk/java/javax/servlet/SingleThreadModel.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/SingleThreadModel.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/SingleThreadModel.java (original)
+++ tomcat/trunk/java/javax/servlet/SingleThreadModel.java Sat Oct 22 20:54:57 2011
@@ -34,7 +34,7 @@ package javax.servlet;
* such as avoiding the usage of an instance variable or synchronizing the block
* of the code accessing those resources. This interface is deprecated in
* Servlet API version 2.4.
- *
+ *
* @author Various
* @version $Version$
* @deprecated As of Java Servlet API 2.4, with no direct replacement.
Modified: tomcat/trunk/java/javax/servlet/UnavailableException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/UnavailableException.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/UnavailableException.java (original)
+++ tomcat/trunk/java/javax/servlet/UnavailableException.java Sat Oct 22 20:54:57 2011
@@ -38,7 +38,7 @@ package javax.servlet;
* the servlet container more robust. Specifically, the servlet container might
* block requests to the servlet or filter for a period of time suggested by the
* exception, rather than rejecting them until the servlet container restarts.
- *
+ *
* @author Various
* @version $Version$
*/
@@ -95,7 +95,7 @@ public class UnavailableException extend
/**
* Constructs a new exception with a descriptive message indicating that the
* servlet is permanently unavailable.
- *
+ *
* @param msg
* a <code>String</code> specifying the descriptive message
*/
@@ -116,7 +116,7 @@ public class UnavailableException extend
* to report how long it will take to be restored to functionality. This can
* be indicated with a negative or zero value for the <code>seconds</code>
* argument.
- *
+ *
* @param msg
* a <code>String</code> specifying the descriptive message,
* which can be written to a log file or displayed for the user.
@@ -140,7 +140,7 @@ public class UnavailableException extend
* Returns a <code>boolean</code> indicating whether the servlet is
* permanently unavailable. If so, something is wrong with the servlet, and
* the system administrator must take some corrective action.
- *
+ *
* @return <code>true</code> if the servlet is permanently unavailable;
* <code>false</code> if the servlet is available or temporarily
* unavailable
@@ -151,7 +151,7 @@ public class UnavailableException extend
/**
* Returns the servlet that is reporting its unavailability.
- *
+ *
* @return the <code>Servlet</code> object that is throwing the
* <code>UnavailableException</code>
* @deprecated As of Java Servlet API 2.2, with no replacement.
@@ -170,7 +170,7 @@ public class UnavailableException extend
* unavailable or cannot provide an estimate of how long it will be
* unavailable. No effort is made to correct for the time elapsed since the
* exception was first reported.
- *
+ *
* @return an integer specifying the number of seconds the servlet will be
* temporarily unavailable, or a negative number if the servlet is
* permanently unavailable or cannot make an estimate
Modified: tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/HandlesTypes.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
/**
* This annotation is used to declare an array of application classes which are
* passed to a {@link javax.servlet.ServletContainerInitializer}.
- *
+ *
* @since Servlet 3.0
*/
@Target({ElementType.TYPE})
Modified: tomcat/trunk/java/javax/servlet/annotation/HttpConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/HttpConstraint.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/HttpConstraint.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/HttpConstraint.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -28,7 +28,7 @@ import javax.servlet.annotation.ServletS
* requests with HTTP protocol method types that are not otherwise represented
* by a corresponding {@link javax.servlet.annotation.HttpMethodConstraint} in a
* {@link javax.servlet.annotation.ServletSecurity} annotation.
- *
+ *
* @since Servlet 3.0
*/
@Retention(RetentionPolicy.RUNTIME)
@@ -38,14 +38,14 @@ public @interface HttpConstraint {
/**
* The EmptyRoleSemantic determines the behaviour when the rolesAllowed list
* is empty.
- *
+ *
* @return empty role semantic
*/
EmptyRoleSemantic value() default EmptyRoleSemantic.PERMIT;
/**
* Determines whether SSL/TLS is required to process the current request.
- *
+ *
* @return transport guarantee
*/
TransportGuarantee transportGuarantee() default TransportGuarantee.NONE;
@@ -54,7 +54,7 @@ public @interface HttpConstraint {
* The authorized roles' names. The container may discard duplicate role
* names during processing of the annotation. N.B. The String "*" does not
* have a special meaning if it occurs as a role name.
- *
+ *
* @return array of names. The array may be of zero length, in which case
* the EmptyRoleSemantic applies; the returned value determines
* whether access is to be permitted or denied regardless of the
@@ -62,7 +62,7 @@ public @interface HttpConstraint {
* Otherwise, when the array contains one or more role names access
* is permitted if the user a member of at least one of the named
* roles. The EmptyRoleSemantic is not applied in this case.
- *
+ *
*/
String[] rolesAllowed() default {};
Modified: tomcat/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/HttpMethodConstraint.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -27,9 +27,9 @@ import javax.servlet.annotation.ServletS
* Specific security constraints can be applied to different types of request,
* differentiated by the HTTP protocol method type by using this annotation
* inside the {@link javax.servlet.annotation.ServletSecurity} annotation.
- *
+ *
* @since Servlet 3.0
- *
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
@Documented
@@ -37,7 +37,7 @@ public @interface HttpMethodConstraint {
/**
* HTTP Protocol method name (e.g. POST, PUT)
- *
+ *
* @return method name
*/
String value();
@@ -45,14 +45,14 @@ public @interface HttpMethodConstraint {
/**
* The EmptyRoleSemantic determines the behaviour when the rolesAllowed list
* is empty.
- *
+ *
* @return empty role semantic
*/
EmptyRoleSemantic emptyRoleSemantic() default EmptyRoleSemantic.PERMIT;
/**
* Determines whether SSL/TLS is required to process the current request.
- *
+ *
* @return transport guarantee
*/
TransportGuarantee transportGuarantee() default TransportGuarantee.NONE;
@@ -61,7 +61,7 @@ public @interface HttpMethodConstraint {
* The authorized roles' names. The container may discard duplicate role
* names during processing of the annotation. N.B. The String "*" does not
* have a special meaning if it occurs as a role name.
- *
+ *
* @return array of names. The array may be of zero length, in which case
* the EmptyRoleSemantic applies; the returned value determines
* whether access is to be permitted or denied regardless of the
Modified: tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/MultipartConfig.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -26,19 +26,19 @@ import java.lang.annotation.Target;
* which it is declared expects requests to made using the {@code
* multipart/form-data} MIME type. <br />
* <br />
- *
+ *
* {@link javax.servlet.http.Part} components of a given {@code
* multipart/form-data} request are retrieved by a Servlet annotated with
* {@code MultipartConfig} by calling
* {@link javax.servlet.http.HttpServletRequest#getPart} or
* {@link javax.servlet.http.HttpServletRequest#getParts}.<br />
* <br />
- *
+ *
* E.g. <code>@WebServlet("/upload")}</code><br />
- *
+ *
* <code>@MultipartConfig()</code> <code>public class UploadServlet extends
* HttpServlet ... } </code><br />
- *
+ *
* @since Servlet 3.0
*/
@Target({ElementType.TYPE})
Modified: tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/ServletSecurity.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
* The container applies constraints to the URL patterns mapped to each Servlet
* which declares this annotation.<br />
* <br />
- *
+ *
* @since Servlet 3.0
*/
@Inherited
@@ -75,7 +75,7 @@ public @interface ServletSecurity {
/**
* The default constraint to apply to requests not handled by specific
* method constraints
- *
+ *
* @return http constraint
*/
HttpConstraint value() default @HttpConstraint;
@@ -83,7 +83,7 @@ public @interface ServletSecurity {
/**
* An array of HttpMethodContraint objects to which the security constraint
* will be applied
- *
+ *
* @return array of http method constraint
*/
HttpMethodConstraint[] httpMethodConstraints() default {};
Modified: tomcat/trunk/java/javax/servlet/annotation/WebFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebFilter.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebFilter.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebFilter.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -27,35 +27,35 @@ import javax.servlet.DispatcherType;
/**
* The annotation used to declare a Servlet {@link javax.servlet.Filter}. <br />
* <br />
- *
+ *
* This annotation will be processed by the container during deployment, the
* Filter class in which it is found will be created as per the configuration
* and applied to the URL patterns, {@link javax.servlet.Servlet}s and
* {@link javax.servlet.DispatcherType}s.<br />
* <br/>
- *
+ *
* If the name attribute is not defined, the fully qualified name of the class
* is used.<br/>
* <br/>
- *
+ *
* At least one URL pattern MUST be declared in either the {@code value} or
* {@code urlPattern} attribute of the annotation, but not both.<br/>
* <br/>
- *
+ *
* The {@code value} attribute is recommended for use when the URL pattern is
* the only attribute being set, otherwise the {@code urlPattern} attribute
* should be used.<br />
* <br />
- *
+ *
* The annotated class MUST implement {@link javax.servlet.Filter}.
- *
+ *
* E.g.
- *
+ *
* <code>@WebFilter("/path/*")</code><br />
* <code>public class AnExampleFilter implements Filter { ... </code><br />
- *
+ *
* @since Servlet 3.0 (Section 8.1.2)
- *
+ *
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@@ -99,7 +99,7 @@ public @interface WebFilter {
/**
* A convenience method, to allow extremely simple annotation of a class.
- *
+ *
* @return array of URL patterns
* @see #urlPatterns()
*/
Modified: tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebInitParam.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -28,11 +28,11 @@ import java.lang.annotation.Target;
* {@link javax.servlet.annotation.WebFilter} or
* {@link javax.servlet.annotation.WebServlet} annotation.<br />
* <br />
- *
+ *
* E.g.
* <code>&#064;WebServlet(name="TestServlet", urlPatterns={"/test"},initParams={&#064;WebInitParam(name="test", value="true")})
* public class TestServlet extends HttpServlet { ... </code><br />
- *
+ *
* @since Servlet 3.0
*/
@Target({ElementType.TYPE})
Modified: tomcat/trunk/java/javax/servlet/annotation/WebListener.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebListener.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebListener.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebListener.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
* The annotation used to declare a listener for various types of event, in a
* given web application context.<br />
* <br />
- *
+ *
* The class annotated MUST implement one, (or more), of the following
* interfaces: {@link javax.servlet.http.HttpSessionAttributeListener},
* {@link javax.servlet.http.HttpSessionListener},
@@ -35,10 +35,10 @@ import java.lang.annotation.Target;
* {@link javax.servlet.ServletRequestAttributeListener},
* {@link javax.servlet.ServletRequestListener} <br />
* <br />
- *
+ *
* E.g. <code>@WebListener</code><br />
* <code>public TestListener implements ServletContextListener {</code><br />
- *
+ *
* @since Servlet 3.0
*/
@Target({ElementType.TYPE})
Modified: tomcat/trunk/java/javax/servlet/annotation/WebServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/annotation/WebServlet.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/annotation/WebServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/annotation/WebServlet.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
@@ -25,33 +25,33 @@ import java.lang.annotation.Target;
/**
* This annotation is used to declare the configuration of an
* {@link javax.servlet.Servlet}. <br/>
- *
+ *
* If the name attribute is not defined, the fully qualified name of the class
* is used.<br/>
* <br/>
- *
+ *
* At least one URL pattern MUST be declared in either the {@code value} or
* {@code urlPattern} attribute of the annotation, but not both.<br/>
* <br/>
- *
+ *
* The {@code value} attribute is recommended for use when the URL pattern is
* the only attribute being set, otherwise the {@code urlPattern} attribute
* should be used.<br />
* <br />
- *
+ *
* The class on which this annotation is declared MUST extend
* {@link javax.servlet.http.HttpServlet}. <br />
* <br />
- *
+ *
* E.g. <code>@WebServlet("/path")}<br />
* public class TestServlet extends HttpServlet ... {</code><br />
- *
+ *
* E.g.
* <code>@WebServlet(name="TestServlet", urlPatterns={"/path", "/alt"}) <br />
* public class TestServlet extends HttpServlet ... {</code><br />
- *
+ *
* @since Servlet 3.0 (Section 8.1.1)
- *
+ *
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@@ -65,7 +65,7 @@ public @interface WebServlet {
/**
* A convenience method, to allow extremely simple annotation of a class.
- *
+ *
* @return array of URL patterns
* @see #urlPatterns()
*/
Modified: tomcat/trunk/java/javax/servlet/descriptor/JspConfigDescriptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/descriptor/JspConfigDescriptor.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/descriptor/JspConfigDescriptor.java (original)
+++ tomcat/trunk/java/javax/servlet/descriptor/JspConfigDescriptor.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java (original)
+++ tomcat/trunk/java/javax/servlet/descriptor/JspPropertyGroupDescriptor.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
Modified: tomcat/trunk/java/javax/servlet/descriptor/TaglibDescriptor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/descriptor/TaglibDescriptor.java?rev=1187778&r1=1187777&r2=1187778&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/descriptor/TaglibDescriptor.java (original)
+++ tomcat/trunk/java/javax/servlet/descriptor/TaglibDescriptor.java Sat Oct 22 20:54:57 2011
@@ -5,9 +5,9 @@
* 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org