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

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

Modified:
    
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java
    
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java
    
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java
    
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java

Modified: 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java
URL: 
http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java?view=diff&r1=157901&r2=157902
==============================================================================
--- 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java
 (original)
+++ 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordErrorService.java
 Wed Mar 16 21:38:30 2005
@@ -18,8 +18,8 @@
 
 import org.apache.changepw.messages.ChangePasswordError;
 import org.apache.changepw.messages.ChangePasswordErrorModifier;
+import org.apache.kerberos.exceptions.KerberosException;
 import org.apache.kerberos.kdc.KdcConfiguration;
-import org.apache.kerberos.kdc.KerberosException;
 import org.apache.kerberos.messages.ErrorMessage;
 import org.apache.kerberos.messages.ErrorMessageModifier;
 import org.apache.kerberos.messages.value.KerberosTime;
@@ -48,7 +48,7 @@
                
                KerberosTime now = new KerberosTime();
                
-               modifier.setErrorCode(exception.getOrdinal());
+               modifier.setErrorCode(exception.getErrorCode());
                modifier.setExplanatoryText(exception.getMessage());
                
                // this is the only difference with main KDC error service; 
refactor

Modified: 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java
URL: 
http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java?view=diff&r1=157901&r2=157902
==============================================================================
--- 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java
 (original)
+++ 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordException.java
 Wed Mar 16 21:38:30 2005
@@ -17,7 +17,7 @@
 
 package org.apache.changepw;
 
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.KerberosException;
 
 public class ChangePasswordException extends KerberosException
 {

Modified: 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java
URL: 
http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java?view=diff&r1=157901&r2=157902
==============================================================================
--- 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java
 (original)
+++ 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/ChangePasswordService.java
 Wed Mar 16 21:38:30 2005
@@ -21,7 +21,7 @@
 
 import org.apache.changepw.messages.ChangePasswordReply;
 import org.apache.changepw.messages.ChangePasswordRequest;
-import org.apache.kerberos.kdc.KerberosException;
+import org.apache.kerberos.exceptions.KerberosException;
 
 /**
  * Kerberos Change Password and Set Password Protocols (RFC 3244)

Modified: 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java
URL: 
http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java?view=diff&r1=157901&r2=157902
==============================================================================
--- 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java
 (original)
+++ 
directory/protocol-providers/changepw/trunk/core/src/java/org/apache/changepw/service/ChangePasswordServiceImpl.java
 Wed Mar 16 21:38:30 2005
@@ -33,11 +33,11 @@
 import org.apache.changepw.value.ChangePasswordDataModifier;
 import org.apache.kerberos.crypto.encryption.EncryptionEngine;
 import org.apache.kerberos.crypto.encryption.EncryptionEngineFactory;
+import org.apache.kerberos.exceptions.KerberosException;
 import org.apache.kerberos.io.decoder.EncKrbPrivPartDecoder;
 import org.apache.kerberos.io.encoder.EncApRepPartEncoder;
 import org.apache.kerberos.io.encoder.EncKrbPrivPartEncoder;
 import org.apache.kerberos.kdc.KdcConfiguration;
-import org.apache.kerberos.kdc.KerberosException;
 import org.apache.kerberos.kdc.KerberosService;
 import org.apache.kerberos.messages.ApplicationRequest;
 import org.apache.kerberos.messages.application.ApplicationReply;


Reply via email to