svn commit: r157901 - in directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos: crypto/encryption/EncryptionEngine.java crypto/encryption/EncryptionEngineFactory.java store/LookupPrincipalActionImpl.java store/PrincipalStore.java

[er...@apache.org]

Author: erodriguez
Date: Wed Mar 16 21:38:16 2005
New Revision: 157901

URL: http://svn.apache.org/viewcvs?view=rev&rev=157901
Log:
Import updates related to exception handling change and move to kerberos-common.

Modified:
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngine.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngineFactory.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/LookupPrincipalActionImpl.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/PrincipalStore.java

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngine.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngine.java?view=diff&r1=157900&r2=157901
==============================================================================
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngine.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngine.java Wed Mar 16 21:38:16 2005
@@ -16,17 +16,17 @@
  */
 package org.apache.kerberos.crypto.encryption;
 
+import java.security.SecureRandom;
+
 import org.apache.kerberos.crypto.checksum.ChecksumEngine;
 import org.apache.kerberos.crypto.checksum.ChecksumType;
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.KerberosException;
 import org.apache.kerberos.messages.value.EncryptedData;
 import org.apache.kerberos.messages.value.EncryptionKey;
 import org.bouncycastle.crypto.BlockCipher;
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
-
-import java.security.SecureRandom;
 
 public abstract class EncryptionEngine
 {

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngineFactory.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngineFactory.java?view=diff&r1=157900&r2=157901
==============================================================================
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngineFactory.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/crypto/encryption/EncryptionEngineFactory.java Wed Mar 16 21:38:16 2005
@@ -17,7 +17,8 @@
 
 package org.apache.kerberos.crypto.encryption;
 
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.ErrorType;
+import org.apache.kerberos.exceptions.KerberosException;
 import org.apache.kerberos.messages.value.EncryptionKey;
 
 
@@ -44,7 +45,7 @@
                 return new Des3CbcSha1Encryption();
         }
 
-        throw KerberosException.KDC_ERR_ETYPE_NOSUPP;
+        throw new KerberosException( ErrorType.KDC_ERR_ETYPE_NOSUPP );
     }
 }
 

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/LookupPrincipalActionImpl.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/LookupPrincipalActionImpl.java?view=diff&r1=157900&r2=157901
==============================================================================
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/LookupPrincipalActionImpl.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/LookupPrincipalActionImpl.java Wed Mar 16 21:38:16 2005
@@ -25,7 +25,7 @@
 import javax.naming.ldap.LdapContext;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.KerberosException;
 import org.apache.kerberos.messages.value.SamType;
 import org.apache.ldap.common.message.LockableAttributesImpl;
 

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/PrincipalStore.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/PrincipalStore.java?view=diff&r1=157900&r2=157901
==============================================================================
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/PrincipalStore.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/PrincipalStore.java Wed Mar 16 21:38:16 2005
@@ -18,7 +18,7 @@
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.KerberosException;
 
 public interface PrincipalStore {
 	public void init();