directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376623 [31/38] - in /directory/sandbox/akarasulu/rc1/apacheds: 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/src/main/java/org/...
Date Fri, 10 Feb 2006 10:49:57 GMT
Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dns.protocol;
 
+
 import org.apache.directory.server.dns.DnsConfiguration;
 import org.apache.directory.server.dns.messages.DnsMessage;
 import org.apache.directory.server.dns.service.DnsContext;
@@ -30,6 +31,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class DnsProtocolHandler implements IoHandler
 {
     private static final Logger log = LoggerFactory.getLogger( DnsProtocolHandler.class );
@@ -39,7 +41,8 @@
 
     private Command dnsService;
 
-    public DnsProtocolHandler( DnsConfiguration config, RecordStore store )
+
+    public DnsProtocolHandler(DnsConfiguration config, RecordStore store)
     {
         this.config = config;
         this.store = store;
@@ -47,41 +50,45 @@
         dnsService = new DomainNameServiceChain();
     }
 
+
     public void sessionCreated( IoSession session ) throws Exception
     {
         log.debug( "{} CREATED", session.getRemoteAddress() );
-        
-        session.getFilterChain().addFirst(
-                "codec",
-                new ProtocolCodecFilter( DnsProtocolCodecFactory.getInstance() ) );
+
+        session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( DnsProtocolCodecFactory.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.error( session.getRemoteAddress() + " EXCEPTION", cause );
         session.close();
     }
 
+
     public void messageReceived( IoSession session, Object message )
     {
         log.debug( "{} RCVD: {}", session.getRemoteAddress(), message );
 
-        DnsMessage request = (DnsMessage) message;
+        DnsMessage request = ( DnsMessage ) message;
 
         try
         {
@@ -99,6 +106,7 @@
             log.error( e.getMessage(), e );
         }
     }
+
 
     public void messageSent( IoSession session, Object message )
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/BuildReply.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/BuildReply.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/BuildReply.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/BuildReply.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.dns.messages.DnsMessage;
 import org.apache.directory.server.dns.messages.DnsMessageModifier;
 import org.apache.directory.server.dns.messages.MessageType;
@@ -25,11 +26,12 @@
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 
+
 public class BuildReply extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
     {
-        DnsContext dnsContext = (DnsContext) context;
+        DnsContext dnsContext = ( DnsContext ) context;
         ResourceRecords records = dnsContext.getResourceRecords();
         DnsMessage request = dnsContext.getRequest();
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsContext.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import java.util.Collection;
 
 import org.apache.directory.server.dns.DnsConfiguration;
@@ -25,6 +26,7 @@
 import org.apache.directory.server.dns.store.RecordStore;
 import org.apache.directory.server.protocol.shared.chain.impl.ContextBase;
 
+
 public class DnsContext extends ContextBase
 {
     private static final long serialVersionUID = -5911142975867852436L;
@@ -35,6 +37,7 @@
     private DnsMessage reply;
     private ResourceRecords records = new ResourceRecords();
 
+
     /**
      * @return Returns the recordEntry.
      */
@@ -43,6 +46,7 @@
         return records;
     }
 
+
     /**
      * @param resourceRecord The resourceRecord to add.
      */
@@ -51,6 +55,7 @@
         this.records.add( resourceRecord );
     }
 
+
     /**
      * @param resourceRecords The resourceRecords to add.
      */
@@ -59,6 +64,7 @@
         this.records.addAll( resourceRecords );
     }
 
+
     /**
      * @return Returns the config.
      */
@@ -67,6 +73,7 @@
         return config;
     }
 
+
     /**
      * @param config The config to set.
      */
@@ -75,6 +82,7 @@
         this.config = config;
     }
 
+
     /**
      * @return Returns the reply.
      */
@@ -83,6 +91,7 @@
         return reply;
     }
 
+
     /**
      * @param reply The reply to set.
      */
@@ -91,6 +100,7 @@
         this.reply = reply;
     }
 
+
     /**
      * @return Returns the request.
      */
@@ -99,6 +109,7 @@
         return request;
     }
 
+
     /**
      * @param request The request to set.
      */
@@ -107,6 +118,7 @@
         this.request = request;
     }
 
+
     /**
      * @return Returns the store.
      */
@@ -114,6 +126,7 @@
     {
         return store;
     }
+
 
     /**
      * @param store The store to set.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsExceptionHandler.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsExceptionHandler.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsExceptionHandler.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DnsExceptionHandler.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.dns.DnsException;
 import org.apache.directory.server.dns.messages.DnsMessage;
 import org.apache.directory.server.dns.messages.DnsMessageModifier;
@@ -29,16 +30,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class DnsExceptionHandler extends CommandBase implements Filter
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( DnsExceptionHandler.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
         return CONTINUE_CHAIN;
     }
 
+
     public boolean postprocess( Context context, Exception exception )
     {
         if ( exception == null )
@@ -46,8 +50,8 @@
             return CONTINUE_CHAIN;
         }
 
-        DnsContext dnsContext = (DnsContext) context;
-        DnsException de = (DnsException) exception;
+        DnsContext dnsContext = ( DnsContext ) context;
+        DnsException de = ( DnsException ) exception;
         DnsMessage message = dnsContext.getRequest();
 
         if ( log.isDebugEnabled() )

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameServiceChain.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameServiceChain.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameServiceChain.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/DomainNameServiceChain.java Fri Feb 10 02:48:07 2006
@@ -16,10 +16,12 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.protocol.shared.chain.impl.ChainBase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * Domain Name Service (DNS) Protocol (RFC 1034, 1035)
  */
@@ -27,6 +29,7 @@
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( DomainNameServiceChain.class );
+
 
     public DomainNameServiceChain()
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/GetResourceRecords.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import java.util.Iterator;
 import java.util.Set;
 
@@ -27,11 +28,12 @@
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 
+
 public class GetResourceRecords extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
     {
-        DnsContext dnsContext = (DnsContext) context;
+        DnsContext dnsContext = ( DnsContext ) context;
         RecordStore store = dnsContext.getStore();
 
         QuestionRecords questions = dnsContext.getRequest().getQuestionRecords();
@@ -40,11 +42,12 @@
 
         while ( it.hasNext() )
         {
-            dnsContext.addResourceRecords( getEntry( store, (QuestionRecord) it.next() ) );
+            dnsContext.addResourceRecords( getEntry( store, ( QuestionRecord ) it.next() ) );
         }
 
         return CONTINUE_CHAIN;
     }
+
 
     public Set getEntry( RecordStore store, QuestionRecord question ) throws Exception
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorContext.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.dns.messages.ResourceRecords;
 import org.apache.directory.server.dns.store.RecordStore;
 import org.apache.directory.server.protocol.shared.chain.Context;
@@ -23,18 +24,20 @@
 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
             {
-                DnsContext dnsContext = (DnsContext) context;
+                DnsContext dnsContext = ( DnsContext ) context;
                 RecordStore store = dnsContext.getStore();
                 ResourceRecords records = dnsContext.getResourceRecords();
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorMessage.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorMessage.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorMessage.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorMessage.java Fri Feb 10 02:48:07 2006
@@ -16,12 +16,14 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.dns.messages.DnsMessage;
 import org.apache.directory.server.dns.messages.MessageType;
 import org.apache.directory.server.dns.messages.OpCode;
 import org.apache.directory.server.dns.messages.QuestionRecords;
 import org.apache.directory.server.dns.messages.ResponseCode;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
+
 
 public abstract class MonitorMessage extends CommandBase
 {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorReply.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorReply.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorReply.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorReply.java Fri Feb 10 02:48:07 2006
@@ -16,22 +16,25 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class MonitorReply extends MonitorMessage
 {
     /** 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
             {
-                DnsContext dnsContext = (DnsContext) context;
+                DnsContext dnsContext = ( DnsContext ) context;
 
                 log.debug( monitorMessage( dnsContext.getReply(), "reply" ) );
             }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorRequest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorRequest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorRequest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/service/MonitorRequest.java Fri Feb 10 02:48:07 2006
@@ -16,22 +16,25 @@
  */
 package org.apache.directory.server.dns.service;
 
+
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class MonitorRequest extends MonitorMessage
 {
     /** 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
             {
-                DnsContext dnsContext = (DnsContext) context;
+                DnsContext dnsContext = ( DnsContext ) context;
 
                 log.debug( monitorMessage( dnsContext.getRequest(), "request" ) );
             }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsAttribute.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsAttribute.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsAttribute.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsAttribute.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.store;
 
+
 /**
  * Constants representing the DNS attribute ids as defined by the Apache DNS schema.
  *
@@ -82,10 +83,10 @@
 
     /** the apachedns schema apacheDnsServicePriority */
     public static final String SERVICE_PRIORITY = "apacheDnsServicePriority";
-    
+
     /** the apachedns schema apacheDnsServiceWeight */
     public static final String SERVICE_WEIGHT = "apacheDnsServiceWeight";
-    
+
     /** the apachedns schema apacheDnsServicePort */
     public static final String SERVICE_PORT = "apacheDnsServicePort";
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsCatalog.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsCatalog.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsCatalog.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/DnsCatalog.java Fri Feb 10 02:48:07 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.dns.store;
 
+
 import java.util.Map;
 
 import org.apache.directory.server.protocol.shared.catalog.Catalog;
 
+
 /**
  * A catalog for mapping DNS zones to search base DN's. 
  * 
@@ -31,11 +33,13 @@
 {
     private Map map;
 
-    public DnsCatalog( Map map )
+
+    public DnsCatalog(Map map)
     {
         this.map = map;
     }
 
+
     public String getBaseDn( String name )
     {
         if ( name.endsWith( "." ) )
@@ -46,7 +50,7 @@
 
         while ( !name.equals( "" ) && name != null )
         {
-            String candidate = (String) map.get( name );
+            String candidate = ( String ) map.get( name );
             if ( candidate != null )
             {
                 return candidate;

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/JndiRecordStoreImpl.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/JndiRecordStoreImpl.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/JndiRecordStoreImpl.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/JndiRecordStoreImpl.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.store;
 
+
 import java.util.Set;
 
 import javax.naming.spi.InitialContextFactory;
@@ -23,6 +24,7 @@
 import org.apache.directory.server.dns.DnsConfiguration;
 import org.apache.directory.server.dns.messages.QuestionRecord;
 
+
 /**
  * A JNDI-backed implementation of the RecordStore interface.  This RecordStore uses
  * the Strategy pattern to either serve records based on a single base DN or to lookup
@@ -40,7 +42,8 @@
     /** a handle on the searchh strategy */
     private SearchStrategy strategy;
 
-    public JndiRecordStoreImpl( DnsConfiguration config, InitialContextFactory factory )
+
+    public JndiRecordStoreImpl(DnsConfiguration config, InitialContextFactory factory)
     {
         this.config = config;
         this.factory = factory;
@@ -48,10 +51,12 @@
         strategy = getSearchStrategy();
     }
 
+
     public Set getRecords( QuestionRecord question ) throws Exception
     {
         return strategy.getRecords( question );
     }
+
 
     private SearchStrategy getSearchStrategy()
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/MultiBaseSearch.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/MultiBaseSearch.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/MultiBaseSearch.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/MultiBaseSearch.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dns.store;
 
+
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
@@ -36,6 +37,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A JNDI-backed search strategy implementation.  This search strategy builds a catalog
  * from directory configuration to determine where zones are to search for
@@ -54,7 +56,8 @@
 
     private Catalog catalog;
 
-    MultiBaseSearch( DnsConfiguration config, InitialContextFactory factory )
+
+    MultiBaseSearch(DnsConfiguration config, InitialContextFactory factory)
     {
         this.factory = factory;
 
@@ -64,33 +67,35 @@
 
         try
         {
-            DirContext ctx = (DirContext) factory.getInitialContext( env );
-            catalog = new DnsCatalog( (Map) execute( ctx, new GetCatalog() ) );
+            DirContext ctx = ( DirContext ) factory.getInitialContext( env );
+            catalog = new DnsCatalog( ( Map ) execute( ctx, new GetCatalog() ) );
         }
         catch ( Exception e )
         {
             log.error( e.getMessage(), e );
-            String message = "Failed to get catalog context " + (String) env.get( Context.PROVIDER_URL );
+            String message = "Failed to get catalog context " + ( String ) env.get( Context.PROVIDER_URL );
             throw new ConfigurationException( message, e );
         }
     }
 
+
     public Set getRecords( QuestionRecord question ) throws Exception
     {
         env.put( Context.PROVIDER_URL, catalog.getBaseDn( question.getDomainName() ) );
 
         try
         {
-            DirContext ctx = (DirContext) factory.getInitialContext( env );
-            return (Set) execute( ctx, new GetRecords( question ) );
+            DirContext ctx = ( DirContext ) factory.getInitialContext( env );
+            return ( Set ) execute( ctx, new GetRecords( question ) );
         }
         catch ( NamingException ne )
         {
             log.error( ne.getMessage(), ne );
-            String message = "Failed to get initial context " + (String) env.get( Context.PROVIDER_URL );
+            String message = "Failed to get initial context " + ( String ) env.get( Context.PROVIDER_URL );
             throw new ConfigurationException( message, ne );
         }
     }
+
 
     private Object execute( DirContext ctx, ContextOperation operation ) throws Exception
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/RecordStore.java Fri Feb 10 02:48:07 2006
@@ -16,9 +16,11 @@
  */
 package org.apache.directory.server.dns.store;
 
+
 import java.util.Set;
 
 import org.apache.directory.server.dns.messages.QuestionRecord;
+
 
 /**
  * The store interface used by the DNS protocol to lookup resource records.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SearchStrategy.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SearchStrategy.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SearchStrategy.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SearchStrategy.java Fri Feb 10 02:48:07 2006
@@ -17,9 +17,11 @@
 
 package org.apache.directory.server.dns.store;
 
+
 import java.util.Set;
 
 import org.apache.directory.server.dns.messages.QuestionRecord;
+
 
 /**
  * Interface for search strategies.  The DNS protocol may search a single

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SingleBaseSearch.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SingleBaseSearch.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SingleBaseSearch.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/SingleBaseSearch.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dns.store;
 
+
 import java.util.Hashtable;
 import java.util.Set;
 
@@ -33,6 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A JNDI-backed search strategy implementation.  This search strategy searches a
  * single base DN for resource records.
@@ -47,7 +49,8 @@
 
     private DirContext ctx;
 
-    SingleBaseSearch( DnsConfiguration config, InitialContextFactory factory )
+
+    SingleBaseSearch(DnsConfiguration config, InitialContextFactory factory)
     {
         Hashtable env = new Hashtable( config.toJndiEnvironment() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, config.getInitialContextFactory() );
@@ -55,20 +58,22 @@
 
         try
         {
-            ctx = (DirContext) factory.getInitialContext( env );
+            ctx = ( DirContext ) factory.getInitialContext( env );
         }
         catch ( NamingException ne )
         {
             log.error( ne.getMessage(), ne );
-            String message = "Failed to get initial context " + (String) env.get( Context.PROVIDER_URL );
+            String message = "Failed to get initial context " + ( String ) env.get( Context.PROVIDER_URL );
             throw new ConfigurationException( message, ne );
         }
     }
 
+
     public Set getRecords( QuestionRecord question ) throws Exception
     {
-        return (Set) execute( new GetRecords( question ) );
+        return ( Set ) execute( new GetRecords( question ) );
     }
+
 
     private Object execute( ContextOperation operation ) throws Exception
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetFlatRecord.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns.store.operations;
 
+
 import javax.naming.Name;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -34,6 +35,7 @@
 import org.apache.directory.server.dns.store.DnsAttribute;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
 
+
 /**
  * A JNDI context operation for looking up a Resource Record with flat attributes.
  *
@@ -47,14 +49,16 @@
     /** The name of the question to get. */
     private final QuestionRecord question;
 
+
     /**
      * Creates the action to be used against the embedded JNDI provider.
      */
-    public GetFlatRecord( QuestionRecord question )
+    public GetFlatRecord(QuestionRecord question)
     {
         this.question = question;
     }
 
+
     /**
      * Note that the base is a relative path from the exiting context.
      * It is not a DN.
@@ -78,7 +82,7 @@
 
         if ( answer.hasMore() )
         {
-            SearchResult result = (SearchResult) answer.next();
+            SearchResult result = ( SearchResult ) answer.next();
 
             Attributes attrs = result.getAttributes();
 
@@ -93,6 +97,7 @@
         return record;
     }
 
+
     /**
      * Marshals a RecordStoreEntry from an Attributes object.
      *
@@ -106,10 +111,10 @@
 
         Attribute attr;
 
-        String dnsName = ( attr = attrs.get( DnsAttribute.NAME ) ) != null ? (String) attr.get() : null;
-        String dnsType = ( attr = attrs.get( DnsAttribute.TYPE ) ) != null ? (String) attr.get() : null;
-        String dnsClass = ( attr = attrs.get( DnsAttribute.CLASS ) ) != null ? (String) attr.get() : null;
-        String dnsTtl = ( attr = attrs.get( DnsAttribute.TTL ) ) != null ? (String) attr.get() : null;
+        String dnsName = ( attr = attrs.get( DnsAttribute.NAME ) ) != null ? ( String ) attr.get() : null;
+        String dnsType = ( attr = attrs.get( DnsAttribute.TYPE ) ) != null ? ( String ) attr.get() : null;
+        String dnsClass = ( attr = attrs.get( DnsAttribute.CLASS ) ) != null ? ( String ) attr.get() : null;
+        String dnsTtl = ( attr = attrs.get( DnsAttribute.TTL ) ) != null ? ( String ) attr.get() : null;
 
         modifier.setDnsName( dnsName );
         modifier.setDnsType( RecordType.getTypeByName( dnsType ) );
@@ -120,8 +125,8 @@
 
         while ( ids.hasMore() )
         {
-            String id = (String) ids.next();
-            modifier.put( id, (String) attrs.get( id ).get() );
+            String id = ( String ) ids.next();
+            modifier.put( id, ( String ) attrs.get( id ).get() );
         }
 
         return modifier.getEntry();

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetRecords.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetRecords.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetRecords.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/main/java/org/apache/directory/server/dns/store/operations/GetRecords.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.dns.store.operations;
 
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -42,6 +43,7 @@
 import org.apache.directory.server.dns.store.DnsAttribute;
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
 
+
 /**
  * A JNDI context operation for looking up Resource Records from an embedded JNDI provider.
  *
@@ -55,10 +57,11 @@
     /** The name of the question to get. */
     private final QuestionRecord question;
 
+
     /**
      * Creates the action to be used against the embedded JNDI provider.
      */
-    public GetRecords( QuestionRecord question )
+    public GetRecords(QuestionRecord question)
     {
         this.question = question;
     }
@@ -105,6 +108,7 @@
         OBJECTCLASS_TO_TYPE = Collections.unmodifiableMap( objectClassToType );
     }
 
+
     /**
      * Note that the base is a relative path from the exiting context.
      * It is not a DN.
@@ -122,7 +126,7 @@
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
-        String filter = "(objectClass=" + (String) TYPE_TO_OBJECTCLASS.get( type ) + ")";
+        String filter = "(objectClass=" + ( String ) TYPE_TO_OBJECTCLASS.get( type ) + ")";
 
         NamingEnumeration list = ctx.search( transformDomainName( name ), filter, controls );
 
@@ -130,7 +134,7 @@
 
         while ( list.hasMore() )
         {
-            SearchResult result = (SearchResult) list.next();
+            SearchResult result = ( SearchResult ) list.next();
             Name relative = getRelativeName( ctx.getNameInNamespace(), result.getName() );
 
             set.add( getRecord( result.getAttributes(), relative ) );
@@ -139,6 +143,7 @@
         return set;
     }
 
+
     /**
      * Marshals a RecordStoreEntry from an Attributes object.
      *
@@ -160,7 +165,7 @@
 
         if ( attr != null )
         {
-            modifier.setDnsName( (String) attr.get() );
+            modifier.setDnsName( ( String ) attr.get() );
         }
         else
         {
@@ -176,7 +181,7 @@
 
         if ( attr != null )
         {
-            modifier.setDnsType( RecordType.getTypeByName( (String) attr.get() ) );
+            modifier.setDnsType( RecordType.getTypeByName( ( String ) attr.get() ) );
         }
         else
         {
@@ -184,24 +189,25 @@
         }
 
         // class defaults to SOA CLASS
-        String dnsClass = ( attr = attrs.get( DnsAttribute.CLASS ) ) != null ? (String) attr.get() : SOA_CLASS;
+        String dnsClass = ( attr = attrs.get( DnsAttribute.CLASS ) ) != null ? ( String ) attr.get() : SOA_CLASS;
         modifier.setDnsClass( RecordClass.getTypeByName( dnsClass ) );
 
         // ttl defaults to SOA MINIMUM
-        String dnsTtl = ( attr = attrs.get( DnsAttribute.TTL ) ) != null ? (String) attr.get() : SOA_MINIMUM;
+        String dnsTtl = ( attr = attrs.get( DnsAttribute.TTL ) ) != null ? ( String ) attr.get() : SOA_MINIMUM;
         modifier.setDnsTtl( Integer.parseInt( dnsTtl ) );
 
         NamingEnumeration ids = attrs.getIDs();
 
         while ( ids.hasMore() )
         {
-            String id = (String) ids.next();
-            modifier.put( id, (String) attrs.get( id ).get() );
+            String id = ( String ) ids.next();
+            modifier.put( id, ( String ) attrs.get( id ).get() );
         }
 
         return modifier.getEntry();
     }
 
+
     /**
      * Uses the algorithm in <a href="http://www.faqs.org/rfcs/rfc2247.html">RFC 2247</a>
      * to transform any Internet domain name into a distinguished name.
@@ -224,6 +230,7 @@
         return buf.toString();
     }
 
+
     /**
      * Uses the algorithm in <a href="http://www.faqs.org/rfcs/rfc2247.html">RFC 2247</a>
      * to transform a distinguished name into an Internet domain name.
@@ -244,17 +251,18 @@
         return domainName;
     }
 
+
     private RecordType getType( Attribute objectClass ) throws NamingException
     {
         NamingEnumeration list = objectClass.getAll();
 
         while ( list.hasMore() )
         {
-            String value = (String) list.next();
+            String value = ( String ) list.next();
 
             if ( !value.equals( "apacheDnsAbstractRecord" ) )
             {
-                RecordType type = (RecordType) OBJECTCLASS_TO_TYPE.get( value );
+                RecordType type = ( RecordType ) OBJECTCLASS_TO_TYPE.get( value );
 
                 if ( type == null )
                 {
@@ -268,6 +276,7 @@
         throw new NamingException( "ResourceRecord requires STRUCTURAL objectClass" );
     }
 
+
     private Name getRelativeName( String nameInNamespace, String baseDn ) throws NamingException
     {
         Properties props = new Properties();
@@ -293,6 +302,7 @@
 
         return searchBaseDn;
     }
+
 
     private Name getDomainComponents( Name name ) throws NamingException
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-dns/src/test/java/org/apache/directory/server/dns/AbstractDnsTestCase.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.dns;
 
+
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -35,19 +36,19 @@
     private final Logger log;
     private static final int MINIMUM_DNS_DATAGRAM_SIZE = 576;
 
-    
+
     public AbstractDnsTestCase()
     {
         log = LoggerFactory.getLogger( AbstractDnsTestCase.class );
     }
-    
-    
-    public AbstractDnsTestCase( Class subclass )
+
+
+    public AbstractDnsTestCase(Class subclass)
     {
         log = LoggerFactory.getLogger( subclass );
     }
-    
-    
+
+
     protected void print( DnsMessage message )
     {
         log.debug( String.valueOf( message.getTransactionId() ) );
@@ -72,11 +73,12 @@
         log.debug( String.valueOf( records ) );
     }
 
+
     protected ByteBuffer getByteBufferFromFile( String file ) throws IOException
     {
         InputStream is = getClass().getResourceAsStream( file );
 
-        byte[] bytes = new byte[ MINIMUM_DNS_DATAGRAM_SIZE ];
+        byte[] bytes = new byte[MINIMUM_DNS_DATAGRAM_SIZE];
 
         int offset = 0;
         int numRead = 0;

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcConfiguration.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.kerberos.kdc;
 
+
 import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.HashMap;
@@ -32,6 +33,7 @@
 import org.apache.directory.server.protocol.shared.ServiceConfiguration;
 import org.apache.kerberos.crypto.encryption.EncryptionType;
 
+
 public class KdcConfiguration extends ServiceConfiguration
 {
     private static final long serialVersionUID = 522567370475574165L;
@@ -85,7 +87,8 @@
     private static final long DEFAULT_ALLOWABLE_CLOCKSKEW = 5 * MINUTE;
 
     /** the default encryption types */
-    private static final String[] DEFAULT_ENCRYPTION_TYPES = new String[] { "des-cbc-md5" };
+    private static final String[] DEFAULT_ENCRYPTION_TYPES = new String[]
+        { "des-cbc-md5" };
 
     /** the default for allowing empty addresses */
     private static final boolean DEFAULT_EMPTY_ADDRESSES_ALLOWED = true;
@@ -117,6 +120,7 @@
 
     private EncryptionType[] encryptionTypes;
 
+
     /**
      * Creates a new instance with default settings.
      */
@@ -125,22 +129,25 @@
         this( getDefaultConfig(), LoadStrategy.LDAP );
     }
 
+
     /**
      * Creates a new instance with default settings that operates on the
      * {@link DirectoryService} with the specified ID.
      */
-    public KdcConfiguration( String instanceId )
+    public KdcConfiguration(String instanceId)
     {
         this( getDefaultConfig(), LoadStrategy.LDAP );
         setInstanceId( instanceId );
     }
 
-    public KdcConfiguration( Map properties )
+
+    public KdcConfiguration(Map properties)
     {
         this( properties, LoadStrategy.LDAP );
     }
 
-    public KdcConfiguration( Map properties, int strategy )
+
+    public KdcConfiguration(Map properties, int strategy)
     {
         if ( properties == null )
         {
@@ -161,6 +168,7 @@
         prepareEncryptionTypes();
     }
 
+
     public static Map getDefaultConfig()
     {
         Map defaults = new HashMap();
@@ -171,11 +179,12 @@
         return defaults;
     }
 
+
     public boolean isDifferent( Dictionary config )
     {
         int port = getPort();
 
-        if ( port == Integer.parseInt( (String) config.get( IP_PORT_KEY ) ) )
+        if ( port == Integer.parseInt( ( String ) config.get( IP_PORT_KEY ) ) )
         {
             return false;
         }
@@ -183,11 +192,13 @@
         return true;
     }
 
+
     public String getName()
     {
         return DEFAULT_NAME;
     }
 
+
     public String getPrimaryRealm()
     {
         String key = REALM_KEY;
@@ -200,6 +211,7 @@
         return DEFAULT_REALM;
     }
 
+
     public KerberosPrincipal getKdcPrincipal()
     {
         String key = PRINCIPAL_KEY;
@@ -212,11 +224,13 @@
         return new KerberosPrincipal( DEFAULT_PRINCIPAL );
     }
 
+
     public EncryptionType[] getEncryptionTypes()
     {
         return encryptionTypes;
     }
 
+
     public Map getProperties()
     {
         // Request that the krb5key value be returned as binary
@@ -225,6 +239,7 @@
         return configuration;
     }
 
+
     public long getClockSkew()
     {
         String key = ALLOWABLE_CLOCKSKEW_KEY;
@@ -237,6 +252,7 @@
         return DEFAULT_ALLOWABLE_CLOCKSKEW;
     }
 
+
     public int getPort()
     {
         String key = IP_PORT_KEY;
@@ -249,6 +265,7 @@
         return Integer.parseInt( DEFAULT_IP_PORT );
     }
 
+
     public int getBufferSize()
     {
         String key = BUFFER_SIZE_KEY;
@@ -261,6 +278,7 @@
         return DEFAULT_BUFFER_SIZE;
     }
 
+
     public boolean isPaEncTimestampRequired()
     {
         String key = PA_ENC_TIMESTAMP_REQUIRED_KEY;
@@ -273,6 +291,7 @@
         return DEFAULT_PA_ENC_TIMESTAMP_REQUIRED;
     }
 
+
     public long getMaximumTicketLifetime()
     {
         String key = TGS_MAXIMUM_TICKET_LIFETIME_KEY;
@@ -285,6 +304,7 @@
         return DEFAULT_TGS_MAXIMUM_TICKET_LIFETIME;
     }
 
+
     public long getMaximumRenewableLifetime()
     {
         String key = TGS_MAXIMUM_RENEWABLE_LIFETIME_KEY;
@@ -297,6 +317,7 @@
         return DEFAULT_TGS_MAXIMUM_RENEWABLE_LIFETIME;
     }
 
+
     public boolean isEmptyAddressesAllowed()
     {
         String key = EMPTY_ADDRESSES_ALLOWED_KEY;
@@ -309,6 +330,7 @@
         return DEFAULT_EMPTY_ADDRESSES_ALLOWED;
     }
 
+
     public boolean isForwardableAllowed()
     {
         String key = TGS_FORWARDABLE_ALLOWED_KEY;
@@ -321,6 +343,7 @@
         return DEFAULT_TGS_FORWARDABLE_ALLOWED;
     }
 
+
     public boolean isProxiableAllowed()
     {
         String key = TGS_PROXIABLE_ALLOWED_KEY;
@@ -333,6 +356,7 @@
         return DEFAULT_TGS_PROXIABLE_ALLOWED;
     }
 
+
     public boolean isPostdateAllowed()
     {
         String key = TGS_POSTDATE_ALLOWED_KEY;
@@ -345,6 +369,7 @@
         return DEFAULT_TGS_POSTDATE_ALLOWED;
     }
 
+
     public boolean isRenewableAllowed()
     {
         String key = TGS_RENEWABLE_ALLOWED_KEY;
@@ -357,6 +382,7 @@
         return DEFAULT_TGS_RENEWABLE_ALLOWED;
     }
 
+
     private void prepareEncryptionTypes()
     {
         String[] encryptionTypeStrings = null;
@@ -376,13 +402,13 @@
 
         for ( int i = 0; i < encryptionTypeStrings.length; i++ )
         {
-            String enc = encryptionTypeStrings[ i ];
+            String enc = encryptionTypeStrings[i];
 
             Iterator it = EncryptionType.VALUES.iterator();
 
             while ( it.hasNext() )
             {
-                EncryptionType type = (EncryptionType) it.next();
+                EncryptionType type = ( EncryptionType ) it.next();
 
                 if ( type.toString().equalsIgnoreCase( enc ) )
                 {
@@ -391,6 +417,6 @@
             }
         }
 
-        encryptionTypes = (EncryptionType[]) encTypes.toArray( new EncryptionType[ encTypes.size() ] );
+        encryptionTypes = ( EncryptionType[] ) encTypes.toArray( new EncryptionType[encTypes.size()] );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KdcContext.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 import java.net.InetAddress;
 
 import org.apache.directory.server.protocol.shared.chain.impl.ContextBase;
@@ -24,6 +25,7 @@
 import org.apache.kerberos.service.LockBox;
 import org.apache.kerberos.store.PrincipalStore;
 
+
 public class KdcContext extends ContextBase
 {
     private static final long serialVersionUID = 6490030984626825108L;
@@ -35,6 +37,7 @@
     private InetAddress clientAddress;
     private LockBox lockBox;
 
+
     /**
      * @return Returns the config.
      */
@@ -43,6 +46,7 @@
         return config;
     }
 
+
     /**
      * @param config The config to set.
      */
@@ -51,6 +55,7 @@
         this.config = config;
     }
 
+
     /**
      * @return Returns the store.
      */
@@ -59,6 +64,7 @@
         return store;
     }
 
+
     /**
      * @param store The store to set.
      */
@@ -67,6 +73,7 @@
         this.store = store;
     }
 
+
     /**
      * @return Returns the request.
      */
@@ -75,6 +82,7 @@
         return request;
     }
 
+
     /**
      * @param request The request to set.
      */
@@ -83,6 +91,7 @@
         this.request = request;
     }
 
+
     /**
      * @return Returns the reply.
      */
@@ -91,6 +100,7 @@
         return reply;
     }
 
+
     /**
      * @param reply The reply to set.
      */
@@ -99,6 +109,7 @@
         this.reply = reply;
     }
 
+
     /**
      * @return Returns the clientAddress.
      */
@@ -107,6 +118,7 @@
         return clientAddress;
     }
 
+
     /**
      * @param clientAddress The clientAddress to set.
      */
@@ -115,6 +127,7 @@
         this.clientAddress = clientAddress;
     }
 
+
     /**
      * @return Returns the lockBox.
      */
@@ -122,6 +135,7 @@
     {
         return lockBox;
     }
+
 
     /**
      * @param lockBox The lockBox to set.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/KerberosServer.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.kerberos.kdc;
 
+
 import java.io.IOException;
 import java.util.Dictionary;
 
@@ -29,6 +30,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A wrapper encapsulating configuration, a MINA registry, and a PrincipalStore
  * to implement a complete Kerberos server. 
@@ -49,7 +51,8 @@
     private Service tcpService;
     private Service udpService;
 
-    public KerberosServer( KdcConfiguration config, ServiceRegistry registry, PrincipalStore store )
+
+    public KerberosServer(KdcConfiguration config, ServiceRegistry registry, PrincipalStore store)
     {
         this.config = config;
         this.registry = registry;
@@ -76,10 +79,12 @@
         }
     }
 
+
     public boolean isDifferent( Dictionary newConfig )
     {
         return config.isDifferent( newConfig );
     }
+
 
     public void destroy()
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorContext.java Fri Feb 10 02:48:07 2006
@@ -16,30 +16,30 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 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 MonitorContext extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( MonitorContext.class );
 
+
     public boolean execute( Context context ) throws Exception
     {
-        KdcContext kdcContext = (KdcContext) context;
+        KdcContext kdcContext = ( KdcContext ) context;
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Monitoring context:"
-                    + "\n\tconfig:                 " + kdcContext.getConfig()
-                    + "\n\tstore:                  " + kdcContext.getStore()
-                    + "\n\trequest:                " + kdcContext.getRequest()
-                    + "\n\treply:                  " + kdcContext.getReply()
-                     );
+            log.debug( "Monitoring context:" + "\n\tconfig:                 " + kdcContext.getConfig()
+                + "\n\tstore:                  " + kdcContext.getStore() + "\n\trequest:                "
+                + kdcContext.getRequest() + "\n\treply:                  " + kdcContext.getReply() );
         }
-        
+
         return CONTINUE_CHAIN;
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorReply.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 import org.apache.kerberos.messages.ErrorMessage;
@@ -23,54 +24,48 @@
 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
     {
-        KdcContext kdcContext = (KdcContext) context;
+        KdcContext kdcContext = ( KdcContext ) context;
         Object message = kdcContext.getReply();
-        
+
         if ( message instanceof KdcReply )
         {
-            KdcReply reply = (KdcReply) message;
-            
+            KdcReply reply = ( KdcReply ) message;
+
             if ( log.isDebugEnabled() )
             {
-                log.debug( "Responding to authentication request with reply:"
-                        + "\n\tclient realm:          " + reply.getClientRealm()
-                        + "\n\tserver realm:          " + reply.getServerRealm()
-                        + "\n\tserverPrincipal:       " + reply.getServerPrincipal()
-                        + "\n\tclientPrincipal:       " + reply.getClientPrincipal()
-                        + "\n\thostAddresses:         " + reply.getClientAddresses()
-                        + "\n\tstart time:            " + reply.getStartTime()
-                        + "\n\tend time:              " + reply.getEndTime()
-                        + "\n\tauth time:             " + reply.getAuthTime()
-                        + "\n\trenew till time:       " + reply.getRenewTill()
-                        + "\n\tmessageType:           " + reply.getMessageType()
-                        + "\n\tnonce:                 " + reply.getNonce()
-                        + "\n\tprotocolVersionNumber: " + reply.getProtocolVersionNumber()
-                         );
+                log.debug( "Responding to authentication request with reply:" + "\n\tclient realm:          "
+                    + reply.getClientRealm() + "\n\tserver realm:          " + reply.getServerRealm()
+                    + "\n\tserverPrincipal:       " + reply.getServerPrincipal() + "\n\tclientPrincipal:       "
+                    + reply.getClientPrincipal() + "\n\thostAddresses:         " + reply.getClientAddresses()
+                    + "\n\tstart time:            " + reply.getStartTime() + "\n\tend time:              "
+                    + reply.getEndTime() + "\n\tauth time:             " + reply.getAuthTime()
+                    + "\n\trenew till time:       " + reply.getRenewTill() + "\n\tmessageType:           "
+                    + reply.getMessageType() + "\n\tnonce:                 " + reply.getNonce()
+                    + "\n\tprotocolVersionNumber: " + reply.getProtocolVersionNumber() );
             }
         }
         else
         {
             if ( message instanceof ErrorMessage )
             {
-                ErrorMessage error = (ErrorMessage) message;
-                
+                ErrorMessage error = ( ErrorMessage ) message;
+
                 if ( log.isDebugEnabled() )
                 {
-                    log.debug( "Responding to authentication request with error:"
-                            + "\n\tserverPrincipal:       " + error.getServerPrincipal()
-                            + "\n\tclientPrincipal:       " + error.getClientPrincipal()
-                            + "\n\tserver time:           " + error.getClientTime()
-                            + "\n\tclient time:           " + error.getServerTime()
-                            + "\n\terror code:            " + error.getErrorCode()
-                            + "\n\texplanatory text:      " + error.getExplanatoryText()
-                             );
+                    log.debug( "Responding to authentication request with error:" + "\n\tserverPrincipal:       "
+                        + error.getServerPrincipal() + "\n\tclientPrincipal:       " + error.getClientPrincipal()
+                        + "\n\tserver time:           " + error.getClientTime() + "\n\tclient time:           "
+                        + error.getServerTime() + "\n\terror code:            " + error.getErrorCode()
+                        + "\n\texplanatory text:      " + error.getExplanatoryText() );
                 }
             }
         }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/MonitorRequest.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 import org.apache.kerberos.crypto.encryption.EncryptionType;
@@ -23,39 +24,36 @@
 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
     {
-        KdcContext kdcContext = (KdcContext) context;
+        KdcContext kdcContext = ( KdcContext ) context;
         KdcRequest request = kdcContext.getRequest();
         String clientAddress = kdcContext.getClientAddress().getHostAddress();
 
         if ( log.isDebugEnabled() )
         {
-            log.debug( "Responding to authentication request:"
-                    + "\n\trealm:                 " + request.getRealm()
-                    + "\n\tserverPrincipal:       " + request.getServerPrincipal()
-                    + "\n\tclientPrincipal:       " + request.getClientPrincipal()
-                    + "\n\tclientAddress:         " + clientAddress
-                    + "\n\thostAddresses:         " + request.getAddresses()
-                    + "\n\tencryptionType:        " + getEncryptionTypes( request )
-                    + "\n\tfrom krb time:         " + request.getFrom()
-                    + "\n\trealm krb time:        " + request.getRtime()
-                    + "\n\tkdcOptions:            " + request.getKdcOptions()
-                    + "\n\tmessageType:           " + request.getMessageType()
-                    + "\n\tnonce:                 " + request.getNonce()
-                    + "\n\tprotocolVersionNumber: " + request.getProtocolVersionNumber()
-                    + "\n\ttill:                  " + request.getTill()
-                     );
+            log.debug( "Responding to authentication request:" + "\n\trealm:                 " + request.getRealm()
+                + "\n\tserverPrincipal:       " + request.getServerPrincipal() + "\n\tclientPrincipal:       "
+                + request.getClientPrincipal() + "\n\tclientAddress:         " + clientAddress
+                + "\n\thostAddresses:         " + request.getAddresses() + "\n\tencryptionType:        "
+                + getEncryptionTypes( request ) + "\n\tfrom krb time:         " + request.getFrom()
+                + "\n\trealm krb time:        " + request.getRtime() + "\n\tkdcOptions:            "
+                + request.getKdcOptions() + "\n\tmessageType:           " + request.getMessageType()
+                + "\n\tnonce:                 " + request.getNonce() + "\n\tprotocolVersionNumber: "
+                + request.getProtocolVersionNumber() + "\n\ttill:                  " + request.getTill() );
         }
 
         return CONTINUE_CHAIN;
     }
 
+
     public String getEncryptionTypes( KdcRequest request )
     {
         EncryptionType[] etypes = request.getEType();
@@ -64,7 +62,7 @@
 
         for ( int ii = 0; ii < etypes.length; ii++ )
         {
-            sb.append( etypes[ ii ].toString() );
+            sb.append( etypes[ii].toString() );
 
             if ( ii < etypes.length - 1 )
             {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectChecksumType.java Fri Feb 10 02:48:07 2006
@@ -16,12 +16,14 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 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.exceptions.ErrorType;
 import org.apache.kerberos.exceptions.KerberosException;
 
+
 public class SelectChecksumType extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
@@ -36,15 +38,16 @@
         return CONTINUE_CHAIN;
     }
 
+
     protected boolean isAllowedChecksumType( ChecksumType requestedType, ChecksumType[] configuredTypes )
     {
-            for ( int ii = 0; ii < configuredTypes.length; ii++ )
+        for ( int ii = 0; ii < configuredTypes.length; ii++ )
+        {
+            if ( requestedType == configuredTypes[ii] )
             {
-                if ( requestedType == configuredTypes[ ii ] )
-                {
-                    return true;
-                }
+                return true;
             }
+        }
 
         return false;
     }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/SelectEncryptionType.java Fri Feb 10 02:48:07 2006
@@ -16,17 +16,19 @@
  */
 package org.apache.directory.server.kerberos.kdc;
 
+
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 import org.apache.kerberos.crypto.encryption.EncryptionType;
 import org.apache.kerberos.exceptions.ErrorType;
 import org.apache.kerberos.exceptions.KerberosException;
 
+
 public class SelectEncryptionType extends CommandBase
 {
     public boolean execute( Context context ) throws Exception
     {
-        KdcContext kdcContext = (KdcContext) context;
+        KdcContext kdcContext = ( KdcContext ) context;
         KdcConfiguration config = kdcContext.getConfig();
 
         EncryptionType[] requestedTypes = kdcContext.getRequest().getEType();
@@ -41,16 +43,16 @@
         return CONTINUE_CHAIN;
     }
 
-    protected EncryptionType getBestEncryptionType( EncryptionType[] requestedTypes,
-            EncryptionType[] configuredTypes )
+
+    protected EncryptionType getBestEncryptionType( EncryptionType[] requestedTypes, EncryptionType[] configuredTypes )
     {
         for ( int ii = 0; ii < requestedTypes.length; ii++ )
         {
             for ( int jj = 0; jj < configuredTypes.length; jj++ )
             {
-                if ( requestedTypes[ ii ] == configuredTypes[ jj ] )
+                if ( requestedTypes[ii] == configuredTypes[jj] )
                 {
-                    return configuredTypes[ jj ];
+                    return configuredTypes[jj];
                 }
             }
         }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationContext.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,6 +26,7 @@
 import org.apache.kerberos.replay.ReplayCache;
 import org.apache.kerberos.store.PrincipalStoreEntry;
 
+
 public class AuthenticationContext extends KdcContext
 {
     private static final long serialVersionUID = -2249170923251265359L;
@@ -39,6 +41,7 @@
     private PrincipalStoreEntry clientEntry;
     private PrincipalStoreEntry serverEntry;
 
+
     /**
      * @return Returns the serverEntry.
      */
@@ -47,6 +50,7 @@
         return serverEntry;
     }
 
+
     /**
      * @param serverEntry The serverEntry to set.
      */
@@ -55,6 +59,7 @@
         this.serverEntry = serverEntry;
     }
 
+
     /**
      * @return Returns the clientEntry.
      */
@@ -63,6 +68,7 @@
         return clientEntry;
     }
 
+
     /**
      * @param clientEntry The clientEntry to set.
      */
@@ -71,6 +77,7 @@
         this.clientEntry = clientEntry;
     }
 
+
     /**
      * @return Returns the checksumEngines.
      */
@@ -79,6 +86,7 @@
         return checksumEngines;
     }
 
+
     /**
      * @param checksumEngines The checksumEngines to set.
      */
@@ -87,6 +95,7 @@
         this.checksumEngines = checksumEngines;
     }
 
+
     /**
      * @return Returns the replayCache.
      */
@@ -95,6 +104,7 @@
         return replayCache;
     }
 
+
     /**
      * @param replayCache The replayCache to set.
      */
@@ -103,6 +113,7 @@
         this.replayCache = replayCache;
     }
 
+
     /**
      * @return Returns the clientKey.
      */
@@ -111,6 +122,7 @@
         return clientKey;
     }
 
+
     /**
      * @param clientKey The clientKey to set.
      */
@@ -119,6 +131,7 @@
         this.clientKey = clientKey;
     }
 
+
     /**
      * @return Returns the sessionKey.
      */
@@ -127,6 +140,7 @@
         return sessionKey;
     }
 
+
     /**
      * @param sessionKey The sessionKey to set.
      */
@@ -135,6 +149,7 @@
         this.sessionKey = sessionKey;
     }
 
+
     /**
      * @return Returns the ticket.
      */
@@ -142,6 +157,7 @@
     {
         return ticket;
     }
+
 
     /**
      * @param ticket The ticket to set.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationExceptionHandler.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.kerberos.exceptions.KerberosException;
@@ -24,15 +25,18 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class AuthenticationExceptionHandler extends ErrorMessageHandler
 {
     private static final Logger log = LoggerFactory.getLogger( AuthenticationExceptionHandler.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() );
         }
 
-        AuthenticationContext authContext = (AuthenticationContext) context;
+        AuthenticationContext authContext = ( AuthenticationContext ) context;
         KdcConfiguration config = authContext.getConfig();
-        KerberosException ke = (KerberosException) exception;
+        KerberosException ke = ( KerberosException ) exception;
 
         ErrorMessage errorMessage = getErrorMessage( config.getKdcPrincipal(), ke );
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/AuthenticationServiceChain.java Fri Feb 10 02:48:07 2006
@@ -16,9 +16,11 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import org.apache.directory.server.kerberos.kdc.MonitorRequest;
 import org.apache.directory.server.kerberos.kdc.preauthentication.PreAuthenticationChain;
 import org.apache.directory.server.protocol.shared.chain.impl.ChainBase;
+
 
 public class AuthenticationServiceChain extends ChainBase
 {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/BuildReply.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.impl.CommandBase;
 import org.apache.kerberos.messages.AuthenticationReply;
@@ -24,11 +25,12 @@
 import org.apache.kerberos.messages.value.LastRequest;
 import org.apache.kerberos.messages.value.TicketFlags;
 
+
 public class BuildReply extends CommandBase
 {
     public boolean execute( Context ctx ) throws Exception
     {
-        AuthenticationContext authContext = (AuthenticationContext) ctx;
+        AuthenticationContext authContext = ( AuthenticationContext ) ctx;
         KdcRequest request = authContext.getRequest();
         Ticket ticket = authContext.getTicket();
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/ConfigureAuthenticationChain.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import java.util.Map;
 
 import org.apache.directory.server.protocol.shared.chain.Context;
@@ -29,14 +30,16 @@
 import org.apache.kerberos.replay.ReplayCache;
 import org.apache.kerberos.service.LockBox;
 
+
 public class ConfigureAuthenticationChain extends CommandBase
 {
     private static final ReplayCache replayCache = new InMemoryReplayCache();
     private static final LockBox lockBox = new LockBox();
 
+
     public boolean execute( Context context ) throws Exception
     {
-        AuthenticationContext authContext = (AuthenticationContext) context;
+        AuthenticationContext authContext = ( AuthenticationContext ) context;
 
         authContext.setReplayCache( replayCache );
         authContext.setLockBox( lockBox );

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GenerateTicket.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.kerberos.kdc.KdcConfiguration;
@@ -37,14 +38,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class GenerateTicket extends CommandBase
 {
     /** the log for this class */
     private static final Logger log = LoggerFactory.getLogger( GenerateTicket.class );
-    
-    public boolean execute(Context context) throws Exception
+
+
+    public boolean execute( Context context ) throws Exception
     {
-        AuthenticationContext authContext = (AuthenticationContext) context;
+        AuthenticationContext authContext = ( AuthenticationContext ) context;
 
         KdcRequest request = authContext.getRequest();
         LockBox lockBox = authContext.getLockBox();
@@ -55,82 +58,79 @@
         KdcConfiguration config = authContext.getConfig();
         EncryptionKey sessionKey = authContext.getSessionKey();
 
-        if(request.getKdcOptions().get(KdcOptions.FORWARDABLE))
+        if ( request.getKdcOptions().get( KdcOptions.FORWARDABLE ) )
         {
-            newTicketBody.setFlag(TicketFlags.FORWARDABLE);
+            newTicketBody.setFlag( TicketFlags.FORWARDABLE );
         }
 
-        if(request.getKdcOptions().get(KdcOptions.PROXIABLE))
+        if ( request.getKdcOptions().get( KdcOptions.PROXIABLE ) )
         {
-            newTicketBody.setFlag(TicketFlags.PROXIABLE);
+            newTicketBody.setFlag( TicketFlags.PROXIABLE );
         }
 
-        if(request.getKdcOptions().get(KdcOptions.ALLOW_POSTDATE))
+        if ( request.getKdcOptions().get( KdcOptions.ALLOW_POSTDATE ) )
         {
-            newTicketBody.setFlag(TicketFlags.MAY_POSTDATE);
+            newTicketBody.setFlag( TicketFlags.MAY_POSTDATE );
         }
 
-        if(request.getKdcOptions().get(KdcOptions.RENEW) ||
-                request.getKdcOptions().get(KdcOptions.VALIDATE) ||
-                request.getKdcOptions().get(KdcOptions.PROXY) ||
-                request.getKdcOptions().get(KdcOptions.FORWARDED) ||
-                request.getKdcOptions().get(KdcOptions.ENC_TKT_IN_SKEY))
+        if ( request.getKdcOptions().get( KdcOptions.RENEW ) || request.getKdcOptions().get( KdcOptions.VALIDATE )
+            || request.getKdcOptions().get( KdcOptions.PROXY ) || request.getKdcOptions().get( KdcOptions.FORWARDED )
+            || request.getKdcOptions().get( KdcOptions.ENC_TKT_IN_SKEY ) )
         {
             throw new KerberosException( ErrorType.KDC_ERR_BADOPTION );
         }
 
         newTicketBody.setSessionKey( sessionKey );
-        newTicketBody.setClientPrincipal(request.getClientPrincipal());
-        newTicketBody.setTransitedEncoding(new TransitedEncoding());
+        newTicketBody.setClientPrincipal( request.getClientPrincipal() );
+        newTicketBody.setTransitedEncoding( new TransitedEncoding() );
 
         KerberosTime now = new KerberosTime();
-        newTicketBody.setAuthTime(now);
+        newTicketBody.setAuthTime( now );
 
-        if (request.getKdcOptions().get(KdcOptions.POSTDATED))
+        if ( request.getKdcOptions().get( KdcOptions.POSTDATED ) )
         {
             // TODO - possibly allow req.from range
-            if (!config.isPostdateAllowed())
+            if ( !config.isPostdateAllowed() )
                 throw new KerberosException( ErrorType.KDC_ERR_POLICY );
-            newTicketBody.setFlag(TicketFlags.INVALID);
-            newTicketBody.setStartTime(request.getFrom());
+            newTicketBody.setFlag( TicketFlags.INVALID );
+            newTicketBody.setStartTime( request.getFrom() );
         }
 
         long till = 0;
-        if (request.getTill().getTime() == 0)
-                till = Long.MAX_VALUE;
+        if ( request.getTill().getTime() == 0 )
+            till = Long.MAX_VALUE;
         else
-                till = request.getTill().getTime();
+            till = request.getTill().getTime();
         /*
-        new_tkt.endtime := min(till,
-                              new_tkt.starttime+client.max_life,
-                              new_tkt.starttime+server.max_life,
-                              new_tkt.starttime+max_life_for_realm);
-        */
-        long endTime = Math.min(now.getTime() + config.getMaximumTicketLifetime(), till);
-        KerberosTime kerberosEndTime = new KerberosTime(endTime);
-        newTicketBody.setEndTime(kerberosEndTime);
+         new_tkt.endtime := min(till,
+         new_tkt.starttime+client.max_life,
+         new_tkt.starttime+server.max_life,
+         new_tkt.starttime+max_life_for_realm);
+         */
+        long endTime = Math.min( now.getTime() + config.getMaximumTicketLifetime(), till );
+        KerberosTime kerberosEndTime = new KerberosTime( endTime );
+        newTicketBody.setEndTime( kerberosEndTime );
 
         long tempRtime = 0;
-        if (request.getKdcOptions().get(KdcOptions.RENEWABLE_OK) &&
-                request.getTill().greaterThan(kerberosEndTime))
+        if ( request.getKdcOptions().get( KdcOptions.RENEWABLE_OK ) && request.getTill().greaterThan( kerberosEndTime ) )
         {
-            request.getKdcOptions().set(KdcOptions.RENEWABLE);
+            request.getKdcOptions().set( KdcOptions.RENEWABLE );
             tempRtime = request.getTill().getTime();
         }
 
         /*
-        if (req.kdc-options.RENEWABLE is set) then
-                set new_tkt.flags.RENEWABLE;
-                new_tkt.renew-till := min(rtime,
-                new_tkt.starttime+client.max_rlife,
-                new_tkt.starttime+server.max_rlife,
-                new_tkt.starttime+max_rlife_for_realm);
-        else
-                omit new_tkt.renew-till;
-        endif
-        */
+         if (req.kdc-options.RENEWABLE is set) then
+         set new_tkt.flags.RENEWABLE;
+         new_tkt.renew-till := min(rtime,
+         new_tkt.starttime+client.max_rlife,
+         new_tkt.starttime+server.max_rlife,
+         new_tkt.starttime+max_rlife_for_realm);
+         else
+         omit new_tkt.renew-till;
+         endif
+         */
 
-        if (tempRtime == 0)
+        if ( tempRtime == 0 )
         {
             tempRtime = Long.MAX_VALUE;
         }
@@ -153,22 +153,21 @@
                 fromTime = new KerberosTime();
             }
 
-            long renewTill = Math.min( fromTime.getTime()
-                    + config.getMaximumRenewableLifetime(), tempRtime );
+            long renewTill = Math.min( fromTime.getTime() + config.getMaximumRenewableLifetime(), tempRtime );
             newTicketBody.setRenewTill( new KerberosTime( renewTill ) );
         }
 
-        if (request.getAddresses() != null)
+        if ( request.getAddresses() != null )
         {
-            newTicketBody.setClientAddresses(request.getAddresses());
+            newTicketBody.setClientAddresses( request.getAddresses() );
         }
 
         EncTicketPart ticketPart = newTicketBody.getEncTicketPart();
 
         EncryptedData encryptedData = lockBox.seal( serverKey, ticketPart );
 
-        Ticket newTicket = new Ticket(ticketPrincipal, encryptedData);
-        newTicket.setEncTicketPart(ticketPart);
+        Ticket newTicket = new Ticket( ticketPrincipal, encryptedData );
+        newTicket.setEncTicketPart( ticketPart );
 
         if ( log.isDebugEnabled() )
         {
@@ -176,7 +175,7 @@
         }
 
         authContext.setTicket( newTicket );
-        
+
         return CONTINUE_CHAIN;
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetClientEntry.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.protocol.shared.chain.Context;
@@ -23,17 +24,18 @@
 import org.apache.kerberos.service.GetPrincipalStoreEntry;
 import org.apache.kerberos.store.PrincipalStore;
 
+
 public class GetClientEntry extends GetPrincipalStoreEntry
 {
-    public boolean execute(Context context) throws Exception
+    public boolean execute( Context context ) throws Exception
     {
-        AuthenticationContext authContext = (AuthenticationContext) context;
-        
+        AuthenticationContext authContext = ( AuthenticationContext ) context;
+
         KerberosPrincipal principal = authContext.getRequest().getClientPrincipal();
         PrincipalStore store = authContext.getStore();
 
         authContext.setClientEntry( getEntry( principal, store, ErrorType.KDC_ERR_C_PRINCIPAL_UNKNOWN ) );
-        
+
         return CONTINUE_CHAIN;
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/authentication/GetServerEntry.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.kerberos.kdc.authentication;
 
+
 import javax.security.auth.kerberos.KerberosPrincipal;
 
 import org.apache.directory.server.protocol.shared.chain.Context;
@@ -23,17 +24,18 @@
 import org.apache.kerberos.service.GetPrincipalStoreEntry;
 import org.apache.kerberos.store.PrincipalStore;
 
+
 public class GetServerEntry extends GetPrincipalStoreEntry
 {
-    public boolean execute(Context context) throws Exception
+    public boolean execute( Context context ) throws Exception
     {
-        AuthenticationContext authContext = (AuthenticationContext) context;
-        
+        AuthenticationContext authContext = ( AuthenticationContext ) context;
+
         KerberosPrincipal principal = authContext.getRequest().getServerPrincipal();
         PrincipalStore store = authContext.getStore();
-        
+
         authContext.setServerEntry( getEntry( principal, store, ErrorType.KDC_ERR_S_PRINCIPAL_UNKNOWN ) );
-        
+
         return CONTINUE_CHAIN;
     }
 }



Mime
View raw message