You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2005/03/12 22:01:09 UTC
svn commit: r157281 - in incubator/directory/protocols/kerberos/trunk:
core/src/java/org/apache/kerberos/kdc/
core/src/java/org/apache/kerberos/protocol/
core/src/java/org/apache/kerberos/sam/
store/src/java/org/apache/kerberos/store/
Author: erodriguez
Date: Sat Mar 12 13:01:07 2005
New Revision: 157281
URL: http://svn.apache.org/viewcvs?view=rev&rev=157281
Log:
Package and import statement updates related to moving store classes.
Modified:
incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/AuthenticationService.java
incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/KerberosService.java
incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/TicketGrantingService.java
incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java
incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java
incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java
incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/BootstrapStore.java
incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/EmbeddedEveStore.java
incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStore.java
incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntry.java
incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java
Modified: incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/AuthenticationService.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/AuthenticationService.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/AuthenticationService.java (original)
+++ incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/AuthenticationService.java Sat Mar 12 13:01:07 2005
@@ -32,8 +32,6 @@
import org.apache.kerberos.io.encoder.EncTicketPartEncoder;
import org.apache.kerberos.io.encoder.EncryptionTypeInfoEncoder;
import org.apache.kerberos.io.encoder.PreAuthenticationDataEncoder;
-import org.apache.kerberos.kdc.store.PrincipalStore;
-import org.apache.kerberos.kdc.store.PrincipalStoreEntry;
import org.apache.kerberos.messages.AuthenticationReply;
import org.apache.kerberos.messages.KdcRequest;
import org.apache.kerberos.messages.components.EncTicketPart;
@@ -54,6 +52,8 @@
import org.apache.kerberos.sam.SamException;
import org.apache.kerberos.sam.SamSubsystem;
import org.apache.kerberos.sam.TimestampChecker;
+import org.apache.kerberos.store.PrincipalStore;
+import org.apache.kerberos.store.PrincipalStoreEntry;
public class AuthenticationService extends KerberosService
Modified: incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/KerberosService.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/KerberosService.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/KerberosService.java (original)
+++ incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/KerberosService.java Sat Mar 12 13:01:07 2005
@@ -35,7 +35,6 @@
import org.apache.kerberos.io.decoder.EncTicketPartDecoder;
import org.apache.kerberos.kdc.replay.InMemoryReplayCache;
import org.apache.kerberos.kdc.replay.ReplayCache;
-import org.apache.kerberos.kdc.store.PrincipalStore;
import org.apache.kerberos.messages.ApplicationRequest;
import org.apache.kerberos.messages.MessageType;
import org.apache.kerberos.messages.components.Authenticator;
@@ -46,6 +45,7 @@
import org.apache.kerberos.messages.value.EncryptionKey;
import org.apache.kerberos.messages.value.KerberosTime;
import org.apache.kerberos.messages.value.TicketFlags;
+import org.apache.kerberos.store.PrincipalStore;
public class KerberosService
Modified: incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/TicketGrantingService.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/TicketGrantingService.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/TicketGrantingService.java (original)
+++ incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/kdc/TicketGrantingService.java Sat Mar 12 13:01:07 2005
@@ -35,7 +35,6 @@
import org.apache.kerberos.io.encoder.EncTgsRepPartEncoder;
import org.apache.kerberos.io.encoder.EncTicketPartEncoder;
import org.apache.kerberos.io.encoder.KdcReqBodyEncoder;
-import org.apache.kerberos.kdc.store.PrincipalStore;
import org.apache.kerberos.messages.ApplicationRequest;
import org.apache.kerberos.messages.KdcRequest;
import org.apache.kerberos.messages.TicketGrantReply;
@@ -52,6 +51,7 @@
import org.apache.kerberos.messages.value.LastRequest;
import org.apache.kerberos.messages.value.PreAuthenticationDataType;
import org.apache.kerberos.messages.value.TicketFlags;
+import org.apache.kerberos.store.PrincipalStore;
/**
* RFC 1510 A.6. KRB_TGS_REQ verification and KRB_TGS_REP generation
Modified: incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolHandler.java Sat Mar 12 13:01:07 2005
@@ -24,11 +24,11 @@
import org.apache.kerberos.kdc.KdcConfiguration;
import org.apache.kerberos.kdc.KerberosException;
import org.apache.kerberos.kdc.TicketGrantingService;
-import org.apache.kerberos.kdc.store.PrincipalStore;
import org.apache.kerberos.messages.AuthenticationReply;
import org.apache.kerberos.messages.ErrorMessage;
import org.apache.kerberos.messages.KdcRequest;
import org.apache.kerberos.messages.TicketGrantReply;
+import org.apache.kerberos.store.PrincipalStore;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.protocol.ProtocolHandler;
import org.apache.mina.protocol.ProtocolSession;
Modified: incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java (original)
+++ incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/protocol/KerberosProtocolProvider.java Sat Mar 12 13:01:07 2005
@@ -18,7 +18,7 @@
package org.apache.kerberos.protocol;
import org.apache.kerberos.kdc.KdcConfiguration;
-import org.apache.kerberos.kdc.store.PrincipalStore;
+import org.apache.kerberos.store.PrincipalStore;
import org.apache.mina.protocol.ProtocolCodecFactory;
import org.apache.mina.protocol.ProtocolDecoder;
import org.apache.mina.protocol.ProtocolEncoder;
Modified: incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java (original)
+++ incubator/directory/protocols/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java Sat Mar 12 13:01:07 2005
@@ -22,7 +22,7 @@
import javax.security.auth.kerberos.KerberosKey;
-import org.apache.kerberos.kdc.store.PrincipalStoreEntry;
+import org.apache.kerberos.store.PrincipalStoreEntry;
/**
Modified: incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/BootstrapStore.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/BootstrapStore.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/BootstrapStore.java (original)
+++ incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/BootstrapStore.java Sat Mar 12 13:01:07 2005
@@ -14,16 +14,22 @@
* limitations under the License.
*
*/
-package org.apache.kerberos.kdc.store;
+package org.apache.kerberos.store;
-import org.apache.kerberos.crypto.RandomKey;
-import org.apache.kerberos.kdc.KdcConfiguration;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.HashMap;
+import java.util.Map;
import javax.security.auth.kerberos.KerberosKey;
import javax.security.auth.kerberos.KerberosPrincipal;
-import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.kerberos.crypto.RandomKey;
+import org.apache.kerberos.kdc.KdcConfiguration;
public class BootstrapStore implements PrincipalStore
{
Modified: incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/EmbeddedEveStore.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/EmbeddedEveStore.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/EmbeddedEveStore.java (original)
+++ incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/EmbeddedEveStore.java Sat Mar 12 13:01:07 2005
@@ -15,12 +15,12 @@
*
*/
-package org.apache.kerberos.kdc.store;
+package org.apache.kerberos.store;
import java.io.File;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.FileNotFoundException;
+import java.io.InputStream;
import java.util.Hashtable;
import javax.naming.Context;
Modified: incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStore.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStore.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStore.java (original)
+++ incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStore.java Sat Mar 12 13:01:07 2005
@@ -14,11 +14,11 @@
* limitations under the License.
*
*/
-package org.apache.kerberos.kdc.store;
+package org.apache.kerberos.store;
-import org.apache.kerberos.kdc.*;
+import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.*;
+import org.apache.kerberos.kdc.KerberosException;
public interface PrincipalStore {
public void init();
Modified: incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntry.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntry.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntry.java (original)
+++ incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntry.java Sat Mar 12 13:01:07 2005
@@ -14,13 +14,14 @@
* limitations under the License.
*
*/
-package org.apache.kerberos.kdc.store;
+package org.apache.kerberos.store;
-import org.apache.kerberos.crypto.encryption.*;
-import org.apache.kerberos.messages.value.*;
-import org.apache.kerberos.sam.SamType;
+import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.*;
+import org.apache.kerberos.crypto.encryption.EncryptionType;
+import org.apache.kerberos.messages.value.EncryptionKey;
+import org.apache.kerberos.messages.value.KerberosTime;
+import org.apache.kerberos.sam.SamType;
public class PrincipalStoreEntry {
Modified: incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java
URL: http://svn.apache.org/viewcvs/incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java?view=diff&r1=157280&r2=157281
==============================================================================
--- incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java (original)
+++ incubator/directory/protocols/kerberos/trunk/store/src/java/org/apache/kerberos/store/PrincipalStoreEntryModifier.java Sat Mar 12 13:01:07 2005
@@ -14,12 +14,12 @@
* limitations under the License.
*
*/
-package org.apache.kerberos.kdc.store;
+package org.apache.kerberos.store;
-import org.apache.kerberos.messages.value.*;
-import org.apache.kerberos.sam.SamType;
+import javax.security.auth.kerberos.KerberosPrincipal;
-import javax.security.auth.kerberos.*;
+import org.apache.kerberos.messages.value.KerberosTime;
+import org.apache.kerberos.sam.SamType;
public class PrincipalStoreEntryModifier {