From 672f274ae88d6ebdf6cdfffbdf56d69a8ebacc65 Mon Sep 17 00:00:00 2001 From: markt Date: Wed, 15 Jul 2009 07:15:10 +0000 Subject: [PATCH] Remainder of fix in trunk for 47444 Update references to Jakarta in Javadoc and JspC git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@794161 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/ant/jmx/package.html | 4 +-- java/org/apache/catalina/ant/package.html | 4 +-- java/org/apache/catalina/servlets/CGIServlet.java | 2 +- .../jasper/resources/LocalStrings.properties | 4 +-- .../jasper/resources/LocalStrings_es.properties | 4 +-- .../jasper/resources/LocalStrings_fr.properties | 4 +-- .../jasper/resources/LocalStrings_ja.properties | 4 +-- .../tomcat/util/digester/CallMethodRule.java | 2 +- java/org/apache/tomcat/util/digester/package.html | 38 ++-------------------- java/org/apache/tomcat/util/modeler/package.html | 4 +-- 10 files changed, 19 insertions(+), 51 deletions(-) diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html index 968eeaa26..578a3a3e5 100644 --- a/java/org/apache/catalina/ant/jmx/package.html +++ b/java/org/apache/catalina/ant/jmx/package.html @@ -20,8 +20,8 @@ Ant (version 1.6 or later) that can be used to interact with the Remote JMX JSR 160 RMI Adaptor to get/set attributes, invoke MBean operations and query for Mbeans inside a running instance of Tomcat. For more information, see - -http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html.

+ +http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html.

Each task element can open a new jmx connection or reference an existing one. The following attribute are exists in every tasks: diff --git a/java/org/apache/catalina/ant/package.html b/java/org/apache/catalina/ant/package.html index ff045e8ef..999a31aa2 100644 --- a/java/org/apache/catalina/ant/package.html +++ b/java/org/apache/catalina/ant/package.html @@ -20,8 +20,8 @@ Ant (version 1.6.x or later) that can be used to interact with the Manager application to deploy, undeploy, list, reload, start and stop web applications from a running instance of Tomcat. For more information, see - -http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html.

+ +http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html.

The attributes of each task element correspond exactly to the request parameters that are included with an HTTP request diff --git a/java/org/apache/catalina/servlets/CGIServlet.java b/java/org/apache/catalina/servlets/CGIServlet.java index 4f5a804ee..436fb6215 100644 --- a/java/org/apache/catalina/servlets/CGIServlet.java +++ b/java/org/apache/catalina/servlets/CGIServlet.java @@ -122,7 +122,7 @@ import org.apache.catalina.util.IOTools; * or an instance where the specification cited differs from Best * Community Practice (BCP). * Such instances should be well-documented here. Please email the - * Jakarta Tomcat group [tomcat-dev@jakarta.apache.org] + * Tomcat group [dev@tomcat.apache.org] * with amendments. * *

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index 26f10672c..2b8bab485 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -265,7 +265,7 @@ jspc.webxml.header=\n\ \ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\ \ "http://java.sun.com/dtd/web-app_2_3.dtd">\n\ \n\ \n\ \n @@ -274,7 +274,7 @@ jspc.webxml.footer=\n\ \n jspc.webinc.header=\n\ \n diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties index 508eda8d3..971575f24 100644 --- a/java/org/apache/jasper/resources/LocalStrings_es.properties +++ b/java/org/apache/jasper/resources/LocalStrings_es.properties @@ -264,7 +264,7 @@ jspc.webxml.header = \n\ \ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\ \ "http\://java.sun.com/dtd/web-app_2_3.dtd">\n\ <\!--\n\ - Creado automaticamente mediante Apache Jakarta Tomcat JspC.\n\ + Creado automaticamente mediante Apache Tomcat JspC.\n\ -->\n\ \n\ \n @@ -273,7 +273,7 @@ jspc.webxml.footer = \n\ \n jspc.webinc.header = \n\ <\!--\n\ - Creado automaticamente mediante Apache Jakarta Tomcat JspC.\n\ + Creado automaticamente mediante Apache Tomcat JspC.\n\ Coloque este fragmento en el fichero web.xml antes de \n\ todos los elementos\: icon, display-name, description, \n\ distributable y context-param .\n\ diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties b/java/org/apache/jasper/resources/LocalStrings_fr.properties index 75d4f5c47..98e328edf 100644 --- a/java/org/apache/jasper/resources/LocalStrings_fr.properties +++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties @@ -207,7 +207,7 @@ jspc.webxml.header=\n\ \ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\ \ "http://java.sun.com/dtd/web-app_2_3.dtd">\n\ \n\ \n\ \n @@ -216,7 +216,7 @@ jspc.webxml.footer=\n\ \n jspc.webinc.header=\n\ \n diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties b/java/org/apache/jasper/resources/LocalStrings_ja.properties index 75305afaa..93ba81210 100644 --- a/java/org/apache/jasper/resources/LocalStrings_ja.properties +++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties @@ -250,7 +250,7 @@ jspc.webxml.header=\n\ \ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\ \ "http://java.sun.com/dtd/web-app_2_3.dtd">\n\ \n\ \n\ \n @@ -259,7 +259,7 @@ jspc.webxml.footer=\n\ \n jspc.webinc.header=\n\ \n diff --git a/java/org/apache/tomcat/util/digester/CallMethodRule.java b/java/org/apache/tomcat/util/digester/CallMethodRule.java index c3cef34e6..f98e253a2 100644 --- a/java/org/apache/tomcat/util/digester/CallMethodRule.java +++ b/java/org/apache/tomcat/util/digester/CallMethodRule.java @@ -39,7 +39,7 @@ import org.xml.sax.Attributes; *

* *

This rule now uses - * + * * org.apache.commons.beanutils.MethodUtils#invokeMethod * by default. * This increases the kinds of methods successfully and allows primitives diff --git a/java/org/apache/tomcat/util/digester/package.html b/java/org/apache/tomcat/util/digester/package.html index b172e98e3..88883c4b0 100644 --- a/java/org/apache/tomcat/util/digester/package.html +++ b/java/org/apache/tomcat/util/digester/package.html @@ -24,7 +24,6 @@ XML documents.

- -

External Dependencies

- - -

Introduction

@@ -473,15 +450,6 @@ class. For example, the following code sequence:

copious amounts of debugging information. So, you need to know how logging works before you start using Digester seriously.

-

Digester uses -Jakarta Commons -Logging. This component is not really a logging framework - rather -an extensible, configurable bridge. It can be configured to swallow all log -messages, to provide very basic logging by itself or to pass logging messages -on to more sophisticated logging frameworks. Commons-Logging comes with -connectors for many popular logging frameworks. Consult the commons-logging -documentation for more information.

-

Two main logs are used by Digester:

  • SAX-related messages are logged to @@ -608,7 +576,7 @@ and configures the Digester to be used, and the initMapping() method for where the parsing actually takes place.

    (Struts binary and source distributions can be acquired at -http://jakarta.apache.org/struts/.)

    +http://struts.apache.org/.)

    The following discussion highlights a few of the matching patterns and processing rules that are configured, to illustrate the use of some of the @@ -1266,8 +1234,8 @@ It works but we have no plans to add support for other versions of the format.

    We would consider donations of standard digester applications but it's unlikely that these would ever be shipped with the base digester distribution. -If you want to discuss this, please post to -common-dev mailing list +If you want to discuss this, please post to +commons dev mailing list

diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html index 51cdaaee3..d2acf346b 100644 --- a/java/org/apache/tomcat/util/modeler/package.html +++ b/java/org/apache/tomcat/util/modeler/package.html @@ -19,7 +19,7 @@ Package Documentation for COMMONS-MODELER -

The Modeler component of the Jakarta Commons subproject +

The Modeler component of the Commons project offers convenient support for configuring and instantiating Model MBeans (management beans), as described in the JMX Specification. It is typically used within a server-based application that wants to expose management @@ -49,7 +49,7 @@ described in detail below. You can find some simple usage code in the unit tests that come with Modeler (in the src/test subdirectory of the source distribution), and much more complex usage code in Tomcat 4.1 (in the org.apache.catalina.mbeans package).

. More advanced uses can -be found in Tomcat 5 and jakarta-tomcat-connectors. +be found in Tomcat 5.

1. Acquire a JMX Implementation

-- 2.11.0