Index: java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
===================================================================
--- java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java	(revision 1096703)
+++ java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java	(working copy)
@@ -69,6 +69,7 @@
     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 @@
         accessFile = System.getProperty(
                 "com.sun.management.jmxremote.access.file",
                 "jmxremote.access");
+        
+        loginModuleName = System.getProperty(
+                "com.sun.management.jmxremote.login.config");
     }
     
 
@@ -209,6 +213,7 @@
             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);
             }