Author: markt
Date: Wed Jul 15 07:15:10 2009
New Revision: 794161
URL: http://svn.apache.org/viewvc?rev=794161&view=rev
Log:
Remainder of fix in trunk for 47444
Update references to Jakarta in Javadoc and JspC
Modified:
tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html
tomcat/trunk/java/org/apache/catalina/ant/package.html
tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
tomcat/trunk/java/org/apache/tomcat/util/modeler/package.html
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/package.html Wed Jul 15
07:15:10 2009
@@ -20,8 +20,8 @@
<em>Ant (version 1.6 or later)</em> 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
-<a href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html";>
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/monitoring.html</a>.</p>
+<a href="http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html";>
+http://tomcat.apache.org/tomcat-7.0-doc/monitoring.html</a>.</p>
<p>Each task element can open a new jmx connection or reference an
existing one. The following attribute are exists in every tasks:
Modified: tomcat/trunk/java/org/apache/catalina/ant/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/package.html?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/package.html (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/package.html Wed Jul 15 07:15:10
2009
@@ -20,8 +20,8 @@
<em>Ant (version 1.6.x or later)</em> 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
-<a href="http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html";>
-http://jakarta.apache.org/tomcat/tomcat-5.5-doc/manager-howto.html</a>.</p>
+<a href="http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html";>
+http://tomcat.apache.org/tomcat-7.0-doc/manager-howto.html</a>.</p>
<p>The attributes of each task element correspond
exactly to the request parameters that are included with an HTTP request
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=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java Wed Jul 15
07:15:10 2009
@@ -122,7 +122,7 @@
* or an instance where the specification cited differs from Best
* Community Practice (BCP).
* Such instances should be well-documented here. Please email the
- * <a href="mailto:tomcat-...@jakarta.apache.org";>Jakarta Tomcat group
[tomcat-...@jakarta.apache.org]</a>
+ * <a href="mailto:dev@tomcat.apache.org";>Tomcat group
[...@tomcat.apache.org]</a>
* with amendments.
*
* </p>
Modified: tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings.properties Wed
Jul 15 07:15:10 2009
@@ -265,7 +265,7 @@
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
\ "http://java.sun.com/dtd/web-app_2_3.dtd";>\n\
<!--\n\
-Automatically created by Apache Jakarta Tomcat JspC.\n\
+Automatically created by Apache Tomcat JspC.\n\
-->\n\
<web-app>\n\
\n
@@ -274,7 +274,7 @@
\n
jspc.webinc.header=\n\
<!--\n\
-Automatically created by Apache Jakarta Tomcat JspC.\n\
+Automatically created by Apache Tomcat JspC.\n\
Place this fragment in the web.xml before all icon, display-name,\n\
description, distributable, and context-param elements.\n\
-->\n
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_es.properties
Wed Jul 15 07:15:10 2009
@@ -264,7 +264,7 @@
\ 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\
<web-app>\n\
\n
@@ -273,7 +273,7 @@
\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\
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_fr.properties
Wed Jul 15 07:15:10 2009
@@ -207,7 +207,7 @@
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
\ "http://java.sun.com/dtd/web-app_2_3.dtd";>\n\
<!--\n\
-Cr\u00e9er automatiquement par le JspC Apache Jakarta Tomcat.\n\
+Cr\u00e9er automatiquement par le JspC Apache Tomcat.\n\
-->\n\
<web-app>\n\
\n
@@ -216,7 +216,7 @@
\n
jspc.webinc.header=\n\
<!--\n\
-Cr\u00e9er automatiquement par le JspC Apache Jakarta Tomcat.\n\
+Cr\u00e9er automatiquement par le JspC Apache Tomcat.\n\
Placez ce fragment dans le fichier web.xml avant all icon, display-name,\n\
description, distributable, and context-param elements.\n\
-->\n
Modified:
tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
(original)
+++ tomcat/trunk/java/org/apache/jasper/resources/LocalStrings_ja.properties
Wed Jul 15 07:15:10 2009
@@ -250,7 +250,7 @@
\ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"\n\
\ "http://java.sun.com/dtd/web-app_2_3.dtd";>\n\
<!--\n\
-Automatically created by Apache Jakarta Tomcat JspC.\n\
+Automatically created by Apache Tomcat JspC.\n\
-->\n\
<web-app>\n\
\n
@@ -259,7 +259,7 @@
\n
jspc.webinc.header=\n\
<!--\n\
-Automatically created by Apache Jakarta Tomcat JspC.\n\
+Automatically created by Apache Tomcat JspC.\n\
Place this fragment in the web.xml before all icon, display-name,\n\
description, distributable, and context-param elements.\n\
-->\n
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Wed
Jul 15 07:15:10 2009
@@ -39,7 +39,7 @@
* </p>
*
* <p>This rule now uses
- * <a
href="http://jakarta.apache.org/commons/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html";>
+ * <a
href="http://commons.apache.org/beanutils/apidocs/org/apache/commons/beanutils/MethodUtils.html";>
* org.apache.commons.beanutils.MethodUtils#invokeMethod
* </a> by default.
* This increases the kinds of methods successfully and allows primitives
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/package.html?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/package.html Wed Jul 15
07:15:10 2009
@@ -24,7 +24,6 @@
<br><br>
<a name="doc.Description"></a>
<div align="center">
-<a href="#doc.Depend">[Dependencies]</a>
<a href="#doc.Intro">[Introduction]</a>
<a href="#doc.Properties">[Configuration Properties]</a>
<a href="#doc.Stack">[The Object Stack]</a>
@@ -42,28 +41,6 @@
<a href="#doc.Limits">[Known Limitations]</a>
</div>
-<a name="doc.Depend"></a>
-<h3>External Dependencies</h3>
-
-<ul>
- <li>An XML parser conforming to
- <a href="http://java.sun.com/products/xml";>JAXP
- </a>, version 1.1 or later (the first one to support SAX 2.0)
- </li>
- <li>
- <a
href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-beanutils";>
-Beanutils Package (Jakarta Commons)</a>, version 1.5 or later
- </li>
- <li>
- <a
href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-collections";>
-Collections Package (Jakarta Commons)</a>, version 2.1 or later
- </li>
- <li>
- <a
href="http://jakarta.apache.org/builds/jakarta-commons/release/commons-logging";>
-Commons Logging Package (Jakarta Commons)</a>, version 1.0.2 or later
- </li>
-</ul>
-
<a name="doc.Intro"></a>
<h3>Introduction</h3>
@@ -473,15 +450,6 @@
copious amounts of debugging information. So, you need to know how logging
works before you start using Digester seriously.</p>
-<p>Digester uses
-<a href="http://jakarta.apache.org/commons/logging.html";>Jakarta Commons
-Logging</a>. 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.</p>
-
<p>Two main logs are used by Digester:</p>
<ul>
<li>SAX-related messages are logged to
@@ -608,7 +576,7 @@
method for where the parsing actually takes place.</p>
<p>(Struts binary and source distributions can be acquired at
-<a
href="http://jakarta.apache.org/struts/";>http://jakarta.apache.org/struts/</a>.)</p>
+<a href="http://struts.apache.org/";>http://struts.apache.org/</a>.)</p>
<p>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 @@
<p>
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 <a
href='http://jakarta.apache.org/site/mail.html'>
-common-dev mailing list</a>
+If you want to discuss this, please post to <a
href='http://commons.apache.org/mail-lists.html'>
+commons dev mailing list</a>
</p>
</li>
</ul>
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/package.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/package.html?rev=794161&r1=794160&r2=794161&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/package.html (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/package.html Wed Jul 15
07:15:10 2009
@@ -19,7 +19,7 @@
<title>Package Documentation for COMMONS-MODELER</title>
</head>
<body bgcolor="white">
-<p>The <em>Modeler</em> component of the Jakarta Commons subproject
+<p>The <em>Modeler</em> 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 @@
tests that come with Modeler (in the <code>src/test</code> subdirectory of the
source distribution), and much more complex usage code in Tomcat 4.1 (in the
<code>org.apache.catalina.mbeans</code> package).</p>. More advanced uses can
-be found in Tomcat 5 and jakarta-tomcat-connectors.
+be found in Tomcat 5.
<h3>1. Acquire a JMX Implementation</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
