Author: rjung
Date: Mon Dec 22 21:24:30 2014
New Revision: 1647408
URL: http://svn.apache.org/r1647408
Log:
- Replace "Jakarta" by "Tomcat" in the IIS ISAPI
Redirector. Keep Registry path containing "Jakarta"
for compatibility.
- Add example isapi_redirect.properties to conf
- Update example config files
Hopefully I haven't broken the ism file.
Added:
tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties (with
props)
tomcat/jk/trunk/native/iis/installer/conf/workers.properties (with props)
Removed:
tomcat/jk/trunk/native/iis/installer/conf/workers.properties.minimal
Modified:
tomcat/jk/trunk/native/iis/installer/bin/README
tomcat/jk/trunk/native/iis/installer/conf/rewrite.properties
tomcat/jk/trunk/native/iis/installer/conf/uriworkermap.properties
tomcat/jk/trunk/native/iis/installer/iisfilter.vbs
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/jk/trunk/native/iis/installer/log/README
tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
Modified: tomcat/jk/trunk/native/iis/installer/bin/README
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/bin/README?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/bin/README (original)
+++ tomcat/jk/trunk/native/iis/installer/bin/README Mon Dec 22 21:24:30 2014
@@ -1 +1 @@
-Jakarta Isapi Redirector
\ No newline at end of file
+Tomcat Isapi Redirector
Added: tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties?rev=1647408&view=auto
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties (added)
+++ tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties Mon Dec
22 21:24:30 2014
@@ -0,0 +1,86 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note that the distributed version of this file requires modification
+# before it is usable.
+#
+# Reference documentation:
http://tomcat.apache.org/connectors-doc/reference/iis.html
+#
+# Configuration file for the Tomcat ISAPI Redirector
+
+# The path to the ISAPI Redirector Extension, relative to the website
+# This must be in a virtual directory with execute privileges
+extension_uri=/jakarta/isapi_redirect.dll
+
+# Full path to the log file for the ISAPI Redirector
+# Use of strftime(3) format in the name is supported.
+log_file=c:\tomcat\logs\isapi_redirect.%Y-%m-%d.log
+
+# Rotate the log file every day
+log_rotationtime=86400
+
+# Log level (trace, debug, info, warn or error)
+log_level=info
+
+# Full path to the workers.properties file
+worker_file=c:\tomcat\conf\workers.properties
+
+# Full path to the uriworkermap.properties file
+worker_mount_file=c:\tomcat\conf\uriworkermap.properties
+
+# Full path to the rewrite.properties file
+rewrite_rule_file=
+
+# Specify the time in seconds upon which the worker_mount_file will be
reloaded.
+worker_mount_reload=
+
+# If this is set to true, URL session suffixes of the form ";jsessionid=..."
+# get stripped of URLs if the are served locally by the web server.
+# Default value is false.
+strip_session=false
+
+# If this is set to true, URLs containing percent signs '%' or backslashes '\'
+# after decoding will be rejected. Most web apps do not use such URLs.
+# By enabling "reject_unsafe" you can block several well known URL encoding
+# attacks.
+# Default value is false.
+reject_unsafe=false
+
+# A value representing the watchdog thread interval in seconds. The workers are
+# maintained periodically by a background thread running periodically every
+# watchdog_interval seconds. Worker maintenance checks for idle connections,
+# corrects load status and is able to detect backend health status.
+#
+# The maintenance only happens, if since the last maintenance at least
+# worker.maintain seconds have passed. So setting the watchdog_interval much
+# smaller than worker.maintain is not useful.
+#
+# The default value is 0 seconds, meaning the watchdog thread will not be
+# created, and the maintenance is done in combination with normal requests
+# instead.
+watchdog_interval=0
+
+# A string value representing the error page url redirection when a backend
+# returns a non-200 response. This directive can be used to customise the error
+# messages returned from the backend server.
+# The url must point to a valid server url and can contain format string number
+# (%d) that can be used to separate the pages by error number. The redirect url
+# in that case is formatted by replacing %d from error_page with the returned
+# error status code.
+error_page=
+
+# If this is set to true, chunked response encoding is supported.
+# The default value is false.
+enable_chunked_encoding=false
Propchange: tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/jk/trunk/native/iis/installer/conf/isapi_redirect.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/jk/trunk/native/iis/installer/conf/rewrite.properties
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/conf/rewrite.properties?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/conf/rewrite.properties (original)
+++ tomcat/jk/trunk/native/iis/installer/conf/rewrite.properties Mon Dec 22
21:24:30 2014
@@ -18,11 +18,11 @@
# Form of the file
# requested=replacement
#
-# Note: Requested must be present in the
+# Note: "requested" must be present in the
# uriworkermap.properies file and mapped to
# the desired worker.
#
-# Next will send /examples/servlets/ to the container
-# for the /servlets-examples request.
+# Next will send requests for /servlets-examples/ as
+# /examples/servlets/ to the container.
#
# /servlets-examples/=/examples/servlets/
Modified: tomcat/jk/trunk/native/iis/installer/conf/uriworkermap.properties
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/conf/uriworkermap.properties?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/conf/uriworkermap.properties (original)
+++ tomcat/jk/trunk/native/iis/installer/conf/uriworkermap.properties Mon Dec
22 21:24:30 2014
@@ -13,27 +13,30 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# uriworkermap.properties - IIS
+# uriworkermap.properties
#
-# This file provides sample mappings for example wlb
-# worker defined in workermap.properties.minimal
+# Use for IIS or with the Apache web server as an alternative
+# to JkMount and JkUnmount
+#
+# This file provides sample mappings for the example
+# worker "balancer" defined in workermap.properties.
# The general syntax for this file is:
# [URL]=[Worker name]
-/admin/*=wlb
-/manager/*=wlb
-/jsp-examples/*=wlb
-/servlets-examples/*=wlb
-/examples/*=wlb
+/admin/*=balancer
+/manager/*=balancer
+/examples/*=balancer
-# Optionally filter out all .jpeg files inside that context
-# For no mapping the url has to start with exclamation (!)
+# Optionally filter out all .jpg files inside that context
+# For no mapping the url has to start with exclamation mark (!)
-!/servlets-examples/*.jpeg=wlb
+!/examples/*.jpg=balancer
#
-# Mount jkstatus to /jkmanager
+# Mount jk status and manager
# For production servers you will need to
-# secure the access to the /jkmanager url
+# secure the access to the /jk-manager and
+# /jk-status urls
#
-/jkmanager=jkstatus
+/jk-manager=jk-manager
+/jk-status=jk-status
Added: tomcat/jk/trunk/native/iis/installer/conf/workers.properties
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/conf/workers.properties?rev=1647408&view=auto
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/conf/workers.properties (added)
+++ tomcat/jk/trunk/native/iis/installer/conf/workers.properties Mon Dec 22
21:24:30 2014
@@ -0,0 +1,164 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Note that the distributed version of this file requires modification
+# before it is usable.
+#
+# Reference documentation:
http://tomcat.apache.org/connectors-doc/reference/workers.html
+#
+# As a general note, the characters $( and ) are used to reference
+# property values in other properties.
+#
+# Whenever you see a set of lines such as:
+# x=value
+# y=$(x)othervalue
+#
+# the final value for y will be "valueothervalue"
+
+# Define two status worker:
+# - jk-status for read-only use
+# - jk-manager for read/write use
+worker.list=jk-status
+worker.jk-status.type=status
+worker.jk-status.read_only=true
+
+worker.list=jk-manager
+worker.jk-manager.type=status
+
+# We define a load balancer worker
+# with name "balancer"
+worker.list=balancer
+worker.balancer.type=lb
+# error_escalation_time: seconds, default = recover_time/2 (=30)
+# Determines, how fast a detected error should switch from
+# local error state to global error state
+# Since: 1.2.28
+worker.balancer.error_escalation_time=0
+
+# - max_reply_timeouts: number, default=0
+# If there are to many reply timeouts, a worker
+# is put into the error state, i.e. it will become
+# unavailable for all sessions residing on the respective
+# Tomcat. The number of tolerated reply timeouts is
+# configured with max_reply_timeouts. The number of
+# timeouts occuring is divided by 2 once a minute and the
+# resulting counter is compared against max_reply_timeouts.
+# If you set max_reply_timeouts to N and the errors are
+# occuring equally distributed over time, you will
+# tolerate N/2 errors per minute. If they occur in a burst
+# you will tolerate N errors.
+# Since: 1.2.24
+worker.balancer.max_reply_timeouts=10
+
+
+
+# Now we add members to the load balancer
+# First member is "node1", most
+# attributes are inherited from the
+# template "worker.template".
+worker.balancer.balance_workers=node1
+worker.node1.reference=worker.template
+worker.node1.host=localhost
+worker.node1.port=8109
+# Activation allows to configure
+# whether this node should actually be used
+# A: active (use node fully)
+# D: disabled (only use, if sticky session needs this node)
+# S: stopped (do not use)
+# Since: 1.2.19
+worker.node1.activation=A
+
+# Second member is "node2", most
+# attributes are inherited from the
+# template "worker.template".
+worker.balancer.balance_workers=node2
+worker.node2.reference=worker.template
+worker.node2.host=localhost
+worker.node2.port=8209
+# Activation allows to configure
+# whether this node should actually be used
+# A: active (use node fully)
+# D: disabled (only use, if sticky session needs this node)
+# S: stopped (do not use)
+# Since: 1.2.19
+worker.node2.activation=A
+
+# Finally we put the parameters
+# which should apply to all our ajp13
+# workers into the referenced template
+# - Type is ajp13
+worker.template.type=ajp13
+
+# - socket_connect_timeout: milliseconds, default=0
+# Since: 1.2.27
+worker.template.socket_connect_timeout=5000
+
+# - socket_keepalive: boolean, default=false
+# Should we send TCP keepalive packets
+# when connection is idle (socket option)?
+worker.template.socket_keepalive=true
+
+# - ping_mode: Character, default=none
+# When should we use cping/cpong connection probing?
+# C = directly after establishing a new connection
+# P = directly before sending each request
+# I = in regular intervals for idle connections
+# using the watchdog thread
+# A = all of the above
+# Since: 1.2.27
+worker.template.ping_mode=A
+
+# - ping_timeout: milliseconds, default=10000
+# Wait timeout for cpong after cping
+# Can be overwritten for modes C and P
+# Using connect_timeout and prepost_timeout.
+# Since: 1.2.27
+worker.template.ping_timeout=10000
+
+# - connection_pool_minsize: number, default=connection_pool_size
+# Lower pool size when shrinking pool due
+# to idle connections
+# We want all connections to be closed when
+# idle for a long time in order to prevent
+# firewall problems.
+# Since: 1.2.16
+worker.template.connection_pool_minsize=0
+
+# - connection_pool_timeout: seconds, default=0
+# Idle time, before a connection is eligible
+# for being closed (pool shrinking).
+# This should be the same value as connectionTimeout
+# in the Tomcat AJP connector, but there it is
+# milliseconds, here seconds.
+worker.template.connection_pool_timeout=600
+
+# - reply_timeout: milliseconds, default=0
+# Any pause longer than this timeout during waiting
+# for a part of the reply will abort handling the request
+# in mod_jk. The request will proceed running in
+# Tomcat, but the web server resources will be freed
+# and an error is send to the client.
+# For individual requests, the timeout can be overwritten
+# by the Apache environment variable JK_REPLY_TIMEOUT.
+# JK_REPLY_TIMEOUT since: 1.2.27
+worker.template.reply_timeout=300000
+
+# - recovery_options: number, default=0
+# Bit mask to configure, if a request, which was send
+# to a backend successfully, should be retried on another backend
+# in case there's a problem with the response.
+# Value "3" disables retries, whenever a part of the request was
+# successfully send to the backend.
+worker.template.recovery_options=3
Propchange: tomcat/jk/trunk/native/iis/installer/conf/workers.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/jk/trunk/native/iis/installer/conf/workers.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: tomcat/jk/trunk/native/iis/installer/iisfilter.vbs
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/iisfilter.vbs?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/iisfilter.vbs (original)
+++ tomcat/jk/trunk/native/iis/installer/iisfilter.vbs Mon Dec 22 21:24:30 2014
@@ -65,7 +65,7 @@ Function IISInstallFilter(filterDir, fil
'
filter.FilterPath = filterDir + filterLib
' filter.FilterEnabled = true
- filter.FilterDescription = "Jakarta Isapi Redirector"
+ filter.FilterDescription = "Tomcat Isapi Redirector"
filter.NotifyOrderHigh = true
filter.SetInfo
info "Created Filter " + filterDir + filterLib
Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
(original)
+++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Mon Dec
22 21:24:30 2014
@@ -1139,19 +1139,15 @@
<row><td>FontsFolder</td><td>TARGETDIR</td><td>.:Fonts</td><td/><td>0</td><td/></row>
<row><td>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
<row><td>IISROOTFOLDER</td><td>TARGETDIR</td><td>.:IISRoo~1|IISRootFolder</td><td/><td>0</td><td/></row>
-
<row><td>INSTALLDIR</td><td>JAKARTA_ISAPI_REDIRECTOR</td><td>.</td><td/><td>0</td><td/></row>
+
<row><td>INSTALLDIR</td><td>TOMCAT_ISAPI_REDIRECTOR</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company
Name</td><td/><td>0</td><td/></row>
<row><td>ISMyProductDir</td><td>ISMyCompanyDir</td><td>MYPROD~1|My Product
Name</td><td/><td>0</td><td/></row>
<row><td>ISUpdateServiceFolder</td><td>ISCommonFilesFolder</td><td>UPDATE~1|UpdateService</td><td/><td>0</td><td/></row>
<row><td>ISYourDataBaseDir</td><td>INSTALLDIR</td><td>Database</td><td/><td>0</td><td/></row>
-
<row><td>JAKARTA_ISAPI_REDIRECTOR</td><td>APACHE_SOFTWARE_FOUNDATION</td><td>JAKART~1|Tomcat
Isapi Redirector</td><td/><td>0</td><td/></row>
-
<row><td>JAKARTA_ISAPU_REDIRECTOR</td><td>APACHE_SOFTWARE_FOUNDATION</td><td>JAKART~1|Jakarta
Isapu Redirector</td><td/><td>0</td><td/></row>
-
<row><td>JBOSS_EUROPE_SARL</td><td>ProgramFilesFolder</td><td>JBOSSE~1|JBoss
Europe SaRL</td><td/><td>0</td><td/></row>
+
<row><td>TOMCAT_ISAPI_REDIRECTOR</td><td>APACHE_SOFTWARE_FOUNDATION</td><td>TOMCAT~1|Tomcat
Isapi Redirector</td><td/><td>0</td><td/></row>
<row><td>LOG</td><td>INSTALLDIR</td><td>log</td><td/><td>0</td><td/></row>
<row><td>LocalAppDataFolder</td><td>TARGETDIR</td><td>.:LocalA~1|LocalAppData</td><td/><td>0</td><td/></row>
-
<row><td>MY_PRODUCT_NAME</td><td>JBOSS_EUROPE_SARL</td><td>MYPROD~1|My Product
Name</td><td/><td>0</td><td/></row>
-
<row><td>MY_PRODUCT_NAME1</td><td>APACHE_SOFTWARE_FOUNDATION</td><td>MYPROD~1|My
Product Name</td><td/><td>0</td><td/></row>
<row><td>MyPicturesFolder</td><td>TARGETDIR</td><td>.:MyPict~1|MyPictures</td><td/><td>0</td><td/></row>
<row><td>PersonalFolder</td><td>TARGETDIR</td><td>.:Personal</td><td/><td>0</td><td/></row>
<row><td>PrimaryVolumePath</td><td>TARGETDIR</td><td>.:Primar~1|PrimaryVolumePath</td><td/><td>0</td><td/></row>
@@ -3496,7 +3492,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA==
<row><td>Registry13</td><td>2</td><td>SOFTWARE\Apache Software
Foundation\Jakarta Isapi
Redirector\1.0</td><td>extension_uri</td><td>/jakarta/isapi_redirect.dll</td><td>ISRegistryComponent1</td><td>0</td></row>
<row><td>Registry14</td><td>2</td><td>SOFTWARE\Apache Software
Foundation\Jakarta Isapi
Redirector\1.0</td><td>log_file</td><td>[INSTALLDIR]log\isapi_redirect.log</td><td>ISRegistryComponent1</td><td>0</td></row>
<row><td>Registry15</td><td>2</td><td>SOFTWARE\Apache Software
Foundation\Jakarta Isapi
Redirector\1.0</td><td>log_level</td><td>info</td><td>ISRegistryComponent1</td><td>0</td></row>
- <row><td>Registry16</td><td>2</td><td>SOFTWARE\Apache Software
Foundation\Jakarta Isapi
Redirector\1.0</td><td>worker_file</td><td>[INSTALLDIR]conf\workers.properties.minimal</td><td>ISRegistryComponent1</td><td>0</td></row>
+ <row><td>Registry16</td><td>2</td><td>SOFTWARE\Apache Software
Foundation\Jakarta Isapi
Redirector\1.0</td><td>worker_file</td><td>[INSTALLDIR]conf\workers.properties</td><td>ISRegistryComponent1</td><td>0</td></row>
<row><td>Registry17</td><td>2</td><td>SOFTWARE\Apache Software
Foundation\Jakarta Isapi
Redirector\1.0</td><td>worker_mount_file</td><td>[INSTALLDIR]conf\uriworkermap.properties</td><td>ISRegistryComponent1</td><td>0</td></row>
</table>
Modified: tomcat/jk/trunk/native/iis/installer/log/README
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/log/README?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/log/README (original)
+++ tomcat/jk/trunk/native/iis/installer/log/README Mon Dec 22 21:24:30 2014
@@ -1 +1 @@
-Jakarta Isapi Redirector log files
\ No newline at end of file
+Tomcat Isapi Redirector log files
Modified: tomcat/jk/trunk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/jk_isapi_plugin.c?rev=1647408&r1=1647407&r2=1647408&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/jk/trunk/native/iis/jk_isapi_plugin.c Mon Dec 22 21:24:30 2014
@@ -53,8 +53,8 @@
#include <strsafe.h>
-#define VERSION_STRING "Jakarta/ISAPI/" JK_EXPOSED_VERSION
-#define FULL_VERSION_STRING "Jakarta/ISAPI/" JK_FULL_EXPOSED_VERSION
+#define VERSION_STRING "Tomcat/ISAPI/" JK_EXPOSED_VERSION
+#define FULL_VERSION_STRING "Tomcat/ISAPI/" JK_FULL_EXPOSED_VERSION
#define SHM_DEF_PREFIX "JK_"
#define DEFAULT_WORKER_NAME "ajp13"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
