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/10/24 05:06:39 UTC
svn commit: r327935 - in
/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw:
protocol/ service/
Author: erodriguez
Date: Sun Oct 23 20:06:32 2005
New Revision: 327935
URL: http://svn.apache.org/viewcvs?rev=327935&view=rev
Log:
Refactoring classes commonly used by protocol-providers to new protocol-common subproject.
Modified:
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/protocol/ChangePasswordProtocolHandler.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/BuildReply.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordChain.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordConfiguration.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordContext.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordExceptionHandler.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/CheckPasswordPolicy.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ConfigureChangePasswordChain.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ExtractPassword.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetAuthHeader.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetServerEntry.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorContext.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorReply.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorRequest.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ProcessPasswordChange.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicket.java
directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicketAuthHeader.java
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/protocol/ChangePasswordProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/protocol/ChangePasswordProtocolHandler.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/protocol/ChangePasswordProtocolHandler.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/protocol/ChangePasswordProtocolHandler.java Sun Oct 23 20:06:32 2005
@@ -24,11 +24,11 @@
import org.apache.changepw.service.ChangePasswordChain;
import org.apache.changepw.service.ChangePasswordConfiguration;
import org.apache.changepw.service.ChangePasswordContext;
-import org.apache.kerberos.chain.Command;
import org.apache.kerberos.store.PrincipalStore;
import org.apache.mina.common.IdleStatus;
import org.apache.mina.protocol.ProtocolHandler;
import org.apache.mina.protocol.ProtocolSession;
+import org.apache.protocol.common.chain.Command;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/BuildReply.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/BuildReply.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/BuildReply.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/BuildReply.java Sun Oct 23 20:06:32 2005
@@ -21,8 +21,6 @@
import org.apache.changepw.exceptions.ChangePasswordException;
import org.apache.changepw.exceptions.ErrorType;
import org.apache.changepw.messages.ChangePasswordReplyModifier;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.exceptions.KerberosException;
import org.apache.kerberos.messages.application.ApplicationReply;
import org.apache.kerberos.messages.application.PrivateMessage;
@@ -36,6 +34,8 @@
import org.apache.kerberos.messages.value.EncryptionKey;
import org.apache.kerberos.messages.value.HostAddress;
import org.apache.kerberos.service.LockBox;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordChain.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordChain.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordChain.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordChain.java Sun Oct 23 20:06:32 2005
@@ -16,7 +16,7 @@
*/
package org.apache.changepw.service;
-import org.apache.kerberos.chain.impl.ChainBase;
+import org.apache.protocol.common.chain.impl.ChainBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordConfiguration.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordConfiguration.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordConfiguration.java Sun Oct 23 20:06:32 2005
@@ -28,33 +28,51 @@
public class ChangePasswordConfiguration
{
- /** the prop key const for changepw.primary.realm */
- private static final String CHANGEPW_PRIMARY_REALM_KEY = "changepw.primary.realm";
+ /** the number of milliseconds in a minute */
+ private static final int MINUTE = 60000;
/** the prop key const for changepw.principal */
private static final String CHANGEPW_PRINCIPAL_KEY = "changepw.principal";
- /** the prop key const for changepw.port */
- public static final String CHANGEPW_PORT_KEY = "changepw.port";
+ /** the default change password principal */
+ private static final String CHANGEPW_DEFAULT_PRINCIPAL = "kadmin/changepw@EXAMPLE.COM";
+
+ /** the prop key const for changepw.primary.realm */
+ private static final String CHANGEPW_PRIMARY_REALM_KEY = "changepw.primary.realm";
/** the default change password realm */
private static final String CHANGEPW_DEFAULT_REALM = "EXAMPLE.COM";
- /** the default change password principal */
- private static final String CHANGEPW_DEFAULT_PRINCIPAL = "kadmin/changepw@EXAMPLE.COM";
+ /** the prop key const for changepw.port */
+ private static final String CHANGEPW_PORT_KEY = "changepw.port";
/** the default change password port */
- public static final int CHANGEPW_DEFAULT_PORT = 464;
+ private static final int CHANGEPW_DEFAULT_PORT = 464;
/** the prop key const for changepw.encryption.types */
private static final String CHANGEPW_ENCRYPTION_TYPES_KEY = "changepw.encryption.types";
+ /** the default encryption types */
+ public static final String[] CHANGEPW_DEFAULT_ENCRYPTION_TYPES = new String[] { "des-cbc-md5" };
+
/** the prop key const for changepw.buffer.size */
private static final String CHANGEPW_BUFFER_SIZE_KEY = "changepw.buffer.size";
/** the default changepw buffer size */
private static final int CHANGEPW_DEFAULT_BUFFER_SIZE = 1024;
+ /** the prop key const for changepw.empty.addresses.allowed */
+ private static final String CHANGEPW_EMPTY_ADDRESSES_ALLOWED_KEY = "changepw.empty.addresses.allowed";
+
+ /** the default empty addresses */
+ private static final boolean CHANGEPW_DEFAULT_EMPTY_ADDRESSES_ALLOWED = true;
+
+ /** the prop key const for changepw.allowable.clockskew */
+ private static final String CHANGEPW_ALLOWABLE_CLOCKSKEW_KEY = "changepw.allowable.clockskew";
+
+ /** the default changepw buffer size */
+ private static final long CHANGEPW_DEFAULT_ALLOWABLE_CLOCKSKEW = 5 * MINUTE;
+
/** the prop key constants for password policy */
public static final String CHANGEPW_PASSWORD_LENGTH_KEY = "changepw.password.length";
public static final String CHANGEPW_CATEGORY_COUNT_KEY = "changepw.category.count";
@@ -65,7 +83,6 @@
public static final int CHANGEPW_DEFAULT_CATEGORY_COUNT = 3;
public static final int CHANGEPW_DEFAULT_TOKEN_SIZE = 3;
- private static final int MINUTE = 60000;
private final Properties properties = new Properties();
private EncryptionType[] encryptionTypes;
@@ -108,14 +125,14 @@
public long getClockSkew()
{
- String key = "kdc.allowable.clockskew";
+ String key = CHANGEPW_ALLOWABLE_CLOCKSKEW_KEY;
if ( properties.containsKey( key ) )
{
return MINUTE * Long.parseLong( properties.getProperty( key ) );
}
- return MINUTE * 5;
+ return CHANGEPW_DEFAULT_ALLOWABLE_CLOCKSKEW;
}
public int getBufferSize()
@@ -156,14 +173,14 @@
public boolean isEmptyAddressesAllowed()
{
- String key = "changepw.empty.addresses.allowed";
+ String key = CHANGEPW_EMPTY_ADDRESSES_ALLOWED_KEY;
if ( properties.containsKey( key ) )
{
return "true".equalsIgnoreCase( properties.getProperty( key ) );
}
- return true;
+ return CHANGEPW_DEFAULT_EMPTY_ADDRESSES_ALLOWED;
}
public int getPasswordLengthPolicy()
@@ -214,7 +231,7 @@
}
else
{
- encryptionTypeStrings = new String[] { "des-cbc-md5" };
+ encryptionTypeStrings = CHANGEPW_DEFAULT_ENCRYPTION_TYPES;
}
List encTypes = new ArrayList();
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordContext.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordContext.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordContext.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordContext.java Sun Oct 23 20:06:32 2005
@@ -19,7 +19,6 @@
import java.net.InetAddress;
import org.apache.changepw.messages.AbstractPasswordMessage;
-import org.apache.kerberos.chain.impl.ContextBase;
import org.apache.kerberos.messages.ApplicationRequest;
import org.apache.kerberos.messages.components.Authenticator;
import org.apache.kerberos.messages.components.Ticket;
@@ -27,6 +26,7 @@
import org.apache.kerberos.service.LockBox;
import org.apache.kerberos.store.PrincipalStore;
import org.apache.kerberos.store.PrincipalStoreEntry;
+import org.apache.protocol.common.chain.impl.ContextBase;
public class ChangePasswordContext extends ContextBase
{
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordExceptionHandler.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordExceptionHandler.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordExceptionHandler.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ChangePasswordExceptionHandler.java Sun Oct 23 20:06:32 2005
@@ -22,14 +22,14 @@
import org.apache.changepw.exceptions.ChangePasswordException;
import org.apache.changepw.messages.ChangePasswordErrorModifier;
-import org.apache.kerberos.chain.Command;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.Filter;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.exceptions.KerberosException;
import org.apache.kerberos.messages.ErrorMessage;
import org.apache.kerberos.messages.ErrorMessageModifier;
import org.apache.kerberos.messages.value.KerberosTime;
+import org.apache.protocol.common.chain.Command;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.Filter;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/CheckPasswordPolicy.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/CheckPasswordPolicy.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/CheckPasswordPolicy.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/CheckPasswordPolicy.java Sun Oct 23 20:06:32 2005
@@ -24,9 +24,9 @@
import org.apache.changepw.exceptions.ChangePasswordException;
import org.apache.changepw.exceptions.ErrorType;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.messages.components.Authenticator;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ConfigureChangePasswordChain.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ConfigureChangePasswordChain.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ConfigureChangePasswordChain.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ConfigureChangePasswordChain.java Sun Oct 23 20:06:32 2005
@@ -16,11 +16,11 @@
*/
package org.apache.changepw.service;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.replay.InMemoryReplayCache;
import org.apache.kerberos.replay.ReplayCache;
import org.apache.kerberos.service.LockBox;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
public class ConfigureChangePasswordChain extends CommandBase
{
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ExtractPassword.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ExtractPassword.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ExtractPassword.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ExtractPassword.java Sun Oct 23 20:06:32 2005
@@ -24,14 +24,14 @@
import org.apache.changepw.messages.ChangePasswordRequest;
import org.apache.changepw.value.ChangePasswordData;
import org.apache.changepw.value.ChangePasswordDataModifier;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.exceptions.KerberosException;
import org.apache.kerberos.messages.components.Authenticator;
import org.apache.kerberos.messages.components.EncKrbPrivPart;
import org.apache.kerberos.messages.value.EncryptedData;
import org.apache.kerberos.messages.value.EncryptionKey;
import org.apache.kerberos.service.LockBox;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetAuthHeader.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetAuthHeader.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetAuthHeader.java Sun Oct 23 20:06:32 2005
@@ -17,10 +17,10 @@
package org.apache.changepw.service;
import org.apache.changepw.messages.ChangePasswordRequest;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.messages.ApplicationRequest;
import org.apache.kerberos.messages.components.Ticket;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
/*
* differs from the TGS getAuthHeader by not verifying the presence of TGS_REQ
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetServerEntry.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetServerEntry.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetServerEntry.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/GetServerEntry.java Sun Oct 23 20:06:32 2005
@@ -18,10 +18,10 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.kerberos.chain.Context;
import org.apache.kerberos.exceptions.ErrorType;
import org.apache.kerberos.service.GetPrincipalStoreEntry;
import org.apache.kerberos.store.PrincipalStore;
+import org.apache.protocol.common.chain.Context;
public class GetServerEntry extends GetPrincipalStoreEntry
{
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorContext.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorContext.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorContext.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorContext.java Sun Oct 23 20:06:32 2005
@@ -20,8 +20,6 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.messages.ApplicationRequest;
import org.apache.kerberos.messages.components.Authenticator;
import org.apache.kerberos.messages.components.Ticket;
@@ -30,6 +28,8 @@
import org.apache.kerberos.replay.ReplayCache;
import org.apache.kerberos.store.PrincipalStore;
import org.apache.kerberos.store.PrincipalStoreEntry;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorReply.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorReply.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorReply.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorReply.java Sun Oct 23 20:06:32 2005
@@ -17,10 +17,10 @@
package org.apache.changepw.service;
import org.apache.changepw.messages.ChangePasswordReply;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.messages.application.ApplicationReply;
import org.apache.kerberos.messages.application.PrivateMessage;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorRequest.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorRequest.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorRequest.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/MonitorRequest.java Sun Oct 23 20:06:32 2005
@@ -17,8 +17,8 @@
package org.apache.changepw.service;
import org.apache.changepw.messages.ChangePasswordRequest;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ProcessPasswordChange.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ProcessPasswordChange.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ProcessPasswordChange.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/ProcessPasswordChange.java Sun Oct 23 20:06:32 2005
@@ -21,11 +21,10 @@
import org.apache.changepw.exceptions.ChangePasswordException;
import org.apache.changepw.exceptions.ErrorType;
-import org.apache.kerberos.chain.Context;
-import org.apache.kerberos.chain.impl.CommandBase;
import org.apache.kerberos.messages.components.Authenticator;
import org.apache.kerberos.store.PrincipalStore;
-import org.apache.kerberos.store.operations.ChangePassword;
+import org.apache.protocol.common.chain.Context;
+import org.apache.protocol.common.chain.impl.CommandBase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +52,7 @@
// store password in database
try
{
- String principalName = (String) store.execute( new ChangePassword( clientPrincipal, newKey ) );
+ String principalName = store.changePassword( clientPrincipal, newKey );
log.debug( "Successfully modified principal " + principalName );
}
catch ( Exception e )
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicket.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicket.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicket.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicket.java Sun Oct 23 20:06:32 2005
@@ -18,9 +18,9 @@
import javax.security.auth.kerberos.KerberosPrincipal;
-import org.apache.kerberos.chain.Context;
import org.apache.kerberos.messages.components.Ticket;
import org.apache.kerberos.service.VerifyTicket;
+import org.apache.protocol.common.chain.Context;
public class VerifyServiceTicket extends VerifyTicket
{
Modified: directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicketAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicketAuthHeader.java?rev=327935&r1=327934&r2=327935&view=diff
==============================================================================
--- directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicketAuthHeader.java (original)
+++ directory/protocol-providers/changepw/trunk/src/java/org/apache/changepw/service/VerifyServiceTicketAuthHeader.java Sun Oct 23 20:06:32 2005
@@ -18,7 +18,6 @@
import java.net.InetAddress;
-import org.apache.kerberos.chain.Context;
import org.apache.kerberos.messages.ApplicationRequest;
import org.apache.kerberos.messages.components.Authenticator;
import org.apache.kerberos.messages.components.Ticket;
@@ -26,6 +25,7 @@
import org.apache.kerberos.replay.ReplayCache;
import org.apache.kerberos.service.LockBox;
import org.apache.kerberos.service.VerifyAuthHeader;
+import org.apache.protocol.common.chain.Context;
public class VerifyServiceTicketAuthHeader extends VerifyAuthHeader
{