Author: kkolinko
Date: Wed Oct 15 11:25:40 2014
New Revision: 1631992
URL: http://svn.apache.org/r1631992
Log:
Correct version of Java WebSocket mentioned in documentation
Followup to r1631839
Modified:
tomcat/trunk/BUILDING.txt
tomcat/trunk/RELEASE-NOTES
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/class-loader-howto.xml
tomcat/trunk/webapps/docs/index.xml
tomcat/trunk/webapps/docs/project.xml
Modified: tomcat/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Wed Oct 15 11:25:40 2014
@@ -20,7 +20,7 @@
====================================================
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
-implements the Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 specifications
+implements the Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.1 specifications
from the Java Community Process <http://www.jcp.org/>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
Modified: tomcat/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Wed Oct 15 11:25:40 2014
@@ -85,8 +85,8 @@ for use by web applications (by placing
* tomcat-jni.jar (Interface to the native component of the APR/native
connector)
* tomcat-spdy.jar (SPDY implementation)
* tomcat-util.jar (Various utilities)
-* tomcat-websocket.jar (WebSocket 1.0 implementation)
-* websocket-api.jar (WebSocket 1.0 API)
+* tomcat-websocket.jar (WebSocket 1.1 implementation)
+* websocket-api.jar (WebSocket 1.1 API)
You can make additional APIs available to all of your web applications by
putting unpacked classes into a "classes" directory (not created by default),
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Oct 15 11:25:40 2014
@@ -720,13 +720,13 @@
filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest" />
- <!-- WebSocket 1.0 API JAR File -->
+ <!-- WebSocket 1.1 API JAR File -->
<jarIt jarfile="${websocket-api.jar}"
filesDir="${tomcat.classes}"
filesId="files.websocket-api"
manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
- <!-- WebSocket 1.0 implementation JAR File -->
+ <!-- WebSocket 1.1 implementation JAR File -->
<jarIt jarfile="${tomcat-websocket.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat-websocket"
@@ -1918,9 +1918,9 @@ Apache Tomcat ${version} native binaries
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/websocketapi"
version="true"
- windowtitle="WebSocket 1.0 API Documentation - Apache Tomcat ${version}"
- doctitle="WebSocket 1.0 API - Apache Tomcat ${version}"
- header="<b>WebSocket 1.0 - Apache Tomcat ${version}</b>"
+ windowtitle="WebSocket 1.1 API Documentation - Apache Tomcat ${version}"
+ doctitle="WebSocket 1.1 API - Apache Tomcat ${version}"
+ header="<b>WebSocket 1.1 - Apache Tomcat ${version}</b>"
bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
encoding="ISO-8859-1"
additionalparam="-breakiterator"
@@ -2590,13 +2590,13 @@ Apache Tomcat ${version} native binaries
filesId="files.el-api"
manifest="${tomcat.manifests}/el-api.jar.manifest" />
- <!-- WebSocket 1.0 API JAR File -->
+ <!-- WebSocket 1.1 API JAR File -->
<jarIt jarfile="${websocket-api-src.jar}"
filesDir="java"
filesId="files.websocket-api"
manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
- <!-- WebSocket 1.0 implementation JAR File -->
+ <!-- WebSocket 1.1 implementation JAR File -->
<jarIt jarfile="${tomcat-websocket-src.jar}"
filesDir="java"
filesId="files.tomcat-websocket" />
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Oct 15 11:25:40 2014
@@ -198,7 +198,11 @@
<code><Engine></code>'s <code>jvmRoute</code> or in a system
property. (schultz)
</fix>
- </changelog>
+ <fix>
+ Correct version of Java WebSocket mentioned in documentation
+ (s/1.0/1.1/). (markt/kkolinko)
+ </fix>
+ </changelog>
</subsection>
<subsection name="Tribes">
<changelog>
Modified: tomcat/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/class-loader-howto.xml?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/trunk/webapps/docs/class-loader-howto.xml Wed Oct 15 11:25:40 2014
@@ -159,8 +159,8 @@ loaders as it is initialized:</p>
<li><em>tomcat-spdy.jar</em> — SPDY implementation</li>
<li><em>tomcat-util.jar</em> — Common classes used by various
components of
Apache Tomcat.</li>
- <li><em>tomcat-websocket.jar</em> — WebSocket 1.0 implementation</li>
- <li><em>websocket-api.jar</em> — WebSocket 1.0 API</li>
+ <li><em>tomcat-websocket.jar</em> — WebSocket 1.1 implementation</li>
+ <li><em>websocket-api.jar</em> — WebSocket 1.1 API</li>
</ul></li>
<li><p><strong>WebappX</strong> — A class loader is created for each web
application that is deployed in a single Tomcat instance. All unpacked
Modified: tomcat/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Wed Oct 15 11:25:40 2014
@@ -180,8 +180,8 @@ are responsible for installing, configur
<a
href="http://docs.oracle.com/javaee/7/api/javax/el/package-summary.html";>
<strong>Javadoc</strong></a>
</li>
-<li>WebSocket 1.0
- <a
href="http://jcp.org/aboutJava/communityprocess/final/jsr356/index.html";>
+<li>WebSocket 1.1
+ <a
href="https://jcp.org/aboutJava/communityprocess/mrel/jsr356/index.html";>
<strong>Specification</strong></a> and
<a
href="http://docs.oracle.com/javaee/7/api/javax/websocket/package-summary.html";>
<strong>Javadoc</strong></a>
Modified: tomcat/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=1631992&r1=1631991&r2=1631992&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Wed Oct 15 11:25:40 2014
@@ -84,7 +84,7 @@
<item name="Servlet Javadocs" href="servletapi/index.html"/>
<item name="JSP 2.3 Javadocs" href="jspapi/index.html"/>
<item name="EL 3.0 Javadocs" href="elapi/index.html"/>
- <item name="WebSocket 1.0 Javadocs"
+ <item name="WebSocket 1.1 Javadocs"
href="websocketapi/index.html"/>
<item name="JK 1.2 Documentation"
href="http://tomcat.apache.org/connectors-doc/"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
