index.html

kkolinko Tue, 21 Oct 2014 16:56:16 -0700

Author: kkolinko
Date: Tue Oct 21 23:55:32 2014
New Revision: 1633489

URL: http://svn.apache.org/r1633489
Log:
Move Async and Comet examples from JSP examples page to Servlets examples page,
like it have already been done in Tomcat 8.


Merged r1518578, r1518581, r1518589 from tomcat/trunk.

Added:
    tomcat/tc7.0.x/trunk/webapps/examples/servlets/chat/
      - copied from r1518589, tomcat/trunk/webapps/examples/servlets/chat/
Removed:
    tomcat/tc7.0.x/trunk/webapps/examples/jsp/chat/
Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
    tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html
    tomcat/tc7.0.x/trunk/webapps/examples/servlets/index.html

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1518578,1518581,1518589

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=1633489&r1=1633488&r2=1633489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Oct 21 23:55:32 2014
@@ -168,6 +168,10 @@
         Correct version of Java WebSocket mentioned in documentation
         (s/1.0/1.1/). (markt/kkolinko)
       </fix>
+      <update>
+        In examples web application move Async and Comet examples from JSP
+        to Servlet examples page. (kkolinko)
+      </update>
     </changelog>
   </subsection>
   <subsection name="jdbc-pool">

Modified: tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml?rev=1633489&r1=1633488&r2=1633489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/web.xml Tue Oct 21 23:55:32 
2014
@@ -157,7 +157,7 @@
 
     <servlet-mapping>
         <servlet-name>ChatServlet</servlet-name>
-        <url-pattern>/jsp/chat/chat</url-pattern>
+        <url-pattern>/servlets/chat/chat</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>CompressionFilterTestServlet</servlet-name>

Modified: tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html?rev=1633489&r1=1633488&r2=1633489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/jsp/index.html Tue Oct 21 23:55:32 
2014
@@ -392,63 +392,6 @@ ght=24 width=24 align=TOP></a>
     is configured to have these roles.</td>
 </tr>
 
-<tr>
-  <td colspan="3">Servlet 3.0 Asynchronous processing examples&nbsp;<br />
-    Examples that demonstrate using Servlet 3.0 asynchronous
-    request processing API.</td>
-</tr>
-<tr VALIGN=TOP>
-  <td>async0&nbsp;</td>
-  <td VALIGN=TOP WIDTH="30%">
-    <a href="../async/async0"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
-  </td>
-  <td WIDTH="30%"></td>
-</tr>
-<tr VALIGN=TOP>
-  <td>async1&nbsp;</td>
-  <td VALIGN=TOP WIDTH="30%">
-    <a href="../async/async1"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
-  </td>
-  <td WIDTH="30%"></td>
-</tr>
-<tr VALIGN=TOP>
-  <td>async2&nbsp;</td>
-  <td VALIGN=TOP WIDTH="30%">
-    <a href="../async/async2"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
-  </td>
-  <td WIDTH="30%"></td>
-</tr>
-<tr VALIGN=TOP>
-  <td>async3&nbsp;</td>
-  <td VALIGN=TOP WIDTH="30%">
-    <a href="../async/async3"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
-  </td>
-  <td WIDTH="30%"></td>
-</tr>
-<tr VALIGN=TOP>
-  <td>stockticker&nbsp;</td>
-  <td VALIGN=TOP WIDTH="30%">
-    <a href="../async/stockticker"><img SRC="images/execute.gif" HSPACE=4 
BORDER=0 align=TOP> Execute</a>
-  </td>
-  <td WIDTH="30%"></td>
-</tr>
-
-<tr>
-  <td colspan="3">Comet processing example&nbsp;<br />
-    Example that demonstrates asynchronous request processing
-    using Comet API. See <strong>"Advanced IO"</strong> chapter in the
-    User Guide for details. It works only with connectors that support
-    Comet processing (<strong>APR</strong> or <strong>NIO</strong>
-    <strong>HTTP</strong> connectors).</td>
-</tr>
-<tr VALIGN=TOP>
-  <td>Comet Chat&nbsp;</td>
-  <td VALIGN=TOP WIDTH="30%">
-    <a href="chat/"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP> 
Execute</a>
-  </td>
-  <td WIDTH="30%"></td>
-</tr>
-
 </table>
 </body>
 </html>

Modified: tomcat/tc7.0.x/trunk/webapps/examples/servlets/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/servlets/index.html?rev=1633489&r1=1633488&r2=1633489&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/examples/servlets/index.html (original)
+++ tomcat/tc7.0.x/trunk/webapps/examples/servlets/index.html Tue Oct 21 
23:55:32 2014
@@ -116,6 +116,65 @@ when looking at the cookie demo.
 <p>Note: The source code for these examples does not contain all of the
 source code that is actually in the example, only the important sections
 of code. Code not important to understand the example has been removed
-for clarity.
+for clarity.</p>
+
+<b><u><font size="+1">Other Examples</font></u></b><br>
+<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
+
+<tr>
+  <td colspan="3">Servlet 3.0 Asynchronous processing examples:</td>
+</tr>
+<tr VALIGN=TOP>
+  <td>async0&nbsp;</td>
+  <td VALIGN=TOP WIDTH="30%">
+    <a href="../async/async0"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
+  </td>
+  <td WIDTH="30%"></td>
+</tr>
+<tr VALIGN=TOP>
+  <td>async1&nbsp;</td>
+  <td VALIGN=TOP WIDTH="30%">
+    <a href="../async/async1"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
+  </td>
+  <td WIDTH="30%"></td>
+</tr>
+<tr VALIGN=TOP>
+  <td>async2&nbsp;</td>
+  <td VALIGN=TOP WIDTH="30%">
+    <a href="../async/async2"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
+  </td>
+  <td WIDTH="30%"></td>
+</tr>
+<tr VALIGN=TOP>
+  <td>async3&nbsp;</td>
+  <td VALIGN=TOP WIDTH="30%">
+    <a href="../async/async3"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 
align=TOP> Execute</a>
+  </td>
+  <td WIDTH="30%"></td>
+</tr>
+<tr VALIGN=TOP>
+  <td>stockticker&nbsp;</td>
+  <td VALIGN=TOP WIDTH="30%">
+    <a href="../async/stockticker"><img SRC="images/execute.gif" HSPACE=4 
BORDER=0 align=TOP> Execute</a>
+  </td>
+  <td WIDTH="30%"></td>
+</tr>
+
+<tr>
+  <td colspan="3">Comet processing example:<br />
+    See the <strong>"Advanced IO"</strong> chapter in the User Guide for
+    details. This example only works with the HTTP NIO or HTTP APR/native
+    connectors as these are the only connectors that support Comet.</td>
+</tr>
+<tr VALIGN=TOP>
+  <td>Comet Chat&nbsp;</td>
+  <td VALIGN=TOP WIDTH="30%">
+    <a href="chat/"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP> 
Execute</a>
+  </td>
+  <td WIDTH="30%"></td>
+</tr>
+
+</table>
+
 </body>
 </html>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r1633489 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/examples/WEB-INF/web.xml webapps/examples/jsp/chat/ webapps/examples/jsp/index.html webapps/examples/servlets/chat/ webapps/examples/servlets/index.html

Reply via email to