svn commit: r1099586 - in /tomcat/trunk: java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Wed May  4 20:22:08 2011
New Revision: 1099586

URL: http://svn.apache.org/viewvc?rev=1099586&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51119
Add JAAS authentication support to the JmxRemoteLifecycleListener
Patch provided by Neil Laurance

Modified:
    tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: 
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1099586&r1=1099585&r2=1099586&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java 
Wed May  4 20:22:08 2011
@@ -69,6 +69,7 @@ public class JmxRemoteLifecycleListener 
     protected boolean clientAuth = true;
     protected boolean authenticate = true;
     protected String passwordFile = null;
+    protected String loginModuleName = null;
     protected String accessFile = null;
     protected boolean useLocalPorts = false;
 
@@ -164,6 +165,9 @@ public class JmxRemoteLifecycleListener 
         accessFile = System.getProperty(
                 "com.sun.management.jmxremote.access.file",
                 "jmxremote.access");
+        
+        loginModuleName = System.getProperty(
+                "com.sun.management.jmxremote.login.config");
     }
     
 
@@ -209,6 +213,7 @@ public class JmxRemoteLifecycleListener 
             if (authenticate) {
                 env.put("jmx.remote.x.password.file", passwordFile);
                 env.put("jmx.remote.x.access.file", accessFile);
+                env.put("jmx.remote.x.login.config", loginModuleName);
             }
 
 

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1099586&r1=1099585&r2=1099586&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed May  4 20:22:08 2011
@@ -95,6 +95,10 @@
         e.g. on authentication. (markt)
       </add>
       <add>
+        <bug>51119</bug>: Add JAAS authentication support to the
+        JMXRemoteLifecycleListener. Patch provided by Neil Laurance. (markt) 
+      </add>
+      <add>
         <bug>51136</bug>: Provide methods that enable the name of a Context on
         Context creation when using Tomcat in an embedded scenario. Based on a
         patch provided by David Calavera. (markt)



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