tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r710179 - in /tomcat/trunk: ./ conf/ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/manager/ java/org/apache/catalina/manager/host/ java/org/apache/catalina/servlets/ webapps/docs/funcspecs/ webapps/exampl...
Date Mon, 03 Nov 2008 21:52:43 GMT
Author: markt
Date: Mon Nov  3 13:52:42 2008
New Revision: 710179

URL: http://svn.apache.org/viewvc?rev=710179&view=rev
Log:
Remove the invoker servlet and all references for security reasons. This will not be proposed
for backport to 6.0.x

Removed:
    tomcat/trunk/java/org/apache/catalina/servlets/InvokerHttpRequest.java
    tomcat/trunk/java/org/apache/catalina/servlets/InvokerServlet.java
    tomcat/trunk/webapps/docs/funcspecs/fs-invoker.xml
Modified:
    tomcat/trunk/RELEASE-NOTES
    tomcat/trunk/conf/web.xml
    tomcat/trunk/java/org/apache/catalina/Globals.java
    tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
    tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
    tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
    tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
    tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
    tomcat/trunk/webapps/docs/funcspecs/fs-default.xml
    tomcat/trunk/webapps/docs/funcspecs/project.xml
    tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
    tomcat/trunk/webapps/examples/WEB-INF/web.xml

Modified: tomcat/trunk/RELEASE-NOTES
URL: http://svn.apache.org/viewvc/tomcat/trunk/RELEASE-NOTES?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/RELEASE-NOTES (original)
+++ tomcat/trunk/RELEASE-NOTES Mon Nov  3 13:52:42 2008
@@ -34,7 +34,6 @@
 * Enabling SSI and CGI Support
 * Security manager URLs
 * Symlinking static resources
-* Enabling invoker servlet
 * Viewing the Tomcat Change Log
 * When all else fails
 
@@ -165,19 +164,6 @@
 the check.
 
 
-=========================
-Enabling invoker servlet:
-=========================
-Starting with Tomcat 4.1.12, the invoker servlet is no longer available by
-default in all webapps. Enabling it for all webapps is possible by editing
-$CATALINA_HOME/conf/web.xml to uncomment the "/servlet/*" servlet-mapping
-definition.
-
-Using the invoker servlet in a production environment is not recommended and
-is unsupported.  More details are available on the Tomcat FAQ at
-http://tomcat.apache.org/faq/misc.html#invoker.
-
-
 ==============================
 Viewing the Tomcat Change Log:
 ==============================

Modified: tomcat/trunk/conf/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/web.xml?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/conf/web.xml (original)
+++ tomcat/trunk/conf/web.xml Mon Nov  3 13:52:42 2008
@@ -102,34 +102,6 @@
     </servlet>
 
 
-  <!-- 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   -->
-  <!-- it to other patterns as well.  The extra path info portion of such a -->
-  <!-- request must be the fully qualified class name of a Java class that  -->
-  <!-- implements Servlet (or extends HttpServlet), or the servlet name     -->
-  <!-- of an existing servlet definition.     This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-
-<!--
-    <servlet>
-        <servlet-name>invoker</servlet-name>
-        <servlet-class>
-          org.apache.catalina.servlets.InvokerServlet
-        </servlet-class>
-        <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-        </init-param>
-        <load-on-startup>2</load-on-startup>
-    </servlet>
--->
-
-
   <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
   <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
   <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
@@ -364,14 +336,6 @@
         <url-pattern>/</url-pattern>
     </servlet-mapping>
 
-    <!-- The mapping for the invoker servlet -->
-<!--
-    <servlet-mapping>
-        <servlet-name>invoker</servlet-name>
-        <url-pattern>/servlet/*</url-pattern>
-    </servlet-mapping>
--->
-
     <!-- The mapping for the JSP servlet -->
     <servlet-mapping>
         <servlet-name>jsp</servlet-name>

Modified: tomcat/trunk/java/org/apache/catalina/Globals.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Globals.java?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Globals.java Mon Nov  3 13:52:42 2008
@@ -121,15 +121,6 @@
 
 
     /**
-     * The request attribute under which the Invoker servlet will store
-     * the invoking servlet path, if it was used to execute a servlet
-     * indirectly instead of through a servlet mapping.
-     */
-    public static final String INVOKED_ATTR =
-        "org.apache.catalina.INVOKED";
-
-
-    /**
      * The request attribute under which we expose the value of the
      * <code>&lt;jsp-file&gt;</code> value associated with this servlet,
      * if any.

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Mon Nov  3 13:52:42
2008
@@ -823,9 +823,6 @@
         while (current != null) {
             if(state.hrequest == null && (current instanceof HttpServletRequest))
                 state.hrequest = (HttpServletRequest)current;
-            if ("org.apache.catalina.servlets.InvokerHttpRequest".
-                equals(current.getClass().getName()))
-                break; // KLUDGE - Make nested RD.forward() using invoker work
             if (!(current instanceof ServletRequestWrapper))
                 break;
             if (current instanceof ApplicationHttpRequest)

Modified: tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/core/RestrictedServlets.properties Mon Nov  3 13:52:42
2008
@@ -15,5 +15,4 @@
 
 org.apache.catalina.ssi.SSIServlet=restricted
 org.apache.catalina.servlets.CGIServlet=restricted
-org.apache.catalina.servlets.InvokerServlet=restricted
 org.apache.catalina.manager.JMXProxyServlet=restricted

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings.properties Mon Nov  3 13:52:42
2008
@@ -57,7 +57,6 @@
 htmlManagerServlet.title=Tomcat Web Application Manager
 managerServlet.alreadyContext=FAIL - Application already exists at path {0}
 managerServlet.alreadyDocBase=FAIL - Directory {0} is already in use
-managerServlet.cannotInvoke=Cannot invoke manager servlet through invoker
 managerServlet.configured=OK - Deployed application from context file {0}
 managerServlet.deployed=OK - Deployed application at context path {0}
 managerServlet.deployFailed=FAIL - Failed to deploy application at context path {0}

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_de.properties Mon Nov  3 13:52:42
2008
@@ -55,7 +55,6 @@
 htmlManagerServlet.title=Tomcat Webanwendungs-Manager
 managerServlet.alreadyContext=FEHLER - Anwendung existiert bereits für Kontext Pfad {0}
 managerServlet.alreadyDocBase=FEHLER - Verzeichnis {0} bereits in Benutzung
-managerServlet.cannotInvoke=Kann Manager-Servlet nicht durch Invoker aufrufen
 managerServlet.configured=OK - Anwendung von Kontext-Datei {0} installiert
 managerServlet.deployed=OK - Anwendung mit Kontext Pfad {0} installiert
 managerServlet.exception=FEHLER - Ausnahme aufgetreten {0}

Modified: tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/LocalStrings_fr.properties Mon Nov  3 13:52:42
2008
@@ -38,7 +38,6 @@
 htmlManagerServlet.title=Gestionnaire d''applications WEB Tomcat
 managerServlet.alreadyContext=ECHEC - l''application existe déjà dans le chemin {0}
 managerServlet.alreadyDocBase=ECHEC - Le répertoire {0} est déjà utilisé
-managerServlet.cannotInvoke=Impossible d''utiliser le gestionnaire de servlet au travers
du délégué (invoker)
 managerServlet.configured=OK - Application configurée depuis le fichier contexte {0}
 managerServlet.deployed=OK - Application déployée pour le chemin de contexte {0}
 managerServlet.exception=ECHEC - L''exception {0} a été rencontrée

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Mon Nov  3 13:52:42
2008
@@ -144,11 +144,6 @@
  * generally be deployed as a separate web application within the virtual host
  * to be managed.
  * <p>
- * <b>NOTE</b> - For security reasons, this application will not operate
- * when accessed via the invoker servlet.  You must explicitly map this servlet
- * with a servlet mapping, and you will always want to protect it with
- * appropriate security constraints as well.
- * <p>
  * The following servlet initialization parameters are recognized:
  * <ul>
  * <li><b>debug</b> - The debugging detail level that controls the amount
@@ -318,11 +313,6 @@
                       HttpServletResponse response)
         throws IOException, ServletException {
 
-        // Verify that we were not accessed using the invoker servlet
-        if (request.getAttribute(Globals.INVOKED_ATTR) != null)
-            throw new UnavailableException
-                (sm.getString("managerServlet.cannotInvoke"));
-
         // Identify the request parameters that we need
         String command = request.getPathInfo();
         if (command == null)
@@ -404,11 +394,6 @@
                       HttpServletResponse response)
         throws IOException, ServletException {
 
-        // Verify that we were not accessed using the invoker servlet
-        if (request.getAttribute(Globals.INVOKED_ATTR) != null)
-            throw new UnavailableException
-                (sm.getString("managerServlet.cannotInvoke"));
-
         // Identify the request parameters that we need
         String command = request.getPathInfo();
         if (command == null)
@@ -452,14 +437,6 @@
             throw new UnavailableException
                 (sm.getString("managerServlet.noWrapper"));
 
-        // Verify that we were not accessed using the invoker servlet
-        String servletName = getServletConfig().getServletName();
-        if (servletName == null)
-            servletName = "";
-        if (servletName.startsWith("org.apache.catalina.INVOKER."))
-            throw new UnavailableException
-                (sm.getString("managerServlet.cannotInvoke"));
-
         // Set our properties from the initialization parameters
         String value = null;
         try {

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Mon Nov  3
13:52:42 2008
@@ -81,11 +81,6 @@
  * this servlet itself will not succeed.  Therefore, this servlet should
  * generally be deployed in a separate virtual host.
  * <p>
- * <b>NOTE</b> - For security reasons, this application will not operate
- * when accessed via the invoker servlet.  You must explicitly map this servlet
- * with a servlet mapping, and you will always want to protect it with
- * appropriate security constraints as well.
- * <p>
  * The following servlet initialization parameters are recognized:
  * <ul>
  * <li><b>debug</b> - The debugging detail level that controls the amount
@@ -216,11 +211,6 @@
                       HttpServletResponse response)
         throws IOException, ServletException {
 
-        // Verify that we were not accessed using the invoker servlet
-        if (request.getAttribute(Globals.INVOKED_ATTR) != null)
-            throw new UnavailableException
-                (sm.getString("hostManagerServlet.cannotInvoke"));
-
         // Identify the request parameters that we need
         String command = request.getPathInfo();
         if (command == null)
@@ -324,14 +314,6 @@
             throw new UnavailableException
                 (sm.getString("hostManagerServlet.noWrapper"));
 
-        // Verify that we were not accessed using the invoker servlet
-        String servletName = getServletConfig().getServletName();
-        if (servletName == null)
-            servletName = "";
-        if (servletName.startsWith("org.apache.catalina.INVOKER."))
-            throw new UnavailableException
-                (sm.getString("hostManagerServlet.cannotInvoke"));
-
         // Set our properties from the initialization parameters
         String value = null;
         try {

Modified: tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/host/LocalStrings.properties Mon Nov  3
13:52:42 2008
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-hostManagerServlet.cannotInvoke=Cannot invoke host manager servlet through invoker
 hostManagerServlet.noCommand=FAIL - No command was specified
 hostManagerServlet.unknownCommand=FAIL - Unknown command {0}
 hostManagerServlet.noWrapper=Container has not called setWrapper() for this servlet

Modified: tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Mon Nov  3 13:52:42 2008
@@ -288,14 +288,6 @@
 
         super.init(config);
 
-        // Verify that we were not accessed using the invoker servlet
-        String servletName = getServletConfig().getServletName();
-        if (servletName == null)
-            servletName = "";
-        if (servletName.startsWith("org.apache.catalina.INVOKER."))
-            throw new UnavailableException
-                ("Cannot invoke CGIServlet through the invoker");
-        
         // Set our properties from the initialization parameters
         if (getServletConfig().getInitParameter("debug") != null)
             debug = Integer.parseInt(getServletConfig().getInitParameter("debug"));
@@ -560,11 +552,6 @@
     protected void doGet(HttpServletRequest req, HttpServletResponse res)
         throws ServletException, IOException {
 
-        // Verify that we were not accessed using the invoker servlet
-        if (req.getAttribute(Globals.INVOKED_ATTR) != null)
-            throw new UnavailableException
-                ("Cannot invoke CGIServlet through the invoker");
-
         CGIEnvironment cgiEnv = new CGIEnvironment(req, getServletContext());
 
         if (cgiEnv.isValid()) {

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings.properties Mon Nov  3 13:52:42
2008
@@ -18,12 +18,6 @@
 defaultservlet.upto=Up to:
 defaultservlet.subdirectories=Subdirectories:
 defaultservlet.files=Files:
-invokerServlet.allocate=Cannot allocate servlet instance for path {0}
-invokerServlet.cannotCreate=Cannot create servlet wrapper for path {0}
-invokerServlet.deallocate=Cannot deallocate servlet instance for path {0}
-invokerServlet.invalidPath=No servlet name or class was specified in path {0}
-invokerServlet.notNamed=Cannot call invoker servlet with a named dispatcher
-invokerServlet.noWrapper=Container has not called setWrapper() for this servlet
 webdavservlet.jaxpfailed=JAXP initialization failed
 webdavservlet.enternalEntityIgnored=The request included a reference to an external entity
with PublicID {0} and SystemID {1} which was ignored
 directory.filename=Filename

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_es.properties Mon Nov  3 13:52:42
2008
@@ -17,12 +17,6 @@
 defaultservlet.upto = Atr\u00E1s a\:
 defaultservlet.subdirectories = Subdirectorios\:
 defaultservlet.files = Archivos\:
-invokerServlet.allocate = No puedo reservar espacio para instancia de servlet para trayectoria
{0}
-invokerServlet.cannotCreate = No puedo crear arropador (wrapper) de servlet para trayectoria
{0}
-invokerServlet.deallocate = No puedo recuperar instancia de servlet para trayectoria {0}
-invokerServlet.invalidPath = No se ha especificado nombre de servlet o clase en trayectoria
{0}
-invokerServlet.notNamed = No puedo llamar a servlet invocador mediante un despachador nombrado
(named)
-invokerServlet.noWrapper = El Contenedor no ha llamado a setWrapper() para este servlet
 webdavservlet.jaxpfailed = Fall\u00F3 la inicializaci\u00F3n de JAXP
 webdavservlet.enternalEntityIgnored = El requerimiento inclu\u00EDa una referencia a una
entidad externa con PublicID {0} y SystemID {1} que fue ignorada
 directory.filename = Nombre de Archivo

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_fr.properties Mon Nov  3 13:52:42
2008
@@ -17,12 +17,6 @@
 defaultservlet.upto=Jusqu''à:
 defaultservlet.subdirectories=Sous-répertoires:
 defaultservlet.files=Fichiers:
-invokerServlet.allocate=Impossible d''allouer une instance de servlet pour le chemin {0}
-invokerServlet.cannotCreate=Impossible de créer un enrobeur (wrapper) de servlet pour le
chemin {0}
-invokerServlet.deallocate=Impossible de désallouer une instance de servlet pour le chemin
{0}
-invokerServlet.invalidPath=Aucun nom de servlet ou de classe n''a été spécifié pour le
chemin {0}
-invokerServlet.notNamed=Impossible d''appeler le délégué (invoker) de servlet avec un
aiguilleur (dispatcher) nommé
-invokerServlet.noWrapper=Le conteneur n''a pas appelé "setWrapper()" pour cette servlet
 webdavservlet.jaxpfailed=Erreur d''initialisation de JAXP
 directory.filename=Nom de fichier
 directory.lastModified=Dernière modification

Modified: tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/LocalStrings_ja.properties Mon Nov  3 13:52:42
2008
@@ -17,12 +17,6 @@
 defaultservlet.upto=\u89aa\u30c7\u30a3\u30ec\u30af\u30c8\u30ea: 
 defaultservlet.subdirectories=\u30b5\u30d6\u30c7\u30a3\u30ec\u30af\u30c8\u30ea:
 defaultservlet.files=\u30d5\u30a1\u30a4\u30eb:
-invokerServlet.allocate=\u30d1\u30b9 {0} \u306b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u3092\u5272\u308a\u5f53\u3066\u3089\u308c\u307e\u305b\u3093
-invokerServlet.cannotCreate=\u30d1\u30b9 {0} \u306b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30e9\u30c3\u30d1\u3092\u4f5c\u6210\u3067\u304d\u307e\u305b\u3093
-invokerServlet.deallocate=\u30d1\u30b9 {0} \u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30a4\u30f3\u30b9\u30bf\u30f3\u30b9\u306e\u5272\u308a\u5f53\u3066\u3092\u89e3\u9664\u3067\u304d\u307e\u305b\u3093
-invokerServlet.invalidPath=\u30d1\u30b9 {0} \u306b\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u540d\u53c8\u306f\u30af\u30e9\u30b9\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-invokerServlet.notNamed=\u305d\u306e\u540d\u524d\u306e\u30c7\u30a3\u30b9\u30d1\u30c3\u30c1\u30e3\u3067\u30a4\u30f3\u30dc\u30fc\u30ab\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u3092\u547c\u3073\u51fa\u305b\u307e\u305b\u3093
-invokerServlet.noWrapper=\u30b3\u30f3\u30c6\u30ca\u306f\u3053\u306e\u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u306b\u5bfe\u3057\u3066\u547c\u3073\u51fa\u3055\u308c\u305fsetWrapper()\u3092\u6301\u3063\u3066\u3044\u307e\u305b\u3093
 webdavservlet.jaxpfailed=JAXP\u306e\u521d\u671f\u5316\u306b\u5931\u6557\u3057\u307e\u3057\u305f
 directory.filename=\u30d5\u30a1\u30a4\u30eb\u540d
 directory.lastModified=\u6700\u7d42\u66f4\u65b0

Modified: tomcat/trunk/webapps/docs/funcspecs/fs-default.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/fs-default.xml?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/funcspecs/fs-default.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/fs-default.xml Mon Nov  3 13:52:42 2008
@@ -123,7 +123,7 @@
   <subsection name="Initialization Functionality">
 
     <p>The following processing must be performed when the <code>init()</code>
-    method of the invoker servlet is called:</p>
+    method of the default servlet is called:</p>
     <ul>
     <li>Process and sanity check configuration parameters.</li>
     </ul>
@@ -248,7 +248,7 @@
 
   <p>In addition the the assertions implied by the functionality requirements
   listed above, the following additional assertions shall be tested to
-  validate the behavior of the invoker servlet:</p>
+  validate the behavior of the default servlet:</p>
   <ul>
   <li>Requests for resources that do not exist in the web application must
       return HTTP status 404 (not found).</li>

Modified: tomcat/trunk/webapps/docs/funcspecs/project.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/funcspecs/project.xml?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/funcspecs/project.xml (original)
+++ tomcat/trunk/webapps/docs/funcspecs/project.xml Mon Nov  3 13:52:42 2008
@@ -40,7 +40,6 @@
 
     <menu name="Internal Servlets">
         <item name="Default Servlet"       href="fs-default.html"/>
-        <item name="Invoker Servlet"       href="fs-invoker.html"/>
     </menu>
 
     <menu name="Realm Implementations">

Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java Mon Nov  3 13:52:42
2008
@@ -126,8 +126,8 @@
     public String toString() {
 
 	if (filterConfig == null)
-	    return ("InvokerFilter()");
-	StringBuffer sb = new StringBuffer("InvokerFilter(");
+	    return ("TimingFilter()");
+	StringBuffer sb = new StringBuffer("TimingFilter(");
 	sb.append(filterConfig);
 	sb.append(")");
 	return (sb.toString());

Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=710179&r1=710178&r2=710179&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Mon Nov  3 13:52:42 2008
@@ -27,23 +27,16 @@
     <display-name>Servlet and JSP Examples</display-name>
 
 
-    <!-- Define servlet-mapped and path-mapped example filters -->
+    <!-- Define example filters -->
     <filter>
-        <filter-name>Servlet Mapped Filter</filter-name>
+        <filter-name>Timing filter</filter-name>
         <filter-class>filters.ExampleFilter</filter-class>
 	<init-param>
 	    <param-name>attribute</param-name>
-	    <param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
-	</init-param>
-    </filter>
-    <filter>
-        <filter-name>Path Mapped Filter</filter-name>
-        <filter-class>filters.ExampleFilter</filter-class>
-	<init-param>
-	    <param-name>attribute</param-name>
-	    <param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
+	    <param-value>filters.ExampleFilter</param-value>
 	</init-param>
     </filter>
+
     <filter>
         <filter-name>Request Dumper Filter</filter-name>
         <filter-class>filters.RequestDumperFilter</filter-class>
@@ -73,15 +66,13 @@
         </init-param>
     </filter>
 
-    <!-- Define filter mappings for the defined filters -->
+    <!-- Define filter mappings for the timing filters -->
+    <!--
     <filter-mapping>
-        <filter-name>Servlet Mapped Filter</filter-name>
-	<servlet-name>invoker</servlet-name>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>Path Mapped Filter</filter-name>
-	<url-pattern>/servlet/*</url-pattern>
+        <filter-name>Timing Filter</filter-name>
+        <url-pattern>/*</url-pattern>
     </filter-mapping>
+    -->
 
 <!-- Example filter mapping to apply the "Set Character Encoding" filter
      to *all* requests processed by this web application -->



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


Mime
View raw message