Author: erodriguez Date: Sat Dec 25 00:36:02 2004 New Revision: 123333 URL: http://svn.apache.org/viewcvs?view=rev&rev=123333 Log: Package, import, and POM cleanup related to consolidation of Eve store into KDC core. Modified: incubator/directory/kerberos/trunk/core/project.xml incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java
Modified: incubator/directory/kerberos/trunk/core/project.xml Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/project.xml?view=diff&rev=123333&p1=incubator/directory/kerberos/trunk/core/project.xml&r1=123332&p2=incubator/directory/kerberos/trunk/core/project.xml&r2=123333 ============================================================================== --- incubator/directory/kerberos/trunk/core/project.xml (original) +++ incubator/directory/kerberos/trunk/core/project.xml Sat Dec 25 00:36:02 2004 @@ -18,6 +18,11 @@ <artifactId>bcprov-jdk14</artifactId> <version>124</version> </dependency> + <dependency> + <groupId>incubator-directory</groupId> + <artifactId>ldap-common</artifactId> + <version>0.8-SNAPSHOT</version> + </dependency> </dependencies> </project> Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java?view=diff&rev=123333&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java&r1=123332&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java&r2=123333 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/store/EmbeddedEveStore.java Sat Dec 25 00:36:02 2004 @@ -14,30 +14,34 @@ * limitations under the License. * */ -package org.apache.kerberos.kdc; +package org.apache.kerberos.kdc.store; -import java.util.Hashtable; -import java.io.FileInputStream; import java.io.File; -import javax.security.auth.kerberos.KerberosPrincipal; +import java.io.FileInputStream; +import java.util.Hashtable; + +import javax.naming.Context; +import javax.naming.Name; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attributes; +import javax.naming.directory.InitialDirContext; +import javax.naming.directory.SearchResult; import javax.security.auth.kerberos.KerberosKey; -import javax.naming.*; -import javax.naming.directory.*; +import javax.security.auth.kerberos.KerberosPrincipal; -import org.apache.kerberos.kdc.store.PrincipalStore; -import org.apache.kerberos.kdc.store.PrincipalStoreEntry; -import org.apache.kerberos.kdc.store.PrincipalStoreEntryModifier; -import org.apache.ldap.common.util.NestableRuntimeException; +import org.apache.kerberos.kdc.KerberosException; import org.apache.ldap.common.ldif.LdifIterator; import org.apache.ldap.common.ldif.LdifParser; import org.apache.ldap.common.ldif.LdifParserImpl; import org.apache.ldap.common.message.LockableAttributesImpl; -import com.sun.jndi.ldap.LdapName; +import org.apache.ldap.common.name.LdapName; +import org.apache.ldap.common.util.NestableRuntimeException; /** - * Document this class. + * KDC backing store implementation using an embedded Eve DIT * * @author <a href="mailto:[EMAIL PROTECTED]">Apache Directory Project</a> * @version $Rev$ @@ -50,10 +54,10 @@ // ------------------------------------------------------------------------ /** - * The key of the property specifing where kdc users are stored. If this + * The key of the property specifying where Kerberos users are stored. If this * property is not set the store defaults to performing a subtree search * from the DN in the [EMAIL PROTECTED] Context#PROVIDER_URL}. If it is present a more - * efficient search is conducted on the + * efficient search is conducted on the more specific DN. */ public static final String KDC_ENTRY_BASEDN_KEY = "kdc.entry.basedn"; public static final String KDC_ENTRY_LDIF_FILE = "kdc.entry.ldif.file"; @@ -76,9 +80,9 @@ /** - * Creates the embedded eve principal store. + * Creates the embedded Eve principal store. * - * @param env the environement properties used to initialize the Eve + * @param env the environment properties used to initialize the Eve * Kerberos environment */ public EmbeddedEveStore( Hashtable env ) @@ -89,12 +93,12 @@ /** - * Fires up the Eve using the environment properties supplied to the + * Fires up the Eve backing store using the environment properties supplied to the * constructor. The JNDI default context factor and some other parameters * are automatically set though. This method then checks to see if the * suffix is installed and setup according to the needed DIT structure. * - * Create some additional indices for the kerberos schema: namely on + * Create some additional indices for the Kerberos schema, namely on * krb5PrincipalName. Also objectClass should be indexed as well. If these * indices are not specified we should add them here. */ Modified: incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java?view=diff&rev=123333&p1=incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java&r1=123332&p2=incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java&r2=123333 ============================================================================== --- incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java (original) +++ incubator/directory/kerberos/trunk/main/src/java/org/apache/kerberos/KerberosMain.java Sat Dec 25 00:36:02 2004 @@ -25,12 +25,12 @@ import javax.naming.directory.InitialDirContext; import org.apache.eve.jndi.EnvKeys; -import org.apache.kerberos.kdc.EmbeddedEveStore; import org.apache.kerberos.kdc.KdcConfiguration; import org.apache.kerberos.kdc.KdcDispatcher; import org.apache.kerberos.kdc.server.seda.KerberosTcpProvider; import org.apache.kerberos.kdc.server.seda.KerberosUdpProvider; import org.apache.kerberos.kdc.store.BootstrapStore; +import org.apache.kerberos.kdc.store.EmbeddedEveStore; import org.apache.kerberos.kdc.store.PrincipalStore; import org.apache.seda.DefaultFrontend; import org.apache.seda.DefaultFrontendFactory;
