Return-Path: 
 <commits-return-3971-apmail-directory-commits-archive=directory.apache.org@directory.apache.org>
Delivered-To: apmail-directory-commits-archive@www.apache.org
Received: (qmail 61517 invoked from network); 17 Mar 2005 05:38:24 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 17 Mar 2005 05:38:24 -0000
Received: (qmail 43069 invoked by uid 500); 17 Mar 2005 05:38:22 -0000
Delivered-To: apmail-directory-commits-archive@directory.apache.org
Received: (qmail 43030 invoked by uid 500); 17 Mar 2005 05:38:22 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 43014 invoked by uid 99); 17 Mar 2005 05:38:22 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 16 Mar 2005 21:38:22 -0800
Received: (qmail 61469 invoked by uid 65534); 17 Mar 2005 05:38:20 -0000
Message-ID: <20050317053820.61468.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Thu, 17 Mar 2005 05:38:20 -0000
Subject: 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
To: commits@directory.apache.org
From: erodriguez@apache.org
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

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

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D157901
Log:
Import updates related to exception handling change and move to kerberos-co=
mmon.

Modified:
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/cry=
pto/encryption/EncryptionEngine.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/cry=
pto/encryption/EncryptionEngineFactory.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/sto=
re/LookupPrincipalActionImpl.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/sto=
re/PrincipalStore.java

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerber=
os/crypto/encryption/EncryptionEngine.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/s=
rc/java/org/apache/kerberos/crypto/encryption/EncryptionEngine.java?view=3D=
diff&r1=3D157900&r2=3D157901
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/cry=
pto/encryption/EncryptionEngine.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/cry=
pto/encryption/EncryptionEngine.java Wed Mar 16 21:38:16 2005
@@ -16,17 +16,17 @@
  */
 package org.apache.kerberos.crypto.encryption;
=20
+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;
=20
 public abstract class EncryptionEngine
 {

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerber=
os/crypto/encryption/EncryptionEngineFactory.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/s=
rc/java/org/apache/kerberos/crypto/encryption/EncryptionEngineFactory.java?=
view=3Ddiff&r1=3D157900&r2=3D157901
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/cry=
pto/encryption/EncryptionEngineFactory.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/cry=
pto/encryption/EncryptionEngineFactory.java Wed Mar 16 21:38:16 2005
@@ -17,7 +17,8 @@
=20
 package org.apache.kerberos.crypto.encryption;
=20
-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;
=20
=20
@@ -44,7 +45,7 @@
                 return new Des3CbcSha1Encryption();
         }
=20
-        throw KerberosException.KDC_ERR_ETYPE_NOSUPP;
+        throw new KerberosException( ErrorType.KDC_ERR_ETYPE_NOSUPP );
     }
 }
=20

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerber=
os/store/LookupPrincipalActionImpl.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/s=
rc/java/org/apache/kerberos/store/LookupPrincipalActionImpl.java?view=3Ddif=
f&r1=3D157900&r2=3D157901
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/sto=
re/LookupPrincipalActionImpl.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/sto=
re/LookupPrincipalActionImpl.java Wed Mar 16 21:38:16 2005
@@ -25,7 +25,7 @@
 import javax.naming.ldap.LdapContext;
 import javax.security.auth.kerberos.KerberosPrincipal;
=20
-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;
=20

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerber=
os/store/PrincipalStore.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/s=
rc/java/org/apache/kerberos/store/PrincipalStore.java?view=3Ddiff&r1=3D1579=
00&r2=3D157901
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/sto=
re/PrincipalStore.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/sto=
re/PrincipalStore.java Wed Mar 16 21:38:16 2005
@@ -18,7 +18,7 @@
=20
 import javax.security.auth.kerberos.KerberosPrincipal;
=20
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.KerberosException;
=20
 public interface PrincipalStore {
 	public void init();