Author: violetagg
Date: Thu Oct 16 08:09:12 2014
New Revision: 1632232
URL: http://svn.apache.org/r1632232
Log:
Merged revision 1631992 from tomcat/trunk:
Correct version of Java WebSocket mentioned in documentation
Followup to r1631839
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/RELEASE-NOTES
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
tomcat/tc7.0.x/trunk/webapps/docs/index.xml
tomcat/tc7.0.x/trunk/webapps/docs/project.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1631992
Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Thu Oct 16 08:09:12 2014
@@ -20,8 +20,8 @@
====================================================
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
-implements the Servlet 3.0 and JSP 2.2 specifications from the Java
-Community Process <http://www.jcp.org/>.
+implements the Servlet 3.0, JSP 2.2, EL 2.2 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
it. You may simply download a binary distribution. It is cross-platform.
Modified: tomcat/tc7.0.x/trunk/RELEASE-NOTES
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RELEASE-NOTES?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc7.0.x/trunk/RELEASE-NOTES Thu Oct 16 08:09:12 2014
@@ -109,13 +109,13 @@ for use by web applications (by placing
* jasper-el.jar (Jasper 2 EL implementation)
* jsp-api.jar (JSP 2.2 API)
* servlet-api.jar (Servlet 3.0 API)
-* tomcat7-websocket.jar (WebSocket 1.0 implementation)
+* tomcat7-websocket.jar (WebSocket 1.1 implementation)
* tomcat-api.jar (Interfaces shared by Catalina and Jasper)
* tomcat-coyote.jar (Tomcat connectors and utility classes)
* tomcat-dbcp.jar (package renamed database connection pool based on Commons
DBCP)
* tomcat-jdbc.jar (Tomcat's database connection pooling solution)
* tomcat-util.jar (Various utilities)
-* websocket-api.jar (WebSocket 1.0 API)
+* 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/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Oct 16 08:09:12 2014
@@ -155,7 +155,7 @@
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
<property name="tomcat-jdbc-src.jar"
value="${tomcat.pool}/tomcat-jdbc-src.jar"/>
- <!-- WebSocket 1.0 (JSR-356) API and implementation JARs & source JARS
-->
+ <!-- WebSocket 1.1 (JSR-356) API and implementation JARs & source JARS
-->
<!-- The API JAR is the same as the one that ships with Tomcat 8 except
-->
<!-- that it does not use Java 7 features (<> and multi-catch) and has
-->
<!-- been compiled for Java 6. The implementation JAR includes a number of
-->
@@ -800,13 +800,13 @@
<target name="package-java7" depends="compile,build-manifests"
if="java.7.home">
- <!-- 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="${tomcat7-websocket.jar}"
filesDir="${tomcat.classes}"
filesId="files.tomcat7-websocket"
@@ -1874,9 +1874,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"
@@ -2603,13 +2603,13 @@ Apache Tomcat ${version} native binaries
depends="build-manifests,build-tomcat-jdbc-src"
if="java.7.home">
- <!-- 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="${tomcat7-websocket-src.jar}"
filesDir="java"
filesId="files.tomcat7-websocket" />
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Oct 16 08:09:12 2014
@@ -105,7 +105,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>
</section>
<section name="Tomcat 7.0.56 (violetagg)" rtext="released 2014-10-06">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/class-loader-howto.xml Thu Oct 16
08:09:12 2014
@@ -156,6 +156,8 @@ loaders as it is initialized:</p>
<a href="jdbc-pool.html">documentation</a> for more details.</li>
<li><em>tomcat-util.jar</em> — Common classes used by various
components of
Apache Tomcat.</li>
+ <li><em>tomcat7-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/tc7.0.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/index.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/index.xml Thu Oct 16 08:09:12 2014
@@ -174,8 +174,8 @@ are responsible for installing, configur
<a
href="http://docs.oracle.com/javaee/6/api/index.html?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/tc7.0.x/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/project.xml?rev=1632232&r1=1632231&r2=1632232&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/project.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/project.xml Thu Oct 16 08:09:12 2014
@@ -83,7 +83,7 @@
<item name="Servlet Javadocs" href="servletapi/index.html"/>
<item name="JSP 2.2 Javadocs" href="jspapi/index.html"/>
<item name="EL 2.2 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
