tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From schu...@apache.org
Subject svn commit: r1311997 - in /tomcat/tc7.0.x/trunk: java/org/apache/catalina/core/AprLifecycleListener.java java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/core/LocalStrings_es.properties webapps/docs/changelog.xml
Date Tue, 10 Apr 2012 21:20:57 GMT
Author: schultz
Date: Tue Apr 10 21:20:57 2012
New Revision: 1311997

URL: http://svn.apache.org/viewvc?rev=1311997&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53056
Add APR version number to tcnative version INFO log message

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java?rev=1311997&r1=1311996&r2=1311997&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/AprLifecycleListener.java Tue Apr 10
21:20:57 2012
@@ -213,7 +213,10 @@ public class AprLifecycleListener
         }
 
         log.info(sm.getString("aprListener.tcnValid", major + "."
-                    + minor + "." + patch));
+                    + minor + "." + patch,
+                    Library.APR_MAJOR_VERSION + "."
+                    + Library.APR_MINOR_VERSION + "."
+                    + Library.APR_PATCH_VERSION));
 
         // Log APR flags
         log.info(sm.getString("aprListener.flags",

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1311997&r1=1311996&r2=1311997&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties Tue Apr 10
21:20:57 2012
@@ -57,7 +57,7 @@ aprListener.tcnInvalid=An incompatible v
 aprListener.tcnVersion=An older version {0} of the APR based Apache Tomcat Native library
is installed, while Tomcat recommends a minimum version of {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.tcnValid=Loaded APR based Apache Tomcat Native library {0} using APR version
{1}.
 aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters [{2}], random
[{3}].
 aprListener.initializingFIPS=Initializing FIPS mode...
 aprListener.initializeFIPSSuccess=Successfully entered FIPS mode

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties?rev=1311997&r1=1311996&r2=1311997&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings_es.properties Tue Apr
10 21:20:57 2012
@@ -56,7 +56,7 @@ aprListener.tcnInvalid = Se encuentra in
 aprListener.tcnVersion = Se encuentra instalada una versi\u00F3n muy vieja {0} de la biblioteca
nativa APR de Apache Tomcat, mientras que Tomcat recomienda una versi\u00F3n mayor de {1}
 aprListener.aprDestroy = No pude apagar la biblioteca nativa de Apache Tomcat
 aprListener.sslInit = No pude inicializar el SSLEngine (Motor SSL)
-aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0}
+aprListener.tcnValid = Cargada la biblioteca nativa APR de Apache Tomcat {0} con la versiĆ³n
APR {1}.
 aprListener.flags = Capacidades APR\: IPv6 [{0}], enviar fichero [{1}], aceptar filtros [{2}],
aleatorio [{3}].
 asyncContextImpl.requestEnded = El requerimiento asociado con AsyncContext ya ha completado
su procesamiento.
 containerBase.alreadyStarted = Ya ha sido arrancado el Contenedor {0}

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1311997&r1=1311996&r2=1311997&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 10 21:20:57 2012
@@ -67,6 +67,10 @@
         Remove potential bottleneck on creation of new WebSocket connections.
         (markt)
       </fix>
+      <fix>
+        <bug>53056</bug>: Add APR version number to tcnative version INFO log
+        message. (schultz)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">



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


Mime
View raw message