Author: markt
Date: Sun Dec 8 16:12:33 2013
New Revision: 1549052
URL: http://svn.apache.org/r1549052
Log:
Better deprecation message.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/Constants.java Sun
Dec 8 16:12:33 2013
@@ -19,7 +19,8 @@ package org.apache.catalina.websocket;
/**
* Constants for this Java package.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public class Constants {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/MessageInbound.java
Sun Dec 8 16:12:33 2013
@@ -30,7 +30,8 @@ import org.apache.tomcat.util.res.String
* specific functionality. Applications that wish to operate on a stream basis
* rather than a message basis should use {@link StreamInbound}.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public abstract class MessageInbound extends StreamInbound {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/StreamInbound.java
Sun Dec 8 16:12:33 2013
@@ -36,7 +36,8 @@ import org.apache.tomcat.util.net.Abstra
* specific functionality. Applications that wish to operate on a message basis
* rather than a stream basis should use {@link MessageInbound}.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public abstract class StreamInbound implements UpgradeInbound {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WebSocketServlet.java
Sun Dec 8 16:12:33 2013
@@ -43,7 +43,8 @@ import org.apache.tomcat.util.res.String
* connections as per RFC6455. It is expected that applications will extend
this
* implementation and provide application specific functionality.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public abstract class WebSocketServlet extends HttpServlet {
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsFrame.java Sun
Dec 8 16:12:33 2013
@@ -31,7 +31,8 @@ import org.apache.tomcat.util.res.String
* Represents a complete WebSocket frame with the exception of the payload for
* non-control frames.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public class WsFrame {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsHttpServletRequestWrapper.java
Sun Dec 8 16:12:33 2013
@@ -45,7 +45,8 @@ import org.apache.tomcat.util.res.String
* Wrapper for the HttpServletRequest object that allows the underlying request
* object to be invalidated.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public class WsHttpServletRequestWrapper implements HttpServletRequest {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsInputStream.java
Sun Dec 8 16:12:33 2013
@@ -28,7 +28,8 @@ import org.apache.tomcat.util.res.String
* makes the number of bytes declared in the payload length available for
* reading even if more bytes are available from the socket.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public class WsInputStream extends InputStream {
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java?rev=1549052&r1=1549051&r2=1549052&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/websocket/WsOutbound.java Sun
Dec 8 16:12:33 2013
@@ -32,7 +32,8 @@ import org.apache.tomcat.util.res.String
* client) are synchronized to prevent multiple threads trying to write to the
* client at the same time.
*
- * @deprecated Will be removed in Tomcat 8.0.x.
+ * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * removed in Tomcat 8.0.x.
*/
@Deprecated
public class WsOutbound {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
