Author: kkolinko
Date: Thu Oct 16 08:45:57 2014
New Revision: 1632245
URL: http://svn.apache.org/r1632245
Log:
Correct version of Java WebSocket mentioned in message displayed on Tomcat
start on Java 6, in documentation and examples
Followup to r1632232
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
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/index.html
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=1632245&r1=1632244&r2=1632245&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 Thu
Oct 16 08:45:57 2014
@@ -19,7 +19,7 @@ package org.apache.catalina.websocket;
/**
* Constants for this Java package.
*
- * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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
Thu Oct 16 08:45:57 2014
@@ -30,7 +30,7 @@ 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 Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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
Thu Oct 16 08:45:57 2014
@@ -36,7 +36,7 @@ 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 Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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
Thu Oct 16 08:45:57 2014
@@ -43,7 +43,7 @@ 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 Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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 Thu
Oct 16 08:45:57 2014
@@ -31,7 +31,7 @@ import org.apache.tomcat.util.res.String
* Represents a complete WebSocket frame with the exception of the payload for
* non-control frames.
*
- * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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
Thu Oct 16 08:45:57 2014
@@ -45,7 +45,7 @@ import org.apache.tomcat.util.res.String
* Wrapper for the HttpServletRequest object that allows the underlying request
* object to be invalidated.
*
- * @deprecated Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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
Thu Oct 16 08:45:57 2014
@@ -28,7 +28,7 @@ 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 Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
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=1632245&r1=1632244&r2=1632245&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 Thu
Oct 16 08:45:57 2014
@@ -32,7 +32,7 @@ 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 Replaced by the JSR356 WebSocket 1.0 implementation and will be
+ * @deprecated Replaced by the JSR356 WebSocket 1.1 implementation and will be
* removed in Tomcat 8.0.x.
*/
@Deprecated
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties?rev=1632245&r1=1632244&r2=1632245&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/server/LocalStrings.properties
Thu Oct 16 08:45:57 2014
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-sci.noWebSocketSupport=JSR 356 WebSocket (Java WebSocket 1.0) support is not
available when running on Java 6. To suppress this message, run Tomcat on Java
7, remove the WebSocket JARs from $CATALINA_HOME/lib or add the WebSocket JARs
to the tomcat.util.scan.DefaultJarScanner.jarsToSkip property in
$CATALINA_BASE/conf/catalina.properties. Note that the deprecated Tomcat 7
WebSocket API will be available.
+sci.noWebSocketSupport=JSR 356 WebSocket (Java WebSocket 1.1) support is not
available when running on Java 6. To suppress this message, run Tomcat on Java
7, remove the WebSocket JARs from $CATALINA_HOME/lib or add the WebSocket JARs
to the tomcat.util.scan.DefaultJarScanner.jarsToSkip property in
$CATALINA_BASE/conf/catalina.properties. Note that the deprecated Tomcat 7
WebSocket API will be available.
serverContainer.addNotAllowed=No further Endpoints may be registered once an
attempt has been made to use one of the previously registered endpoints
serverContainer.configuratorFail=Failed to create configurator of type [{0}]
for POJO of type [{1}]
Modified: tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml?rev=1632245&r1=1632244&r2=1632245&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/web-socket-howto.xml Thu Oct 16 08:45:57
2014
@@ -68,7 +68,7 @@ implement its own timeout mechanism to h
</section>
<section name="Tomcat WebSocket specific configuration">
-<p>The JSR-356 Java WebSocket 1.0 implementation is only available when Tomcat
+<p>The JSR-356 Java WebSocket 1.1 implementation is only available when Tomcat
is running on Java 7 or later.</p>
<p>Tomcat provides a number of Tomcat specific configuration options for
Modified: tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/index.html?rev=1632245&r1=1632244&r2=1632245&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/index.html
(original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/index.html Thu
Oct 16 08:45:57 2014
@@ -28,6 +28,6 @@
<li><a href="snake.html">Multiplayer snake example</a></li>
</ul>
<p>This API has been deprecated. The examples are also available using the JSR
- 356 <a href="../websocket/index.xhtml">Java WebSocket 1.0 API</a>.</p>
+ 356 <a href="../websocket/index.xhtml">Java WebSocket 1.1 API</a>.</p>
</body>
</html>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
