You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2017/11/30 08:28:38 UTC

svn commit: r1816684 - in /tomcat/tc8.5.x/trunk/webapps: docs/changelog.xml examples/WEB-INF/classes/http2/ examples/WEB-INF/web.xml examples/servlets/index.html

Author: markt
Date: Thu Nov 30 08:28:38 2017
New Revision: 1816684

URL: http://svn.apache.org/viewvc?rev=1816684&view=rev
Log:
Remove the Servlet 4.0 early preview example from the examples web application as the early preview is now deprecated in favour of Tomcat 9 which provides a full Servlet 4.0 implementation.

Removed:
    tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/classes/http2/
Modified:
    tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
    tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml
    tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html

Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1816684&r1=1816683&r2=1816684&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Nov 30 08:28:38 2017
@@ -52,6 +52,15 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        Remove the Servlet 4.0 early preview example from the examples web
+        application as the early preview is now deprecated in favour of Tomcat
+        9 which provides a full Servlet 4.0 implementation. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <fix>

Modified: tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml?rev=1816684&r1=1816683&r2=1816684&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/examples/WEB-INF/web.xml Thu Nov 30 08:28:38 2017
@@ -379,16 +379,6 @@
       <url-pattern>/servlets/nonblocking/numberwriter</url-pattern>
     </servlet-mapping>
 
-    <!-- Server Push examples -->
-    <servlet>
-      <servlet-name>simpleimagepush</servlet-name>
-      <servlet-class>http2.SimpleImagePush</servlet-class>
-    </servlet>
-    <servlet-mapping>
-      <servlet-name>simpleimagepush</servlet-name>
-      <url-pattern>/servlets/serverpush/simpleimage</url-pattern>
-    </servlet-mapping>
-
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
         <welcome-file>index.xhtml</welcome-file>

Modified: tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html
URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html?rev=1816684&r1=1816683&r2=1816684&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html (original)
+++ tomcat/tc8.5.x/trunk/webapps/examples/servlets/index.html Thu Nov 30 08:28:38 2017
@@ -166,17 +166,6 @@ for clarity.</p>
   <td style="width: 30%;"></td>
 </tr>
 
-<tr>
-  <th colspan="3">Servlet 4.0 Server Push examples</th>
-</tr>
-<tr>
-  <td>HTTP/2 server push</td>
-  <td style="width: 30%;">
-    <a href="serverpush/simpleimage"><img src="images/execute.gif" alt=""> Execute</a>
-  </td>
-  <td style="width: 30%;"></td>
-</tr>
-
 </table>
 
 </body>



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