Author: markt
Date: Sat Nov 15 10:30:48 2008
New Revision: 717908
URL: http://svn.apache.org/viewvc?rev=717908&view=rev
Log:
Mark the invoker as deprecated as it has been removed from trunk.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/conf/web.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=717908&r1=717907&r2=717908&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Nov 15 10:30:48 2008
@@ -190,12 +190,6 @@
Just did that for trunk (r711934; but it contains also other changes).
Caution: at the moment there's no @VERSION@ substitution for
service.bat.
-* Deprecate the invoker servlet ready for its removal in 7.0.x
- http://people.apache.org/~markt/patches/2008-11-03-invoker.patch
- +1: markt, rjung, fhanik
- -1:
- rjung: You might also add the deprecation info to the default conf/web.xml.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46047
Include jar in path for dependencies if they are in a JAR
Patch provided by CĀdric Mailleux
Modified: tomcat/tc6.0.x/trunk/conf/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/web.xml?rev=717908&r1=717907&r2=717908&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/conf/web.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/web.xml Sat Nov 15 10:30:48 2008
@@ -102,6 +102,9 @@
</servlet>
+ <!-- This servlet has been deprecated due to security concerns. Servlets -->
+ <!-- should be explicitly mapped in web.xml -->
+ <!-- -->
<!-- The "invoker" servlet, which executes anonymous servlet classes -->
<!-- that have not been defined in a web.xml file. Traditionally, this -->
<!-- servlet is mapped to the URL pattern "/servlet/*", but you can map -->
@@ -364,7 +367,7 @@
<url-pattern>/</url-pattern>
</servlet-mapping>
- <!-- The mapping for the invoker servlet -->
+ <!-- The mapping for the deprecated invoker servlet -->
<!--
<servlet-mapping>
<servlet-name>invoker</servlet-name>
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java?rev=717908&r1=717907&r2=717908&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java
Sat Nov 15 10:30:48 2008
@@ -29,6 +29,8 @@
* for an invoked servlet. Subsequent requests will be mapped directly
* to the servlet, because a new servlet mapping will have been created.
*
+ * @deprecated Servlets should be explicitly mapped in web.xml
+ *
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerServlet.java?rev=717908&r1=717907&r2=717908&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/InvokerServlet.java
Sat Nov 15 10:30:48 2008
@@ -40,6 +40,8 @@
* used to serve requests to servlets that have not been registered
* in the web application deployment descriptor.
*
+ * @deprecated Servlets should be explicitly mapped in web.xml
+ *
* @author Craig R. McClanahan
* @version $Revision$ $Date$
*/
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=717908&r1=717907&r2=717908&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Nov 15 10:30:48 2008
@@ -166,6 +166,10 @@
<bug>46096</bug>: Support annotation processing whilst running under a
security manager. (markt)
</fix>
+ <fix>
+ The invoker servlet has been deprecated and will be removed in Tomcat 7
+ onwards. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
