Author: markt
Date: Sun Apr 11 11:19:49 2010
New Revision: 932866

URL: http://svn.apache.org/viewvc?rev=932866&view=rev
Log:
Backport AprLifecycleListener messages from TC 6.0. It fixes "Cannot find 
message" messages that are printed to the log when Tomcat is being started and 
Tomcat-Native library is present (kkolinko)

Modified:
    tomcat/tc5.5.x/trunk/STATUS.txt
    
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
    tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932866&r1=932865&r2=932866&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Apr 11 11:19:49 2010
@@ -134,13 +134,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
-* Backport AprLifecycleListener messages from TC 6.0
-  It fixes "Cannot find message" messages that are printed to the log when
-  Tomcat is being started and Tomcat-Native library is present
-  
http://people.apache.org/~kkolinko/patches/2010-04-07_tc55_AprLifecycleListener_messages.patch
-  +1: kkolinko, markt, rjung
-  -1:
-
 * Use chunked encoding for http 1.1 requests with no content-length (regardless
   of keep-alive) so client can differentiate between complete and partial
   responses.

Modified: 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties?rev=932866&r1=932865&r2=932866&view=diff
==============================================================================
--- 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
 (original)
+++ 
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
 Sun Apr 11 11:19:49 2010
@@ -31,10 +31,13 @@ applicationRequest.badParent=Cannot loca
 applicationRequest.badRequest=Request is not a 
javax.servlet.ServletRequestWrapper
 applicationResponse.badParent=Cannot locate parent Response implementation
 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 than {1}
-aprListener.aprDestroy=Failed shutdown of Apache Portable Runtime
+aprListener.aprInit=The APR based 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 APR based Apache 
Tomcat Native library is installed, while Tomcat requires version {1} 
+aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat 
Native library is installed, while Tomcat recommends version greater than {1}
+aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native 
library
+aprListener.sslInit=Failed to initialize the SSLEngine.
+aprListener.tcnValid=Loaded APR based Apache Tomcat Native library {0}.
+aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters 
[{2}], random [{3}].
 containerBase.addDefaultMapper=Exception configuring default mapper of class 
{0}
 containerBase.alreadyStarted=Container {0} has already been started
 containerBase.notConfigured=No basic Valve has been configured

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932866&r1=932865&r2=932866&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Apr 11 
11:19:49 2010
@@ -50,6 +50,10 @@
         <bug>47774</bug>: Ensure web application class loader is used when 
         calling session listeners. (kfujino)
       </fix>
+      <fix>
+        Ensure all required i18n messages are present for the APR/native
+        Listener. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to