Author: mturk
Date: Thu Jun 30 19:16:43 2011
New Revision: 1141674
URL: http://svn.apache.org/viewvc?rev=1141674&view=rev
Log:
Use a real product name; Apache != Apache HTTP Server
Modified:
tomcat/jk/trunk/BUILD.txt
tomcat/jk/trunk/native/BUILDING.txt
tomcat/jk/trunk/xdocs/ajp/project.xml
tomcat/jk/trunk/xdocs/generic_howto/project.xml
tomcat/jk/trunk/xdocs/index.xml
tomcat/jk/trunk/xdocs/miscellaneous/project.xml
tomcat/jk/trunk/xdocs/news/project.xml
tomcat/jk/trunk/xdocs/project.xml
tomcat/jk/trunk/xdocs/reference/project.xml
tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
tomcat/jk/trunk/xdocs/webserver_howto/project.xml
Modified: tomcat/jk/trunk/BUILD.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/BUILD.txt?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/BUILD.txt (original)
+++ tomcat/jk/trunk/BUILD.txt Thu Jun 30 19:16:43 2011
@@ -21,7 +21,7 @@ Documentation for how to build mod_jk 1.
it for your webserver is located in the native/BUILDING.txt file in this
source distribution.
-For the impatient Apache admins:
+For the impatient Apache HTTP Server admins:
$> cd native
$> ./configure --with-apxs=/usr/sbin/apxs (or where ever the apxs/apxs2 is)
$> make
Modified: tomcat/jk/trunk/native/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/BUILDING.txt?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/native/BUILDING.txt (original)
+++ tomcat/jk/trunk/native/BUILDING.txt Thu Jun 30 19:16:43 2011
@@ -49,17 +49,20 @@
./configure -with-apxs=/home2/local/apache/bin/apxs
- Build for both Apache 1.3 and 2.0
- ---------------------------------
+ Build for both Apache HTTP Server 1.3 and 2.0
+ ---------------------------------------------
- If you want to build mod_jk for Apache 1.3 and 2.0, you should :
+ If you want to build mod_jk for Apache HTTP Server
+ 1.3 and 2.0, you should :
- use configure and indicate Apache 1.3 apxs location (--with-apxs)
+ use configure and indicate Apache HTTP Server 1.3
+ apxs location (--with-apxs)
use make
copy the mod_jk binary to the apache modules location
make clean (to remove all previously compiled modules)
- use configure and indicate Apache 2.0 apxs location,
+ use configure and indicate Apache HTTP Server 2.0
+ apxs location,
then make.
./configure --with-apxs=/usr/sbin/apxs
@@ -74,11 +77,11 @@
Examples
--------
- Apache2.0, JNI support:
+ Apache HTTP Server 2.0:
- ./configure --with-apxs=/opt/apache2/bin/apxs --with-java-home=${JAVA_HOME}
--with-java-platform=2 -enable-jni
+ ./configure --with-apxs=/opt/apache2/bin/apxs
- Apache 1.3, no JNI support:
+ Apache HTTP Server 1.3:
./configure --with-apxs=/usr/sbin/apxs
@@ -113,6 +116,7 @@
JNI support:
--enable-jni
Build the jni_connect.so and the JNI worker.
+ Note that JNI support has been discontinued
* Static build need more tests, and we strongly recommand dynamic build
using DSO/APXS.
Modified: tomcat/jk/trunk/xdocs/ajp/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/ajp/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/ajp/project.xml (original)
+++ tomcat/jk/trunk/xdocs/ajp/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties"
href="../reference/workers.html"/>
<item name="uriworkermap.properties"
href="../reference/uriworkermap.html"/>
<item name="Status Worker"
href="../reference/status.html"/>
- <item name="Apache"
href="../reference/apache.html"/>
+ <item name="Apache HTTP Server"
href="../reference/apache.html"/>
<item name="IIS" href="../reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="../webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="../webserver_howto/apache.html"/>
<item name="IIS"
href="../webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="../webserver_howto/nes.html"/>
</menu>
Modified: tomcat/jk/trunk/xdocs/generic_howto/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/generic_howto/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/generic_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/generic_howto/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties"
href="../reference/workers.html"/>
<item name="uriworkermap.properties"
href="../reference/uriworkermap.html"/>
<item name="Status Worker"
href="../reference/status.html"/>
- <item name="Apache"
href="../reference/apache.html"/>
+ <item name="Apache HTTP Server"
href="../reference/apache.html"/>
<item name="IIS" href="../reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="../webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="../webserver_howto/apache.html"/>
<item name="IIS"
href="../webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="../webserver_howto/nes.html"/>
</menu>
Modified: tomcat/jk/trunk/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/index.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/index.xml (original)
+++ tomcat/jk/trunk/xdocs/index.xml Thu Jun 30 19:16:43 2011
@@ -200,7 +200,7 @@ install JK for the various web servers.
</p>
<ul>
-<li><a href="webserver_howto/apache.html"><b>Apache</b></a>
+<li><a href="webserver_howto/apache.html"><b>Apache HTTP Server</b></a>
</li>
<li><a href="webserver_howto/iis.html"><b>IIS</b></a>
</li>
Modified: tomcat/jk/trunk/xdocs/miscellaneous/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/project.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties"
href="../reference/workers.html"/>
<item name="uriworkermap.properties"
href="../reference/uriworkermap.html"/>
<item name="Status Worker"
href="../reference/status.html"/>
- <item name="Apache"
href="../reference/apache.html"/>
+ <item name="Apache HTTP Server"
href="../reference/apache.html"/>
<item name="IIS" href="../reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="../webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="../webserver_howto/apache.html"/>
<item name="IIS"
href="../webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="../webserver_howto/nes.html"/>
</menu>
Modified: tomcat/jk/trunk/xdocs/news/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/news/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/news/project.xml (original)
+++ tomcat/jk/trunk/xdocs/news/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties"
href="../reference/workers.html"/>
<item name="uriworkermap.properties"
href="../reference/uriworkermap.html"/>
<item name="Status Worker"
href="../reference/status.html"/>
- <item name="Apache"
href="../reference/apache.html"/>
+ <item name="Apache HTTP Server"
href="../reference/apache.html"/>
<item name="IIS" href="../reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="../webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="../webserver_howto/apache.html"/>
<item name="IIS"
href="../webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="../webserver_howto/nes.html"/>
</menu>
Modified: tomcat/jk/trunk/xdocs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/project.xml (original)
+++ tomcat/jk/trunk/xdocs/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties" href="reference/workers.html"/>
<item name="uriworkermap.properties"
href="reference/uriworkermap.html"/>
<item name="Status Worker" href="reference/status.html"/>
- <item name="Apache" href="reference/apache.html"/>
+ <item name="Apache HTTP Server" href="reference/apache.html"/>
<item name="IIS" href="reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="webserver_howto/apache.html"/>
<item name="IIS"
href="webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="webserver_howto/nes.html"/>
</menu>
Modified: tomcat/jk/trunk/xdocs/reference/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/reference/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/reference/project.xml (original)
+++ tomcat/jk/trunk/xdocs/reference/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties"
href="../reference/workers.html"/>
<item name="uriworkermap.properties"
href="../reference/uriworkermap.html"/>
<item name="Status Worker"
href="../reference/status.html"/>
- <item name="Apache"
href="../reference/apache.html"/>
+ <item name="Apache HTTP Server"
href="../reference/apache.html"/>
<item name="IIS" href="../reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="../webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="../webserver_howto/apache.html"/>
<item name="IIS"
href="../webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="../webserver_howto/nes.html"/>
</menu>
Modified: tomcat/jk/trunk/xdocs/webserver_howto/apache.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/apache.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/apache.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/apache.xml Thu Jun 30 19:16:43 2011
@@ -22,7 +22,7 @@
limitations under the License.
</copyright>
<properties>
-<title>Apache HowTo</title>
+<title>Apache HTTP Server HowTo</title>
<author email="[email protected]">Henri Gomez</author>
<author email="[email protected]">Gal Shachor</author>
<date>$Date$</date>
@@ -30,8 +30,8 @@
<body>
<section name="Introduction">
<p>
-This document explains how to connect Tomcat to the popular open source web
server, Apache.
-There is actually three versions of Apache, 1.3, 2.0 and 2.2 and all can be
used with mod_jk,
+This document explains how to connect Tomcat to the popular open source web
server, Apache httpd.
+There is actually three versions of Apache HTTP Server, 1.3, 2.0 and 2.2 and
all can be used with mod_jk,
the Tomcat redirector module.
</p>
@@ -45,7 +45,7 @@ For more detailed configuration informat
and <a href="../reference/apache.html">Apache</a>.
</p>
-<p><b>Waring: If Apache httpd and Tomcat are configured to serve content from
+<p><b>Waring: If Apache HTTP Server and Tomcat are configured to serve content
from
the same filing system location then care must be taken to ensure that httpd is
not able to serve inappropriate content such as the contents of the WEB-INF
directory or JSP source code.</b> This could occur if the httpd DocumentRoot
@@ -100,7 +100,7 @@ Cygwin (until you have an apache server
Netware
</li>
<li>
-i5/OS V5R4 (System I) with Apache 2.0.58. Be sure to have the latest Apache
PTF installed.
+i5/OS V5R4 (System I) with Apache HTTP Server 2.0.58. Be sure to have the
latest Apache PTF installed.
</li>
<li>
Tomcat 3.2.x, Tomcat 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x, Tomcat 5.0.x, Tomcat
5.5.x and Tomcat 6.
@@ -215,7 +215,7 @@ mod_jk requires two entities:
<ul>
<li>
-<b>mod_jk.xxx</b> - The Apache module, depending on your operating system, it
will be mod_jk.so, mod_jk.nlm or
+<b>mod_jk.xxx</b> - The Apache HTTP Server module, depending on your operating
system, it will be mod_jk.so, mod_jk.nlm or
or MOD_JK.SRVPGM (see the build section).
</li>
<li>
@@ -226,7 +226,7 @@ A sample workers.properties can be found
</p>
<p>
-Also as with other Apache modules, mod_jk should be first installed on the
modules directory of your
+Also as with other Apache HTTP Server modules, mod_jk should be first
installed on the modules directory of your
Apache webserver, ie : /usr/lib/apache and you should update your
<b>httpd.conf</b> file.
</p>
@@ -248,8 +248,8 @@ The mod_jserv configuration directives a
<subsection name="Using Tomcat auto-configure">
<p>
-The auto-configure works only for a single Tomcat running on the same machine
where Apache (httpd) is running.
-The simplest way to configure Apache to use mod_jk is to turn on the Apache
auto-configure setting
+The auto-configure works only for a single Tomcat running on the same machine
where Apache HTTP Server is running.
+The simplest way to configure Apache HTTP Server to use mod_jk is to turn on
the Apache HTTP Server auto-configure setting
in Tomcat and put the following include directive at the end of your Apache
httpd.conf file
(make sure you replace $TOMCAT_HOME with the correct path for your Tomcat
installation:
</p>
@@ -264,7 +264,7 @@ Note: this file may also be generated as
</p>
<p>
-This will tell Apache to use directives in the <b>mod_jk.conf-auto</b> file in
+This will tell Apache HTTP Server to use directives in the
<b>mod_jk.conf-auto</b> file in
the Apache configuration. This file is created by enabling the Apache
auto-configuration by creating your workers.properties file at
$TOMCAT_HOME/conf/jk/workers.properties and adding the listener to the Engine
Modified: tomcat/jk/trunk/xdocs/webserver_howto/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/webserver_howto/project.xml?rev=1141674&r1=1141673&r2=1141674&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/webserver_howto/project.xml (original)
+++ tomcat/jk/trunk/xdocs/webserver_howto/project.xml Thu Jun 30 19:16:43 2011
@@ -33,7 +33,7 @@
<item name="workers.properties"
href="../reference/workers.html"/>
<item name="uriworkermap.properties"
href="../reference/uriworkermap.html"/>
<item name="Status Worker"
href="../reference/status.html"/>
- <item name="Apache"
href="../reference/apache.html"/>
+ <item name="Apache HTTP Server"
href="../reference/apache.html"/>
<item name="IIS" href="../reference/iis.html"/>
</menu>
@@ -46,7 +46,7 @@
</menu>
<menu name="Webserver HowTo">
- <item name="Apache"
href="../webserver_howto/apache.html"/>
+ <item name="Apache HTTP Server"
href="../webserver_howto/apache.html"/>
<item name="IIS"
href="../webserver_howto/iis.html"/>
<item name="Netscape/SunOne/Sun"
href="../webserver_howto/nes.html"/>
</menu>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
