Author: violetagg
Date: Sun Oct 27 15:34:59 2013
New Revision: 1536152
URL: http://svn.apache.org/r1536152
Log:
Update the documentation with information for WebSocket 1.0 specification and
javadoc.
Added:
tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/ (with props)
tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/index.html (with props)
Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/index.xml
tomcat/tc7.0.x/trunk/webapps/docs/project.xml
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=1536152&r1=1536151&r2=1536152&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Oct 27 15:34:59 2013
@@ -124,6 +124,10 @@
<code>notifyLifecycleListenerOnFailure</code> and
<code>heartbeatBackgroundEnabled</code>. (kfujino)
</add>
+ <fix>
+ Update the documentation with information for WebSocket 1.0
specification
+ and javadoc. (violetagg)
+ </fix>
</changelog>
</subsection>
<subsection name="Extras">
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=1536152&r1=1536151&r2=1536152&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/index.xml Sun Oct 27 15:34:59 2013
@@ -166,12 +166,19 @@ are responsible for installing, configur
<a
href="http://docs.oracle.com/javaee/6/api/index.html?javax/servlet/package-summary.html";>
<strong>Javadoc</strong></a>
</li>
-<li><a href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index.html";>
- <strong>JSP 2.2 and EL 2.2 Specifications</strong></a>,
+<li>JSP 2.2 and EL 2.2
+ <a href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index.html";>
+ <strong>Specifications</strong></a>, JSP 2.2
<a
href="http://docs.oracle.com/javaee/6/api/index.html?javax/servlet/jsp/package-summary.html";>
- <strong>JSP 2.2 Javadoc (note it is labelled as JSP 2.1)</strong></a>,
+ <strong>Javadoc (note it is labelled as JSP 2.1)</strong></a>, EL 2.2
<a
href="http://docs.oracle.com/javaee/6/api/index.html?javax/el/package-summary.html";>
- <strong>EL 2.2 Javadoc</strong></a>
+ <strong>Javadoc</strong></a>
+ </li>
+<li>WebSocket 1.0
+ <a
href="http://jcp.org/aboutJava/communityprocess/final/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>
</li>
</ul>
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=1536152&r1=1536151&r2=1536152&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/project.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/project.xml Sun Oct 27 15:34:59 2013
@@ -83,6 +83,8 @@
<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"
+ href="websocketapi/index.html"/>
<item name="JK 1.2 Documentation"
href="http://tomcat.apache.org/connectors-doc/"/>
</menu>
Propchange: tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/
------------------------------------------------------------------------------
bugtraq:append = false
Propchange: tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/
------------------------------------------------------------------------------
bugtraq:label = Bugzilla ID (optional)
Propchange: tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/
------------------------------------------------------------------------------
--- bugtraq:message (added)
+++ bugtraq:message Sun Oct 27 15:34:59 2013
@@ -0,0 +1 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/
------------------------------------------------------------------------------
bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%
Added: tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/index.html?rev=1536152&view=auto
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/index.html (added)
+++ tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/index.html Sun Oct 27
15:34:59 2013
@@ -0,0 +1,34 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+-->
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="UTF-8" />
+ <title>API docs</title>
+</head>
+
+<body>
+
+The WebSocket Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+<a href="http://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/";>
+documentation bundle</a>.
+
+</body>
+</html>
Propchange: tomcat/tc7.0.x/trunk/webapps/docs/websocketapi/index.html
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
