Port relevant parts of fix for bug 40999.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@477409 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml b/java/org/apache/catalina/connector/mbeans-descriptors.xml
index 5651d53..cd16011 100644 (file)
--- a/java/org/apache/catalina/connector/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml
@@ -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"/>

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 598079a..8df9cef 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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>