Author: markt
Date: Tue Jan 1 09:33:12 2008
New Revision: 607875
URL: http://svn.apache.org/viewvc?rev=607875&view=rev
Log:
Fix bug 43800. Make clearer relationship between APR and native in docs, error
messages and the installer.
Modified:
tomcat/connectors/trunk/jni/native/src/sslcontext.c
tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/apr.xml
tomcat/trunk/webapps/docs/project.xml
Modified: tomcat/connectors/trunk/jni/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/sslcontext.c?rev=607875&r1=607874&r2=607875&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/sslcontext.c (original)
+++ tomcat/connectors/trunk/jni/native/src/sslcontext.c Tue Jan 1 09:33:12 2008
@@ -534,7 +534,7 @@
if (!key_file)
key_file = cert_file;
if (!key_file) {
- tcn_Throw(e, "No Certificate file specified");
+ tcn_Throw(e, "No Certificate file specified or invalid file format");
rv = JNI_FALSE;
goto cleanup;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=607875&r1=607874&r2=607875&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Tue Jan
1 09:33:12 2008
@@ -31,12 +31,12 @@
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 then {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 then {1}
+aprListener.aprDestroy=Failed shutdown of APR based Apache Tomcat Native
library
aprListener.sslInit=Failed to initialize the SSLEngine.
-aprListener.tcnValid=Loaded Apache Tomcat Native library {0}.
+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
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=607875&r1=607874&r2=607875&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Jan 1 09:33:12 2008
@@ -95,7 +95,7 @@
LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet
container."
LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet
container core."
LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000
or Windows XP."
- LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs
Tomcat native .dll for better performance and scalability in production
environments."
+ LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs
APR based Tomcat native .dll for better performance and scalability in
production environments."
; LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat
source code."
LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group
for Tomcat."
LangString DESC_SecDocs ${LANG_ENGLISH} "Install the Tomcat documentation
bundle. This include documentation on the servlet container and its
configuration options, on the Jasper JSP page compiler, as well as on the
native webserver connectors."
Modified: tomcat/trunk/webapps/docs/apr.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/apr.xml?rev=607875&r1=607874&r2=607875&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/apr.xml (original)
+++ tomcat/trunk/webapps/docs/apr.xml Tue Jan 1 09:33:12 2008
@@ -23,7 +23,7 @@
&project;
<properties>
- <title>Apache Portable Runtime and Tomcat</title>
+ <title>Apache Portable Runtime (APR) based Native library for
Tomcat</title>
<author>Remy Maucherat</author>
</properties>
Modified: tomcat/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=607875&r1=607874&r2=607875&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Tue Jan 1 09:33:12 2008
@@ -59,7 +59,7 @@
<item name="21) Monitoring and Management"
href="monitoring.html"/>
<item name="22) Logging" href="logging.html"/>
- <item name="23) APR" href="apr.html"/>
+ <item name="23) APR/Native" href="apr.html"/>
<item name="24) Virtual Hosting" href="virtual-hosting-howto.html"/>
<item name="25) Advanced IO" href="aio.html"/>
<item name="26) Additional Components" href="extras.html"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
