directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r376623 [35/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-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/messages/StratumType.java Fri Feb 10 02:48:07 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.ntp.messages;
 
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+
 /**
  * Stratum: This is a eight-bit unsigned integer indicating the stratum
  * level of the local clock, with values defined as follows:
@@ -34,55 +36,61 @@
  */
 public final class StratumType implements Comparable
 {
-	/**
-	 * Enumeration elements are constructed once upon class loading.
-	 * Order of appearance here determines the order of compareTo.
-	 */
-	public static final StratumType UNSPECIFIED         = new StratumType(0, "Unspecified or unavailable.");
-	public static final StratumType PRIMARY_REFERENCE   = new StratumType(1, "Primary reference.");
-	public static final StratumType SECONDARY_REFERENCE = new StratumType(2, "Secondary reference.");
+    /**
+     * Enumeration elements are constructed once upon class loading.
+     * Order of appearance here determines the order of compareTo.
+     */
+    public static final StratumType UNSPECIFIED = new StratumType( 0, "Unspecified or unavailable." );
+    public static final StratumType PRIMARY_REFERENCE = new StratumType( 1, "Primary reference." );
+    public static final StratumType SECONDARY_REFERENCE = new StratumType( 2, "Secondary reference." );
 
     /**
      * These two lines are all that's necessary to export a List of VALUES.
      */
-    private static final StratumType[] values = { UNSPECIFIED, PRIMARY_REFERENCE, SECONDARY_REFERENCE };
+    private static final StratumType[] values =
+        { UNSPECIFIED, PRIMARY_REFERENCE, SECONDARY_REFERENCE };
     // VALUES needs to be located here, otherwise illegal forward reference
     public static final List VALUES = Collections.unmodifiableList( Arrays.asList( values ) );
 
     private final int ordinal;
     private final String name;
 
+
     /**
      * Private constructor prevents construction outside of this class.
      */
-    private StratumType( int ordinal, String name )
+    private StratumType(int ordinal, String name)
     {
         this.ordinal = ordinal;
         this.name = name;
     }
 
+
     public static StratumType getTypeByOrdinal( int type )
     {
         for ( int ii = 0; ii < values.length; ii++ )
         {
-            if ( values[ ii ].ordinal == type )
+            if ( values[ii].ordinal == type )
             {
-                return values[ ii ];
+                return values[ii];
             }
         }
 
         return UNSPECIFIED;
     }
 
+
     public int getOrdinal()
     {
         return ordinal;
     }
 
+
     public int compareTo( Object that )
     {
-        return ordinal - ( (StratumType) that ).ordinal;
+        return ordinal - ( ( StratumType ) that ).ordinal;
     }
+
 
     public String toString()
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpDecoder.java Fri Feb 10 02:48:07 2006
@@ -17,12 +17,14 @@
 
 package org.apache.directory.server.ntp.protocol;
 
+
 import org.apache.directory.server.ntp.io.NtpMessageDecoder;
 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 NtpDecoder implements ProtocolDecoder
 {
     public void decode( IoSession session, ByteBuffer in, ProtocolDecoderOutput out )
@@ -30,6 +32,7 @@
         NtpMessageDecoder decoder = new NtpMessageDecoder();
         out.write( decoder.decode( in.buf() ) );
     }
+
 
     public void dispose( IoSession arg0 ) throws Exception
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpEncoder.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.ntp.protocol;
 
+
 import org.apache.directory.server.ntp.io.NtpMessageEncoder;
 import org.apache.directory.server.ntp.messages.NtpMessage;
 import org.apache.mina.common.ByteBuffer;
@@ -24,6 +25,7 @@
 import org.apache.mina.filter.codec.ProtocolEncoder;
 import org.apache.mina.filter.codec.ProtocolEncoderOutput;
 
+
 public class NtpEncoder implements ProtocolEncoder
 {
     public void encode( IoSession session, Object message, ProtocolEncoderOutput out )
@@ -31,12 +33,13 @@
         NtpMessageEncoder encoder = new NtpMessageEncoder();
 
         ByteBuffer buf = ByteBuffer.allocate( 1024 );
-        encoder.encode( buf.buf(), (NtpMessage) message );
+        encoder.encode( buf.buf(), ( NtpMessage ) message );
 
         buf.flip();
 
         out.write( buf );
     }
+
 
     public void dispose( IoSession arg0 ) throws Exception
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolCodecFactory.java Fri Feb 10 02:48:07 2006
@@ -17,28 +17,34 @@
 
 package org.apache.directory.server.ntp.protocol;
 
+
 import org.apache.mina.filter.codec.ProtocolCodecFactory;
 import org.apache.mina.filter.codec.ProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolEncoder;
 
+
 public class NtpProtocolCodecFactory implements ProtocolCodecFactory
 {
     private static final NtpProtocolCodecFactory INSTANCE = new NtpProtocolCodecFactory();
 
+
     public static NtpProtocolCodecFactory getInstance()
     {
         return INSTANCE;
     }
 
+
     private NtpProtocolCodecFactory()
     {
     }
 
+
     public ProtocolEncoder getEncoder()
     {
         // Create a new encoder.
         return new NtpEncoder();
     }
+
 
     public ProtocolDecoder getDecoder()
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/protocol/NtpProtocolHandler.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.ntp.protocol;
 
+
 import org.apache.directory.server.ntp.NtpService;
 import org.apache.directory.server.ntp.messages.NtpMessage;
 import org.apache.directory.server.ntp.service.NtpServiceImpl;
@@ -27,6 +28,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 public class NtpProtocolHandler implements IoHandler
 {
     /** the log for this class */
@@ -34,6 +36,7 @@
 
     private NtpService ntpService = new NtpServiceImpl();
 
+
     public void sessionCreated( IoSession session ) throws Exception
     {
         if ( log.isDebugEnabled() )
@@ -44,6 +47,7 @@
         session.getFilterChain().addFirst( "codec", new ProtocolCodecFilter( NtpProtocolCodecFactory.getInstance() ) );
     }
 
+
     public void sessionOpened( IoSession session )
     {
         if ( log.isDebugEnabled() )
@@ -52,6 +56,7 @@
         }
     }
 
+
     public void sessionClosed( IoSession session )
     {
         if ( log.isDebugEnabled() )
@@ -60,6 +65,7 @@
         }
     }
 
+
     public void sessionIdle( IoSession session, IdleStatus status )
     {
         if ( log.isDebugEnabled() )
@@ -68,12 +74,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() )
@@ -81,10 +89,11 @@
             log.debug( session.getRemoteAddress() + " RCVD: " + message );
         }
 
-        NtpMessage reply = ntpService.getReplyFor( (NtpMessage) message );
+        NtpMessage reply = ntpService.getReplyFor( ( NtpMessage ) message );
 
         session.write( reply );
     }
+
 
     public void messageSent( IoSession session, Object message )
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-ntp/src/main/java/org/apache/directory/server/ntp/service/NtpServiceImpl.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.ntp.service;
 
+
 import org.apache.directory.server.ntp.NtpService;
 import org.apache.directory.server.ntp.messages.LeapIndicatorType;
 import org.apache.directory.server.ntp.messages.ModeType;
@@ -26,6 +27,7 @@
 import org.apache.directory.server.ntp.messages.ReferenceIdentifier;
 import org.apache.directory.server.ntp.messages.StratumType;
 
+
 public class NtpServiceImpl implements NtpService
 {
     public NtpMessage getReplyFor( NtpMessage request )
@@ -36,8 +38,8 @@
         modifier.setVersionNumber( 4 );
         modifier.setMode( ModeType.SERVER );
         modifier.setStratum( StratumType.PRIMARY_REFERENCE );
-        modifier.setPollInterval( (byte) 0x04 );
-        modifier.setPrecision( (byte) 0xFA );
+        modifier.setPollInterval( ( byte ) 0x04 );
+        modifier.setPrecision( ( byte ) 0xFA );
         modifier.setRootDelay( 0 );
         modifier.setRootDispersion( 0 );
         modifier.setReferenceIdentifier( ReferenceIdentifier.LOCL );

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/AbstractBackingStoreTest.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.protocol.shared;
 
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -63,6 +64,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * Base class for testing protocol providers against the JNDI provider.
  *
@@ -83,6 +85,7 @@
     protected CoreContextFactory factory;
     protected Hashtable env;
 
+
     protected void setUp() throws Exception
     {
         env = new Hashtable( setUpPartition() );
@@ -96,13 +99,15 @@
         factory = new CoreContextFactory();
     }
 
+
     protected void loadPartition( String partition, String ldifFile ) throws NamingException
     {
         env.put( Context.PROVIDER_URL, partition );
-        DirContext ctx = (DirContext) factory.getInitialContext( env );
+        DirContext ctx = ( DirContext ) factory.getInitialContext( env );
         load( ctx, ldifFile );
     }
 
+
     /**
      * Test that the system partition was set up properly.
      *
@@ -111,27 +116,30 @@
     protected void doTestSystemPartition() throws Exception
     {
         env.put( Context.PROVIDER_URL, "ou=system" );
-        DirContext ctx = (DirContext) factory.getInitialContext( env );
+        DirContext ctx = ( DirContext ) factory.getInitialContext( env );
         Attributes attributes = ctx.getAttributes( "cn=A,dc=www,dc=apache,dc=org,ou=Zones" );
         assertEquals( 3, attributes.size() );
     }
 
+
     protected void doTestApacheZone() throws Exception
     {
         env.put( Context.PROVIDER_URL, "dc=apache,dc=org" );
-        DirContext ctx = (DirContext) factory.getInitialContext( env );
+        DirContext ctx = ( DirContext ) factory.getInitialContext( env );
         Attributes attributes = ctx.getAttributes( "cn=A,dc=www,dc=apache,dc=org,ou=Zones" );
         assertEquals( 3, attributes.size() );
     }
 
+
     protected void doTestExampleZone() throws Exception
     {
         env.put( Context.PROVIDER_URL, "dc=example,dc=com" );
-        DirContext ctx = (DirContext) factory.getInitialContext( env );
+        DirContext ctx = ( DirContext ) factory.getInitialContext( env );
         Attributes attributes = ctx.getAttributes( "cn=A,dc=www,dc=example,dc=com,ou=Zones" );
         assertEquals( 3, attributes.size() );
     }
 
+
     protected Hashtable setUpPartition()
     {
         config = new MutableStartupConfiguration();
@@ -155,6 +163,7 @@
         return config.toJndiEnvironment();
     }
 
+
     private DirectoryPartitionConfiguration getExamplePartition()
     {
         MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
@@ -181,6 +190,7 @@
         return partConfig;
     }
 
+
     private DirectoryPartitionConfiguration getApachePartition()
     {
         MutableDirectoryPartitionConfiguration partConfig = new MutableDirectoryPartitionConfiguration();
@@ -207,6 +217,7 @@
         return partConfig;
     }
 
+
     /**
      * Shuts down the backing store, optionally deleting the database directory.
      *
@@ -230,6 +241,7 @@
         doDelete( config.getWorkingDirectory() );
     }
 
+
     /**
      * Deletes the working directory.
      */
@@ -249,6 +261,7 @@
         }
     }
 
+
     private void recursiveRemoveDir( File directory )
     {
         String[] filelist = directory.list();
@@ -256,7 +269,7 @@
 
         for ( int ii = 0; ii < filelist.length; ii++ )
         {
-            tmpFile = new File( directory.getAbsolutePath(), filelist[ ii ] );
+            tmpFile = new File( directory.getAbsolutePath(), filelist[ii] );
             if ( tmpFile.isDirectory() )
             {
                 recursiveRemoveDir( tmpFile );
@@ -273,6 +286,7 @@
         directory.delete();
     }
 
+
     /**
      * Opens the LDIF file and loads the entries into the context.
      */
@@ -290,17 +304,17 @@
 
             while ( iterator.hasNext() )
             {
-                String ldif = (String) iterator.next();
+                String ldif = ( String ) iterator.next();
 
                 Attributes attributes = new LockableAttributesImpl();
                 ldifParser.parse( attributes, ldif );
 
-                String dn = (String) attributes.remove( "dn" ).get();
+                String dn = ( String ) attributes.remove( "dn" ).get();
 
                 if ( attributes.get( "objectClass" ).contains( "krb5KDCEntry" ) )
                 {
-                    String pw = (String) attributes.get( "userpassword" ).get();
-                    String krbPrincipal = (String) attributes.get( KerberosAttribute.PRINCIPAL ).get();
+                    String pw = ( String ) attributes.get( "userpassword" ).get();
+                    String krbPrincipal = ( String ) attributes.get( KerberosAttribute.PRINCIPAL ).get();
 
                     KerberosPrincipal principal = new KerberosPrincipal( krbPrincipal );
                     KerberosKey key = new KerberosKey( principal, pw.toCharArray(), "DES" );
@@ -354,13 +368,13 @@
 
             while ( iterator.hasNext() )
             {
-                String ldif = (String) iterator.next();
+                String ldif = ( String ) iterator.next();
 
                 Attributes attributes = new LockableAttributesImpl();
 
                 ldifParser.parse( attributes, ldif );
 
-                String dn = (String) attributes.remove( "dn" ).get();
+                String dn = ( String ) attributes.remove( "dn" ).get();
 
                 rdn = getRelativeName( ctx.getNameInNamespace(), dn );
 
@@ -393,6 +407,7 @@
         }
     }
 
+
     /**
      * Tries to find an LDIF file either on the file system or packaged within a jar.
      *
@@ -425,6 +440,7 @@
         return in;
     }
 
+
     protected Name getRelativeName( String nameInNamespace, String baseDn ) throws NamingException
     {
         Properties props = new Properties();
@@ -451,6 +467,7 @@
         return searchBaseDn;
     }
 
+
     /*
      * escape LDAP filter characters as \HH (hex value).
      */
@@ -481,6 +498,7 @@
         return escapedBuf.toString();
     }
 
+
     protected void printAttr( Attributes attrs, String id )
     {
         if ( attrs == null || id == null )
@@ -492,7 +510,7 @@
         try
         {
             Attribute attr;
-            String a = ( attr = attrs.get( id ) ) != null ? (String) attr.get() : null;
+            String a = ( attr = attrs.get( id ) ) != null ? ( String ) attr.get() : null;
             System.out.println( attr.getID() + ":\t" + a );
         }
         catch ( NamingException e )
@@ -501,6 +519,7 @@
         }
     }
 
+
     protected void printAttrs( Attributes attrs )
     {
         if ( attrs == null )
@@ -513,7 +532,7 @@
         {
             for ( NamingEnumeration ae = attrs.getAll(); ae.hasMore(); )
             {
-                final Attribute attr = (Attribute) ae.next();
+                final Attribute attr = ( Attribute ) ae.next();
 
                 for ( NamingEnumeration e = attr.getAll(); e.hasMore(); )
                 {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LdapLoader.java Fri Feb 10 02:48:07 2006
@@ -17,7 +17,9 @@
 
 package org.apache.directory.server.protocol.shared;
 
+
 import java.util.Map;
+
 
 /**
  * Load strategy for configuration properties coming from LDAP.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/LoadStrategy.java Fri Feb 10 02:48:07 2006
@@ -17,8 +17,10 @@
 
 package org.apache.directory.server.protocol.shared;
 
+
 import java.util.Map;
 
+
 /**
  * Load strategy interface for configuration properties.
  *
@@ -29,6 +31,7 @@
 {
     public static final int LDAP = 1;
     public static final int PROPS = 2;
+
 
     public Map load( String prefix, Map properties );
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/MapAdapter.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.protocol.shared;
 
+
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Dictionary;
@@ -28,6 +29,7 @@
 import java.util.Map;
 import java.util.Set;
 
+
 /**
  * Adapter to add the Map interface to Dictionary's.  Many of the OSGi interfaces use
  * Dictionary's for legacy reasons, but the Dictionary is obsolete.
@@ -39,11 +41,13 @@
 {
     private Dictionary dictionary;
 
-    public MapAdapter( Dictionary dictionary )
+
+    public MapAdapter(Dictionary dictionary)
     {
         this.dictionary = dictionary;
     }
 
+
     /**
      * @see java.util.Map#clear()
      */
@@ -52,6 +56,7 @@
         dictionary = new Hashtable();
     }
 
+
     /**
      * @see java.util.Map#containsKey(java.lang.Object)
      */
@@ -60,6 +65,7 @@
         return Collections.list( dictionary.keys() ).contains( key );
     }
 
+
     /**
      * @see java.util.Map#containsValue(java.lang.Object)
      */
@@ -68,6 +74,7 @@
         return Collections.list( dictionary.elements() ).contains( value );
     }
 
+
     /**
      * @see java.util.Map#entrySet()
      */
@@ -87,6 +94,7 @@
         return map.entrySet();
     }
 
+
     /**
      * @see java.util.Map#get(java.lang.Object)
      */
@@ -95,6 +103,7 @@
         return dictionary.get( key );
     }
 
+
     /**
      * @see java.util.Map#isEmpty()
      */
@@ -103,6 +112,7 @@
         return dictionary.isEmpty();
     }
 
+
     /**
      * @see java.util.Map#keySet()
      */
@@ -111,6 +121,7 @@
         return new HashSet( Collections.list( dictionary.keys() ) );
     }
 
+
     /**
      * @see java.util.Map#put(java.lang.Object, java.lang.Object)
      */
@@ -119,6 +130,7 @@
         return dictionary.put( arg0, arg1 );
     }
 
+
     /**
      * @see java.util.Map#putAll(java.util.Map)
      */
@@ -128,11 +140,12 @@
 
         while ( it.hasNext() )
         {
-            Map.Entry entry = (Map.Entry) it.next();
+            Map.Entry entry = ( Map.Entry ) it.next();
             dictionary.put( entry.getKey(), entry.getValue() );
         }
     }
 
+
     /**
      * @see java.util.Map#remove(java.lang.Object)
      */
@@ -141,6 +154,7 @@
         return dictionary.remove( key );
     }
 
+
     /**
      * @see java.util.Map#size()
      */
@@ -148,6 +162,7 @@
     {
         return dictionary.size();
     }
+
 
     /**
      * @see java.util.Map#values()

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/PropsLoader.java Fri Feb 10 02:48:07 2006
@@ -17,10 +17,12 @@
 
 package org.apache.directory.server.protocol.shared;
 
+
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+
 /**
  * Load strategy for configuration properties coming from a properties file.
  *
@@ -37,11 +39,11 @@
 
         while ( it.hasNext() )
         {
-            String key = (String) it.next();
+            String key = ( String ) it.next();
 
             if ( properties.get( key ) instanceof String )
             {
-                String value = (String) properties.get( key );
+                String value = ( String ) properties.get( key );
 
                 if ( key.startsWith( prefix ) )
                 {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/ServiceConfiguration.java Fri Feb 10 02:48:07 2006
@@ -17,12 +17,14 @@
 
 package org.apache.directory.server.protocol.shared;
 
+
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
 
 import org.apache.directory.server.core.configuration.Configuration;
 
+
 /**
  * Base class shared by all protocol providers for configuration.
  *
@@ -73,6 +75,7 @@
     /** the map of configuration */
     protected Map configuration = new HashMap();
 
+
     public String getCatalogBaseDn()
     {
         String key = CATALOG_BASEDN_KEY;
@@ -85,6 +88,7 @@
         return null;
     }
 
+
     public String getEntryBaseDn()
     {
         String key = ENTRY_BASEDN_KEY;
@@ -97,6 +101,7 @@
         return DEFAULT_ENTRY_BASEDN;
     }
 
+
     public String getInitialContextFactory()
     {
         String key = INITIAL_CONTEXT_FACTORY_KEY;
@@ -109,6 +114,7 @@
         return DEFAULT_INITIAL_CONTEXT_FACTORY;
     }
 
+
     public Hashtable toJndiEnvironment()
     {
         Hashtable env = new Hashtable();
@@ -118,6 +124,7 @@
         return env;
     }
 
+
     protected void loadProperties( String prefix, Map properties, int strategy )
     {
         LoadStrategy loader;
@@ -136,8 +143,9 @@
         configuration.putAll( loader.load( prefix, properties ) );
     }
 
+
     protected String get( String key )
     {
-        return (String) configuration.get( key );
+        return ( String ) configuration.get( key );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/Catalog.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.protocol.shared.catalog;
 
+
 /**
  * The interface for resolving search-base DN's from zone or realm names.
  *

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/catalog/GetCatalog.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.protocol.shared.catalog;
 
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -30,6 +31,7 @@
 
 import org.apache.directory.server.protocol.shared.store.ContextOperation;
 
+
 /**
  * A JNDI context operation for building a catalog.
  *
@@ -43,6 +45,7 @@
     private static final String ENTRY_NAME = "apacheCatalogEntryName";
     private static final String ENTRY_BASEDN = "apacheCatalogEntryBaseDn";
 
+
     /**
      * Note that the base is relative to the existing context.
      */
@@ -59,13 +62,13 @@
 
         while ( list.hasMore() )
         {
-            SearchResult result = (SearchResult) list.next();
+            SearchResult result = ( SearchResult ) list.next();
 
             Attributes attrs = result.getAttributes();
             Attribute attr;
 
-            String name = ( attr = attrs.get( ENTRY_NAME ) ) != null ? (String) attr.get() : null;
-            String basedn = ( attr = attrs.get( ENTRY_BASEDN ) ) != null ? (String) attr.get() : null;
+            String name = ( attr = attrs.get( ENTRY_NAME ) ) != null ? ( String ) attr.get() : null;
+            String basedn = ( attr = attrs.get( ENTRY_BASEDN ) ) != null ? ( String ) attr.get() : null;
 
             catalog.put( name, basedn );
         }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Chain.java Fri Feb 10 02:48:07 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server.protocol.shared.chain;
 
+
 /**
  * <p>A {@link Chain} represents a configured list of
  * {@link Command}s that will be executed in order to perform processing
@@ -65,6 +66,7 @@
      *  been executed at least once, so no further configuration is allowed
      */
     void addCommand( Command command );
+
 
     /**
      * <p>Execute the processing represented by this {@link Chain} according

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Command.java Fri Feb 10 02:48:07 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server.protocol.shared.chain;
 
+
 /**
  * <p>A {@link Command} encapsulates a unit of processing work to be
  * performed, whose purpose is to examine and/or modify the state of a

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Context.java Fri Feb 10 02:48:07 2006
@@ -15,7 +15,9 @@
  */
 package org.apache.directory.server.protocol.shared.chain;
 
+
 import java.util.Map;
+
 
 /**
  * <p>A {@link Context} represents the state information that is

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/Filter.java Fri Feb 10 02:48:07 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server.protocol.shared.chain;
 
+
 /**
  * <p>A {@link Filter} is a specialized {@link Command} that also expects
  * the {@link Chain} that is executing it to call the

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ChainBase.java Fri Feb 10 02:48:07 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server.protocol.shared.chain.impl;
 
+
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -23,6 +24,7 @@
 import org.apache.directory.server.protocol.shared.chain.Context;
 import org.apache.directory.server.protocol.shared.chain.Filter;
 
+
 /**
  * <p>Convenience base class for {@link Chain} implementations.</p>
  *
@@ -41,6 +43,7 @@
 
     }
 
+
     /**
      * <p>Construct a {@link Chain} configured with the specified
      * {@link Command}.</p>
@@ -50,11 +53,12 @@
      * @exception IllegalArgumentException if <code>command</code>
      *  is <code>null</code>
      */
-    public ChainBase( Command command )
+    public ChainBase(Command command)
     {
         addCommand( command );
     }
 
+
     /**
      * <p>Construct a {@link Chain} configured with the specified
      * {@link Command}s.</p>
@@ -65,7 +69,7 @@
      *  or one of the individual {@link Command} elements,
      *  is <code>null</code>
      */
-    public ChainBase( Command[] commands )
+    public ChainBase(Command[] commands)
     {
         if ( commands == null )
         {
@@ -74,10 +78,11 @@
 
         for ( int i = 0; i < commands.length; i++ )
         {
-            addCommand( commands[ i ] );
+            addCommand( commands[i] );
         }
     }
 
+
     /**
      * <p>Construct a {@link Chain} configured with the specified
      * {@link Command}s.</p>
@@ -88,7 +93,7 @@
      *  or one of the individual {@link Command} elements,
      *  is <code>null</code>
      */
-    public ChainBase( Collection commands )
+    public ChainBase(Collection commands)
     {
         if ( commands == null )
         {
@@ -98,7 +103,7 @@
         Iterator elements = commands.iterator();
         while ( elements.hasNext() )
         {
-            addCommand( (Command) elements.next() );
+            addCommand( ( Command ) elements.next() );
         }
     }
 
@@ -109,7 +114,7 @@
      * the order in which they may delegate processing to the remainder of
      * the {@link Chain}.</p>
      */
-    protected Command[] commands = new Command[ 0 ];
+    protected Command[] commands = new Command[0];
 
     /**
      * <p>Flag indicating whether the configuration of our commands list
@@ -117,6 +122,7 @@
      */
     protected boolean frozen = false;
 
+
     // ---------------------------------------------------------- Chain Methods
 
     // Documented in Chain interface
@@ -132,12 +138,13 @@
             throw new IllegalStateException();
         }
 
-        Command[] results = new Command[ commands.length + 1 ];
+        Command[] results = new Command[commands.length + 1];
         System.arraycopy( commands, 0, results, 0, commands.length );
-        results[ commands.length ] = command;
+        results[commands.length] = command;
         commands = results;
     }
 
+
     // Documented in Chain interface
     public boolean execute( Context context ) throws Exception
     {
@@ -161,7 +168,7 @@
         {
             try
             {
-                saveResult = commands[ i ].execute( context );
+                saveResult = commands[i].execute( context );
                 if ( saveResult )
                 {
                     break;
@@ -183,11 +190,11 @@
         boolean result = false;
         for ( int j = i; j >= 0; j-- )
         {
-            if ( commands[ j ] instanceof Filter )
+            if ( commands[j] instanceof Filter )
             {
                 try
                 {
-                    result = ( (Filter) commands[ j ] ).postprocess( context, saveException );
+                    result = ( ( Filter ) commands[j] ).postprocess( context, saveException );
                     if ( result )
                     {
                         handled = true;
@@ -210,6 +217,7 @@
             return ( saveResult );
         }
     }
+
 
     // -------------------------------------------------------- Package Methods
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/CommandBase.java Fri Feb 10 02:48:07 2006
@@ -16,7 +16,9 @@
  */
 package org.apache.directory.server.protocol.shared.chain.impl;
 
+
 import org.apache.directory.server.protocol.shared.chain.Command;
+
 
 /**
  * <p>Convenience base class for {@link Command} implementations.</p>

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/chain/impl/ContextBase.java Fri Feb 10 02:48:07 2006
@@ -15,6 +15,7 @@
  */
 package org.apache.directory.server.protocol.shared.chain.impl;
 
+
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
@@ -29,6 +30,7 @@
 
 import org.apache.directory.server.protocol.shared.chain.Context;
 
+
 /**
  * <p>Convenience base class for {@link Context} implementations.</p>
  *
@@ -52,6 +54,7 @@
 
     private static final long serialVersionUID = 5536081240350960868L;
 
+
     /**
      * Default, no argument constructor.
      */
@@ -61,6 +64,7 @@
         initialize();
     }
 
+
     /**
      * <p>Initialize the contents of this {@link Context} by copying the
      * values from the specified <code>Map</code>.  Any keys in <code>map</code>
@@ -74,7 +78,7 @@
      * @exception UnsupportedOperationException if a local property does not
      *  have a write method.
      */
-    public ContextBase( Map map )
+    public ContextBase(Map map)
     {
         super( map );
         initialize();
@@ -118,7 +122,8 @@
      * <p>Zero-length array of parameter values for calling property getters.
      * </p>
      */
-    private static Object[] zeroParams = new Object[ 0 ];
+    private static Object[] zeroParams = new Object[0];
+
 
     // ------------------------------------------------------------- Map Methods
 
@@ -146,6 +151,7 @@
         }
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to return
      * <code>true</code> if the specified value is present in either the
@@ -162,18 +168,17 @@
             return ( super.containsValue( value ) );
         }
         // Case 2 -- value found in the underlying Map
-        else
-            if ( super.containsValue( value ) )
-            {
-                return ( true );
-            }
+        else if ( super.containsValue( value ) )
+        {
+            return ( true );
+        }
 
         // Case 3 -- check the values of our readable properties
         for ( int i = 0; i < pd.length; i++ )
         {
-            if ( pd[ i ].getReadMethod() != null )
+            if ( pd[i].getReadMethod() != null )
             {
-                Object prop = readProperty( pd[ i ] );
+                Object prop = readProperty( pd[i] );
                 if ( value == null )
                 {
                     if ( prop == null )
@@ -181,17 +186,17 @@
                         return ( true );
                     }
                 }
-                else
-                    if ( value.equals( prop ) )
-                    {
-                        return ( true );
-                    }
+                else if ( value.equals( prop ) )
+                {
+                    return ( true );
+                }
             }
         }
 
         return ( false );
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to return a
      * <code>Set</code> that meets the specified default behavior except
@@ -204,6 +209,7 @@
         return ( new EntrySetImpl() );
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to return the value
      * of a local property if the specified key matches a local property name.
@@ -232,7 +238,7 @@
         // Case 2 -- this is a local property
         if ( key != null )
         {
-            PropertyDescriptor descriptor = (PropertyDescriptor) descriptors.get( key );
+            PropertyDescriptor descriptor = ( PropertyDescriptor ) descriptors.get( key );
             if ( descriptor != null )
             {
                 if ( descriptor.getReadMethod() != null )
@@ -250,6 +256,7 @@
         return ( super.get( key ) );
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to return
      * <code>true</code> if the underlying <code>Map</code> only contains
@@ -268,6 +275,7 @@
 
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to return a
      * <code>Set</code> that meets the specified default behavior except
@@ -280,6 +288,7 @@
         return ( super.keySet() );
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to set the value
      * of a local property if the specified key matches a local property name.
@@ -304,7 +313,7 @@
         // Case 2 -- this is a local property
         if ( key != null )
         {
-            PropertyDescriptor descriptor = (PropertyDescriptor) descriptors.get( key );
+            PropertyDescriptor descriptor = ( PropertyDescriptor ) descriptors.get( key );
             if ( descriptor != null )
             {
                 Object previous = null;
@@ -321,6 +330,7 @@
         return ( super.put( key, value ) );
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to call the
      * <code>put()</code> method individually for each key-value pair
@@ -339,11 +349,12 @@
         Iterator pairs = map.entrySet().iterator();
         while ( pairs.hasNext() )
         {
-            Map.Entry pair = (Map.Entry) pairs.next();
+            Map.Entry pair = ( Map.Entry ) pairs.next();
             put( pair.getKey(), pair.getValue() );
         }
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to throw
      * <code>UnsupportedOperationException</code> on any attempt to
@@ -365,7 +376,7 @@
         // Case 2 -- this is a local property
         if ( key != null )
         {
-            PropertyDescriptor descriptor = (PropertyDescriptor) descriptors.get( key );
+            PropertyDescriptor descriptor = ( PropertyDescriptor ) descriptors.get( key );
             if ( descriptor != null )
             {
                 throw new UnsupportedOperationException( "Local property '" + key + "' cannot be removed" );
@@ -376,6 +387,7 @@
         return ( super.remove( key ) );
     }
 
+
     /**
      * <p>Override the default <code>Map</code> behavior to return a
      * <code>Collection</code> that meets the specified default behavior except
@@ -388,6 +400,7 @@
         return ( new ValuesImpl() );
     }
 
+
     // --------------------------------------------------------- Private Methods
 
     /**
@@ -404,7 +417,7 @@
         int j = -1;
         for ( int i = 0; i < pd.length; i++ )
         {
-            if ( name.equals( pd[ i ].getName() ) )
+            if ( name.equals( pd[i].getName() ) )
             {
                 j = i;
                 break;
@@ -416,12 +429,13 @@
             throw new IllegalArgumentException( "Property '" + name + "' is not present" );
         }
 
-        PropertyDescriptor[] results = new PropertyDescriptor[ pd.length - 1 ];
+        PropertyDescriptor[] results = new PropertyDescriptor[pd.length - 1];
         System.arraycopy( pd, 0, results, 0, j );
         System.arraycopy( pd, j + 1, results, j, pd.length - ( j + 1 ) );
         pd = results;
     }
 
+
     /**
      * <p>Return an <code>Iterator</code> over the set of <code>Map.Entry</code>
      * objects representing our key-value pairs.</p>
@@ -431,6 +445,7 @@
         return ( new EntrySetIterator() );
     }
 
+
     /**
      * <p>Return a <code>Map.Entry</code> for the specified key value, if it
      * is present; otherwise, return <code>null</code>.</p>
@@ -449,6 +464,7 @@
         }
     }
 
+
     /**
      * <p>Customize the contents of our underlying <code>Map</code> so that
      * it contains keys corresponding to all of the JavaBeans properties of
@@ -469,7 +485,7 @@
         }
         catch ( IntrospectionException e )
         {
-            pd = new PropertyDescriptor[ 0 ]; // Should never happen
+            pd = new PropertyDescriptor[0]; // Should never happen
         }
         eliminate( "class" ); // Because of "getClass()"
         eliminate( "empty" ); // Because of "isEmpty()"
@@ -480,13 +496,14 @@
             descriptors = new HashMap();
             for ( int i = 0; i < pd.length; i++ )
             {
-                descriptors.put( pd[ i ].getName(), pd[ i ] );
-                super.put( pd[ i ].getName(), singleton );
+                descriptors.put( pd[i].getName(), pd[i] );
+                super.put( pd[i].getName(), singleton );
             }
         }
 
     }
 
+
     /**
      * <p>Get and return the value for the specified property.</p>
      *
@@ -512,10 +529,11 @@
         catch ( Exception e )
         {
             throw new UnsupportedOperationException( "Exception reading property '" + descriptor.getName() + "': "
-                    + e.getMessage() );
+                + e.getMessage() );
         }
     }
 
+
     /**
      * <p>Remove the specified key-value pair, if it exists, and return
      * <code>true</code>.  If this pair does not exist, return
@@ -533,18 +551,18 @@
         {
             return ( false );
         }
+        else if ( !entry.equals( actual ) )
+        {
+            return ( false );
+        }
         else
-            if ( !entry.equals( actual ) )
-            {
-                return ( false );
-            }
-            else
-            {
-                remove( entry.getKey() );
-                return ( true );
-            }
+        {
+            remove( entry.getKey() );
+            return ( true );
+        }
     }
 
+
     /**
      * <p>Return an <code>Iterator</code> over the set of values in this
      * <code>Map</code>.</p>
@@ -554,6 +572,7 @@
         return ( new ValuesIterator() );
     }
 
+
     /**
      * <p>Set the value for the specified property.</p>
      *
@@ -576,12 +595,13 @@
             {
                 throw new UnsupportedOperationException( "Property '" + descriptor.getName() + "' is not writeable" );
             }
-            method.invoke( this, new Object[] { value } );
+            method.invoke( this, new Object[]
+                { value } );
         }
         catch ( Exception e )
         {
             throw new UnsupportedOperationException( "Exception writing property '" + descriptor.getName() + "': "
-                    + e.getMessage() );
+                + e.getMessage() );
         }
     }
 
@@ -598,13 +618,14 @@
             ContextBase.this.clear();
         }
 
+
         public boolean contains( Object obj )
         {
             if ( !( obj instanceof Map.Entry ) )
             {
                 return ( false );
             }
-            Map.Entry entry = (Map.Entry) obj;
+            Map.Entry entry = ( Map.Entry ) obj;
             Entry actual = ContextBase.this.entry( entry.getKey() );
             if ( actual != null )
             {
@@ -616,21 +637,24 @@
             }
         }
 
+
         public boolean isEmpty()
         {
             return ( ContextBase.this.isEmpty() );
         }
 
+
         public Iterator iterator()
         {
             return ( ContextBase.this.entriesIterator() );
         }
 
+
         public boolean remove( Object obj )
         {
             if ( obj instanceof Map.Entry )
             {
-                return ( ContextBase.this.remove( (Map.Entry) obj ) );
+                return ( ContextBase.this.remove( ( Map.Entry ) obj ) );
             }
             else
             {
@@ -638,6 +662,7 @@
             }
         }
 
+
         public int size()
         {
             return ( ContextBase.this.size() );
@@ -653,17 +678,20 @@
         Map.Entry entry = null;
         private Iterator keys = ContextBase.this.keySet().iterator();
 
+
         public boolean hasNext()
         {
             return ( keys.hasNext() );
         }
 
+
         public Object next()
         {
             entry = ContextBase.this.entry( keys.next() );
             return ( entry );
         }
 
+
         public void remove()
         {
             ContextBase.this.remove( entry );
@@ -677,7 +705,7 @@
      */
     private class MapEntryImpl implements Map.Entry
     {
-        MapEntryImpl( Object key, Object value )
+        MapEntryImpl(Object key, Object value)
         {
             this.key = key;
             this.value = value;
@@ -686,18 +714,18 @@
         private Object key;
         private Object value;
 
+
         public boolean equals( Object obj )
         {
             if ( obj == null )
             {
                 return ( false );
             }
-            else
-                if ( !( obj instanceof Map.Entry ) )
-                {
-                    return ( false );
-                }
-            Map.Entry entry = (Map.Entry) obj;
+            else if ( !( obj instanceof Map.Entry ) )
+            {
+                return ( false );
+            }
+            Map.Entry entry = ( Map.Entry ) obj;
             if ( key == null )
             {
                 return ( entry.getKey() == null );
@@ -719,21 +747,25 @@
             }
         }
 
+
         public Object getKey()
         {
             return ( this.key );
         }
 
+
         public Object getValue()
         {
             return ( this.value );
         }
 
+
         public int hashCode()
         {
             return ( ( ( key == null ) ? 0 : key.hashCode() ) ^ ( ( value == null ) ? 0 : value.hashCode() ) );
         }
 
+
         public Object setValue( Object value )
         {
             Object previous = this.value;
@@ -754,31 +786,35 @@
             ContextBase.this.clear();
         }
 
+
         public boolean contains( Object obj )
         {
             if ( !( obj instanceof Map.Entry ) )
             {
                 return ( false );
             }
-            Map.Entry entry = (Map.Entry) obj;
+            Map.Entry entry = ( Map.Entry ) obj;
             return ( ContextBase.this.containsValue( entry.getValue() ) );
         }
 
+
         public boolean isEmpty()
         {
             return ( ContextBase.this.isEmpty() );
         }
 
+
         public Iterator iterator()
         {
             return ( ContextBase.this.valuesIterator() );
         }
 
+
         public boolean remove( Object obj )
         {
             if ( obj instanceof Map.Entry )
             {
-                return ( ContextBase.this.remove( (Map.Entry) obj ) );
+                return ( ContextBase.this.remove( ( Map.Entry ) obj ) );
             }
             else
             {
@@ -786,6 +822,7 @@
             }
         }
 
+
         public int size()
         {
             return ( ContextBase.this.size() );
@@ -801,16 +838,19 @@
         Map.Entry entry = null;
         private Iterator keys = ContextBase.this.keySet().iterator();
 
+
         public boolean hasNext()
         {
             return ( keys.hasNext() );
         }
 
+
         public Object next()
         {
             entry = ContextBase.this.entry( keys.next() );
             return ( entry.getValue() );
         }
+
 
         public void remove()
         {

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/ContextOperation.java Fri Feb 10 02:48:07 2006
@@ -16,10 +16,12 @@
  */
 package org.apache.directory.server.protocol.shared.store;
 
+
 import java.io.Serializable;
 
 import javax.naming.Name;
 import javax.naming.directory.DirContext;
+
 
 /**
  * Interface to support the command pattern with JNDI contexts.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/KerberosAttribute.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.protocol.shared.store;
 
+
 public class KerberosAttribute
 {
     // ------------------------------------------------------------------------
@@ -23,13 +24,13 @@
     // ------------------------------------------------------------------------
 
     /** the krb5kdc schema key for a krb5KDCEntry */
-    public static final String KEY       = "krb5Key";
+    public static final String KEY = "krb5Key";
     /** the krb5kdc schema key encryption type for a krb5KDCEntry */
-    public static final String TYPE      = "krb5EncryptionType";
+    public static final String TYPE = "krb5EncryptionType";
     /** the krb5kdc schema principal name for a krb5KDCEntry */
     public static final String PRINCIPAL = "krb5PrincipalName";
     /** the krb5kdc schema key version identifier for a krb5KDCEntry */
-    public static final String VERSION   = "krb5KeyVersionNumber";
+    public static final String VERSION = "krb5KeyVersionNumber";
     /** the Apache specific SAM type attribute */
-    public static final String SAM_TYPE  = "apacheSamType";
+    public static final String SAM_TYPE = "apacheSamType";
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/Krb5KdcEntryFilter.java Fri Feb 10 02:48:07 2006
@@ -20,7 +20,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class Krb5KdcEntryFilter implements  LdifLoadFilter
+public class Krb5KdcEntryFilter implements LdifLoadFilter
 {
     private static final Logger log = LoggerFactory.getLogger( Krb5KdcEntryFilter.class );
     private static final String KEY_TYPE = "DES";

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/main/java/org/apache/directory/server/protocol/shared/store/LdifFileLoader.java Fri Feb 10 02:48:07 2006
@@ -16,6 +16,7 @@
  */
 package org.apache.directory.server.protocol.shared.store;
 
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -37,6 +38,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * Support for commands to load an LDIF file into a DirContext.
  *
@@ -59,23 +61,26 @@
     /** the total count of entries loaded */
     private int count;
 
+
     /**
      * Creates the LDIF file loader command.
      *
      * @param ctx the context to load the entries into.
      * @param ldif the file of LDIF entries to load.
      */
-    public LdifFileLoader( DirContext ctx, String ldif )
+    public LdifFileLoader(DirContext ctx, String ldif)
     {
         this( ctx, new File( ldif ), null );
     }
 
-    public LdifFileLoader( DirContext ctx, File ldif, List filters )
+
+    public LdifFileLoader(DirContext ctx, File ldif, List filters)
     {
         this( ctx, ldif, filters, null );
     }
 
-    public LdifFileLoader( DirContext ctx, File ldif, List filters, ClassLoader loader )
+
+    public LdifFileLoader(DirContext ctx, File ldif, List filters, ClassLoader loader)
     {
         this.ctx = ctx;
         this.ldif = ldif;
@@ -91,6 +96,7 @@
         }
     }
 
+
     /**
      * Applies filters making sure failures in one filter do not effect another.
      *
@@ -112,7 +118,7 @@
         {
             try
             {
-                accept &= ( (LdifLoadFilter) filters.get( ii ) ).filter( ldif, dn, entry, ctx );
+                accept &= ( ( LdifLoadFilter ) filters.get( ii ) ).filter( ldif, dn, entry, ctx );
             }
             catch ( NamingException e )
             {
@@ -128,6 +134,7 @@
         return true;
     }
 
+
     /**
      * Opens the LDIF file and loads the entries into the context.
      */
@@ -144,10 +151,10 @@
 
             while ( iterator.hasNext() )
             {
-                String ldif = (String) iterator.next();
+                String ldif = ( String ) iterator.next();
                 Attributes attributes = new LockableAttributesImpl();
                 ldifParser.parse( attributes, ldif );
-                String dn = (String) attributes.remove( "dn" ).get();
+                String dn = ( String ) attributes.remove( "dn" ).get();
 
                 boolean filterAccepted = applyFilters( dn, attributes );
 
@@ -197,6 +204,7 @@
         return count;
     }
 
+
     private Name getRelativeName( DirContext ctx, String baseDn ) throws NamingException
     {
         Properties props = new Properties();
@@ -229,6 +237,7 @@
 
         return searchBaseDn;
     }
+
 
     /**
      * Tries to find an LDIF file either on the file system or packaged within a jar.

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/catalog/CatalogTest.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.protocol.shared.catalog;
 
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -32,6 +33,7 @@
 
 import org.apache.directory.server.protocol.shared.AbstractBackingStoreTest;
 
+
 public class CatalogTest extends AbstractBackingStoreTest
 {
     /**
@@ -44,17 +46,19 @@
         loadPartition( "ou=system", "configuration-dns.ldif" );
     }
 
+
     public void testListCatalogEntries() throws Exception
     {
         String baseDn = "cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system";
 
         env.put( Context.PROVIDER_URL, baseDn );
-        DirContext ctx = (DirContext) factory.getInitialContext( env );
+        DirContext ctx = ( DirContext ) factory.getInitialContext( env );
 
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
 
-        String[] returningAttributes = new String[] { "apacheCatalogEntryBaseDn", "apacheCatalogEntryName" };
+        String[] returningAttributes = new String[]
+            { "apacheCatalogEntryBaseDn", "apacheCatalogEntryName" };
         controls.setReturningAttributes( returningAttributes );
 
         Set set = new HashSet();
@@ -64,16 +68,16 @@
 
         while ( list.hasMore() )
         {
-            SearchResult result = (SearchResult) list.next();
+            SearchResult result = ( SearchResult ) list.next();
             set.add( result.getName() );
 
             Attributes attrs = result.getAttributes();
             Attribute attr;
 
-            String catalogEntryBaseDn = ( attr = attrs.get( "apacheCatalogEntryBaseDn" ) ) != null ? (String) attr
-                    .get() : null;
-            String catalogEntryName = ( attr = attrs.get( "apacheCatalogEntryName" ) ) != null ? (String) attr.get()
-                    : null;
+            String catalogEntryBaseDn = ( attr = attrs.get( "apacheCatalogEntryBaseDn" ) ) != null ? ( String ) attr
+                .get() : null;
+            String catalogEntryName = ( attr = attrs.get( "apacheCatalogEntryName" ) ) != null ? ( String ) attr.get()
+                : null;
             map.put( catalogEntryName, catalogEntryBaseDn );
 
             assertTrue( catalogEntryBaseDn.equals( "ou=zones,dc=example,dc=com" ) );
@@ -81,6 +85,6 @@
         }
 
         assertTrue( set
-                .contains( "cn=example.com,ou=catalog,cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system" ) );
+            .contains( "cn=example.com,ou=catalog,cn=org.apache.dns.1,cn=dns,ou=services,ou=configuration,ou=system" ) );
     }
 }

Modified: directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/protocol-shared/src/test/java/org/apache/directory/server/protocol/shared/kerberos/KerberosTest.java Fri Feb 10 02:48:07 2006
@@ -17,6 +17,7 @@
 
 package org.apache.directory.server.protocol.shared.kerberos;
 
+
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -27,6 +28,7 @@
 
 import org.apache.directory.server.protocol.shared.AbstractBackingStoreTest;
 
+
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
@@ -44,6 +46,7 @@
         loadPartition( "dc=example,dc=com", "kerberos-example.ldif" );
     }
 
+
     /**
      * Makes sure the context has the right attributes and values.
      *
@@ -52,7 +55,7 @@
     public void testContext() throws Exception
     {
         env.put( Context.PROVIDER_URL, "dc=example,dc=com" );
-        DirContext ctx = (DirContext) factory.getInitialContext( env );
+        DirContext ctx = ( DirContext ) factory.getInitialContext( env );
 
         Attributes matchAttrs = new BasicAttributes( true );
         matchAttrs.put( new BasicAttribute( "krb5PrincipalName", "kadmin/changepw@EXAMPLE.COM" ) );
@@ -60,7 +63,7 @@
         Attributes attributes = ctx.getAttributes( "ou=users" );
         System.out.println( attributes );
         assertNotNull( attributes );
-        assertTrue( "users".equalsIgnoreCase( (String) attributes.get( "ou" ).get() ) );
+        assertTrue( "users".equalsIgnoreCase( ( String ) attributes.get( "ou" ).get() ) );
 
         Attribute attribute = attributes.get( "objectClass" );
 

Modified: directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/MutableServerStartupConfiguration.java Fri Feb 10 02:48:07 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.configuration;
 
+
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
@@ -25,126 +26,149 @@
 
 import org.apache.mina.registry.ServiceRegistry;
 
+
 /**
  * A mutable version of {@link ServerStartupConfiguration}.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class MutableServerStartupConfiguration extends
-        ServerStartupConfiguration
+public class MutableServerStartupConfiguration extends ServerStartupConfiguration
 {
     private static final long serialVersionUID = 515104910980600099L;
 
+
     public MutableServerStartupConfiguration()
     {
         super();
     }
 
+
     public void setAccessControlEnabled( boolean accessControlEnabled )
     {
         super.setAccessControlEnabled( accessControlEnabled );
     }
 
+
     public void setAllowAnonymousAccess( boolean arg0 )
     {
         super.setAllowAnonymousAccess( arg0 );
     }
 
+
     public void setAuthenticatorConfigurations( Set arg0 )
     {
         super.setAuthenticatorConfigurations( arg0 );
     }
 
+
     public void setBootstrapSchemas( Set arg0 )
     {
         super.setBootstrapSchemas( arg0 );
     }
 
+
     public void setContextPartitionConfigurations( Set arg0 )
     {
         super.setContextPartitionConfigurations( arg0 );
     }
 
+
     public void setInterceptorConfigurations( List arg0 )
     {
         super.setInterceptorConfigurations( arg0 );
     }
 
+
     public void setTestEntries( List arg0 )
     {
         super.setTestEntries( arg0 );
     }
 
+
     public void setWorkingDirectory( File arg0 )
     {
         super.setWorkingDirectory( arg0 );
     }
 
+
     public void setEnableKerberos( boolean enableKerberos )
     {
         super.setEnableKerberos( enableKerberos );
     }
 
+
     public void setEnableChangePassword( boolean enableChangePassword )
     {
         super.setEnableChangePassword( enableChangePassword );
     }
 
+
     public void setEnableNtp( boolean enableNtp )
     {
         super.setEnableNtp( enableNtp );
     }
 
+
     public void setLdapPort( int ldapPort )
     {
         super.setLdapPort( ldapPort );
     }
 
+
     public void setLdapsPort( int ldapsPort )
     {
         super.setLdapsPort( ldapsPort );
     }
 
+
     public void setMinaServiceRegistry( ServiceRegistry minaServiceRegistry )
     {
         super.setMinaServiceRegistry( minaServiceRegistry );
     }
 
+
     public void setExtendedOperationHandlers( Collection handlers )
     {
         super.setExtendedOperationHandlers( handlers );
     }
 
+
     public void setLdifDirectory( File ldifDirectory )
     {
         super.setLdifDirectory( ldifDirectory );
     }
 
+
     public void setLdifFilters( List ldifFilters )
     {
         super.setLdifFilters( ldifFilters );
     }
 
+
     public void setEnableLdaps( boolean enableLdaps )
     {
         super.setEnableLdaps( enableLdaps );
     }
 
+
     public void setLdapsCertificateFile( File ldapsCertificateFile )
     {
         super.setLdapsCertificateFile( ldapsCertificateFile );
     }
 
+
     public void setLdapsCertificatePassword( String ldapsCertificatePassword )
     {
         super.setLdapsCertificatePassword( ldapsCertificatePassword );
     }
-    
+
+
     public void setShutdownHookEnabled( boolean shutdownHookEnabled )
     {
         super.setShutdownHookEnabled( shutdownHookEnabled );
     }
+
 
     public void setExitVmOnShutdown( boolean exitVmOnShutdown )
     {

Modified: directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java?rev=376623&r1=376622&r2=376623&view=diff
==============================================================================
--- directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java (original)
+++ directory/sandbox/akarasulu/rc1/apacheds/server-jndi/src/main/java/org/apache/directory/server/configuration/ServerStartupConfiguration.java Fri Feb 10 02:48:07 2006
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.configuration;
 
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -47,10 +48,8 @@
     private ServiceRegistry minaServiceRegistry = new SimpleServiceRegistry();
     private int ldapPort = 389;
     private int ldapsPort = 636;
-    private File ldapsCertificateFile = new File(
-            this.getWorkingDirectory().getPath() + File.separator +
-            "certificates" + File.separator +
-            "server.cert" );
+    private File ldapsCertificateFile = new File( this.getWorkingDirectory().getPath() + File.separator
+        + "certificates" + File.separator + "server.cert" );
     private String ldapsCertificatePassword = "changeit";
     private boolean enableLdaps = false;
     private boolean enableKerberos = false;
@@ -60,10 +59,12 @@
     private File ldifDirectory = null;
     private final List ldifFilters = new ArrayList();
 
+
     protected ServerStartupConfiguration()
     {
     }
 
+
     /**
      * Returns <tt>true</tt> if networking (LDAP, LDAPS, and Kerberos) is enabled.
      */
@@ -72,6 +73,7 @@
         return enableNetworking;
     }
 
+
     /**
      * Sets whether to enable networking (LDAP, LDAPS, and Kerberos) or not.
      */
@@ -80,6 +82,7 @@
         this.enableNetworking = enableNetworking;
     }
 
+
     /**
      * Returns <tt>true</tt> if Kerberos support is enabled.
      */
@@ -88,6 +91,7 @@
         return enableKerberos;
     }
 
+
     /**
      * Returns <tt>true</tt> if Change Password support is enabled.
      */
@@ -96,6 +100,7 @@
         return enableChangePassword;
     }
 
+
     /**
      * Returns <tt>true</tt> if Kerberos support is enabled.
      */
@@ -104,6 +109,7 @@
         return enableNtp;
     }
 
+
     /**
      * Sets whether to enable Kerberos support or not.
      */
@@ -112,6 +118,7 @@
         this.enableKerberos = enableKerberos;
     }
 
+
     /**
      * Sets whether to enable Change Password support or not.
      */
@@ -120,6 +127,7 @@
         this.enableChangePassword = enableChangePassword;
     }
 
+
     /**
      * Sets whether to enable Ntp support or not.
      */
@@ -128,6 +136,7 @@
         this.enableNtp = enableNtp;
     }
 
+
     /**
      * Returns LDAP TCP/IP port number to listen to.
      */
@@ -136,6 +145,7 @@
         return ldapPort;
     }
 
+
     /**
      * Sets LDAP TCP/IP port number to listen to.
      */
@@ -145,6 +155,7 @@
         this.ldapPort = ldapPort;
     }
 
+
     /**
      * Returns LDAPS TCP/IP port number to listen to.
      */
@@ -153,6 +164,7 @@
         return ldapsPort;
     }
 
+
     /**
      * Sets LDAPS TCP/IP port number to listen to.
      */
@@ -161,7 +173,8 @@
         ConfigurationUtil.validatePortNumber( ldapsPort );
         this.ldapsPort = ldapsPort;
     }
-    
+
+
     /**
      * Returns <tt>true</tt> if LDAPS is enabled.
      */
@@ -170,6 +183,7 @@
         return enableLdaps;
     }
 
+
     /**
      * Sets if LDAPS is enabled or not.
      */
@@ -177,7 +191,8 @@
     {
         this.enableLdaps = enableLdaps;
     }
-    
+
+
     /**
      * Returns the path of the X509 (or JKS) certificate file for LDAPS.
      * The default value is <tt>"&lt;WORKDIR&gt;/certificates/server.cert"</tt>. 
@@ -187,20 +202,22 @@
     {
         return ldapsCertificateFile;
     }
-    
+
+
     /**
      * Sets the path of the SunX509 certificate file (either PKCS12 or JKS format)
      * for LDAPS.
      */
     protected void setLdapsCertificateFile( File ldapsCertificateFile )
     {
-        if( ldapsCertificateFile == null )
+        if ( ldapsCertificateFile == null )
         {
             throw new ConfigurationException( "LdapsCertificateFile cannot be null." );
         }
         this.ldapsCertificateFile = ldapsCertificateFile;
     }
-    
+
+
     /**
      * Returns the password which is used to load the the SunX509 certificate file
      * (either PKCS12 or JKS format).
@@ -212,19 +229,21 @@
     {
         return ldapsCertificatePassword;
     }
-    
+
+
     /**
      * Sets the password which is used to load the LDAPS certificate file.
      */
     protected void setLdapsCertificatePassword( String ldapsCertificatePassword )
     {
-        if( ldapsCertificatePassword == null )
+        if ( ldapsCertificatePassword == null )
         {
             throw new ConfigurationException( "LdapsCertificatePassword cannot be null." );
         }
         this.ldapsCertificatePassword = ldapsCertificatePassword;
     }
 
+
     /**
      * Returns <a href="http://directory.apache.org/subprojects/network/">MINA</a>
      * {@link ServiceRegistry} that will be used by ApacheDS.
@@ -234,32 +253,35 @@
         return minaServiceRegistry;
     }
 
+
     /**
      * Sets <a href="http://directory.apache.org/subprojects/network/">MINA</a>
      * {@link ServiceRegistry} that will be used by ApacheDS.
      */
     protected void setMinaServiceRegistry( ServiceRegistry minaServiceRegistry )
     {
-        if( minaServiceRegistry == null )
+        if ( minaServiceRegistry == null )
         {
             throw new ConfigurationException( "MinaServiceRegistry cannot be null" );
         }
         this.minaServiceRegistry = minaServiceRegistry;
     }
 
+
     public Collection getExtendedOperationHandlers()
     {
         return new ArrayList( extendedOperationHandlers );
     }
 
+
     protected void setExtendedOperationHandlers( Collection handlers )
     {
-        for( Iterator i = handlers.iterator(); i.hasNext(); )
+        for ( Iterator i = handlers.iterator(); i.hasNext(); )
         {
-            if( !( i.next() instanceof ExtendedOperationHandler ) )
+            if ( !( i.next() instanceof ExtendedOperationHandler ) )
             {
                 throw new IllegalArgumentException(
-                        "The specified handler collection contains an element which is not an ExtendedOperationHandler." );
+                    "The specified handler collection contains an element which is not an ExtendedOperationHandler." );
             }
         }
 
@@ -267,29 +289,33 @@
         this.extendedOperationHandlers.addAll( handlers );
     }
 
+
     public File getLdifDirectory()
     {
         return this.ldifDirectory;
     }
 
+
     protected void setLdifDirectory( File ldifDirectory )
     {
         this.ldifDirectory = ldifDirectory;
     }
 
+
     public List getLdifFilters()
     {
         return new ArrayList( ldifFilters );
     }
 
+
     protected void setLdifFilters( List filters )
     {
-        for( int ii = 0; ii < filters.size(); ii++ )
+        for ( int ii = 0; ii < filters.size(); ii++ )
         {
-            if( !( filters.get( ii ) instanceof LdifLoadFilter ) )
+            if ( !( filters.get( ii ) instanceof LdifLoadFilter ) )
             {
                 throw new IllegalArgumentException(
-                        "The specified filter collection contains an element which is not an LdifLoadFilter." );
+                    "The specified filter collection contains an element which is not an LdifLoadFilter." );
             }
         }
 



Mime
View raw message