You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by yo...@apache.org on 2004/10/28 22:30:53 UTC
cvs commit: jakarta-tomcat-catalina/webapps/docs/config engine.xml logger.xml project.xml service.xml
yoavs 2004/10/28 13:30:53
Modified: webapps/docs Tag: TOMCAT_5_0 changelog.xml
class-loader-howto.xml developers.xml project.xml
proxy-howto.xml ssl-howto.xml status.xml
webapps/docs/config Tag: TOMCAT_5_0 engine.xml logger.xml
project.xml service.xml
Log:
Bugzilla 31945: enhanced connector doc links. I probably added a broken link or two, will need to check when publishing.
Revision Changes Path
No revision
No revision
1.70.2.61 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.70.2.60
retrieving revision 1.70.2.61
diff -u -r1.70.2.60 -r1.70.2.61
--- changelog.xml 28 Oct 2004 19:59:42 -0000 1.70.2.60
+++ changelog.xml 28 Oct 2004 20:30:52 -0000 1.70.2.61
@@ -37,6 +37,9 @@
<fix>
<bug>31592</bug>: Allow specification of digest encoding for realms. (yoavs)
</fix>
+ <update>
+ Added and updated Connector documentation: <bug>31945</bug>. (yoavs)
+ </update>
</changelog>
</subsection>
1.11.2.2 +2 -2 jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml
Index: class-loader-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/class-loader-howto.xml,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- class-loader-howto.xml 3 Sep 2004 21:58:39 -0000 1.11.2.1
+++ class-loader-howto.xml 28 Oct 2004 20:30:52 -0000 1.11.2.2
@@ -159,9 +159,9 @@
These are separated so that they can be completely removed if the
corresponding service is not required, or they can be subject to
specialized security manager permissions.</li>
- <li><em>tomcat-coyote.jar</em> - Coyote connector for Tomcat 5.</li>
+ <li><em>tomcat-coyote.jar</em> - Coyote <a href="config/connector.html">connector</a> for Tomcat 5.</li>
<li><em>tomcat-http11.jar</em> - Standalone Java HTTP/1.1
- connector.</li>
+ <a href="config/connector.html">connector.</a></li>
<li><em>tomcat-jk2.jar</em> - Classes for the Java portion of the
<code>JK 2</code> web server connector, which allows Tomcat to
run behind web servers such as Apache and iPlanet iAS and iWS.</li>
1.5.2.1 +3 -3 jakarta-tomcat-catalina/webapps/docs/developers.xml
Index: developers.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/developers.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- developers.xml 10 Jun 2004 01:04:06 -0000 1.5
+++ developers.xml 28 Oct 2004 20:30:52 -0000 1.5.2.1
@@ -49,9 +49,9 @@
</section>
<section name="Retired Developers">
-
-
-
+ <ul>
+ <li>Craig McClanahan (craigmcc): Everything :)</li>
+ </ul>
</section>
</body>
1.21.2.2 +1 -0 jakarta-tomcat-catalina/webapps/docs/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/project.xml,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- project.xml 21 Aug 2004 15:50:07 -0000 1.21.2.1
+++ project.xml 28 Oct 2004 20:30:52 -0000 1.21.2.2
@@ -13,6 +13,7 @@
<menu name="Links">
<item name="Docs Home" href="index.html"/>
+ <item name="FAQ" href="../faq" />
</menu>
<menu name="User Guide">
1.6.2.1 +6 -6 jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml
Index: proxy-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/proxy-howto.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- proxy-howto.xml 8 Jan 2004 14:55:57 -0000 1.6
+++ proxy-howto.xml 28 Oct 2004 20:30:52 -0000 1.6.2.1
@@ -21,7 +21,7 @@
processing. When Tomcat is running standalone with the
<a href="config/coyote.html">Coyote HTTP/1.1 Connector</a>, it will generally
report the server name specified in the request, and the port number on
-which the <strong>Connector</strong> is listening. The two servlet API
+which the <strong><a href="config/connector.html">Connector</a></strong> is listening. The two servlet API
calls of interest, for this purpose, are:</p>
<ul>
<li><code>ServletRequest.getServerName()</code></li>
@@ -32,9 +32,9 @@
configured to behave like a proxy server), you will sometimes prefer to
manage the values returned by these calls. In particular, you will
generally want the port number to reflect that specified in the original
-request, not the one on which the <strong>Connector</strong> itself is
+request, not the one on which the <strong><a href="config/connector.html">Connector</a></strong> itself is
listening. You can use the <code>proxyName</code> and <code>proxyPort</code>
-attributes on the <code><Connector></code> element to configure
+attributes on the <code><<a href="config/connector.html">Connector</a>></code> element to configure
these values.</p>
<p>Proxy support can take many forms. The following sections describe
@@ -70,10 +70,10 @@
ProxyPassReverse /myapp http://localhost:8081/myapp
</source>
which tells Apache to forward URLs of the form
- <code>http://localhost/myapp/*</code> to the Tomcat 5 connector
+ <code>http://localhost/myapp/*</code> to the Tomcat 5 <a href="config/connector.html">connector</a>
listening on port 8081.</li>
<li>Configure your copy of Tomcat 5 to include a special
- <code><Connector></code> element, with appropriate
+ <code><<a href="config/connector.html">Connector</a>></code> element, with appropriate
proxy settings, for example:
<source>
<Connector port="8081" ...
@@ -100,7 +100,7 @@
only available via proxying, as follows:
<ul>
<li>Configure another <code><Service></code> that contains
- only a <code><Connector></code> for the proxy port.</li>
+ only a <code><<a href="config/connector.html">Connector</a>></code> for the proxy port.</li>
<li>Configure appropriate <a href="config/engine.html">Engine</a>,
<a href="config/host.html">Host</a>, and
<a href="config/context.html">Context</a> elements for the virtual hosts
1.11.2.1 +2 -2 jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml
Index: ssl-howto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/ssl-howto.xml,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- ssl-howto.xml 26 Jan 2004 02:11:09 -0000 1.11
+++ ssl-howto.xml 28 Oct 2004 20:30:52 -0000 1.11.2.1
@@ -278,7 +278,7 @@
<p>The final step is to configure your secure socket in the
<code>$CATALINA_HOME/conf/server.xml</code> file, where
<code>$CATALINA_HOME</code> represents the directory into which you
-installed Tomcat 5. An example <code><Connector></code> element
+installed Tomcat 5. An example <code><<a href="config/connector.html">Connector</a>></code> element
for an SSL connector is included in the default <code>server.xml</code>
file installed with Tomcat. It will look something like this:</p>
<source>
@@ -310,7 +310,7 @@
<blockquote><em>
<p>If you change the port number here, you should also change the
value specified for the <code>redirectPort</code> attribute on the
- non-SSL connector. This allows Tomcat to automatically redirect
+ non-SSL <a href="config/connector.html">connector</a>. This allows Tomcat to automatically redirect
users who attempt to access a page with a security constraint specifying
that SSL is required, as required by the Servlet 2.4 Specification.</p>
</em></blockquote>
1.5.2.2 +10 -11 jakarta-tomcat-catalina/webapps/docs/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/status.xml,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -r1.5.2.1 -r1.5.2.2
--- status.xml 21 Aug 2004 15:50:08 -0000 1.5.2.1
+++ status.xml 28 Oct 2004 20:30:52 -0000 1.5.2.2
@@ -29,17 +29,16 @@
<section name="Current Status Summary">
<p>
- <b>Tomcat 5.0.27</b> was released on June 17th, 2004. At that time, the TOMCAT_5_0
- branch was tagged in CVS, and work on Tomcat 5.1 (or 5.5, or 5.next, we haven't
- decided yet) began. Until the first stable release of Tomcat 5.1, building from
- CVS head may be unstable or broken: use the TOMCAT_5_0 branch tag to build
- the Tomcat 5.0 releases.
+ <b>Tomcat 5.0.29</b> was released on October 6th, 2004. Work on the 5.0 branch is primarily
+ for maintenance and bug fixes. It is still considered the best branch for production use, but
+ Tomcat 5.5 is rapidly nearing a stable release.
</p>
<p>
- <b>Tomcat 5.1</b> has several major goals. They are discussed in the tomcat-dev
+ <b>Tomcat 5.5</b> has several major goals. They are discussed in the tomcat-dev
mailing list's "5.next" thread:
<a href="http://marc.theaimsgroup.com/?l=tomcat-dev&w=2&r=1&s=5.next&q=b">MARC</a>.
- The status of some of these items is detailed below.
+ The status of some of these items is detailed below. This branch has yet to have a stable
+ release, but stability is improving and a stable release is expected soon.
</p>
<p>
<b>Tomcat 4.0.x</b> is relatively old, and not actively maintained or supported.
@@ -93,19 +92,19 @@
<status>
<item priority="High" owner="remm, costin">
- Refactor ClassLoaders for Tomcat 5.1.
+ Refactor ClassLoaders for Tomcat 5.5.
</item>
<item priority="High" owner="remm">
- Refactor application deployment for Tomcat 5.1.
+ Refactor application deployment for Tomcat 5.5.
</item>
<item priority="High" owner="remm">
Remove Logger interface and implementation, use commons-logging everywhere.
</item>
<item priority="Medium" owner="fhanik">
- Enhance Cluster functionality for Tomcat 5.1.
+ Enhance Cluster functionality for Tomcat 5.5.
</item>
<item priority="Low" owner="yoavs, funkman">
- Update docs, site, and FAQ for Tomcat 5.1 once ready.
+ Update docs, site, and FAQ for Tomcat 5.5.
</item>
<item priority="Low" owner="everyone">
Continue fixing bugs ;)
No revision
No revision
1.4.2.1 +4 -4 jakarta-tomcat-catalina/webapps/docs/config/engine.xml
Index: engine.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/engine.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- engine.xml 30 Jul 2003 18:37:51 -0000 1.4
+++ engine.xml 28 Oct 2004 20:30:52 -0000 1.4.2.1
@@ -19,13 +19,13 @@
<p>The <strong>Engine</strong> element represents the entire request
processing machinery associated with a particular Catalina
<a href="service.html">Service</a>. It receives and processes
- <em>all</em> requests from one or more <strong>Connectors</strong>,
- and returns the completed response to the Connector for ultimate
+ <em>all</em> requests from one or more <strong><a href="connector.html">Connectors</a></strong>,
+ and returns the completed response to the <a href="connector.html">Connector</a> for ultimate
transmission back to the client.</p>
<p>Exactly one <strong>Engine</strong> element MUST be nested inside
a <a href="service.html">Service</a> element, following all of the
- corresponding Connector elements associated with this Service.</p>
+ corresponding <a href="connector.html">Connector</a> elements associated with this Service.</p>
</section>
@@ -129,7 +129,7 @@
<li><a href="logger.html"><strong>Logger</strong></a> -
Configure a logger that will receive
and process all log messages for this <strong>Engine</strong>, plus
- messages from <strong>Connectors</strong> associated with this Engine
+ messages from <strong><a href="connector.html">Connectors</a></strong> associated with this Engine
in the surrounding Service. In addition, this Logger will log messages
from subordinate <a href="host.html">Hosts</a> and
<a href="context.html">Contexts</a>, unless overridden by a
1.3.2.1 +7 -1 jakarta-tomcat-catalina/webapps/docs/config/Attic/logger.xml
Index: logger.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/Attic/logger.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- logger.xml 15 Jan 2003 03:40:44 -0000 1.3
+++ logger.xml 28 Oct 2004 20:30:52 -0000 1.3.2.1
@@ -15,6 +15,11 @@
<section name="Introduction">
+ <p>
+ <strong>Please note that Loggers are deprecated in Tomcat 5.0 and removed
+ from Tomcat 5.5. Tomcat 5.5 uses <a href="http://jakarta.apache.org/commons/logging">Commons-Logging</a>
+ instead.</strong>
+ </p>
<p>A <strong>Logger</strong> element represents a destination for
logging, debugging, and error messages (including stack tracebacks)
@@ -31,7 +36,8 @@
<a href="context.html#Access Logs">Context</a>.</p>
<p>For a more in-depth description of the class loader hierarchy
- that is implemented by Catalina, see <strong>FIXME - Reference</strong>.</p>
+ that is implemented by Catalina, see <a href="../class-loader-howto.html">the ClassLoader HOW-TO</a>
+ </p>
<blockquote><em>
<p>The description below uses the variable name $CATALINA_HOME
1.4.2.1 +1 -0 jakarta-tomcat-catalina/webapps/docs/config/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- project.xml 10 Dec 2003 12:57:38 -0000 1.4
+++ project.xml 28 Oct 2004 20:30:52 -0000 1.4.2.1
@@ -22,6 +22,7 @@
</menu>
<menu name="Connectors">
+ <item name="General Intro" href="connector.html" />
<item name="HTTP" href="http.html"/>
<item name="AJP" href="ajp.html"/>
</menu>
1.3.2.1 +2 -2 jakarta-tomcat-catalina/webapps/docs/config/service.xml
Index: service.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/service.xml,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- service.xml 15 Jan 2003 03:40:44 -0000 1.3
+++ service.xml 28 Oct 2004 20:30:52 -0000 1.3.2.1
@@ -17,7 +17,7 @@
<section name="Introduction">
<p>A <strong>Service</strong> element represents the combination of one or
- more <strong>Connector</strong> components that share a single
+ more <strong><a href="connector.html">Connector</a></strong> components that share a single
<a href="engine.html">Engine</a> component for processing incoming
requests. One or more <strong>Service</strong> elements may be nested
inside a <a href="server.html">Server</a> element.</p>
@@ -74,7 +74,7 @@
<section name="Nested Components">
<p>The only components that may be nested inside a <strong>Service</strong>
- element are one or more <strong>Connector</strong> elements,
+ element are one or more <strong><a href="connector.html">Connector</a></strong> elements,
followed by exactly one <a href="engine.html">Engine</a> element.</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org