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 2012/10/12 11:19:25 UTC
svn commit: r1397487 - in /tomcat/trunk:
java/javax/servlet/http/ProtocolHandler.java
java/javax/servlet/http/WebConnection.java
res/checkstyle/javax-import-control.xml
Author: markt
Date: Fri Oct 12 09:19:25 2012
New Revision: 1397487
URL: http://svn.apache.org/viewvc?rev=1397487&view=rev
Log:
Add @since tags.
Modified:
tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java
tomcat/trunk/java/javax/servlet/http/WebConnection.java
tomcat/trunk/res/checkstyle/javax-import-control.xml
Modified: tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java?rev=1397487&r1=1397486&r2=1397487&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java (original)
+++ tomcat/trunk/java/javax/servlet/http/ProtocolHandler.java Fri Oct 12 09:19:25 2012
@@ -18,16 +18,20 @@ package javax.servlet.http;
/**
* Interface between the HTTP upgrade process and the new protocol.
+ *
+ * @since Servlet 3.1
*/
public interface ProtocolHandler {
/**
* This method is called once the request/response pair where
- * {@link HttpServletRequest#upgrade(ProtocolHandler) is called has
+ * {@link HttpServletRequest#upgrade(ProtocolHandler)} is called has
* completed processing and is the point where control of the connection
* passes from the container to the {@link ProtocolHandler}.
*
* @param connection The connection that has been upgraded
+ *
+ * @since Servlet 3.1
*/
void init(WebConnection connection);
}
Modified: tomcat/trunk/java/javax/servlet/http/WebConnection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/WebConnection.java?rev=1397487&r1=1397486&r2=1397487&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/WebConnection.java (original)
+++ tomcat/trunk/java/javax/servlet/http/WebConnection.java Fri Oct 12 09:19:25 2012
@@ -24,18 +24,24 @@ import javax.servlet.ServletOutputStream
/**
* The interface used by a {@link ProtocolHandler} to interact with an upgraded
* HTTP connection.
+ *
+ * @since Servlet 3.1
*/
public interface WebConnection {
/**
* Provides access to the {@link ServletInputStream} for reading data from
* the client.
+ *
+ * @since Servlet 3.1
*/
ServletInputStream getInputStream() throws IOException;
/**
* Provides access to the {@link ServletOutputStream} for writing data to
* the client.
+ *
+ * @since Servlet 3.1
*/
ServletOutputStream getOutputStream() throws IOException;
}
\ No newline at end of file
Modified: tomcat/trunk/res/checkstyle/javax-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/javax-import-control.xml?rev=1397487&r1=1397486&r2=1397487&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/javax-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/javax-import-control.xml Fri Oct 12 09:19:25 2012
@@ -33,6 +33,10 @@
<subpackage name="mail">
<allow pkg="javax.mail"/>
</subpackage>
+ <subpackage name="net.websocket">
+ <allow pkg="javax.net.websocket"/>
+ <allow pkg="javax.net.websocket.extensions"/>
+ </subpackage>
<subpackage name="persistence">
<allow pkg="javax.persistence"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org