Author: markt
Date: Mon Nov 20 15:37:43 2006
New Revision: 477409
URL: http://svn.apache.org/viewvc?view=rev&rev=477409
Log:
Port relevant parts of fix for bug 40999.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?view=diff&rev=477409&r1=477408&r2=477409
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
Mon Nov 20 15:37:43 2006
@@ -171,6 +171,18 @@
description="The thread priority for processors"
type="int"/>
+ <attribute name="trustStoreFile"
+ description="Pathname to the trust store file to be used"
+ type="java.lang.String"/>
+
+ <attribute name="trustStorePass"
+ description="Password for accessing the trust store file"
+ type="java.lang.String"/>
+
+ <attribute name="trustStoreType"
+ description="Type of trust store file to be used for trusted
certificates"
+ type="java.lang.String"/>
+
<attribute name="URIEncoding"
description="Character encoding used to decode the URI"
type="java.lang.String"/>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?view=diff&rev=477409&r1=477408&r2=477409
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Nov 20 15:37:43 2006
@@ -49,6 +49,9 @@
<bug>40860</bug>: Log exceptions and other problems during parameter
processing. (markt)
</fix>
+ <update>
+ Enable JMX for trust store attributes for SSL connector. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
