yoavs 2004/08/22 09:34:14
Modified: jk/native/iis Tag: TOMCAT_5_0 isapi_install.vbs
jk/xdocs/jk Tag: TOMCAT_5_0 iishowto.xml
jk/xdocs/jk2 Tag: TOMCAT_5_0 configwebcom.xml
installhowto.xml
Log:
Back-ported CVS HEAD patches to TOMCAT_5_0 for 5.0.28.
Revision Changes Path
No revision
No revision
1.4.2.1 +3 -3 jakarta-tomcat-connectors/jk/native/iis/isapi_install.vbs
Index: isapi_install.vbs
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/iis/isapi_install.vbs,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- isapi_install.vbs 27 Feb 2004 16:07:39 -0000 1.4
+++ isapi_install.vbs 22 Aug 2004 16:34:14 -0000 1.4.2.1
@@ -47,7 +47,7 @@
serverName = args(0)
filterDir = args(1)
filterName = "jakarta"
-filterLib = "\isapi_redirector.dll"
+filterLib = "\isapi_redirect.dll"
workerFile = args(2)
mountFile = args(3)
logFile = args(4)
@@ -161,7 +161,7 @@
on error goto 0
info "Updating Registry"
-shell.RegWrite regRoot + "extension_uri", "/jakarta/isapi_redirector.dll"
+shell.RegWrite regRoot + "extension_uri", "/jakarta/isapi_redirect.dll"
shell.RegWrite regRoot + "log_file", logFile
shell.RegWrite regRoot + "log_level", logLevel
shell.RegWrite regRoot + "worker_file", workerFile
No revision
No revision
1.6.2.1 +11 -3 jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml
Index: iishowto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk/iishowto.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- iishowto.xml 4 Mar 2004 04:46:34 -0000 1.6
+++ iishowto.xml 22 Aug 2004 16:34:14 -0000 1.6.2.1
@@ -19,6 +19,7 @@
<title>IIS HowTo</title>
<author email="[EMAIL PROTECTED]">Henri Gomez</author>
<author email="[EMAIL PROTECTED]">Gal Shachor</author>
+<author email="[EMAIL PROTECTED]">Yoav Shapira</author>
<date>$Date$</date>
</properties>
@@ -71,10 +72,10 @@
WinNT4.0-i386 SP4/SP5/SP6a (should be able to work with other service packs), Win2K
and WinXP and Win98
</li>
<li>
-IIS4.0 and PWS4.0
+IIS4.0 and PWS4.0 (numerous people have working IIS 5 and IIS 6 configurations)
</li>
<li>
-Tomcat 3.2.x, Tomcat 3.3.x, Tomcat 4.0.x, Tomcat 4.1.x and Tomcat 5
+Tomcat 3.2 and later, Tomcat 4.x and Tomcat 5
</li>
</ul>
</p>
@@ -85,6 +86,13 @@
</p>
</subsection>
+<subsection name="IIS 5 and 6 Notes">
+<p>
+There are extra steps you need to take for configuring Tomcat with IIS 5 and 6.
Please see the appropriate links from
+<a href="http://wiki.apache.org/jakarta-tomcat/Tomcat_2fLinks";>Tomcat Useful
Links</a>.
+</p>
+</subsection>
+
<subsection name="Who support ajp protocols ?">
<p>
The ajp12 protocol is only available in Tomcat 3.2.x and 3.3.x.
@@ -92,7 +100,7 @@
<p>
The <b>ajp12</b> has been <b>deprecated</b> with Tomcat 3.3.x and you should use
instead
-<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.0.x, 4.1.x and 5.
+<b>ajp13</b> which is the only ajp protocol known by Tomcat 4.x and 5.
</p>
<p>
No revision
No revision
1.18.2.1 +62 -42 jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml
Index: configwebcom.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/configwebcom.xml,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- configwebcom.xml 26 May 2004 07:06:00 -0000 1.18
+++ configwebcom.xml 22 Aug 2004 16:34:14 -0000 1.18.2.1
@@ -15,51 +15,71 @@
See the License for the specific language governing permissions and
limitations under the License.
</copyright>
+
<properties>
-<title>Components</title>
-<author email="[EMAIL PROTECTED]">Costin Manolache</author>
-<author email="[EMAIL PROTECTED]">Jean-Frederic Clere</author>
-<date>$Date$</date>
+ <title>Components</title>
+
+ <author email="[EMAIL PROTECTED]">Costin Manolache</author>
+ <author email="[EMAIL PROTECTED]">Jean-Frederic Clere</author>
+ <author email="[EMAIL PROTECTED]">Yoav Shapira</author>
+
+ <date>$Date$</date>
</properties>
- <section name="Intro"><p>Each component instance has a name, that is used for
configuration and at runtime. Each component has a number of configurable properties.
The following rules are used:
-<ul><li>The name is composed from the type and a local part, separated with a ':' (
example: channel.unixsocket:/tmp/jk.socket ) </li>
-<li>The 'type' consist of '.' and ascii characters. It is mapped to a JMX
'domain'. </li>
-<li>The local part consists of ascii characters and .:/;
-<p>Note that '=,' are not currently allowed - a future version may support the jmx
syntax by using quotes to separate the local part from the property and value ( in
.properties mode we must use '=' to separate the value from type, local name and
property name ). </p></li>
-<li>The property is a simple name, with no dots. </li>
-<li>A simple form of substitution is used in values, where $(property) will be
replaced with a previously defined setting. If the property has ':' in it, it'll take
the value from the object, if not it'll take the value from a global map.</li></ul></p>
+
+<section name="Intro">
+ <p>
+ Each component instance has a name, that is used for configuration and at
runtime.
+ Each component has a number of configurable properties. The following rules are
used:
+ <ul>
+ <li>The name is composed from the type and a local part, separated with a ':'
( example: channel.unixsocket:/tmp/jk.socket ) </li>
+ <li>The 'type' consist of '.' and ascii characters. It is mapped to a JMX
'domain'. </li>
+ <li>The local part consists of ascii characters and .:/;
+
+ <p>
+ Note that '=,' are not currently allowed - a future version may support
the jmx syntax by using quotes to separate the local part from the property and value
( in .properties mode we must use '=' to separate the value from type, local name and
property name ).
+ </p>
+ </li>
+ <li>The property is a simple name, with no dots. </li>
+ <li>A simple form of substitution is used in values, where $(property) will
be replaced with a previously defined setting. If the property has ':' in it, it'll
take the value from the object, if not it'll take the value from a global map.
+ </li>
+ </ul>
+ </p>
</section>
- <section name="Common properties">
- <p>Common properties for all components</p>
- <p>
- <table>
- <tr>
- <th>Property name</th>
- <th>Default</th>
- <th>Description</th>
- </tr>
- <tr>
- <td>disabled</td>
- <td>0 (false)</td>
- <td>"disabled" state for the component, 1=true 0=false</td>
- </tr>
- <tr>
- <td>debug</td>
- <td>0 (false)</td>
- <td>Debug level for the component, 0=disabled, 1..10
enabled. Higher levels
- generate more debug.</td>
- </tr>
- <tr>
- <td>version</td>
- <td>0</td>
- <td>'Generation' of the component config. Important for
runtime reconfiguration.
- If you edit the config file or set the shmem
properties, you need to also
- upgrade the version of the modified component. The
config layer will detect
- the change and call the setter method.</td>
- </tr>
- </table>
- </p>
- </section>
+
+<section name="Common properties">
+ <p>
+ Common properties for all components
+ </p>
+ <p>
+ <table>
+ <tr>
+ <th>Property name</th>
+ <th>Default</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>disabled</td>
+ <td>0 (false)</td>
+ <td>"disabled" state for the component, 1=true 0=false</td>
+ </tr>
+ <tr>
+ <td>debug</td>
+ <td>0 (false)</td>
+ <td>Debug level for the component, 0=disabled, 1..10 enabled. Higher levels
+ generate more debug information.</td>
+ </tr>
+ <tr>
+ <td>ver (short for, and formerly known as, version)</td>
+ <td>0</td>
+ <td>'Generation' of the component config. Important for runtime
reconfiguration.
+ If you edit the config file or set the shmem properties, you need to
also
+ upgrade the version of the modified component. The config layer will
detect
+ the change and call the setter method.</td>
+ </tr>
+ </table>
+ </p>
+</section>
+
<section name="workerEnv">
<p>This component represent the core jk2, it has the default logger for
all other components. Is the central controller, it controls global properties
and provides access to all other objects</p>
1.7.2.1 +12 -5 jakarta-tomcat-connectors/jk/xdocs/jk2/installhowto.xml
Index: installhowto.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/xdocs/jk2/installhowto.xml,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- installhowto.xml 4 Mar 2004 04:46:34 -0000 1.7
+++ installhowto.xml 22 Aug 2004 16:34:14 -0000 1.7.2.1
@@ -15,12 +15,17 @@
See the License for the specific language governing permissions and
limitations under the License.
</copyright>
+
<properties>
-<title>Installation of jk2 in the Web Server</title>
-<author email="[EMAIL PROTECTED]">Jean-Frederic Clere</author>
-<author email="[EMAIL PROTECTED]">Andy Armstrng</author>
-<date>$Date$</date>
+ <title>Installation of jk2 in the Web Server</title>
+
+ <author email="[EMAIL PROTECTED]">Jean-Frederic Clere</author>
+ <author email="[EMAIL PROTECTED]">Andy Armstrng</author>
+ <author email="[EMAIL PROTECTED]">Yoav Shapira</author>
+
+ <date>$Date$</date>
</properties>
+
<section name="Installation">
<p>
The actual build mechanism creates the dso files in the
@@ -104,7 +109,9 @@
<b>"HKEY_LOCAL_MACHINE\SOFTWARE\Apache Software Foundation\Jakarta
Isapi Redirector\2.0"</b>
</li><li>
Add a string value with the name <b>serverRoot</b> and a value which is
a full path
- to your Tomcat installation (for example <b>c:\jakarta-tomcat</b>)
+ to your Tomcat installation (for example <b>c:\jakarta-tomcat</b>). If
Tomcat is installed
+ on a different server, this entry must point to the location
(directory) where the
+ workers2.properties file resides.
</li><li>
Add a string value with the name <b>extensionUri</b> and a value of
<b>/jakarta/isapi_redirector2.dll</b>
</li><li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
