Author: mturk
Date: Sat Sep 9 05:26:11 2006
New Revision: 441786
URL: http://svn.apache.org/viewvc?view=rev&rev=441786
Log:
Add [info] message if the installed Native version
is lower then a recommended one.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java?view=diff&rev=441786&r1=441785&r2=441786
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
Sat Sep 9 05:26:11 2006
@@ -53,6 +53,7 @@
protected static final int REQUIRED_MAJOR = 1;
protected static final int REQUIRED_MINOR = 1;
protected static final int REQUIRED_PATCH = 3;
+ protected static final int RECOMMENDED_PV = 4;
// ---------------------------------------------- LifecycleListener Methods
@@ -96,6 +97,21 @@
log.error(sm.getString("aprListener.tcnInvalid", major + "."
+ minor + "." + patch, REQUIRED_MAJOR + "."
+ REQUIRED_MINOR + "." + REQUIRED_PATCH));
+ }
+ if (patch < RECOMMENDED_PV) {
+ /* The version is lower then recommended.
+ * Instruct the user to consider upgrading the native
+ * to the current stable version.
+ */
+ if (!log.isDebugEnabled()) {
+ log.info(sm.getString("aprListener.tcnVersion", major +
"."
+ + minor + "." + patch, REQUIRED_MAJOR + "."
+ + REQUIRED_MINOR + "." + RECOMMENDED_PV));
+ } else {
+ log.debug(sm.getString("aprListener.tcnVersion", major +
"."
+ + minor + "." + patch, REQUIRED_MAJOR + "."
+ + REQUIRED_MINOR + "." + RECOMMENDED_PV));
+ }
}
} else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) {
try {
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties?view=diff&rev=441786&r1=441785&r2=441786
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
Sat Sep 9 05:26:11 2006
@@ -16,6 +16,7 @@
applicationResponse.badResponse=Response is not a
javax.servlet.ServletResponseWrapper
aprListener.aprInit=The Apache Tomcat Native library which allows optimal
performance in production environments was not found on the java.library.path:
{0}
aprListener.tcnInvalid=An incompatible version {0} of the Apache Tomcat Native
library is installed, while Tomcat requires version {1}
+aprListener.tcnVersion=An older version {0} of the Apache Tomcat Native
library is installed, while Tomcat recommends version greater then {1}
aprListener.aprDestroy=Failed shutdown of Apache Portable Runtime
containerBase.addDefaultMapper=Exception configuring default mapper of class
{0}
containerBase.alreadyStarted=Container {0} has already been started
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
