directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [29/45] - in /directory/trunks/apacheds: ./ core-plugin/ core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/ core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/ core-shared/ core-shared/src/...
Date Mon, 20 Feb 2006 03:58:21 GMT
Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java Sun Feb 19 19:57:02 2006
@@ -16,15 +16,17 @@
  */
 package org.apache.directory.server.changepw.io;
 
+
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
 import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
 import org.apache.directory.server.changepw.messages.ChangePasswordRequestModifier;
-import org.apache.kerberos.io.decoder.ApplicationRequestDecoder;
-import org.apache.kerberos.io.decoder.PrivateMessageDecoder;
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.application.PrivateMessage;
+import org.apache.directory.server.kerberos.shared.io.decoder.ApplicationRequestDecoder;
+import org.apache.directory.server.kerberos.shared.io.decoder.PrivateMessageDecoder;
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+
 
 public class ChangePasswordRequestDecoder
 {
@@ -38,7 +40,7 @@
         short authHeaderLength = buf.getShort();
         modifier.setAuthHeaderLength( authHeaderLength );
 
-        byte[] undecodedAuthHeader = new byte[ authHeaderLength ];
+        byte[] undecodedAuthHeader = new byte[authHeaderLength];
         buf.get( undecodedAuthHeader, 0, authHeaderLength );
 
         ApplicationRequestDecoder decoder = new ApplicationRequestDecoder();
@@ -46,7 +48,7 @@
 
         modifier.setAuthHeader( authHeader );
 
-        byte[] encodedPrivate = new byte[ buf.remaining() ];
+        byte[] encodedPrivate = new byte[buf.remaining()];
         buf.get( encodedPrivate, 0, buf.remaining() );
 
         PrivateMessageDecoder privateDecoder = new PrivateMessageDecoder();

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/io/ChangePasswordRequestDecoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessage.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessage.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessage.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessage.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.changepw.messages;
 
+
 abstract public class AbstractPasswordMessage
 {
     // ChangePassword protocol version number
@@ -25,23 +26,26 @@
     private short versionNumber;
     private short authHeaderLength;
 
-    protected AbstractPasswordMessage( short messageLength, short versionNumber,
-            short authHeaderLength )
+
+    protected AbstractPasswordMessage(short messageLength, short versionNumber, short authHeaderLength)
     {
         this.messageLength = messageLength;
         this.versionNumber = versionNumber;
         this.authHeaderLength = authHeaderLength;
     }
 
+
     public short getMessageLength()
     {
         return messageLength;
     }
 
+
     public short getVersionNumber()
     {
         return versionNumber;
     }
+
 
     public short getAuthHeaderLength()
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessage.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessage.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessageModifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessageModifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessageModifier.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessageModifier.java Sun Feb 19 19:57:02 2006
@@ -16,21 +16,25 @@
  */
 package org.apache.directory.server.changepw.messages;
 
+
 abstract public class AbstractPasswordMessageModifier
 {
     protected short messageLength;
     protected short versionNumber;
     protected short authHeaderLength;
 
+
     public void setMessageLength( short messageLength )
     {
         this.messageLength = messageLength;
     }
 
+
     public void setProtocolVersionNumber( short versionNumber )
     {
         this.versionNumber = versionNumber;
     }
+
 
     public void setAuthHeaderLength( short authHeaderLength )
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessageModifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/AbstractPasswordMessageModifier.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java Sun Feb 19 19:57:02 2006
@@ -16,19 +16,23 @@
  */
 package org.apache.directory.server.changepw.messages;
 
-import org.apache.kerberos.messages.ErrorMessage;
+
+import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+
 
 public class ChangePasswordError extends AbstractPasswordMessage
 {
     private ErrorMessage errorMessage;
 
-    public ChangePasswordError( short messageLength, short versionNumber, short authHeaderLength,
-            ErrorMessage errorMessage )
+
+    public ChangePasswordError(short messageLength, short versionNumber, short authHeaderLength,
+        ErrorMessage errorMessage)
     {
         super( messageLength, versionNumber, authHeaderLength );
 
         this.errorMessage = errorMessage;
     }
+
 
     public ErrorMessage getErrorMessage()
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordError.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java Sun Feb 19 19:57:02 2006
@@ -16,17 +16,20 @@
  */
 package org.apache.directory.server.changepw.messages;
 
-import org.apache.kerberos.messages.ErrorMessage;
+
+import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+
 
 public class ChangePasswordErrorModifier extends AbstractPasswordMessageModifier
 {
     private ErrorMessage errorMessage;
 
+
     public ChangePasswordError getChangePasswordError()
     {
-        return new ChangePasswordError( messageLength, versionNumber, authHeaderLength,
-                errorMessage );
+        return new ChangePasswordError( messageLength, versionNumber, authHeaderLength, errorMessage );
     }
+
 
     public void setErrorMessage( ErrorMessage errorMessage )
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordErrorModifier.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java Sun Feb 19 19:57:02 2006
@@ -16,16 +16,19 @@
  */
 package org.apache.directory.server.changepw.messages;
 
-import org.apache.kerberos.messages.application.ApplicationReply;
-import org.apache.kerberos.messages.application.PrivateMessage;
+
+import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+
 
 public class ChangePasswordReply extends AbstractPasswordMessage
 {
     private ApplicationReply applicationReply;
     private PrivateMessage privateMessage;
 
-    public ChangePasswordReply( short messageLength, short versionNumber, short authHeaderLength,
-            ApplicationReply applicationReply, PrivateMessage privateMessage )
+
+    public ChangePasswordReply(short messageLength, short versionNumber, short authHeaderLength,
+        ApplicationReply applicationReply, PrivateMessage privateMessage)
     {
         super( messageLength, versionNumber, authHeaderLength );
 
@@ -33,10 +36,12 @@
         this.privateMessage = privateMessage;
     }
 
+
     public ApplicationReply getApplicationReply()
     {
         return applicationReply;
     }
+
 
     public PrivateMessage getPrivateMessage()
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReply.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java Sun Feb 19 19:57:02 2006
@@ -16,24 +16,29 @@
  */
 package org.apache.directory.server.changepw.messages;
 
-import org.apache.kerberos.messages.application.ApplicationReply;
-import org.apache.kerberos.messages.application.PrivateMessage;
+
+import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+
 
 public class ChangePasswordReplyModifier extends AbstractPasswordMessageModifier
 {
     private ApplicationReply applicationReply;
     private PrivateMessage privateMessage;
 
+
     public ChangePasswordReply getChangePasswordReply()
     {
-        return new ChangePasswordReply( messageLength, versionNumber, authHeaderLength,
-                applicationReply, privateMessage );
+        return new ChangePasswordReply( messageLength, versionNumber, authHeaderLength, applicationReply,
+            privateMessage );
     }
 
+
     public void setApplicationReply( ApplicationReply applicationReply )
     {
         this.applicationReply = applicationReply;
     }
+
 
     public void setPrivateMessage( PrivateMessage privateMessage )
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordReplyModifier.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java Sun Feb 19 19:57:02 2006
@@ -16,16 +16,19 @@
  */
 package org.apache.directory.server.changepw.messages;
 
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.application.PrivateMessage;
+
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+
 
 public class ChangePasswordRequest extends AbstractPasswordMessage
 {
     private ApplicationRequest authHeader;
     private PrivateMessage privateMessage;
 
-    public ChangePasswordRequest( short messageLength, short versionNumber, short authHeaderLength,
-            ApplicationRequest authHeader, PrivateMessage privateMessage )
+
+    public ChangePasswordRequest(short messageLength, short versionNumber, short authHeaderLength,
+        ApplicationRequest authHeader, PrivateMessage privateMessage)
     {
         super( messageLength, versionNumber, authHeaderLength );
 
@@ -33,10 +36,12 @@
         this.privateMessage = privateMessage;
     }
 
+
     public ApplicationRequest getAuthHeader()
     {
         return authHeader;
     }
+
 
     public PrivateMessage getPrivateMessage()
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java Sun Feb 19 19:57:02 2006
@@ -16,24 +16,28 @@
  */
 package org.apache.directory.server.changepw.messages;
 
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.application.PrivateMessage;
+
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+
 
 public class ChangePasswordRequestModifier extends AbstractPasswordMessageModifier
 {
     private ApplicationRequest authHeader;
     private PrivateMessage privateMessage;
 
+
     public ChangePasswordRequest getChangePasswordMessage()
     {
-        return new ChangePasswordRequest( messageLength, versionNumber,
-                authHeaderLength, authHeader, privateMessage );
+        return new ChangePasswordRequest( messageLength, versionNumber, authHeaderLength, authHeader, privateMessage );
     }
 
+
     public void setAuthHeader( ApplicationRequest authHeader )
     {
         this.authHeader = authHeader;
     }
+
 
     public void setPrivateMessage( PrivateMessage privateMessage )
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/messages/ChangePasswordRequestModifier.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java Sun Feb 19 19:57:02 2006
@@ -1,39 +1,42 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.changepw.protocol;
-
-import java.io.IOException;
-
-import org.apache.directory.server.changepw.io.ChangePasswordRequestDecoder;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolDecoderOutput;
-
-public class ChangePasswordDecoder implements ProtocolDecoder
-{
-    public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws IOException
-    {
-        ChangePasswordRequestDecoder decoder = new ChangePasswordRequestDecoder();
-        out.write( decoder.decode( in.buf() ) );
-    }
-
-    public void dispose( IoSession session ) throws Exception
-    {
-    }
-}
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.changepw.protocol;
+
+
+import java.io.IOException;
+
+import org.apache.directory.server.changepw.io.ChangePasswordRequestDecoder;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+
+public class ChangePasswordDecoder implements ProtocolDecoder
+{
+    public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws IOException
+    {
+        ChangePasswordRequestDecoder decoder = new ChangePasswordRequestDecoder();
+        out.write( decoder.decode( in.buf() ) );
+    }
+
+
+    public void dispose( IoSession session ) throws Exception
+    {
+    }
+}

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordDecoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordEncoder.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordEncoder.java Sun Feb 19 19:57:02 2006
@@ -1,71 +1,76 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.changepw.protocol;
-
-import java.io.IOException;
-
-import org.apache.directory.server.changepw.io.ChangePasswordErrorEncoder;
-import org.apache.directory.server.changepw.io.ChangePasswordReplyEncoder;
-import org.apache.directory.server.changepw.messages.ChangePasswordError;
-import org.apache.directory.server.changepw.messages.ChangePasswordReply;
-import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-import org.apache.mina.filter.codec.ProtocolEncoderOutput;
-
-public class ChangePasswordEncoder implements ProtocolEncoder
-{
-    public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws IOException
-    {
-        ByteBuffer buf = ByteBuffer.allocate( 512 );
-
-        if ( message instanceof ChangePasswordReply )
-        {
-            encodeReply( (ChangePasswordReply) message, buf );
-        }
-        else
-        {
-            if ( message instanceof ChangePasswordError )
-            {
-                encodeError( (ChangePasswordError) message, buf );
-            }
-        }
-
-        buf.flip();
-
-        out.write( buf );
-    }
-
-    private void encodeReply( ChangePasswordReply reply, ByteBuffer buf ) throws IOException
-    {
-        ChangePasswordReplyEncoder encoder = new ChangePasswordReplyEncoder();
-
-        encoder.encode( buf.buf(), reply );
-    }
-
-    private void encodeError( ChangePasswordError error, ByteBuffer buf ) throws IOException
-    {
-        ChangePasswordErrorEncoder encoder = new ChangePasswordErrorEncoder();
-
-        encoder.encode( buf.buf(), error );
-    }
-
-    public void dispose( IoSession arg0 ) throws Exception
-    {
-    }
-}
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.changepw.protocol;
+
+
+import java.io.IOException;
+
+import org.apache.directory.server.changepw.io.ChangePasswordErrorEncoder;
+import org.apache.directory.server.changepw.io.ChangePasswordReplyEncoder;
+import org.apache.directory.server.changepw.messages.ChangePasswordError;
+import org.apache.directory.server.changepw.messages.ChangePasswordReply;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+
+
+public class ChangePasswordEncoder implements ProtocolEncoder
+{
+    public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws IOException
+    {
+        ByteBuffer buf = ByteBuffer.allocate( 512 );
+
+        if ( message instanceof ChangePasswordReply )
+        {
+            encodeReply( ( ChangePasswordReply ) message, buf );
+        }
+        else
+        {
+            if ( message instanceof ChangePasswordError )
+            {
+                encodeError( ( ChangePasswordError ) message, buf );
+            }
+        }
+
+        buf.flip();
+
+        out.write( buf );
+    }
+
+
+    private void encodeReply( ChangePasswordReply reply, ByteBuffer buf ) throws IOException
+    {
+        ChangePasswordReplyEncoder encoder = new ChangePasswordReplyEncoder();
+
+        encoder.encode( buf.buf(), reply );
+    }
+
+
+    private void encodeError( ChangePasswordError error, ByteBuffer buf ) throws IOException
+    {
+        ChangePasswordErrorEncoder encoder = new ChangePasswordErrorEncoder();
+
+        encoder.encode( buf.buf(), error );
+    }
+
+
+    public void dispose( IoSession arg0 ) throws Exception
+    {
+    }
+}

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordEncoder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordEncoder.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolCodecFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolCodecFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolCodecFactory.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolCodecFactory.java Sun Feb 19 19:57:02 2006
@@ -1,49 +1,54 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.changepw.protocol;
-
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-
-public class ChangePasswordProtocolCodecFactory implements ProtocolCodecFactory
-{
-    private static final ChangePasswordProtocolCodecFactory INSTANCE = 
-        new ChangePasswordProtocolCodecFactory();
-
-    public static ChangePasswordProtocolCodecFactory getInstance()
-    {
-        return INSTANCE;
-    }
-
-    private ChangePasswordProtocolCodecFactory()
-    {
-    }
-    
-    public ProtocolEncoder getEncoder()
-    {
-        // Create a new encoder.
-        return new ChangePasswordEncoder();
-    }
-
-    public ProtocolDecoder getDecoder()
-    {
-        // Create a new decoder.
-        return new ChangePasswordDecoder();
-    }
-}
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.changepw.protocol;
+
+
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+
+public class ChangePasswordProtocolCodecFactory implements ProtocolCodecFactory
+{
+    private static final ChangePasswordProtocolCodecFactory INSTANCE = new ChangePasswordProtocolCodecFactory();
+
+
+    public static ChangePasswordProtocolCodecFactory getInstance()
+    {
+        return INSTANCE;
+    }
+
+
+    private ChangePasswordProtocolCodecFactory()
+    {
+    }
+
+
+    public ProtocolEncoder getEncoder()
+    {
+        // Create a new encoder.
+        return new ChangePasswordEncoder();
+    }
+
+
+    public ProtocolDecoder getDecoder()
+    {
+        // Create a new decoder.
+        return new ChangePasswordDecoder();
+    }
+}

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolCodecFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java Sun Feb 19 19:57:02 2006
@@ -1,116 +1,124 @@
-/*
- *   Copyright 2005 The Apache Software Foundation
- *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
- *
- *       http://www.apache.org/licenses/LICENSE-2.0
- *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- *
- */
-
-package org.apache.directory.server.changepw.protocol;
-
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-
-import org.apache.directory.server.changepw.ChangePasswordConfiguration;
-import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
-import org.apache.directory.server.changepw.service.ChangePasswordChain;
-import org.apache.directory.server.changepw.service.ChangePasswordContext;
-import org.apache.directory.server.protocol.shared.chain.Command;
-import org.apache.kerberos.store.PrincipalStore;
-import org.apache.mina.common.IdleStatus;
-import org.apache.mina.common.IoHandler;
-import org.apache.mina.common.IoSession;
-import org.apache.mina.filter.codec.ProtocolCodecFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ChangePasswordProtocolHandler implements IoHandler
-{
-    private static final Logger log = LoggerFactory.getLogger( ChangePasswordProtocolHandler.class );
-
-    private ChangePasswordConfiguration config;
-    private PrincipalStore store;
-
-    private Command changepwService;
-
-    public ChangePasswordProtocolHandler( ChangePasswordConfiguration config, PrincipalStore store )
-    {
-        this.config = config;
-        this.store = store;
-
-        changepwService = new ChangePasswordChain();
-    }
-
-    public void sessionCreated( IoSession session ) throws Exception
-    {
-        log.debug( "{} CREATED", session.getRemoteAddress());
-        
-        session.getFilterChain().addFirst(
-                "codec",
-                new ProtocolCodecFilter(
-                        ChangePasswordProtocolCodecFactory.getInstance() ) );
-    }
-
-    public void sessionOpened( IoSession session )
-    {
-        log.debug( "{} OPENED", session.getRemoteAddress());
-    }
-
-    public void sessionClosed( IoSession session )
-    {
-        log.debug( "{} CLOSED", session.getRemoteAddress());
-    }
-
-    public void sessionIdle( IoSession session, IdleStatus status )
-    {
-        log.debug( "{} IDLE({})", session.getRemoteAddress(), status );
-    }
-
-    public void exceptionCaught( IoSession session, Throwable cause )
-    {
-        log.debug( session.getRemoteAddress() + " EXCEPTION", cause);
-        session.close();
-    }
-
-    public void messageReceived( IoSession session, Object message )
-    {
-        log.debug( "{} RCVD: {}", session.getRemoteAddress(), message );
-
-        InetAddress clientAddress = ( (InetSocketAddress) session.getRemoteAddress() ).getAddress();
-        ChangePasswordRequest request = (ChangePasswordRequest) message;
-
-        try
-        {
-            ChangePasswordContext changepwContext = new ChangePasswordContext();
-            changepwContext.setConfig( config );
-            changepwContext.setStore( store );
-            changepwContext.setClientAddress( clientAddress );
-            changepwContext.setRequest( request );
-
-            changepwService.execute( changepwContext );
-
-            session.write( changepwContext.getReply() );
-        }
-        catch ( Exception e )
-        {
-            log.error( e.getMessage() );
-        }
-    }
-
-    public void messageSent( IoSession session, Object message )
-    {
-        if ( log.isDebugEnabled() )
-        {
-            log.debug( "{} SENT: {}", session.getRemoteAddress(), message );
-        }
-    }
-}
+/*
+ *   Copyright 2005 The Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */
+
+package org.apache.directory.server.changepw.protocol;
+
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+
+import org.apache.directory.server.changepw.ChangePasswordConfiguration;
+import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
+import org.apache.directory.server.changepw.service.ChangePasswordChain;
+import org.apache.directory.server.changepw.service.ChangePasswordContext;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
+import org.apache.directory.server.protocol.shared.chain.Command;
+import org.apache.mina.common.IdleStatus;
+import org.apache.mina.common.IoHandler;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class ChangePasswordProtocolHandler implements IoHandler
+{
+    private static final Logger log = LoggerFactory.getLogger( ChangePasswordProtocolHandler.class );
+
+    private ChangePasswordConfiguration config;
+    private PrincipalStore store;
+
+    private Command changepwService;
+
+
+    public ChangePasswordProtocolHandler(ChangePasswordConfiguration config, PrincipalStore store)
+    {
+        this.config = config;
+        this.store = store;
+
+        changepwService = new ChangePasswordChain();
+    }
+
+
+    public void sessionCreated( IoSession session ) throws Exception
+    {
+        log.debug( "{} CREATED", session.getRemoteAddress() );
+
+        session.getFilterChain().addFirst( "codec",
+            new ProtocolCodecFilter( ChangePasswordProtocolCodecFactory.getInstance() ) );
+    }
+
+
+    public void sessionOpened( IoSession session )
+    {
+        log.debug( "{} OPENED", session.getRemoteAddress() );
+    }
+
+
+    public void sessionClosed( IoSession session )
+    {
+        log.debug( "{} CLOSED", session.getRemoteAddress() );
+    }
+
+
+    public void sessionIdle( IoSession session, IdleStatus status )
+    {
+        log.debug( "{} IDLE({})", session.getRemoteAddress(), status );
+    }
+
+
+    public void exceptionCaught( IoSession session, Throwable cause )
+    {
+        log.debug( session.getRemoteAddress() + " EXCEPTION", cause );
+        session.close();
+    }
+
+
+    public void messageReceived( IoSession session, Object message )
+    {
+        log.debug( "{} RCVD: {}", session.getRemoteAddress(), message );
+
+        InetAddress clientAddress = ( ( InetSocketAddress ) session.getRemoteAddress() ).getAddress();
+        ChangePasswordRequest request = ( ChangePasswordRequest ) message;
+
+        try
+        {
+            ChangePasswordContext changepwContext = new ChangePasswordContext();
+            changepwContext.setConfig( config );
+            changepwContext.setStore( store );
+            changepwContext.setClientAddress( clientAddress );
+            changepwContext.setRequest( request );
+
+            changepwService.execute( changepwContext );
+
+            session.write( changepwContext.getReply() );
+        }
+        catch ( Exception e )
+        {
+            log.error( e.getMessage() );
+        }
+    }
+
+
+    public void messageSent( IoSession session, Object message )
+    {
+        if ( log.isDebugEnabled() )
+        {
+            log.debug( "{} SENT: {}", session.getRemoteAddress(), message );
+        }
+    }
+}

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/protocol/ChangePasswordProtocolHandler.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java Sun Feb 19 19:57:02 2006
@@ -16,37 +16,40 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import java.net.InetAddress;
 
 import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
 import org.apache.directory.server.changepw.exceptions.ErrorType;
 import org.apache.directory.server.changepw.messages.ChangePasswordReplyModifier;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPart;
+import org.apache.directory.server.kerberos.shared.messages.components.EncApRepPartModifier;
+import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPart;
+import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPartModifier;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.messages.value.HostAddress;
+import org.apache.directory.server.kerberos.shared.service.LockBox;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.exceptions.KerberosException;
-import org.apache.kerberos.messages.application.ApplicationReply;
-import org.apache.kerberos.messages.application.PrivateMessage;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.messages.components.EncApRepPart;
-import org.apache.kerberos.messages.components.EncApRepPartModifier;
-import org.apache.kerberos.messages.components.EncKrbPrivPart;
-import org.apache.kerberos.messages.components.EncKrbPrivPartModifier;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.EncryptedData;
-import org.apache.kerberos.messages.value.EncryptionKey;
-import org.apache.kerberos.messages.value.HostAddress;
-import org.apache.kerberos.service.LockBox;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class BuildReply extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( BuildReply.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
         Authenticator authenticator = changepwContext.getAuthenticator();
         Ticket ticket = changepwContext.getTicket();
@@ -57,7 +60,8 @@
         // create priv message
         // user-data component is short result code
         EncKrbPrivPartModifier modifier = new EncKrbPrivPartModifier();
-        byte[] resultCode = { (byte) 0x00, (byte) 0x00 };
+        byte[] resultCode =
+            { ( byte ) 0x00, ( byte ) 0x00 };
         modifier.setUserData( resultCode );
 
         modifier.setSenderAddress( new HostAddress( InetAddress.getLocalHost() ) );

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/BuildReply.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordChain.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordChain.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordChain.java Sun Feb 19 19:57:02 2006
@@ -16,10 +16,12 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import org.apache.directory.server.protocol.shared.chain.impl.ChainBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * Kerberos Change Password and Set Password Protocols (RFC 3244)
  */
@@ -27,6 +29,7 @@
 {
     /** the logger for this class */
     private static final Logger log = LoggerFactory.getLogger( ChangePasswordChain.class );
+
 
     public ChangePasswordChain()
     {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordChain.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java Sun Feb 19 19:57:02 2006
@@ -16,18 +16,20 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import java.net.InetAddress;
 
 import org.apache.directory.server.changepw.ChangePasswordConfiguration;
 import org.apache.directory.server.changepw.messages.AbstractPasswordMessage;
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
+import org.apache.directory.server.kerberos.shared.service.LockBox;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 import org.apache.directory.server.protocol.shared.chain.impl.ContextBase;
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.replay.ReplayCache;
-import org.apache.kerberos.service.LockBox;
-import org.apache.kerberos.store.PrincipalStore;
-import org.apache.kerberos.store.PrincipalStoreEntry;
+
 
 public class ChangePasswordContext extends ContextBase
 {
@@ -47,6 +49,7 @@
     private LockBox lockBox;
     private String password;
 
+
     /**
      * @return Returns the replayCache.
      */
@@ -55,6 +58,7 @@
         return replayCache;
     }
 
+
     /**
      * @param replayCache The replayCache to set.
      */
@@ -63,6 +67,7 @@
         this.replayCache = replayCache;
     }
 
+
     /**
      * @return Returns the serverEntry.
      */
@@ -71,6 +76,7 @@
         return serverEntry;
     }
 
+
     /**
      * @param serverEntry The serverEntry to set.
      */
@@ -79,6 +85,7 @@
         this.serverEntry = serverEntry;
     }
 
+
     /**
      * @return Returns the config.
      */
@@ -87,6 +94,7 @@
         return config;
     }
 
+
     /**
      * @param config The config to set.
      */
@@ -95,6 +103,7 @@
         this.config = config;
     }
 
+
     /**
      * @return Returns the reply.
      */
@@ -103,6 +112,7 @@
         return reply;
     }
 
+
     /**
      * @param reply The reply to set.
      */
@@ -111,6 +121,7 @@
         this.reply = reply;
     }
 
+
     /**
      * @return Returns the request.
      */
@@ -119,6 +130,7 @@
         return request;
     }
 
+
     /**
      * @param request The request to set.
      */
@@ -127,6 +139,7 @@
         this.request = request;
     }
 
+
     /**
      * @return Returns the store.
      */
@@ -135,6 +148,7 @@
         return store;
     }
 
+
     /**
      * @param store The store to set.
      */
@@ -143,6 +157,7 @@
         this.store = store;
     }
 
+
     /**
      * @return Returns the lockBox.
      */
@@ -151,6 +166,7 @@
         return lockBox;
     }
 
+
     /**
      * @param lockBox The lockBox to set.
      */
@@ -159,6 +175,7 @@
         this.lockBox = lockBox;
     }
 
+
     /**
      * @return Returns the authenticator.
      */
@@ -167,6 +184,7 @@
         return authenticator;
     }
 
+
     /**
      * @param authenticator The authenticator to set.
      */
@@ -175,6 +193,7 @@
         this.authenticator = authenticator;
     }
 
+
     /**
      * @return Returns the authHeader.
      */
@@ -183,6 +202,7 @@
         return authHeader;
     }
 
+
     /**
      * @param authHeader The authHeader to set.
      */
@@ -191,6 +211,7 @@
         this.authHeader = authHeader;
     }
 
+
     /**
      * @return Returns the ticket.
      */
@@ -199,6 +220,7 @@
         return ticket;
     }
 
+
     /**
      * @param ticket The ticket to set.
      */
@@ -207,6 +229,7 @@
         this.ticket = ticket;
     }
 
+
     /**
      * @return Returns the clientAddress.
      */
@@ -215,6 +238,7 @@
         return clientAddress;
     }
 
+
     /**
      * @param clientAddress The clientAddress to set.
      */
@@ -223,6 +247,7 @@
         this.clientAddress = clientAddress;
     }
 
+
     /**
      * @return Returns the password.
      */
@@ -230,6 +255,7 @@
     {
         return password;
     }
+
 
     /**
      * @param password The password to set.

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordContext.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import java.nio.ByteBuffer;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
@@ -23,17 +24,18 @@
 import org.apache.directory.server.changepw.ChangePasswordConfiguration;
 import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
 import org.apache.directory.server.changepw.messages.ChangePasswordErrorModifier;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+import org.apache.directory.server.kerberos.shared.messages.ErrorMessageModifier;
+import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
 import org.apache.directory.server.protocol.shared.chain.Command;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.Filter;
 import org.apache.directory.server.protocol.shared.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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A {@link Command} for helping convert a {@link ChangePasswordException} into
  * an {@link ErrorMessage} to be returned to clients.
@@ -45,11 +47,13 @@
 {
     private static final Logger log = LoggerFactory.getLogger( ChangePasswordExceptionHandler.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
         return CONTINUE_CHAIN;
     }
 
+
     public boolean postprocess( Context context, Exception exception )
     {
         if ( exception == null )
@@ -66,9 +70,9 @@
             log.info( exception.getMessage() );
         }
 
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
         ChangePasswordConfiguration config = changepwContext.getConfig();
-        ChangePasswordException cpe = (ChangePasswordException) exception;
+        ChangePasswordException cpe = ( ChangePasswordException ) exception;
 
         ErrorMessage errorMessage = getErrorMessage( config.getChangepwPrincipal(), cpe );
 
@@ -80,6 +84,7 @@
         return STOP_CHAIN;
     }
 
+
     private ErrorMessage getErrorMessage( KerberosPrincipal principal, KerberosException exception )
     {
         ErrorMessageModifier modifier = new ErrorMessageModifier();
@@ -96,9 +101,10 @@
         return modifier.getErrorMessage();
     }
 
+
     private byte[] buildExplanatoryData( KerberosException exception )
     {
-        short resultCode = (short) exception.getErrorCode();
+        short resultCode = ( short ) exception.getErrorCode();
         byte[] resultString = exception.getExplanatoryData();
 
         ByteBuffer byteBuffer = ByteBuffer.allocate( 256 );
@@ -106,7 +112,7 @@
         byteBuffer.put( resultString );
 
         byteBuffer.flip();
-        byte[] explanatoryData = new byte[ byteBuffer.remaining() ];
+        byte[] explanatoryData = new byte[byteBuffer.remaining()];
         byteBuffer.get( explanatoryData, 0, explanatoryData.length );
 
         return explanatoryData;

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ChangePasswordExceptionHandler.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -25,12 +26,13 @@
 import org.apache.directory.server.changepw.ChangePasswordConfiguration;
 import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
 import org.apache.directory.server.changepw.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.messages.components.Authenticator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A basic password policy check using well-established methods.
  * 
@@ -42,9 +44,10 @@
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( CheckPasswordPolicy.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
         ChangePasswordConfiguration config = changepwContext.getConfig();
         Authenticator authenticator = changepwContext.getAuthenticator();
@@ -70,6 +73,7 @@
         throw new ChangePasswordException( ErrorType.KRB5_KPASSWD_SOFTERROR, explanatoryData );
     }
 
+
     /**
      * Tests that:
      * The password is at least six characters long.
@@ -79,9 +83,10 @@
     boolean isValid( String username, String password, int passwordLength, int categoryCount, int tokenSize )
     {
         return isValidPasswordLength( password, passwordLength ) && isValidCategoryCount( password, categoryCount )
-                && isValidUsernameSubstring( username, password, tokenSize );
+            && isValidUsernameSubstring( username, password, tokenSize );
     }
 
+
     /**
      * The password is at least six characters long.
      */
@@ -90,6 +95,7 @@
         return password.length() >= passwordLength;
     }
 
+
     /**
      * The password contains characters from at least three of the following four categories:
      * English uppercase characters (A - Z)
@@ -108,25 +114,25 @@
 
         for ( int ii = 0; ii < characters.length; ii++ )
         {
-            if ( Character.isLowerCase( characters[ ii ] ) )
+            if ( Character.isLowerCase( characters[ii] ) )
             {
                 lowercase = 1;
             }
             else
             {
-                if ( Character.isUpperCase( characters[ ii ] ) )
+                if ( Character.isUpperCase( characters[ii] ) )
                 {
                     uppercase = 1;
                 }
                 else
                 {
-                    if ( Character.isDigit( characters[ ii ] ) )
+                    if ( Character.isDigit( characters[ii] ) )
                     {
                         digit = 1;
                     }
                     else
                     {
-                        if ( !Character.isLetterOrDigit( characters[ ii ] ) )
+                        if ( !Character.isLetterOrDigit( characters[ii] ) )
                         {
                             nonAlphaNumeric = 1;
                         }
@@ -138,6 +144,7 @@
         return ( uppercase + lowercase + digit + nonAlphaNumeric ) >= categoryCount;
     }
 
+
     /**
      * The password does not contain three letter (or more) tokens from the user's account name.
      * 
@@ -156,9 +163,9 @@
 
         for ( int ii = 0; ii < tokens.length; ii++ )
         {
-            if ( tokens[ ii ].length() >= tokenSize )
+            if ( tokens[ii].length() >= tokenSize )
             {
-                if ( password.matches( "(?i).*" + tokens[ ii ] + ".*" ) )
+                if ( password.matches( "(?i).*" + tokens[ii] + ".*" ) )
                 {
                     return false;
                 }
@@ -168,8 +175,9 @@
         return true;
     }
 
+
     private String buildErrorMessage( String username, String password, int passwordLength, int categoryCount,
-            int tokenSize )
+        int tokenSize )
     {
         List violations = new ArrayList();
 
@@ -194,7 +202,7 @@
 
         while ( it.hasNext() )
         {
-            sb.append( (String) it.next() );
+            sb.append( ( String ) it.next() );
 
             if ( it.hasNext() )
             {

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/CheckPasswordPolicy.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java Sun Feb 19 19:57:02 2006
@@ -16,20 +16,23 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
+import org.apache.directory.server.kerberos.shared.replay.InMemoryReplayCache;
+import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
+import org.apache.directory.server.kerberos.shared.service.LockBox;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.replay.InMemoryReplayCache;
-import org.apache.kerberos.replay.ReplayCache;
-import org.apache.kerberos.service.LockBox;
+
 
 public class ConfigureChangePasswordChain extends CommandBase
 {
     private static final ReplayCache replayCache = new InMemoryReplayCache();
     private static final LockBox lockBox = new LockBox();
 
+
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
         changepwContext.setReplayCache( replayCache );
         changepwContext.setLockBox( lockBox );

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ConfigureChangePasswordChain.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import java.io.UnsupportedEncodingException;
 
 import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
@@ -24,27 +25,29 @@
 import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
 import org.apache.directory.server.changepw.value.ChangePasswordData;
 import org.apache.directory.server.changepw.value.ChangePasswordDataModifier;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.messages.components.EncKrbPrivPart;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.service.LockBox;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class ExtractPassword extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( ExtractPassword.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
-        ChangePasswordRequest request = (ChangePasswordRequest) changepwContext.getRequest();
+        ChangePasswordRequest request = ( ChangePasswordRequest ) changepwContext.getRequest();
         Authenticator authenticator = changepwContext.getAuthenticator();
         LockBox lockBox = changepwContext.getLockBox();
 
@@ -63,7 +66,7 @@
 
         try
         {
-            privatePart = (EncKrbPrivPart) lockBox.unseal( EncKrbPrivPart.class, subSessionKey, encReqPrivPart );
+            privatePart = ( EncKrbPrivPart ) lockBox.unseal( EncKrbPrivPart.class, subSessionKey, encReqPrivPart );
         }
         catch ( KerberosException ke )
         {
@@ -73,7 +76,7 @@
 
         ChangePasswordData passwordData = null;
 
-        if ( request.getVersionNumber() == (short) 1 )
+        if ( request.getVersionNumber() == ( short ) 1 )
         {
             // Use protocol version 0x0001, the legacy Kerberos change password protocol
             ChangePasswordDataModifier modifier = new ChangePasswordDataModifier();

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ExtractPassword.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java Sun Feb 19 19:57:02 2006
@@ -16,11 +16,13 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.components.Ticket;
+
 
 /*
  * differs from the TGS getAuthHeader by not verifying the presence of TGS_REQ
@@ -29,8 +31,8 @@
 {
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
-        ChangePasswordRequest request = (ChangePasswordRequest) changepwContext.getRequest();
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
+        ChangePasswordRequest request = ( ChangePasswordRequest ) changepwContext.getRequest();
 
         ApplicationRequest authHeader = request.getAuthHeader();
         Ticket ticket = authHeader.getTicket();

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetAuthHeader.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java Sun Feb 19 19:57:02 2006
@@ -16,24 +16,25 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.service.GetPrincipalStoreEntry;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.server.protocol.shared.chain.Context;
-import org.apache.kerberos.exceptions.ErrorType;
-import org.apache.kerberos.service.GetPrincipalStoreEntry;
-import org.apache.kerberos.store.PrincipalStore;
+
 
 public class GetServerEntry extends GetPrincipalStoreEntry
 {
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
         KerberosPrincipal principal = changepwContext.getTicket().getServerPrincipal();
         PrincipalStore store = changepwContext.getStore();
 
-        changepwContext.setServerEntry( getEntry( principal, store,
-                ErrorType.KDC_ERR_S_PRINCIPAL_UNKNOWN ) );
+        changepwContext.setServerEntry( getEntry( principal, store, ErrorType.KDC_ERR_S_PRINCIPAL_UNKNOWN ) );
 
         return CONTINUE_CHAIN;
     }

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/GetServerEntry.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java Sun Feb 19 19:57:02 2006
@@ -16,35 +16,38 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import java.net.InetAddress;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.messages.value.HostAddress;
+import org.apache.directory.server.kerberos.shared.messages.value.HostAddresses;
+import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.HostAddress;
-import org.apache.kerberos.messages.value.HostAddresses;
-import org.apache.kerberos.replay.ReplayCache;
-import org.apache.kerberos.store.PrincipalStore;
-import org.apache.kerberos.store.PrincipalStoreEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class MonitorContext extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( MonitorContext.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
         if ( log.isDebugEnabled() )
         {
             try
             {
-                ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+                ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
                 PrincipalStore store = changepwContext.getStore();
                 ApplicationRequest authHeader = changepwContext.getAuthHeader();

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorContext.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java Sun Feb 19 19:57:02 2006
@@ -16,28 +16,31 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import org.apache.directory.server.changepw.messages.ChangePasswordReply;
+import org.apache.directory.server.kerberos.shared.messages.application.ApplicationReply;
+import org.apache.directory.server.kerberos.shared.messages.application.PrivateMessage;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.messages.application.ApplicationReply;
-import org.apache.kerberos.messages.application.PrivateMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class MonitorReply extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( MonitorReply.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
         if ( log.isDebugEnabled() )
         {
             try
             {
-                ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+                ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
-                ChangePasswordReply reply = (ChangePasswordReply) changepwContext.getReply();
+                ChangePasswordReply reply = ( ChangePasswordReply ) changepwContext.getReply();
                 ApplicationReply appReply = reply.getApplicationReply();
                 PrivateMessage priv = reply.getPrivateMessage();
 

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorReply.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorRequest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorRequest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorRequest.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorRequest.java Sun Feb 19 19:57:02 2006
@@ -16,26 +16,29 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import org.apache.directory.server.changepw.messages.ChangePasswordRequest;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class MonitorRequest extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( MonitorRequest.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
         if ( log.isDebugEnabled() )
         {
             try
             {
-                ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+                ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
-                ChangePasswordRequest request = (ChangePasswordRequest) changepwContext.getRequest();
+                ChangePasswordRequest request = ( ChangePasswordRequest ) changepwContext.getRequest();
                 short authHeaderLength = request.getAuthHeaderLength();
                 short messageLength = request.getMessageLength();
                 short versionNumber = request.getVersionNumber();

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/MonitorRequest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Modified: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java (original)
+++ directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java Sun Feb 19 19:57:02 2006
@@ -16,26 +16,29 @@
  */
 package org.apache.directory.server.changepw.service;
 
+
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.changepw.exceptions.ChangePasswordException;
 import org.apache.directory.server.changepw.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.store.PrincipalStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class ProcessPasswordChange extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( ProcessPasswordChange.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
-        ChangePasswordContext changepwContext = (ChangePasswordContext) context;
+        ChangePasswordContext changepwContext = ( ChangePasswordContext ) context;
 
         PrincipalStore store = changepwContext.getStore();
         Authenticator authenticator = changepwContext.getAuthenticator();

Propchange: directory/trunks/apacheds/protocol-changepw/src/main/java/org/apache/directory/server/changepw/service/ProcessPasswordChange.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id



Mime
View raw message