Author: remm
Date: Sat Sep 9 14:14:11 2006
New Revision: 441857
URL: http://svn.apache.org/viewvc?view=rev&rev=441857
Log:
- Port patch.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?view=diff&rev=441857&r1=441856&r2=441857
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
Sat Sep 9 14:14:11 2006
@@ -31,7 +31,7 @@
* and destroy APR.
*
* @author Remy Maucherat
- * @version $Revision: 374878 $ $Date: 2006-02-04 16:02:39 +0100 (sam., 04
févr. 2006) $
+ * @version $Revision: 441786 $ $Date: 2006-09-09 14:26:11 +0200 (sam., 09
sept. 2006) $
* @since 4.1
*/
@@ -52,7 +52,8 @@
protected static final int REQUIRED_MAJOR = 1;
protected static final int REQUIRED_MINOR = 1;
- protected static final int REQUIRED_PATCH = 4;
+ protected static final int REQUIRED_PATCH = 3;
+ protected static final int RECOMMENDED_PV = 4;
// ---------------------------------------------- LifecycleListener Methods
@@ -96,6 +97,17 @@
log.error(sm.getString("aprListener.tcnInvalid", major + "."
+ minor + "." + patch, REQUIRED_MAJOR + "."
+ REQUIRED_MINOR + "." + REQUIRED_PATCH));
+ }
+ if (patch < RECOMMENDED_PV) {
+ 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/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?view=diff&rev=441857&r1=441856&r2=441857
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
Sat Sep 9 14:14: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]
