Return-Path: Delivered-To: apmail-incubator-directory-cvs-archive@www.apache.org Received: (qmail 51726 invoked from network); 7 Nov 2004 05:56:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 7 Nov 2004 05:56:52 -0000 Received: (qmail 2562 invoked by uid 500); 7 Nov 2004 05:56:52 -0000 Delivered-To: apmail-incubator-directory-cvs-archive@incubator.apache.org Received: (qmail 2511 invoked by uid 500); 7 Nov 2004 05:56:52 -0000 Mailing-List: contact directory-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: directory-dev@incubator.apache.org Delivered-To: mailing list directory-cvs@incubator.apache.org Received: (qmail 2498 invoked by uid 99); 7 Nov 2004 05:56:52 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sat, 06 Nov 2004 21:56:51 -0800 Received: (qmail 51721 invoked by uid 65534); 7 Nov 2004 05:56:50 -0000 Date: 7 Nov 2004 05:56:50 -0000 Message-ID: <20041107055650.51718.qmail@minotaur.apache.org> From: erodriguez@apache.org To: directory-cvs@incubator.apache.org Subject: svn commit: rev 56813 - incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: erodriguez Date: Sat Nov 6 21:56:50 2004 New Revision: 56813 Modified: incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/KdcLoginConfiguration.java incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/Krb5LoginConfiguration.java Log: Renaming login configurations to differentiate from other configuration classes. Modified: incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/KdcLoginConfiguration.java ============================================================================== --- incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/KdcLoginConfiguration.java (original) +++ incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/KdcLoginConfiguration.java Sat Nov 6 21:56:50 2004 @@ -21,15 +21,15 @@ import javax.security.auth.login.Configuration; import java.util.HashMap; -public class KdcConfiguration extends Configuration +public class KdcLoginConfiguration extends Configuration { - private static AppConfigurationEntry[] _configList = new AppConfigurationEntry[1]; + private static AppConfigurationEntry[] configList = new AppConfigurationEntry[1]; - public KdcConfiguration() + public KdcLoginConfiguration() { String loginModule = "org.apache.kerberos.kdc.jaas.KdcLoginModule"; LoginModuleControlFlag flag = LoginModuleControlFlag.REQUIRED; - _configList[0] = new AppConfigurationEntry(loginModule, flag, new HashMap()); + configList[0] = new AppConfigurationEntry(loginModule, flag, new HashMap()); } /** @@ -38,7 +38,7 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String applicationName) { // We will ignore the applicationName, since we want all apps to use Kerberos V5 - return _configList; + return configList; } /** Modified: incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/Krb5LoginConfiguration.java ============================================================================== --- incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/Krb5LoginConfiguration.java (original) +++ incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/jaas/Krb5LoginConfiguration.java Sat Nov 6 21:56:50 2004 @@ -16,34 +16,36 @@ */ package org.apache.kerberos.kdc.jaas; -import java.util.*; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; +import javax.security.auth.login.Configuration; +import java.util.HashMap; -import javax.security.auth.login.*; -import javax.security.auth.login.AppConfigurationEntry.*; +public class Krb5LoginConfiguration extends Configuration { -public class Krb5Configuration extends Configuration { - - private static AppConfigurationEntry[] _configList = new AppConfigurationEntry[1]; + private static AppConfigurationEntry[] configList = new AppConfigurationEntry[1]; - public Krb5Configuration() { - - String loginModule = "org.apache.kerberos.kdc.jaas.KdcLoginModule"; + public Krb5LoginConfiguration() + { + String loginModule = "com.sun.security.auth.module.Krb5LoginModule"; LoginModuleControlFlag flag = LoginModuleControlFlag.REQUIRED; - _configList[0] = new AppConfigurationEntry(loginModule, flag, new HashMap()); + configList[0] = new AppConfigurationEntry(loginModule, flag, new HashMap()); } /** * Interface method requiring us to return all the LoginModules we know about. */ - public AppConfigurationEntry[] getAppConfigurationEntry(String applicationName) { + public AppConfigurationEntry[] getAppConfigurationEntry(String applicationName) + { // We will ignore the applicationName, since we want all apps to use Kerberos V5 - return _configList; + return configList; } /** * Interface method for reloading the configuration. We don't need this. */ - public void refresh() { + public void refresh() + { // Right now this is a load once scheme and we will not implement the refresh method } }