directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r379013 [36/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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/BuildReply.java Sun Feb 19 19:57:02 2006
@@ -16,20 +16,22 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
+import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
+import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.messages.value.LastRequest;
+import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.messages.KdcRequest;
-import org.apache.kerberos.messages.TicketGrantReply;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.EncryptionKey;
-import org.apache.kerberos.messages.value.LastRequest;
-import org.apache.kerberos.messages.value.TicketFlags;
+
 
 public class BuildReply extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
         KdcRequest request = tgsContext.getRequest();
         Ticket tgt = tgsContext.getTgt();
         Ticket newTicket = tgsContext.getNewTicket();

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.java Sun Feb 19 19:57:02 2006
@@ -16,20 +16,23 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
+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 ConfigureTicketGrantingChain extends CommandBase
 {
     private static final ReplayCache replayCache = new InMemoryReplayCache();
     private static final LockBox lockBox = new LockBox();
 
+
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
 
         tgsContext.setReplayCache( replayCache );
         tgsContext.setLockBox( lockBox );

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ConfigureTicketGrantingChain.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -23,28 +24,29 @@
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
+import org.apache.directory.server.kerberos.shared.messages.components.Authenticator;
+import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPart;
+import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.messages.value.AuthorizationData;
+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.KdcOptions;
+import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
+import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags;
+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.ErrorType;
-import org.apache.kerberos.exceptions.KerberosException;
-import org.apache.kerberos.messages.KdcRequest;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.messages.components.EncTicketPart;
-import org.apache.kerberos.messages.components.EncTicketPartModifier;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.AuthorizationData;
-import org.apache.kerberos.messages.value.EncryptedData;
-import org.apache.kerberos.messages.value.EncryptionKey;
-import org.apache.kerberos.messages.value.KdcOptions;
-import org.apache.kerberos.messages.value.KerberosTime;
-import org.apache.kerberos.messages.value.TicketFlags;
-import org.apache.kerberos.service.LockBox;
+
 
 public class GenerateTicket extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
 
         KdcRequest request = tgsContext.getRequest();
         Ticket tgt = tgsContext.getTgt();
@@ -66,7 +68,8 @@
 
         if ( request.getEncAuthorizationData() != null )
         {
-            AuthorizationData authData = (AuthorizationData) lockBox.unseal( AuthorizationData.class, authenticator.getSubSessionKey(), request.getEncAuthorizationData() );
+            AuthorizationData authData = ( AuthorizationData ) lockBox.unseal( AuthorizationData.class, authenticator
+                .getSubSessionKey(), request.getEncAuthorizationData() );
             authData.add( tgt.getAuthorizationData() );
             newTicketBody.setAuthorizationData( authData );
         }
@@ -103,8 +106,9 @@
         return CONTINUE_CHAIN;
     }
 
+
     private void processFlags( KdcConfiguration config, KdcRequest request, Ticket tgt,
-            EncTicketPartModifier newTicketBody ) throws KerberosException
+        EncTicketPartModifier newTicketBody ) throws KerberosException
     {
         if ( request.getOption( KdcOptions.FORWARDABLE ) )
         {
@@ -208,8 +212,9 @@
         }
     }
 
+
     private void processTimes( KdcConfiguration config, KdcRequest request, EncTicketPartModifier newTicketBody,
-            Ticket tgt ) throws KerberosException
+        Ticket tgt ) throws KerberosException
     {
         KerberosTime now = new KerberosTime();
 
@@ -234,7 +239,7 @@
             newTicketBody.setStartTime( now );
             long oldLife = tgt.getEndTime().getTime() - tgt.getStartTime().getTime();
             newTicketBody.setEndTime( new KerberosTime( Math
-                    .min( tgt.getRenewTill().getTime(), now.getTime() + oldLife ) ) );
+                .min( tgt.getRenewTill().getTime(), now.getTime() + oldLife ) ) );
         }
         else
         {
@@ -258,11 +263,11 @@
             minimizer.add( till );
             minimizer.add( new KerberosTime( now.getTime() + config.getMaximumTicketLifetime() ) );
             minimizer.add( tgt.getEndTime() );
-            KerberosTime minTime = (KerberosTime) Collections.min( minimizer );
+            KerberosTime minTime = ( KerberosTime ) Collections.min( minimizer );
             newTicketBody.setEndTime( minTime );
 
             if ( request.getOption( KdcOptions.RENEWABLE_OK ) && minTime.lessThan( request.getTill() )
-                    && tgt.getFlag( TicketFlags.RENEWABLE ) )
+                && tgt.getFlag( TicketFlags.RENEWABLE ) )
             {
                 // we set the RENEWABLE option for later processing                           
                 request.setOption( KdcOptions.RENEWABLE );
@@ -307,10 +312,11 @@
 
             minimizer.add( new KerberosTime( now.getTime() + config.getMaximumRenewableLifetime() ) );
             minimizer.add( tgt.getRenewTill() );
-            newTicketBody.setRenewTill( (KerberosTime) Collections.min( minimizer ) );
+            newTicketBody.setRenewTill( ( KerberosTime ) Collections.min( minimizer ) );
         }
     }
 
+
     /*
      if (realm_tgt_is_for(tgt) := tgt.realm) then
      // tgt issued by local realm
@@ -328,6 +334,7 @@
         // TODO - currently no transited support other than local
         newTicketBody.setTransitedEncoding( tgt.getTransitedEncoding() );
     }
+
 
     protected void echoTicket( EncTicketPartModifier newTicketBody, Ticket tgt )
     {

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GenerateTicket.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetAuthHeader.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetAuthHeader.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetAuthHeader.java Sun Feb 19 19:57:02 2006
@@ -16,18 +16,20 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import java.io.IOException;
 
+import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.io.decoder.ApplicationRequestDecoder;
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationData;
+import org.apache.directory.server.kerberos.shared.messages.value.PreAuthenticationDataType;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.exceptions.ErrorType;
-import org.apache.kerberos.exceptions.KerberosException;
-import org.apache.kerberos.io.decoder.ApplicationRequestDecoder;
-import org.apache.kerberos.messages.ApplicationRequest;
-import org.apache.kerberos.messages.KdcRequest;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.PreAuthenticationData;
-import org.apache.kerberos.messages.value.PreAuthenticationDataType;
+
 
 /*
  * differs from the changepw getAuthHeader by verifying the presence of TGS_REQ
@@ -36,7 +38,7 @@
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
         KdcRequest request = tgsContext.getRequest();
 
         ApplicationRequest authHeader = getAuthHeader( request );
@@ -48,6 +50,7 @@
         return CONTINUE_CHAIN;
     }
 
+
     protected ApplicationRequest getAuthHeader( KdcRequest request ) throws KerberosException, IOException
     {
         byte[] undecodedAuthHeader = null;
@@ -55,9 +58,9 @@
 
         for ( int ii = 0; ii < preAuthData.length; ii++ )
         {
-            if ( preAuthData[ ii ].getDataType() == PreAuthenticationDataType.PA_TGS_REQ )
+            if ( preAuthData[ii].getDataType() == PreAuthenticationDataType.PA_TGS_REQ )
             {
-                undecodedAuthHeader = preAuthData[ ii ].getDataValue();
+                undecodedAuthHeader = preAuthData[ii].getDataValue();
             }
         }
 

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetRequestPrincipalEntry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetRequestPrincipalEntry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetRequestPrincipalEntry.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetRequestPrincipalEntry.java Sun Feb 19 19:57:02 2006
@@ -16,19 +16,21 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 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.kerberos.shared.store.PrincipalStoreEntry;
 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;
-import org.apache.kerberos.store.PrincipalStoreEntry;
+
 
 public class GetRequestPrincipalEntry extends GetPrincipalStoreEntry
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
 
         KerberosPrincipal principal = tgsContext.getRequest().getServerPrincipal();
         PrincipalStore store = tgsContext.getStore();

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetRequestPrincipalEntry.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetSessionKey.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetSessionKey.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetSessionKey.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetSessionKey.java Sun Feb 19 19:57:02 2006
@@ -16,28 +16,32 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import java.security.SecureRandom;
 
+import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.service.DesStringToKey;
 import org.apache.directory.server.protocol.shared.chain.Context;
-import org.apache.kerberos.crypto.encryption.EncryptionType;
-import org.apache.kerberos.messages.value.EncryptionKey;
-import org.apache.kerberos.service.DesStringToKey;
+
 
 public class GetSessionKey extends DesStringToKey
 {
     private static final SecureRandom random = new SecureRandom();
 
+
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
         tgsContext.setSessionKey( getNewSessionKey() );
 
         return CONTINUE_CHAIN;
     }
 
+
     private EncryptionKey getNewSessionKey()
     {
-        byte[] confounder = new byte[ 8 ];
+        byte[] confounder = new byte[8];
 
         // SecureRandom.nextBytes is already synchronized
         random.nextBytes( confounder );

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetSessionKey.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetTicketPrincipalEntry.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetTicketPrincipalEntry.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetTicketPrincipalEntry.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetTicketPrincipalEntry.java Sun Feb 19 19:57:02 2006
@@ -16,19 +16,21 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 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.kerberos.shared.store.PrincipalStoreEntry;
 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;
-import org.apache.kerberos.store.PrincipalStoreEntry;
+
 
 public class GetTicketPrincipalEntry extends GetPrincipalStoreEntry
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
 
         KerberosPrincipal principal = tgsContext.getTgt().getServerPrincipal();
         PrincipalStore store = tgsContext.getStore();

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/GetTicketPrincipalEntry.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/MonitorContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/MonitorContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/MonitorContext.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/MonitorContext.java Sun Feb 19 19:57:02 2006
@@ -16,35 +16,38 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import java.net.InetAddress;
 
 import javax.security.auth.kerberos.KerberosPrincipal;
 
+import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType;
+import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
+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.crypto.checksum.ChecksumType;
-import org.apache.kerberos.messages.ApplicationRequest;
-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
             {
-                TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+                TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
 
                 PrincipalStore store = tgsContext.getStore();
                 ApplicationRequest authHeader = tgsContext.getAuthHeader();

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/SealReply.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/SealReply.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/SealReply.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/SealReply.java Sun Feb 19 19:57:02 2006
@@ -16,21 +16,23 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
+import org.apache.directory.server.kerberos.shared.messages.TicketGrantReply;
+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.EncryptedData;
+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.messages.TicketGrantReply;
-import org.apache.kerberos.messages.components.Authenticator;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.messages.value.EncryptedData;
-import org.apache.kerberos.service.LockBox;
+
 
 public class SealReply extends CommandBase
 {
     public boolean execute( Context ctx ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) ctx;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) ctx;
 
-        TicketGrantReply reply = (TicketGrantReply) tgsContext.getReply();
+        TicketGrantReply reply = ( TicketGrantReply ) tgsContext.getReply();
         Ticket tgt = tgsContext.getTgt();
         LockBox lockBox = tgsContext.getLockBox();
         Authenticator authenticator = tgsContext.getAuthenticator();

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/SealReply.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.java Sun Feb 19 19:57:02 2006
@@ -16,13 +16,15 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import org.apache.directory.server.kerberos.kdc.KdcContext;
-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.EncryptionKey;
-import org.apache.kerberos.replay.ReplayCache;
-import org.apache.kerberos.store.PrincipalStoreEntry;
+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.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.replay.ReplayCache;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
+
 
 public class TicketGrantingContext extends KdcContext
 {
@@ -38,6 +40,7 @@
     private PrincipalStoreEntry ticketPrincipalEntry;
     private PrincipalStoreEntry requestPrincipalEntry;
 
+
     /**
      * @return Returns the requestPrincipalEntry.
      */
@@ -46,6 +49,7 @@
         return requestPrincipalEntry;
     }
 
+
     /**
      * @param requestPrincipalEntry The requestPrincipalEntry to set.
      */
@@ -54,6 +58,7 @@
         this.requestPrincipalEntry = requestPrincipalEntry;
     }
 
+
     /**
      * @return Returns the ticketPrincipalEntry.
      */
@@ -62,6 +67,7 @@
         return ticketPrincipalEntry;
     }
 
+
     /**
      * @param ticketPrincipalEntry The ticketPrincipalEntry to set.
      */
@@ -70,6 +76,7 @@
         this.ticketPrincipalEntry = ticketPrincipalEntry;
     }
 
+
     /**
      * @return Returns the replayCache.
      */
@@ -78,6 +85,7 @@
         return replayCache;
     }
 
+
     /**
      * @param replayCache The replayCache to set.
      */
@@ -86,6 +94,7 @@
         this.replayCache = replayCache;
     }
 
+
     /**
      * @return Returns the authenticator.
      */
@@ -94,6 +103,7 @@
         return authenticator;
     }
 
+
     /**
      * @param authenticator The authenticator to set.
      */
@@ -102,6 +112,7 @@
         this.authenticator = authenticator;
     }
 
+
     /**
      * @return Returns the newTicket.
      */
@@ -110,6 +121,7 @@
         return newTicket;
     }
 
+
     /**
      * @param newTicket The newTicket to set.
      */
@@ -118,6 +130,7 @@
         this.newTicket = newTicket;
     }
 
+
     /**
      * @return Returns the sessionKey.
      */
@@ -126,6 +139,7 @@
         return sessionKey;
     }
 
+
     /**
      * @param sessionKey The sessionKey to set.
      */
@@ -134,6 +148,7 @@
         this.sessionKey = sessionKey;
     }
 
+
     /**
      * @return Returns the tgt.
      */
@@ -142,6 +157,7 @@
         return tgt;
     }
 
+
     /**
      * @param tgt The tgt to set.
      */
@@ -150,6 +166,7 @@
         this.tgt = tgt;
     }
 
+
     /**
      * @return Returns the authHeader.
      */
@@ -157,6 +174,7 @@
     {
         return authHeader;
     }
+
 
     /**
      * @param authHeader The authHeader to set.

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingContext.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingExceptionHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingExceptionHandler.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingExceptionHandler.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingExceptionHandler.java Sun Feb 19 19:57:02 2006
@@ -16,23 +16,27 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+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.service.ErrorMessageHandler;
 import org.apache.directory.server.protocol.shared.chain.Context;
-import org.apache.kerberos.exceptions.KerberosException;
-import org.apache.kerberos.messages.ErrorMessage;
-import org.apache.kerberos.service.ErrorMessageHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class TicketGrantingExceptionHandler extends ErrorMessageHandler
 {
     private static final Logger log = LoggerFactory.getLogger( TicketGrantingExceptionHandler.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
         return CONTINUE_CHAIN;
     }
 
+
     public boolean postprocess( Context context, Exception exception )
     {
         if ( exception == null )
@@ -49,9 +53,9 @@
             log.info( exception.getMessage() );
         }
 
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
         KdcConfiguration config = tgsContext.getConfig();
-        KerberosException ke = (KerberosException) exception;
+        KerberosException ke = ( KerberosException ) exception;
 
         ErrorMessage errorMessage = getErrorMessage( config.getKdcPrincipal(), ke );
 

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingExceptionHandler.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.java Sun Feb 19 19:57:02 2006
@@ -16,12 +16,14 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import org.apache.directory.server.kerberos.kdc.MonitorReply;
 import org.apache.directory.server.kerberos.kdc.MonitorRequest;
 import org.apache.directory.server.protocol.shared.chain.impl.ChainBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * KRB_TGS_REQ verification and KRB_TGS_REP generation
  */
@@ -29,6 +31,7 @@
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( TicketGrantingServiceChain.class );
+
 
     public TicketGrantingServiceChain()
     {

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingServiceChain.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.java Sun Feb 19 19:57:02 2006
@@ -16,20 +16,22 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
+import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumEngine;
+import org.apache.directory.server.kerberos.shared.crypto.checksum.ChecksumType;
+import org.apache.directory.server.kerberos.shared.crypto.checksum.RsaMd5Checksum;
+import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.messages.value.Checksum;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
-import org.apache.kerberos.crypto.checksum.ChecksumEngine;
-import org.apache.kerberos.crypto.checksum.ChecksumType;
-import org.apache.kerberos.crypto.checksum.RsaMd5Checksum;
-import org.apache.kerberos.exceptions.ErrorType;
-import org.apache.kerberos.exceptions.KerberosException;
-import org.apache.kerberos.messages.value.Checksum;
+
 
 public class VerifyBodyChecksum extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
         byte[] bodyBytes = tgsContext.getRequest().getBodyBytes();
         Checksum checksum = tgsContext.getAuthenticator().getChecksum();
 
@@ -37,6 +39,7 @@
 
         return CONTINUE_CHAIN;
     }
+
 
     private void verifyChecksum( Checksum checksum, byte[] bytes ) throws KerberosException
     {

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyBodyChecksum.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.java Sun Feb 19 19:57:02 2006
@@ -16,18 +16,20 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
+import org.apache.directory.server.kerberos.shared.messages.components.Ticket;
+import org.apache.directory.server.kerberos.shared.service.VerifyTicket;
 import org.apache.directory.server.protocol.shared.chain.Context;
-import org.apache.kerberos.messages.components.Ticket;
-import org.apache.kerberos.service.VerifyTicket;
+
 
 public class VerifyTgt extends VerifyTicket
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
         KdcConfiguration config = tgsContext.getConfig();
         Ticket tgt = tgsContext.getTgt();
         String primaryRealm = config.getPrimaryRealm();

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgt.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-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgtAuthHeader.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgtAuthHeader.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgtAuthHeader.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgtAuthHeader.java Sun Feb 19 19:57:02 2006
@@ -16,22 +16,24 @@
  */
 package org.apache.directory.server.kerberos.kdc.ticketgrant;
 
+
 import java.net.InetAddress;
 
+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.EncryptionKey;
+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.service.VerifyAuthHeader;
 import org.apache.directory.server.protocol.shared.chain.Context;
-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.EncryptionKey;
-import org.apache.kerberos.replay.ReplayCache;
-import org.apache.kerberos.service.LockBox;
-import org.apache.kerberos.service.VerifyAuthHeader;
+
 
 public class VerifyTgtAuthHeader extends VerifyAuthHeader
 {
     public boolean execute( Context context ) throws Exception
     {
-        TicketGrantingContext tgsContext = (TicketGrantingContext) context;
+        TicketGrantingContext tgsContext = ( TicketGrantingContext ) context;
 
         ApplicationRequest authHeader = tgsContext.getAuthHeader();
         Ticket tgt = tgsContext.getTgt();
@@ -43,7 +45,7 @@
         LockBox lockBox = tgsContext.getLockBox();
 
         Authenticator authenticator = verifyAuthHeader( authHeader, tgt, serverKey, clockSkew, replayCache,
-                emptyAddressesAllowed, clientAddress, lockBox );
+            emptyAddressesAllowed, clientAddress, lockBox );
 
         tgsContext.setAuthenticator( authenticator );
 

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/VerifyTgtAuthHeader.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-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.java Sun Feb 19 19:57:02 2006
@@ -1,39 +1,43 @@
-/*
- *   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.kerberos.protocol;
-
-import java.io.IOException;
-
-import org.apache.kerberos.io.decoder.KdcRequestDecoder;
-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 KerberosDecoder implements ProtocolDecoder
-{
-    private KdcRequestDecoder decoder = new KdcRequestDecoder();
-
-    public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws IOException
-    {
-        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.kerberos.protocol;
+
+
+import java.io.IOException;
+
+import org.apache.directory.server.kerberos.shared.io.decoder.KdcRequestDecoder;
+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 KerberosDecoder implements ProtocolDecoder
+{
+    private KdcRequestDecoder decoder = new KdcRequestDecoder();
+
+
+    public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out ) throws IOException
+    {
+        out.write( decoder.decode( in.buf() ) );
+    }
+
+
+    public void dispose( IoSession session ) throws Exception
+    {
+    }
+}

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosDecoder.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-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.java Sun Feb 19 19:57:02 2006
@@ -1,59 +1,63 @@
-/*
- *   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.kerberos.protocol;
-
-import java.io.IOException;
-
-import org.apache.kerberos.io.encoder.ErrorMessageEncoder;
-import org.apache.kerberos.io.encoder.KdcReplyEncoder;
-import org.apache.kerberos.messages.ErrorMessage;
-import org.apache.kerberos.messages.KdcReply;
-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 KerberosEncoder implements ProtocolEncoder
-{
-    private KdcReplyEncoder replyEncoder = new KdcReplyEncoder();
-    private ErrorMessageEncoder errorEncoder = new ErrorMessageEncoder();
-
-    public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws IOException
-    {
-        ByteBuffer buf = ByteBuffer.allocate( 1024 );
-
-        if ( message instanceof KdcReply )
-        {
-            replyEncoder.encode( (KdcReply) message, buf.buf() );
-        }
-        else
-        {
-            if ( message instanceof ErrorMessage )
-            {
-                errorEncoder.encode( (ErrorMessage) message, buf.buf() );
-            }
-        }
-
-        buf.flip();
-
-        out.write( buf );
-    }
-
-    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.kerberos.protocol;
+
+
+import java.io.IOException;
+
+import org.apache.directory.server.kerberos.shared.io.encoder.ErrorMessageEncoder;
+import org.apache.directory.server.kerberos.shared.io.encoder.KdcReplyEncoder;
+import org.apache.directory.server.kerberos.shared.messages.ErrorMessage;
+import org.apache.directory.server.kerberos.shared.messages.KdcReply;
+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 KerberosEncoder implements ProtocolEncoder
+{
+    private KdcReplyEncoder replyEncoder = new KdcReplyEncoder();
+    private ErrorMessageEncoder errorEncoder = new ErrorMessageEncoder();
+
+
+    public void encode( IoSession session, Object message, ProtocolEncoderOutput out ) throws IOException
+    {
+        ByteBuffer buf = ByteBuffer.allocate( 1024 );
+
+        if ( message instanceof KdcReply )
+        {
+            replyEncoder.encode( ( KdcReply ) message, buf.buf() );
+        }
+        else
+        {
+            if ( message instanceof ErrorMessage )
+            {
+                errorEncoder.encode( ( ErrorMessage ) message, buf.buf() );
+            }
+        }
+
+        buf.flip();
+
+        out.write( buf );
+    }
+
+
+    public void dispose( IoSession arg0 ) throws Exception
+    {
+    }
+}

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosEncoder.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-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java Sun Feb 19 19:57:02 2006
@@ -1,47 +1,53 @@
-/*
- *   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.kerberos.protocol;
-
-import org.apache.mina.filter.codec.ProtocolCodecFactory;
-import org.apache.mina.filter.codec.ProtocolDecoder;
-import org.apache.mina.filter.codec.ProtocolEncoder;
-
-public class KerberosProtocolCodecFactory implements ProtocolCodecFactory
-{
-    private static final KerberosProtocolCodecFactory INSTANCE = new KerberosProtocolCodecFactory();
-
-    public static KerberosProtocolCodecFactory getInstance()
-    {
-        return INSTANCE;
-    }
-
-    private KerberosProtocolCodecFactory()
-    {
-    }
-
-    public ProtocolEncoder getEncoder()
-    {
-        // Create a new encoder.
-        return new KerberosEncoder();
-    }
-
-    public ProtocolDecoder getDecoder()
-    {
-        // Create a new decoder.
-        return new KerberosDecoder();
-    }
-}
+/*
+ *   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.kerberos.protocol;
+
+
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+
+
+public class KerberosProtocolCodecFactory implements ProtocolCodecFactory
+{
+    private static final KerberosProtocolCodecFactory INSTANCE = new KerberosProtocolCodecFactory();
+
+
+    public static KerberosProtocolCodecFactory getInstance()
+    {
+        return INSTANCE;
+    }
+
+
+    private KerberosProtocolCodecFactory()
+    {
+    }
+
+
+    public ProtocolEncoder getEncoder()
+    {
+        // Create a new encoder.
+        return new KerberosEncoder();
+    }
+
+
+    public ProtocolDecoder getDecoder()
+    {
+        // Create a new decoder.
+        return new KerberosDecoder();
+    }
+}

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.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-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.protocol;
 
+
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
@@ -24,10 +25,10 @@
 import org.apache.directory.server.kerberos.kdc.authentication.AuthenticationServiceChain;
 import org.apache.directory.server.kerberos.kdc.ticketgrant.TicketGrantingContext;
 import org.apache.directory.server.kerberos.kdc.ticketgrant.TicketGrantingServiceChain;
+import org.apache.directory.server.kerberos.shared.exceptions.ErrorType;
+import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStore;
 import org.apache.directory.server.protocol.shared.chain.Command;
-import org.apache.kerberos.exceptions.ErrorType;
-import org.apache.kerberos.messages.KdcRequest;
-import org.apache.kerberos.store.PrincipalStore;
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoHandler;
 import org.apache.mina.common.IoSession;
@@ -35,6 +36,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * The Kerberos protocol handler for MINA which handles requests for the authentication
  * service and the ticket granting service of the KDC.
@@ -52,7 +54,8 @@
     private Command authService;
     private Command tgsService;
 
-    public KerberosProtocolHandler( KdcConfiguration config, PrincipalStore store )
+
+    public KerberosProtocolHandler(KdcConfiguration config, PrincipalStore store)
     {
         this.config = config;
         this.store = store;
@@ -61,6 +64,7 @@
         tgsService = new TicketGrantingServiceChain();
     }
 
+
     public void sessionCreated( IoSession session ) throws Exception
     {
         if ( log.isDebugEnabled() )
@@ -69,9 +73,10 @@
         }
 
         session.getFilterChain().addFirst( "codec",
-                new ProtocolCodecFilter( KerberosProtocolCodecFactory.getInstance() ) );
+            new ProtocolCodecFilter( KerberosProtocolCodecFactory.getInstance() ) );
     }
 
+
     public void sessionOpened( IoSession session )
     {
         if ( log.isDebugEnabled() )
@@ -80,6 +85,7 @@
         }
     }
 
+
     public void sessionClosed( IoSession session )
     {
         if ( log.isDebugEnabled() )
@@ -88,6 +94,7 @@
         }
     }
 
+
     public void sessionIdle( IoSession session, IdleStatus status )
     {
         if ( log.isDebugEnabled() )
@@ -96,12 +103,14 @@
         }
     }
 
+
     public void exceptionCaught( IoSession session, Throwable cause )
     {
         log.error( session.getRemoteAddress() + " EXCEPTION", cause );
         session.close();
     }
 
+
     public void messageReceived( IoSession session, Object message )
     {
         if ( log.isDebugEnabled() )
@@ -109,8 +118,8 @@
             log.debug( session.getRemoteAddress() + " RCVD: " + message );
         }
 
-        InetAddress clientAddress = ( (InetSocketAddress) session.getRemoteAddress() ).getAddress();
-        KdcRequest request = (KdcRequest) message;
+        InetAddress clientAddress = ( ( InetSocketAddress ) session.getRemoteAddress() ).getAddress();
+        KdcRequest request = ( KdcRequest ) message;
 
         int messageType = request.getMessageType().getOrdinal();
 
@@ -155,6 +164,7 @@
             log.error( e.getMessage() );
         }
     }
+
 
     public void messageSent( IoSession session, Object message )
     {

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.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-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/KeyIntegrityChecker.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/KeyIntegrityChecker.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/KeyIntegrityChecker.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/KeyIntegrityChecker.java Sun Feb 19 19:57:02 2006
@@ -16,7 +16,9 @@
  */
 package org.apache.directory.server.kerberos.sam;
 
+
 import javax.security.auth.kerberos.KerberosKey;
+
 
 /**
  * Checks the integrity of a kerberos key to decode-decrypt an encrypted

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/KeyIntegrityChecker.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-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.java Sun Feb 19 19:57:02 2006
@@ -16,7 +16,9 @@
  */
 package org.apache.directory.server.kerberos.sam;
 
-import org.apache.kerberos.messages.value.SamType;
+
+import org.apache.directory.server.kerberos.shared.messages.value.SamType;
+
 
 /**
  * Base class for all SAM subsystem errors.
@@ -32,31 +34,34 @@
     /** the SAM type that caused this exception */
     private final SamType type;
 
+
     /**
      * Creates a SamException for a specific SamType.
      *
      * @param type the type value for the SAM algorithm associated with this exception
      */
-    public SamException( SamType type )
+    public SamException(SamType type)
     {
         super();
 
         this.type = type;
     }
 
+
     /**
      * Creates a SamException for a specific SamType, with message.
      *
      * @param type the type value for the SAM algorithm associated with this exception
      * @param message a message regarding the nature of the fault
      */
-    public SamException( SamType type, String message )
+    public SamException(SamType type, String message)
     {
         super( message );
 
         this.type = type;
     }
 
+
     /**
      * Creates a SamException for a specific SamType, with the cause resulted in
      * this exception.
@@ -64,13 +69,14 @@
      * @param type the type value for the SAM algorithm associated with this exception
      * @param cause the throwable that resulted in this exception being thrown
      */
-    public SamException( SamType type, Throwable cause )
+    public SamException(SamType type, Throwable cause)
     {
         super( cause );
 
         this.type = type;
     }
 
+
     /**
      * Creates a SamException for a specific SamType, with a message and the
      * cause that resulted in this exception.
@@ -80,12 +86,13 @@
      * @param message a message regarding the nature of the fault
      * @param cause the throwable that resulted in this exception being thrown
      */
-    public SamException( SamType type, String message, Throwable cause )
+    public SamException(SamType type, String message, Throwable cause)
     {
         super( message, cause );
 
         this.type = type;
     }
+
 
     /**
      * Gets the registered SAM algorithm type associated with this SamException.

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamException.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-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.sam;
 
+
 import java.util.HashMap;
 import java.util.Hashtable;
 
@@ -23,7 +24,8 @@
 import javax.naming.directory.DirContext;
 import javax.security.auth.kerberos.KerberosKey;
 
-import org.apache.kerberos.store.PrincipalStoreEntry;
+import org.apache.directory.server.kerberos.shared.store.PrincipalStoreEntry;
+
 
 /**
  * The Subsystem that enables the Kerberos server to use plugable Single-use
@@ -49,6 +51,7 @@
     private DirContext userContext;
     private String userBaseRdn;
 
+
     /**
      * Gets the singleton instance of the SamSubsystem.
      *
@@ -64,6 +67,7 @@
         return instance;
     }
 
+
     /**
      * Sets the KeyIntegrityChecker used by the entire SamSubsystem.
      *
@@ -74,6 +78,7 @@
         this.keyChecker = keyChecker;
     }
 
+
     /**
      * Uses the principal entry information to load the approapriate SamVerifier
      * and verify the Single-use password.
@@ -100,7 +105,7 @@
 
         if ( verifiers.containsKey( entry.getSamType() ) )
         {
-            verifier = (SamVerifier) verifiers.get( entry.getSamType() );
+            verifier = ( SamVerifier ) verifiers.get( entry.getSamType() );
 
             return verifier.verify( entry.getPrincipal(), sad );
         }
@@ -125,17 +130,17 @@
             throw new SamException( entry.getSamType(), msg );
         }
 
-        String fqcn = (String) env.get( key );
+        String fqcn = ( String ) env.get( key );
 
         try
         {
             Class c = Class.forName( fqcn );
 
-            verifier = (SamVerifier) c.newInstance();
+            verifier = ( SamVerifier ) c.newInstance();
 
             try
             {
-                verifier.setUserContext( (DirContext) userContext.lookup( userBaseRdn ) );
+                verifier.setUserContext( ( DirContext ) userContext.lookup( userBaseRdn ) );
             }
             catch ( NamingException e )
             {
@@ -185,6 +190,7 @@
             throw new SamException( entry.getSamType(), msg, e );
         }
     }
+
 
     /**
      * Sets the context under which user entries can be found.

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamSubsystem.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-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.java Sun Feb 19 19:57:02 2006
@@ -16,11 +16,13 @@
  */
 package org.apache.directory.server.kerberos.sam;
 
+
 import javax.naming.directory.DirContext;
 import javax.security.auth.kerberos.KerberosKey;
 import javax.security.auth.kerberos.KerberosPrincipal;
 
-import org.apache.kerberos.messages.value.SamType;
+import org.apache.directory.server.kerberos.shared.messages.value.SamType;
+
 
 /**
  * Single-use Authentication Mechanism verifier (subsystem) interface.
@@ -46,9 +48,11 @@
     /** Starts one of many pluggable SAM type subsystem*/
     void startup() throws SamException;
 
+
     /** Shuts down one of many pluggable SAM type subsystem*/
     void shutdown();
 
+
     /**
      * SamVerifiers require a KeyIntegrityChecker to calculate the integrity of
      * a generated KerberosKey.  The Kerberos service exposes this interface
@@ -61,6 +65,7 @@
      */
     void setIntegrityChecker( KeyIntegrityChecker keyChecker );
 
+
     /**
      * Verifies the single use password supplied.
      *
@@ -69,12 +74,14 @@
      */
     KerberosKey verify( KerberosPrincipal principal, byte[] sad ) throws SamException;
 
+
     /**
      * Gets the registered SAM algorithm type implemented by this SamVerifier.
      *
      * @return the type value for the SAM algorithm used to verify the SUP.
      */
     SamType getSamType();
+
 
     /** sets the user context where users are stored for the primary realm */
     void setUserContext( DirContext userContext );

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/SamVerifier.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-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.java Sun Feb 19 19:57:02 2006
@@ -16,24 +16,27 @@
  */
 package org.apache.directory.server.kerberos.sam;
 
+
 import java.io.IOException;
 
 import javax.security.auth.kerberos.KerberosKey;
 
-import org.apache.kerberos.crypto.encryption.EncryptionType;
-import org.apache.kerberos.exceptions.KerberosException;
-import org.apache.kerberos.io.decoder.EncryptedDataDecoder;
-import org.apache.kerberos.messages.value.EncryptedData;
-import org.apache.kerberos.messages.value.EncryptedTimeStamp;
-import org.apache.kerberos.messages.value.EncryptionKey;
-import org.apache.kerberos.messages.value.KerberosTime;
-import org.apache.kerberos.service.LockBox;
+import org.apache.directory.server.kerberos.shared.crypto.encryption.EncryptionType;
+import org.apache.directory.server.kerberos.shared.exceptions.KerberosException;
+import org.apache.directory.server.kerberos.shared.io.decoder.EncryptedDataDecoder;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptedData;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptedTimeStamp;
+import org.apache.directory.server.kerberos.shared.messages.value.EncryptionKey;
+import org.apache.directory.server.kerberos.shared.messages.value.KerberosTime;
+import org.apache.directory.server.kerberos.shared.service.LockBox;
+
 
 public class TimestampChecker implements KeyIntegrityChecker
 {
     private static final long FIVE_MINUTES = 300000;
     private static final LockBox lockBox = new LockBox();
 
+
     public boolean checkKeyIntegrity( byte[] encryptedData, KerberosKey kerberosKey )
     {
         EncryptionType keyType = EncryptionType.getTypeByOrdinal( kerberosKey.getKeyType() );
@@ -47,7 +50,8 @@
 
             // Decrypt the EncryptedData structure to get the PA-ENC-TS-ENC
             // Decode the decrypted timestamp into our timestamp object.
-            EncryptedTimeStamp timestamp = (EncryptedTimeStamp) lockBox.unseal( EncryptedTimeStamp.class, key, sadValue );
+            EncryptedTimeStamp timestamp = ( EncryptedTimeStamp ) lockBox.unseal( EncryptedTimeStamp.class, key,
+                sadValue );
 
             // Since we got here we must have a valid timestamp structure that we can
             // validate to be within a five minute skew.

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

Propchange: directory/trunks/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/sam/TimestampChecker.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-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/TestUtils.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/TestUtils.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/TestUtils.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/TestUtils.java Sun Feb 19 19:57:02 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 import java.io.BufferedInputStream;
 import java.io.CharArrayWriter;
 import java.io.IOException;
@@ -23,6 +24,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 
+
 public class TestUtils
 {
     public static char[] getControlDocument( String resource ) throws IOException
@@ -35,7 +37,7 @@
 
         try
         {
-            char[] buf = new char[ 2048 ];
+            char[] buf = new char[2048];
             int len = 0;
             while ( len >= 0 )
             {
@@ -61,23 +63,26 @@
         return isca;
     }
 
+
     public static byte[] getBytesFromResource( String resource ) throws IOException
     {
         InputStream is = ClassLoader.getSystemClassLoader().getResourceAsStream( resource );
 
         BufferedInputStream stream = new BufferedInputStream( is );
         int len = stream.available();
-        byte[] bytes = new byte[ len ];
+        byte[] bytes = new byte[len];
         stream.read( bytes, 0, len );
 
         return bytes;
     }
 
+
     public static void hexdump( byte[] data )
     {
         hexdump( data, true );
     }
 
+
     public static void hexdump( byte[] data, boolean delimit )
     {
         String delimiter = new String( "-------------------------------------------------" );
@@ -90,14 +95,14 @@
         int lineLength = 0;
         for ( int ii = 0; ii < data.length; ii++ )
         {
-            System.out.print( byte2hexString( data[ ii ] ) + " " );
+            System.out.print( byte2hexString( data[ii] ) + " " );
             lineLength++;
-            
+
             if ( lineLength == 8 )
             {
                 System.out.print( "  " );
             }
-            
+
             if ( lineLength == 16 )
             {
                 System.out.println();
@@ -112,58 +117,63 @@
         }
     }
 
-    public static final String[] hex_digit = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9",
-            "a", "b", "c", "d", "e", "f" };
+    public static final String[] hex_digit =
+        { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f" };
+
 
     public static String byte2hexString( byte x )
     {
         String s = "";
         for ( int ii = 0; ii < 2; ii++ )
         {
-            s = hex_digit[ ( ( ( x ) & 0xff ) & ( 15 << ( ii * 4 ) ) ) >>> ( ii * 4 ) ] + s;
+            s = hex_digit[( ( ( x ) & 0xff ) & ( 15 << ( ii * 4 ) ) ) >>> ( ii * 4 )] + s;
         }
 
         return s;
     }
 
+
     public static String int2hexString( int x )
     {
         String s = "";
         for ( int ii = 0; ii < 8; ii++ )
         {
-            s = hex_digit[ ( x & ( 15 << ( ii * 4 ) ) ) >>> ( ii * 4 ) ] + s;
+            s = hex_digit[( x & ( 15 << ( ii * 4 ) ) ) >>> ( ii * 4 )] + s;
         }
 
         return s;
     }
 
+
     public static String int2binString( int x )
     {
         String s = "";
         for ( int ii = 0; ii < 32; ii++ )
         {
-            if ( ( ii > 0 ) && ( ii % 4 == 0 ) ) 
+            if ( ( ii > 0 ) && ( ii % 4 == 0 ) )
             {
                 s = " " + s;
             }
 
-            s = hex_digit[ ( x & ( 1 << ii ) ) >>> ii ] + s;
+            s = hex_digit[( x & ( 1 << ii ) ) >>> ii] + s;
         }
 
         return s;
     }
 
+
     public static String long2hexString( long x )
     {
         String s = "";
         for ( int ii = 0; ii < 16; ii++ )
         {
-            s = hex_digit[ (int) ( ( x & ( 15L << ( ii * 4 ) ) ) >>> ( ii * 4 ) ) ] + s;
+            s = hex_digit[( int ) ( ( x & ( 15L << ( ii * 4 ) ) ) >>> ( ii * 4 ) )] + s;
         }
 
         return s;
     }
 
+
     public static String long2binString( long x )
     {
         String s = "";
@@ -174,22 +184,25 @@
                 s = " " + s;
             }
 
-            s = hex_digit[ (int) ( ( x & ( 1L << ii ) ) >>> ii ) ] + s;
+            s = hex_digit[( int ) ( ( x & ( 1L << ii ) ) >>> ii )] + s;
         }
 
         return s;
     }
 
+
     public static String byte2hexString( byte[] input )
     {
         return byte2hexString( input, 0, input.length );
     }
 
+
     public static String byte2hexString( byte[] input, int offset )
     {
         return byte2hexString( input, offset, input.length );
     }
 
+
     public static String byte2hexString( byte[] input, int offset, int length )
     {
         String result = "";
@@ -197,7 +210,7 @@
         {
             if ( ii + offset < input.length )
             {
-                result += byte2hexString( input[ ii + offset ] );
+                result += byte2hexString( input[ii + offset] );
             }
         }
 

Propchange: directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/TestUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/kdc/TestUtils.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-kerberos/src/test/java/org/apache/directory/server/kerberos/messages/value/OptionsTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/messages/value/OptionsTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/messages/value/OptionsTest.java (original)
+++ directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/messages/value/OptionsTest.java Sun Feb 19 19:57:02 2006
@@ -16,16 +16,20 @@
  */
 package org.apache.directory.server.kerberos.messages.value;
 
+
 import java.util.Arrays;
 
-import org.apache.kerberos.messages.value.KdcOptions;
-import org.apache.kerberos.messages.value.TicketFlags;
+import org.apache.directory.server.kerberos.shared.messages.value.KdcOptions;
+import org.apache.directory.server.kerberos.shared.messages.value.TicketFlags;
 
 import junit.framework.TestCase;
 
+
 public class OptionsTest extends TestCase
 {
-    private byte[] fpriOptions = { (byte) 0x50, (byte) 0x00, (byte) 0x00, (byte) 0x10 };
+    private byte[] fpriOptions =
+        { ( byte ) 0x50, ( byte ) 0x00, ( byte ) 0x00, ( byte ) 0x10 };
+
 
     public void testToString()
     {
@@ -37,6 +41,7 @@
         assertEquals( flags.toString(), "FORWARDABLE PROXIABLE RENEWABLE INITIAL" );
     }
 
+
     public void testDuplicateSetting()
     {
         TicketFlags flags = new TicketFlags();
@@ -47,6 +52,7 @@
         flags.set( TicketFlags.RENEWABLE );
         assertEquals( flags.toString(), "FORWARDABLE PROXIABLE MAY_POSTDATE RENEWABLE" );
     }
+
 
     public void testConstruction()
     {

Propchange: directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/messages/value/OptionsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/trunks/apacheds/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/messages/value/OptionsTest.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-ldap/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/protocol-ldap/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/protocol-ldap/pom.xml (original)
+++ directory/trunks/apacheds/protocol-ldap/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,9 +4,12 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-RC1-SNAPSHOT</version>
+    <version>1.0-RC1</version>
   </parent>
   <artifactId>apacheds-protocol-ldap</artifactId>
+  <description>
+    The LDAPv3 protocol provider for ApacheDS
+  </description>
   <name>ApacheDS Protocol Ldap</name>
   <packaging>jar</packaging>  
   <dependencies>



Mime
View raw message