directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1235306 [1/3] - in /directory/apacheds/trunk/interceptors: changelog/src/main/java/org/apache/directory/server/core/changelog/ changelog/src/test/java/org/apache/directory/server/core/changelog/ collective/src/main/java/org/apache/director...
Date Tue, 24 Jan 2012 15:43:21 GMT
Author: elecharny
Date: Tue Jan 24 15:43:19 2012
New Revision: 1235306

URL: http://svn.apache.org/viewvc?rev=1235306&view=rev
Log:
Formatted the code using Directory formatter

Modified:
    directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
    directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
    directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
    directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/package-info.java
    directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
    directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java
    directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
    directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/CryptPasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Md5PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha256PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha384PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha512PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/ShaPasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Smd5PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha256PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha384PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha512PasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/SshaPasswordHashingInterceptor.java
    directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java
    directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java
    directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
    directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
    directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
    directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
    directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java
    directory/apacheds/trunk/interceptors/normalization/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
    directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
    directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/AttributesFactory.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
    directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/package-info.java
    directory/apacheds/trunk/interceptors/schema/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/apacheds/trunk/interceptors/subtree/src/main/java/org/apache/directory/server/core/subtree/SubentryInterceptor.java
    directory/apacheds/trunk/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/apacheds/trunk/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/apacheds/trunk/interceptors/subtree/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/AbstractStoredProcedureParameterInjector.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/AddStoredProcedureParameterInjector.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/DeleteStoredProcedureParameterInjector.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyDNStoredProcedureParameterInjector.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/ModifyStoredProcedureParameterInjector.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/SimpleTriggerExecutionAuthorizer.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/StoredProcedureParameterInjector.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerInterceptor.java
    directory/apacheds/trunk/interceptors/trigger/src/main/java/org/apache/directory/server/core/trigger/TriggerSpecCache.java

Modified: directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/ChangeLogInterceptor.java Tue Jan 24 15:43:19 2012
@@ -84,7 +84,7 @@ public class ChangeLogInterceptor extend
         super( InterceptorEnum.CHANGE_LOG_INTERCEPTOR );
     }
 
-    
+
     // -----------------------------------------------------------------------
     // Overridden init() and destroy() methods
     // -----------------------------------------------------------------------
@@ -120,7 +120,7 @@ public class ChangeLogInterceptor extend
         Entry addEntry = addContext.getEntry();
 
         // we don't want to record addition of a tag as a change
-        if( addEntry.get( REV_AT_OID ) != null )
+        if ( addEntry.get( REV_AT_OID ) != null )
         {
             return;
         }
@@ -129,10 +129,10 @@ public class ChangeLogInterceptor extend
         forward.setChangeType( ChangeType.Add );
         forward.setDn( addContext.getDn() );
 
-        for ( Attribute attribute:addEntry.getAttributes() )
+        for ( Attribute attribute : addEntry.getAttributes() )
         {
             AttributeType attributeType = attribute.getAttributeType();
-            forward.addAttribute( addEntry.get( attributeType).clone() );
+            forward.addAttribute( addEntry.get( attributeType ).clone() );
         }
 
         LdifEntry reverse = LdifRevertor.reverseAdd( addContext.getDn() );
@@ -166,7 +166,7 @@ public class ChangeLogInterceptor extend
         }
 
         // we don't want to record deleting a tag as a change
-        if( serverEntry.get( REV_AT_OID ) != null )
+        if ( serverEntry.get( REV_AT_OID ) != null )
         {
             return;
         }
@@ -223,9 +223,8 @@ public class ChangeLogInterceptor extend
 
         // @TODO: needs big consideration!!!
         // NOTE: perhaps we need to log this as a system operation that cannot and should not be reapplied?
-        if (
-            isDelete ||
-            ! changeLog.isEnabled() ||
+        if ( isDelete ||
+            !changeLog.isEnabled() ||
 
             // if there are no modifications due to stripping out bogus non-
             // existing attributes then we will have no modification items and
@@ -257,7 +256,7 @@ public class ChangeLogInterceptor extend
 
         Entry clientEntry = new DefaultEntry( serverEntry.getDn() );
 
-        for ( Attribute attribute:serverEntry )
+        for ( Attribute attribute : serverEntry )
         {
             clientEntry.add( attribute.clone() );
         }
@@ -288,7 +287,7 @@ public class ChangeLogInterceptor extend
         forward.setDn( moveContext.getDn() );
         forward.setNewSuperior( moveContext.getNewSuperior().getName() );
 
-        LdifEntry reverse = LdifRevertor.reverseMove(moveContext.getNewSuperior(), moveContext.getDn());
+        LdifEntry reverse = LdifRevertor.reverseMove( moveContext.getNewSuperior(), moveContext.getDn() );
         moveContext.setChangeLogEvent( changeLog.log( getPrincipal( moveContext ), forward, reverse ) );
     }
 
@@ -330,7 +329,8 @@ public class ChangeLogInterceptor extend
             reversedEntry.addControl( new ManageDsaITImpl() );
         }
 
-        moveAndRenameContext.setChangeLogEvent( changeLog.log( getPrincipal( moveAndRenameContext ), forward, reverses ) );
+        moveAndRenameContext
+            .setChangeLogEvent( changeLog.log( getPrincipal( moveAndRenameContext ), forward, reverses ) );
     }
 
 
@@ -343,7 +343,7 @@ public class ChangeLogInterceptor extend
 
         if ( renameContext.getEntry() != null )
         {
-            serverEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
+            serverEntry = ( ( ClonedServerEntry ) renameContext.getEntry() ).getOriginalEntry();
         }
 
         next( renameContext );
@@ -391,7 +391,7 @@ public class ChangeLogInterceptor extend
             CoreSession session = opContext.getSession();
             LookupOperationContext lookupContext = new LookupOperationContext( session, dn );
             lookupContext.setAttrsId( SchemaConstants.ALL_ATTRIBUTES_ARRAY );
-            serverEntry = directoryService.getPartitionNexus().lookup( lookupContext  );
+            serverEntry = directoryService.getPartitionNexus().lookup( lookupContext );
         }
 
         return serverEntry;

Modified: directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/DefaultChangeLog.java Tue Jan 24 15:43:19 2012
@@ -62,17 +62,17 @@ public class DefaultChangeLog implements
     /** The class logger */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultChangeLog.class );
 
-    /** Tells if the service is activated or not */ 
+    /** Tells if the service is activated or not */
     private boolean enabled;
-    
+
     /** The latest tag set */
     private Tag latest;
-    
+
     /** 
      * The default store is a InMemory store.
      **/
     private ChangeLogStore store;
-    
+
     /** A volatile flag used to avoid store switching when in use */
     private volatile boolean storeInitialized = false;
 
@@ -89,7 +89,7 @@ public class DefaultChangeLog implements
     private String revContainerName = DEFAULT_REV_CONTAINER_NAME;
     private String tagContainerName = DEFAULT_TAG_CONTAINER_NAME;
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -122,7 +122,7 @@ public class DefaultChangeLog implements
      */
     public long getCurrentRevision() throws LdapException
     {
-        synchronized( store )
+        synchronized ( store )
         {
             return store.getCurrentRevision();
         }
@@ -142,7 +142,7 @@ public class DefaultChangeLog implements
         try
         {
             ChangeLogEvent event = store.log( principal, forward, reverse );
-            
+
             return event;
         }
         catch ( Exception e )
@@ -155,7 +155,8 @@ public class DefaultChangeLog implements
     /**
      * {@inheritDoc}
      */
-    public ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, List<LdifEntry> reverses ) throws LdapException
+    public ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, List<LdifEntry> reverses )
+        throws LdapException
     {
         if ( !enabled )
         {
@@ -328,22 +329,22 @@ public class DefaultChangeLog implements
                 // If no store has been defined, create an In Memory store
                 store = new MemoryChangeLogStore();
             }
-            
+
             store.init( service );
 
             if ( exposed && isTagSearchSupported() )
             {
                 TaggableSearchableChangeLogStore tmp = ( TaggableSearchableChangeLogStore ) store;
-                
+
                 tmp.createPartition( partitionSuffix, revContainerName, tagContainerName );
-                
+
                 Partition partition = tmp.getPartition();
-                partition.initialize( );
+                partition.initialize();
 
                 service.addPartition( partition );
             }
         }
-        
+
         // Flip the protection flag
         storeInitialized = true;
     }
@@ -370,7 +371,7 @@ public class DefaultChangeLog implements
         {
             store.destroy();
         }
-        
+
         storeInitialized = false;
     }
 
@@ -419,17 +420,17 @@ public class DefaultChangeLog implements
         this.tagContainerName = tagContainerName;
     }
 
-    
+
     /**
      * @see Object#toString()
      */
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
-        
+
         sb.append( "ChangeLog tag[" ).append( latest ).append( "]\n" );
         sb.append( "    store : \n" ).append( store );
-        
+
         return sb.toString();
     }
 }

Modified: directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/MemoryChangeLogStore.java Tue Jan 24 15:43:19 2012
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.changelog;
 
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
@@ -56,23 +57,23 @@ import org.apache.directory.shared.util.
  */
 public class MemoryChangeLogStore implements TaggableChangeLogStore
 {
-    
+
     private static final String REV_FILE = "revision";
     private static final String TAG_FILE = "tags";
     private static final String CHANGELOG_FILE = "changelog.dat";
 
     /** An incremental number giving the current revision */
     private long currentRevision;
-    
+
     /** The latest tag */
     private Tag latest;
-    
+
     /** A Map of tags and revisions */
-    private final Map<Long,Tag> tags = new HashMap<Long,Tag>( 100 );
-    
+    private final Map<Long, Tag> tags = new HashMap<Long, Tag>( 100 );
+
     private final List<ChangeLogEvent> events = new ArrayList<ChangeLogEvent>();
     private File workingDirectory;
-    
+
     /** The DirectoryService */
     private DirectoryService directoryService;
 
@@ -98,7 +99,7 @@ public class MemoryChangeLogStore implem
      */
     public Tag tag() throws Exception
     {
-        if ( ( latest != null) && ( latest.getRevision() == currentRevision ) )
+        if ( ( latest != null ) && ( latest.getRevision() == currentRevision ) )
         {
             return latest;
         }
@@ -137,11 +138,11 @@ public class MemoryChangeLogStore implem
     private void loadRevision() throws Exception
     {
         File revFile = new File( workingDirectory, REV_FILE );
-        
+
         if ( revFile.exists() )
         {
             BufferedReader reader = null;
-            
+
             try
             {
                 reader = new BufferedReader( new FileReader( revFile ) );
@@ -173,17 +174,17 @@ public class MemoryChangeLogStore implem
     private void saveRevision() throws Exception
     {
         File revFile = new File( workingDirectory, REV_FILE );
-        
+
         if ( revFile.exists() )
         {
-            if( !revFile.delete() )
+            if ( !revFile.delete() )
             {
                 throw new IOException( I18n.err( I18n.ERR_726_FILE_UNDELETABLE, revFile.getAbsolutePath() ) );
             }
         }
 
         PrintWriter out = null;
-        
+
         try
         {
             out = new PrintWriter( new FileWriter( revFile ) );
@@ -209,27 +210,27 @@ public class MemoryChangeLogStore implem
     private void saveTags() throws Exception
     {
         File tagFile = new File( workingDirectory, TAG_FILE );
-        
+
         if ( tagFile.exists() )
         {
-            if( !tagFile.delete() )
+            if ( !tagFile.delete() )
             {
                 throw new IOException( I18n.err( I18n.ERR_726_FILE_UNDELETABLE, tagFile.getAbsolutePath() ) );
             }
         }
 
         FileOutputStream out = null;
-        
+
         try
         {
             out = new FileOutputStream( tagFile );
 
             Properties props = new Properties();
-            
+
             for ( Tag tag : tags.values() )
             {
                 String key = String.valueOf( tag.getRevision() );
-                
+
                 if ( tag.getDescription() == null )
                 {
                     props.setProperty( key, "null" );
@@ -269,18 +270,18 @@ public class MemoryChangeLogStore implem
     private void loadTags() throws Exception
     {
         File revFile = new File( workingDirectory, REV_FILE );
-        
+
         if ( revFile.exists() )
         {
             Properties props = new Properties();
             FileInputStream in = null;
-            
+
             try
             {
                 in = new FileInputStream( revFile );
                 props.load( in );
                 ArrayList<Long> revList = new ArrayList<Long>();
-                
+
                 for ( Object key : props.keySet() )
                 {
                     revList.add( Long.valueOf( ( String ) key ) );
@@ -291,7 +292,7 @@ public class MemoryChangeLogStore implem
 
                 // @todo need some serious syncrhoization here on tags
                 tags.clear();
-                
+
                 for ( Long lkey : revList )
                 {
                     String rev = String.valueOf( lkey );
@@ -338,7 +339,7 @@ public class MemoryChangeLogStore implem
     private void loadChangeLog() throws Exception
     {
         File file = new File( workingDirectory, CHANGELOG_FILE );
-        
+
         if ( file.exists() )
         {
             ObjectInputStream in = null;
@@ -347,12 +348,13 @@ public class MemoryChangeLogStore implem
             {
                 in = new ObjectInputStream( new FileInputStream( file ) );
                 int size = in.readInt();
-                
+
                 ArrayList<ChangeLogEvent> changeLogEvents = new ArrayList<ChangeLogEvent>( size );
 
                 for ( int i = 0; i < size; i++ )
                 {
-                    ChangeLogEvent event = ChangeLogEventSerializer.deserialize( directoryService.getSchemaManager(), in );
+                    ChangeLogEvent event = ChangeLogEventSerializer.deserialize( directoryService.getSchemaManager(),
+                        in );
                     event.getCommitterPrincipal().setSchemaManager( directoryService.getSchemaManager() );
                     changeLogEvents.add( event );
                 }
@@ -388,10 +390,10 @@ public class MemoryChangeLogStore implem
     private void saveChangeLog() throws Exception
     {
         File file = new File( workingDirectory, CHANGELOG_FILE );
-        
+
         if ( file.exists() )
         {
-            if( !file.delete() )
+            if ( !file.delete() )
             {
                 throw new IOException( I18n.err( I18n.ERR_726_FILE_UNDELETABLE, file.getAbsolutePath() ) );
             }
@@ -413,10 +415,10 @@ public class MemoryChangeLogStore implem
             out = new ObjectOutputStream( new FileOutputStream( file ) );
 
             out.writeInt( events.size() );
-            
+
             for ( ChangeLogEvent event : events )
             {
-                ChangeLogEventSerializer.serialize( event, out  );
+                ChangeLogEventSerializer.serialize( event, out );
             }
 
             out.flush();
@@ -473,8 +475,8 @@ public class MemoryChangeLogStore implem
     public ChangeLogEvent log( LdapPrincipal principal, LdifEntry forward, LdifEntry reverse ) throws Exception
     {
         currentRevision++;
-        ChangeLogEvent event = new ChangeLogEvent( currentRevision, DateUtils.getGeneralizedTime(), 
-                principal, forward, reverse );
+        ChangeLogEvent event = new ChangeLogEvent( currentRevision, DateUtils.getGeneralizedTime(),
+            principal, forward, reverse );
         events.add( event );
         return event;
     }
@@ -487,7 +489,7 @@ public class MemoryChangeLogStore implem
     {
         currentRevision++;
         ChangeLogEvent event = new ChangeLogEvent( currentRevision, DateUtils.getGeneralizedTime(),
-                principal, forward, reverses );
+            principal, forward, reverses );
         events.add( event );
         return event;
     }
@@ -562,25 +564,25 @@ public class MemoryChangeLogStore implem
         tags.put( revision, latest );
         return latest;
     }
-    
-    
+
+
     /**
      * @see Object#toString()
      */
     public String toString()
     {
         StringBuilder sb = new StringBuilder();
-        
+
         sb.append( "MemoryChangeLog\n" );
         sb.append( "latest tag : " ).append( latest ).append( '\n' );
-        
+
         if ( events != null )
         {
             sb.append( "Nb of events : " ).append( events.size() ).append( '\n' );
-            
+
             int i = 0;
-            
-            for ( ChangeLogEvent event:events )
+
+            for ( ChangeLogEvent event : events )
             {
                 sb.append( "event[" ).append( i++ ).append( "] : " );
                 sb.append( "\n---------------------------------------\n" );
@@ -588,8 +590,7 @@ public class MemoryChangeLogStore implem
                 sb.append( "\n---------------------------------------\n" );
             }
         }
-        
-        
+
         return sb.toString();
     }
 }

Modified: directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/package-info.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/package-info.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/package-info.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/main/java/org/apache/directory/server/core/changelog/package-info.java Tue Jan 24 15:43:19 2012
@@ -53,3 +53,5 @@
  */
 
 package org.apache.directory.server.core.changelog;
+
+

Modified: directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/trunk/interceptors/changelog/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Tue Jan 24 15:43:19 2012
@@ -19,7 +19,6 @@
 package org.apache.directory.server.core.changelog;
 
 
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
@@ -64,7 +63,8 @@ public class MemoryChangeLogStoreTest
     private static MemoryChangeLogStore store;
 
     private static SchemaManager schemaManager;
-    
+
+
     @BeforeClass
     public static void setUp() throws Exception
     {
@@ -96,14 +96,14 @@ public class MemoryChangeLogStoreTest
         assertEquals( 1, store.log( new LdapPrincipal( schemaManager ), forward, reverse ).getRevision() );
         assertEquals( 1, store.getCurrentRevision() );
     }
-    
-    
+
+
     @Test
     public void testChangeLogSerialization() throws LdapException, IOException, ClassNotFoundException
     {
         Dn systemDn = new Dn( schemaManager, "ou=system" );
         systemDn.apply( schemaManager );
-        
+
         Dn adminDn = new Dn( schemaManager, "uid=admin, ou=system" );
         adminDn.apply( schemaManager );
 
@@ -112,7 +112,7 @@ public class MemoryChangeLogStoreTest
         forward.setChangeType( ChangeType.Add );
         forward.putAttribute( "objectClass", "organizationalUnit" );
         forward.putAttribute( "ou", "system" );
-        
+
         Dn reverseDn = forward.getDn();
         reverseDn.apply( schemaManager );
 
@@ -120,31 +120,32 @@ public class MemoryChangeLogStoreTest
 
         String zuluTime = DateUtils.getGeneralizedTime();
         long revision = 1L;
-        
-        LdapPrincipal principal = new LdapPrincipal( schemaManager, adminDn, AuthenticationLevel.SIMPLE, Strings.getBytesUtf8("secret") );
+
+        LdapPrincipal principal = new LdapPrincipal( schemaManager, adminDn, AuthenticationLevel.SIMPLE,
+            Strings.getBytesUtf8( "secret" ) );
         ChangeLogEvent event = new ChangeLogEvent( revision, zuluTime, principal, forward, reverse );
-        
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         ObjectOutputStream out = new ObjectOutputStream( baos );
 
         ChangeLogEventSerializer.serialize( event, out );
-        
+
         byte[] data = baos.toByteArray();
         ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( data ) );
-        
-        ChangeLogEvent read = ChangeLogEventSerializer.deserialize( schemaManager, in ); 
-        
+
+        ChangeLogEvent read = ChangeLogEventSerializer.deserialize( schemaManager, in );
+
         // The read event should not be equal to the written event, as
         // the principal's password has not been stored
         assertNotSame( event, read );
-        
+
         LdapPrincipal readPrincipal = read.getCommitterPrincipal();
-        
+
         assertEquals( principal.getAuthenticationLevel(), readPrincipal.getAuthenticationLevel() );
         assertEquals( principal.getName(), readPrincipal.getName() );
         assertEquals( principal.getDn(), readPrincipal.getDn() );
         assertNull( readPrincipal.getUserPassword() );
-        
+
         assertEquals( zuluTime, read.getZuluTime() );
         assertEquals( revision, read.getRevision() );
         assertEquals( forward, read.getForwardLdif() );

Modified: directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/collective/src/main/java/org/apache/directory/server/core/collective/CollectiveAttributeInterceptor.java Tue Jan 24 15:43:19 2012
@@ -71,6 +71,7 @@ public class CollectiveAttributeIntercep
     /** The LoggerFactory used by this Interceptor */
     private static Logger LOG = LoggerFactory.getLogger( CollectiveAttributeInterceptor.class );
 
+
     /**
      * Creates a new instance of a CollectiveAttributeInterceptor.
      */
@@ -79,7 +80,6 @@ public class CollectiveAttributeIntercep
         super( InterceptorEnum.COLLECTIVE_ATTRIBUTE_INTERCEPTOR );
     }
 
-    
     /**
      * the search result filter to use for collective attribute injection
      */
@@ -209,7 +209,8 @@ public class CollectiveAttributeIntercep
             }
 
             LOG.info( "A CollectiveAttribute subentry *should* have at least one collectiveAttribute" );
-            throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION, I18n.err( I18n.ERR_257_COLLECTIVE_SUBENTRY_WITHOUT_COLLECTIVE_AT ) );
+            throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION,
+                I18n.err( I18n.ERR_257_COLLECTIVE_SUBENTRY_WITHOUT_COLLECTIVE_AT ) );
         }
 
         if ( containsAnyCollectiveAttributes( entry ) )
@@ -217,9 +218,11 @@ public class CollectiveAttributeIntercep
             /*
              * TODO: Replace the Exception and the ResultCodeEnum with the correct ones.
              */
-            LOG.info( "Cannot add the entry {} : it contains some CollectiveAttributes and is not a collective subentry",
+            LOG.info(
+                "Cannot add the entry {} : it contains some CollectiveAttributes and is not a collective subentry",
                 entry );
-            throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION, I18n.err( I18n.ERR_241_CANNOT_STORE_COLLECTIVE_ATT_IN_ENTRY ) );
+            throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION,
+                I18n.err( I18n.ERR_241_CANNOT_STORE_COLLECTIVE_ATT_IN_ENTRY ) );
         }
     }
 
@@ -246,7 +249,8 @@ public class CollectiveAttributeIntercep
             /*
              * TODO: Replace the Exception and the ResultCodeEnum with the correct ones.
              */
-            LOG.info( "Cannot modify the entry {} : it contains some CollectiveAttributes and is not a collective subentry",
+            LOG.info(
+                "Cannot modify the entry {} : it contains some CollectiveAttributes and is not a collective subentry",
                 targetEntry );
             throw new LdapSchemaViolationException( ResultCodeEnum.OBJECT_CLASS_VIOLATION, I18n.err( I18n.ERR_242 ) );
         }
@@ -323,7 +327,8 @@ public class CollectiveAttributeIntercep
      * @param retAttrs array or attribute type to be specifically included in the result entry(s)
      * @throws LdapException if there are problems accessing subentries
      */
-    private void addCollectiveAttributes( OperationContext opContext, Entry entry, String[] retAttrs ) throws LdapException
+    private void addCollectiveAttributes( OperationContext opContext, Entry entry, String[] retAttrs )
+        throws LdapException
     {
         Attribute collectiveAttributeSubentries = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get(
             COLLECTIVE_ATTRIBUTE_SUBENTRIES_AT );
@@ -414,7 +419,8 @@ public class CollectiveAttributeIntercep
              */
 
             CoreSession session = opContext.getSession();
-            LookupOperationContext lookupContext = new LookupOperationContext( session, subentryDn, SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+            LookupOperationContext lookupContext = new LookupOperationContext( session, subentryDn,
+                SchemaConstants.ALL_ATTRIBUTES_ARRAY );
             Entry subentry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext );
 
             for ( Attribute attribute : subentry.getAttributes() )

Modified: directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java (original)
+++ directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/DefaultEventService.java Tue Jan 24 15:43:19 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.core.event;
 
+
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -34,6 +35,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.normalizers.ConcreteNameComponentNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.NameComponentNormalizer;
 
+
 /**
  * A class implementing the EventService interface. It stores all the Listener 
  * associated with a DirectoryService.
@@ -44,13 +46,14 @@ class DefaultEventService implements Eve
 {
     /** The list of RegistrationEntries being registered */
     private List<RegistrationEntry> registrations = new CopyOnWriteArrayList<RegistrationEntry>();
-    
+
     /** The DirectoryService instance */
     private DirectoryService directoryService;
-    
+
     /** A normalizer used for filters */
     private FilterNormalizingVisitor filterNormalizer;
 
+
     /**
      * Create an instance of EventService
      * @param directoryService The associated DirectoryService
@@ -58,13 +61,13 @@ class DefaultEventService implements Eve
      */
     public DefaultEventService( DirectoryService directoryService )
     {
-        this.directoryService= directoryService;
+        this.directoryService = directoryService;
         SchemaManager schemaManager = directoryService.getSchemaManager();
         NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager );
         filterNormalizer = new FilterNormalizingVisitor( ncn, schemaManager );
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */

Modified: directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/event/src/main/java/org/apache/directory/server/core/event/EventInterceptor.java Tue Jan 24 15:43:19 2012
@@ -71,6 +71,7 @@ public class EventInterceptor extends Ba
     private Evaluator evaluator;
     private ExecutorService executor;
 
+
     /**
      * Creates a new instance of a EventInterceptor.
      */
@@ -78,8 +79,8 @@ public class EventInterceptor extends Ba
     {
         super( InterceptorEnum.EVENT_INTERCEPTOR );
     }
-    
-    
+
+
     /**
      * Initialize the event interceptor. It creates a pool of executor which will be used
      * to call the listeners in separate threads.
@@ -304,7 +305,7 @@ public class EventInterceptor extends Ba
      */
     public void rename( RenameOperationContext renameContext ) throws LdapException
     {
-        Entry oriEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
+        Entry oriEntry = ( ( ClonedServerEntry ) renameContext.getEntry() ).getOriginalEntry();
         List<RegistrationEntry> selecting = getSelectingRegistrations( renameContext.getDn(), oriEntry );
 
         next( renameContext );

Modified: directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/exception/src/main/java/org/apache/directory/server/core/exception/ExceptionInterceptor.java Tue Jan 24 15:43:19 2012
@@ -92,6 +92,7 @@ public class ExceptionInterceptor extend
     /** Declare a default for this cache. 100 entries seems to be enough */
     private static final int DEFAULT_CACHE_SIZE = 100;
 
+
     /**
      * Creates an interceptor that is also the exception handling service.
      */
@@ -422,7 +423,6 @@ public class ExceptionInterceptor extend
         }
     }
 
-
     /**
      * Asserts that an entry is present and as a side effect if it is not, creates a LdapNoSuchObjectException, which is
      * used to set the before exception on the invocation - eventually the exception is thrown.

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/CryptPasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/CryptPasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/CryptPasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/CryptPasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using CRYPT hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Md5PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Md5PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Md5PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Md5PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using MD5 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -48,6 +48,7 @@ public abstract class PasswordHashingInt
     /** the hashing algorithm to be used, if null then the password won't be changed */
     private LdapSecurityConstants algorithm;
 
+
     /**
      * 
      * Creates a new instance of PasswordHashingInterceptor which hashes the

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha256PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha256PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha256PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha256PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SHA-256 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha384PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha384PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha384PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha384PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SHA-384 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha512PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha512PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha512PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Sha512PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SHA-512 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/ShaPasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/ShaPasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/ShaPasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/ShaPasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SHA hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Smd5PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Smd5PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Smd5PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Smd5PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SMD5 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha256PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha256PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha256PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha256PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SSHA-256 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha384PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha384PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha384PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha384PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SSHA-384 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha512PasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha512PasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha512PasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/Ssha512PasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SSHA-512 hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/SshaPasswordHashingInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/SshaPasswordHashingInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/SshaPasswordHashingInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/hash/src/main/java/org/apache/directory/server/core/hash/SshaPasswordHashingInterceptor.java Tue Jan 24 15:43:19 2012
@@ -20,8 +20,10 @@
 
 package org.apache.directory.server.core.hash;
 
+
 import org.apache.directory.shared.ldap.model.constants.LdapSecurityConstants;
 
+
 /**
  * PasswordHashingInterceptor using SSHA hashing algorithm.
  *

Modified: directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java (original)
+++ directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournal.java Tue Jan 24 15:43:19 2012
@@ -18,6 +18,7 @@
  */
 package org.apache.directory.server.core.journal;
 
+
 import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.LdapPrincipal;
 import org.apache.directory.server.core.api.journal.Journal;
@@ -27,6 +28,7 @@ import org.apache.directory.shared.ldap.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * The default journal implementation. It stores the operation and the
  * associated status (acked or nacked) in a file which will be used to
@@ -39,7 +41,7 @@ public class DefaultJournal implements J
     /** The class logger */
     private static final Logger LOG = LoggerFactory.getLogger( DefaultJournal.class );
 
-    /** Tells if the service is activated or not */ 
+    /** Tells if the service is activated or not */
     private boolean enabled;
 
     /** An instance of the Journal store */
@@ -48,16 +50,17 @@ public class DefaultJournal implements J
     /** 
      * A parameter indicating the number of operations stored in a journal
      * before it is rotated. If set to 0, no rotation is done
-     */ 
+     */
     private int rotation;
-    
+
+
     /**
      * {@inheritDoc}
      */
     public void destroy() throws Exception
     {
         LOG.debug( "Stopping the journal" );
-        
+
         // We have to release the file, otherwise Windows won't be able
         // to stop the server
         if ( store != null )
@@ -83,7 +86,7 @@ public class DefaultJournal implements J
     {
         LOG.debug( "Starting the journal" );
 
-        if( store == null )
+        if ( store == null )
         {
             store = new DefaultJournalStore();
         }
@@ -147,10 +150,10 @@ public class DefaultJournal implements J
         this.rotation = rotation;
     }
 
-    
+
     public void setEnabled( boolean enabled )
     {
-        this.enabled = enabled; 
+        this.enabled = enabled;
     }
 
 

Modified: directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java (original)
+++ directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/DefaultJournalStore.java Tue Jan 24 15:43:19 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.core.journal;
 
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -33,6 +34,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
 
+
 /**
  * @todo : Missing Javadoc
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -41,17 +43,17 @@ public class DefaultJournalStore impleme
 {
     /** The directory where the journal is stored */
     private File workingDirectory;
-    
+
     /** The journal file name */
     private String fileName;
-    
+
     /** The file containing the journal */
     private File journal;
-    
+
     /** The stream used to write data into the journal */
     private Writer writer;
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -62,8 +64,8 @@ public class DefaultJournalStore impleme
             writer.close();
         }
     }
-    
-    
+
+
     /**
      * Initialize the interceptor
      */
@@ -79,16 +81,16 @@ public class DefaultJournalStore impleme
         {
             fileName = "journal.ldif";
         }
-        
+
         journal = new File( workingDirectory, fileName );
-        
+
         // The new requests are added at the end of the existing journal
-        writer = new PrintWriter( 
+        writer = new PrintWriter(
             new OutputStreamWriter(
                 new FileOutputStream( journal, true ) ) );
     }
-    
-    
+
+
     /**
      * Stores an event into the journal.
      * 
@@ -106,19 +108,19 @@ public class DefaultJournalStore impleme
                 writer.write( "# principal: " );
                 writer.write( principal.getName() );
                 writer.write( '\n' );
-                
+
                 // Write the timestamp
                 writer.write( "# timestamp: " );
                 writer.write( Long.toString( System.currentTimeMillis() ) );
                 writer.write( '\n' );
-                
+
                 // Write the revision
                 writer.write( "# revision: " );
                 writer.write( Long.toString( revision ) );
                 writer.write( "\n" );
-                
+
                 // Write the entry
-                writer.write( LdifUtils.convertToLdif(forward, 80) );
+                writer.write( LdifUtils.convertToLdif( forward, 80 ) );
                 writer.flush();
             }
             catch ( LdapException ne )
@@ -130,11 +132,11 @@ public class DefaultJournalStore impleme
                 return false;
             }
         }
-        
+
         return true;
     }
-    
-    
+
+
     /**
      * Records a ack for a change
      *
@@ -160,11 +162,11 @@ public class DefaultJournalStore impleme
                 return false;
             }
         }
-        
+
         return true;
     }
-    
-    
+
+
     /**
      * Records a nack for a change
      *
@@ -190,17 +192,18 @@ public class DefaultJournalStore impleme
                 return false;
             }
         }
-        
+
         return true;
     }
 
-    
+
     public void sync() throws Exception
     {
         // TODO Auto-generated method stub
-        
+
     }
-    
+
+
     public long getCurrentRevision()
     {
         // TODO Auto-generated method stub

Modified: directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/journal/src/main/java/org/apache/directory/server/core/journal/JournalInterceptor.java Tue Jan 24 15:43:19 2012
@@ -63,6 +63,7 @@ public class JournalInterceptor extends 
     /** the Journal service to log changes to */
     private Journal journal;
 
+
     /**
      * Creates a new instance of a JournalInterceptor.
      */
@@ -71,7 +72,7 @@ public class JournalInterceptor extends 
         super( InterceptorEnum.JOURNAL_INTERCEPTOR );
     }
 
-    
+
     // -----------------------------------------------------------------------
     // Overridden init() and destroy() methods
     // -----------------------------------------------------------------------
@@ -124,10 +125,10 @@ public class JournalInterceptor extends 
             ldif.setChangeType( ChangeType.Add );
             ldif.setDn( addContext.getDn() );
 
-            for ( Attribute attribute:addEntry.getAttributes() )
+            for ( Attribute attribute : addEntry.getAttributes() )
             {
                 AttributeType attributeType = attribute.getAttributeType();
-                ldif.addAttribute( addEntry.get( attributeType).clone() );
+                ldif.addAttribute( addEntry.get( attributeType ).clone() );
             }
 
             log( addContext, opRevision, ldif );
@@ -143,7 +144,7 @@ public class JournalInterceptor extends 
                 journal.ack( opRevision );
             }
         }
-        catch( LdapException le )
+        catch ( LdapException le )
         {
             if ( journalEnabled )
             {
@@ -185,7 +186,7 @@ public class JournalInterceptor extends 
                 journal.ack( opRevision );
             }
         }
-        catch( LdapException e )
+        catch ( LdapException e )
         {
             if ( journalEnabled )
             {
@@ -215,7 +216,7 @@ public class JournalInterceptor extends 
             ldif.setDn( modifyContext.getDn() );
 
             // Store the modifications
-            for ( Modification modification:modifyContext.getModItems() )
+            for ( Modification modification : modifyContext.getModItems() )
             {
                 ldif.addModification( modification );
             }
@@ -233,7 +234,7 @@ public class JournalInterceptor extends 
                 journal.ack( opRevision );
             }
         }
-        catch( LdapException e )
+        catch ( LdapException e )
         {
             if ( journalEnabled )
             {
@@ -275,7 +276,7 @@ public class JournalInterceptor extends 
                 journal.ack( opRevision );
             }
         }
-        catch( LdapException e )
+        catch ( LdapException e )
         {
             if ( journalEnabled )
             {
@@ -320,7 +321,7 @@ public class JournalInterceptor extends 
                 journal.ack( opRevision );
             }
         }
-        catch( LdapException e )
+        catch ( LdapException e )
         {
             if ( journalEnabled )
             {
@@ -364,7 +365,7 @@ public class JournalInterceptor extends 
                 journal.ack( opRevision );
             }
         }
-        catch( LdapException e )
+        catch ( LdapException e )
         {
             if ( journalEnabled )
             {

Modified: directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/logger/src/main/java/org/apache/directory/server/core/logger/TimerInterceptor.java Tue Jan 24 15:43:19 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.core.logger;
 
+
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -44,6 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * An interceptor used to log times to process each operation.
  * 
@@ -124,6 +126,7 @@ public class TimerInterceptor extends Ba
     private static AtomicLong totalUnbind = new AtomicLong( 0 );
     private static AtomicInteger nbUnbindCalls = new AtomicInteger( 0 );
 
+
     /**
      * 
      * Creates a new instance of TimerInterceptor.
@@ -168,8 +171,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbAddCalls.get() % 1000 == 0 )
             {
-                long average = totalAdd.get()/(nbAddCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average add = {} microseconds, nb adds = {}", average, nbAddCalls.get() );
+                long average = totalAdd.get() / ( nbAddCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average add = {} microseconds, nb adds = {}", average,
+                    nbAddCalls.get() );
             }
         }
 
@@ -196,8 +200,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbBindCalls.get() % 1000 == 0 )
             {
-                long average = totalBind.get()/(nbBindCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average bind = {} microseconds, nb binds = {}", average, nbBindCalls.get() );
+                long average = totalBind.get() / ( nbBindCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average bind = {} microseconds, nb binds = {}", average,
+                    nbBindCalls.get() );
             }
         }
 
@@ -224,8 +229,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbCompareCalls.get() % 1000 == 0 )
             {
-                long average = totalCompare.get()/(nbCompareCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average compare = {} microseconds, nb compares = {}", average, nbCompareCalls.get() );
+                long average = totalCompare.get() / ( nbCompareCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average compare = {} microseconds, nb compares = {}", average,
+                    nbCompareCalls.get() );
             }
         }
 
@@ -254,8 +260,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbDeleteCalls.get() % 1000 == 0 )
             {
-                long average = totalDelete.get()/(nbDeleteCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average delete = {} microseconds, nb deletes = {}", average, nbDeleteCalls.get() );
+                long average = totalDelete.get() / ( nbDeleteCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average delete = {} microseconds, nb deletes = {}", average,
+                    nbDeleteCalls.get() );
             }
         }
 
@@ -282,8 +289,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbGetRootDseCalls.get() % 1000 == 0 )
             {
-                long average = totalGetRootDse.get()/(nbGetRootDseCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average getRootDSE = {} microseconds, nb getRootDSEs = {}", average, nbGetRootDseCalls.get() );
+                long average = totalGetRootDse.get() / ( nbGetRootDseCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average getRootDSE = {} microseconds, nb getRootDSEs = {}",
+                    average, nbGetRootDseCalls.get() );
             }
         }
 
@@ -312,8 +320,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbHasEntryCalls.get() % 1000 == 0 )
             {
-                long average = totalHasEntry.get()/(nbHasEntryCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average hasEntry = {} microseconds, nb hasEntrys = {}", average, nbHasEntryCalls.get() );
+                long average = totalHasEntry.get() / ( nbHasEntryCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average hasEntry = {} microseconds, nb hasEntrys = {}", average,
+                    nbHasEntryCalls.get() );
             }
         }
 
@@ -342,8 +351,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbListCalls.get() % 1000 == 0 )
             {
-                long average = totalList.get()/(nbListCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average list = {} microseconds, nb lists = {}", average, nbListCalls.get() );
+                long average = totalList.get() / ( nbListCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average list = {} microseconds, nb lists = {}", average,
+                    nbListCalls.get() );
             }
         }
 
@@ -372,8 +382,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbLookupCalls.get() % 1000 == 0 )
             {
-                long average = totalLookup.get()/(nbLookupCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average lookup = {} microseconds, nb lookups = {}", average, nbLookupCalls.get() );
+                long average = totalLookup.get() / ( nbLookupCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average lookup = {} microseconds, nb lookups = {}", average,
+                    nbLookupCalls.get() );
             }
         }
 
@@ -402,8 +413,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbModifyCalls.get() % 1000 == 0 )
             {
-                long average = totalModify.get()/(nbModifyCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average modify = {} microseconds, nb modifys = {}", average, nbModifyCalls.get() );
+                long average = totalModify.get() / ( nbModifyCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average modify = {} microseconds, nb modifys = {}", average,
+                    nbModifyCalls.get() );
             }
         }
 
@@ -430,8 +442,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbMoveCalls.get() % 1000 == 0 )
             {
-                long average = totalMove.get()/(nbMoveCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average move = {} microseconds, nb moves = {}", average, nbMoveCalls.get() );
+                long average = totalMove.get() / ( nbMoveCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average move = {} microseconds, nb moves = {}", average,
+                    nbMoveCalls.get() );
             }
         }
 
@@ -458,8 +471,10 @@ public class TimerInterceptor extends Ba
 
             if ( nbMoveAndRenameCalls.get() % 1000 == 0 )
             {
-                long average = totalMoveAndRename.get()/(nbMoveAndRenameCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average moveAndRename = {} microseconds, nb moveAndRenames = {}", average, nbMoveAndRenameCalls.get() );
+                long average = totalMoveAndRename.get() / ( nbMoveAndRenameCalls.get() * 1000 );
+                OPERATION_STATS.debug(
+                    getName() + " : Average moveAndRename = {} microseconds, nb moveAndRenames = {}", average,
+                    nbMoveAndRenameCalls.get() );
             }
         }
 
@@ -486,8 +501,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbRenameCalls.get() % 1000 == 0 )
             {
-                long average = totalRename.get()/(nbRenameCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average rename = {} microseconds, nb renames = {}", average, nbRenameCalls.get() );
+                long average = totalRename.get() / ( nbRenameCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average rename = {} microseconds, nb renames = {}", average,
+                    nbRenameCalls.get() );
             }
         }
 
@@ -514,8 +530,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbSearchCalls.get() % 1000 == 0 )
             {
-                long average = totalSearch.get()/(nbSearchCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average search = {} microseconds, nb searches = {}", average, nbSearchCalls.get() );
+                long average = totalSearch.get() / ( nbSearchCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average search = {} microseconds, nb searches = {}", average,
+                    nbSearchCalls.get() );
             }
         }
 
@@ -544,8 +561,9 @@ public class TimerInterceptor extends Ba
 
             if ( nbUnbindCalls.get() % 1000 == 0 )
             {
-                long average = totalUnbind.get()/(nbUnbindCalls.get() * 1000);
-                OPERATION_STATS.debug( getName() + " : Average unbind = {} microseconds, nb unbinds = {}", average, nbUnbindCalls.get() );
+                long average = totalUnbind.get() / ( nbUnbindCalls.get() * 1000 );
+                OPERATION_STATS.debug( getName() + " : Average unbind = {} microseconds, nb unbinds = {}", average,
+                    nbUnbindCalls.get() );
             }
         }
 

Modified: directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/ExpandingVisitor.java Tue Jan 24 15:43:19 2012
@@ -50,8 +50,8 @@ public class ExpandingVisitor implements
 {
     /** The schemaManager */
     private SchemaManager schemaManager;
-    
-    
+
+
     /**
      * 
      * Creates a new instance of ExpandingVisitor.
@@ -112,7 +112,8 @@ public class ExpandingVisitor implements
                         children.set( childNumber++, orNode );
 
                         // iterate through descendants adding them to the orNode
-                        Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants( leaf.getAttributeType() );
+                        Iterator<AttributeType> descendants = schemaManager.getAttributeTypeRegistry().descendants(
+                            leaf.getAttributeType() );
 
                         while ( descendants.hasNext() )
                         {
@@ -131,7 +132,7 @@ public class ExpandingVisitor implements
                             }
                             else if ( leaf instanceof EqualityNode )
                             {
-                                EqualityNode equalityNode = (EqualityNode) leaf;
+                                EqualityNode equalityNode = ( EqualityNode ) leaf;
 
                                 newLeaf = new EqualityNode( descendant, equalityNode.getValue() );
                             }

Modified: directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/NormalizationInterceptor.java Tue Jan 24 15:43:19 2012
@@ -79,6 +79,7 @@ public class NormalizationInterceptor ex
     /** a filter node value normalizer and undefined node remover */
     private FilterNormalizingVisitor normVisitor;
 
+
     /**
      * Creates a new instance of a NormalizationInterceptor.
      */
@@ -86,7 +87,7 @@ public class NormalizationInterceptor ex
     {
         super( InterceptorEnum.NORMALIZATION_INTERCEPTOR );
     }
-    
+
 
     /**
      * Initialize the registries, normalizers.

Modified: directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/main/java/org/apache/directory/server/core/normalization/UndefinedFilterAttributeException.java Tue Jan 24 15:43:19 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.core.normalization;
 
+
 import org.apache.directory.shared.ldap.model.filter.LeafNode;
 
 
@@ -33,7 +34,7 @@ public class UndefinedFilterAttributeExc
     private static final long serialVersionUID = -8073762118319523479L;
     private final LeafNode node;
 
-    
+
     public UndefinedFilterAttributeException( LeafNode node )
     {
         super();
@@ -60,7 +61,7 @@ public class UndefinedFilterAttributeExc
         super( cause );
         this.node = node;
     }
-    
+
 
     public LeafNode getUndefinedFilterNode()
     {

Modified: directory/apacheds/trunk/interceptors/normalization/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/normalization/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/normalization/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java (original)
+++ directory/apacheds/trunk/interceptors/normalization/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java Tue Jan 24 15:43:19 2012
@@ -75,7 +75,7 @@ public class NormalizationVisitorTest
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(schemaManager.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( schemaManager.getErrors() ) );
         }
 
         NameComponentNormalizer ncn = new ConcreteNameComponentNormalizer( schemaManager );
@@ -87,10 +87,10 @@ public class NormalizationVisitorTest
     public void testSimpleFilter() throws ParseException
     {
         ExprNode filter = FilterParser.parse( schemaManager, "(ou=  test  1 )" );
-        ExprNode result = (ExprNode) filter.accept( normVisitor );
+        ExprNode result = ( ExprNode ) filter.accept( normVisitor );
 
         assertNotNull( result );
-        assertTrue( result instanceof EqualityNode<?>);
+        assertTrue( result instanceof EqualityNode<?> );
         EqualityNode<?> equalityNode = ( EqualityNode<?> ) result;
 
         assertEquals( "test 1", equalityNode.getValue().getNormValue() );
@@ -105,7 +105,7 @@ public class NormalizationVisitorTest
         ExprNode result = ( ExprNode ) filter.accept( normVisitor );
 
         assertNotNull( result );
-        assertTrue( result instanceof PresenceNode);
+        assertTrue( result instanceof PresenceNode );
         PresenceNode presenceNode = ( PresenceNode ) result;
 
         assertEquals( "2.5.4.11", presenceNode.getAttributeType().getOid() );

Modified: directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Tue Jan 24 15:43:19 2012
@@ -103,7 +103,6 @@ public class OperationalAttributeInterce
             return filterDenormalized( entry );
         }
     }
-    
 
     /**
      * the database search result filter to register with filter service
@@ -116,8 +115,8 @@ public class OperationalAttributeInterce
                 || filterOperationalAttributes( entry );
         }
     }
-    
-    
+
+
     /**
      * Creates the operational attribute management service interceptor.
      */
@@ -254,7 +253,7 @@ public class OperationalAttributeInterce
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         Entry result = next( lookupContext );
-        
+
         if ( lookupContext.hasAllUser() )
         {
             if ( lookupContext.hasAllOperational() )
@@ -293,7 +292,7 @@ public class OperationalAttributeInterce
                 filterList( lookupContext, result );
             }
         }
-        
+
         denormalizeEntryOpAttrs( result );
 
         return result;
@@ -382,7 +381,8 @@ public class OperationalAttributeInterce
                 Attribute attribute = new DefaultAttribute( MODIFIERS_NAME_AT, getPrincipal( modifyContext )
                     .getName() );
 
-                Modification modifiersName = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE, attribute );
+                Modification modifiersName = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
+                    attribute );
 
                 mods.add( modifiersName );
             }
@@ -545,7 +545,7 @@ public class OperationalAttributeInterce
         {
             removedAttributes.remove( returningAttribute );
         }
-        
+
         // Now, remove the attributes from the result
         for ( String attribute : removedAttributes )
         {
@@ -575,7 +575,7 @@ public class OperationalAttributeInterce
             for ( Attribute attribute : entry.getAttributes() )
             {
                 AttributeType attributeType = attribute.getAttributeType();
-                
+
                 if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
                 {
                     // If it's not in the list of returning attribute, remove it
@@ -585,7 +585,7 @@ public class OperationalAttributeInterce
                     }
                 }
             }
-            
+
             for ( AttributeType attributeType : removedAttributes )
             {
                 entry.removeAttributes( attributeType );
@@ -619,14 +619,14 @@ public class OperationalAttributeInterce
             for ( Attribute attribute : entry.getAttributes() )
             {
                 AttributeType attributeType = attribute.getAttributeType();
-                
+
                 // If it's not in the list of returning attribute, remove it
                 if ( !ids.contains( attributeType.getOid() ) )
                 {
                     removedAttributes.add( attributeType );
                 }
             }
-            
+
             for ( AttributeType attributeType : removedAttributes )
             {
                 entry.removeAttributes( attributeType );

Modified: directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java?rev=1235306&r1=1235305&r2=1235306&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/referral/src/main/java/org/apache/directory/server/core/referral/ReferralInterceptor.java Tue Jan 24 15:43:19 2012
@@ -71,9 +71,10 @@ public class ReferralInterceptor extends
     /** A normalized form for the SubschemaSubentry Dn */
     private Dn subschemaSubentryDn;
 
+
     static private void checkRefAttributeValue( Value<?> value ) throws LdapException, LdapURLEncodingException
     {
-        StringValue ref = (StringValue) value;
+        StringValue ref = ( StringValue ) value;
 
         String refVal = ref.getString();
 
@@ -96,7 +97,7 @@ public class ReferralInterceptor extends
             throw new LdapException( message );
         }
 
-        if ( !Strings.isEmpty(ldapUrl.getFilter()) )
+        if ( !Strings.isEmpty( ldapUrl.getFilter() ) )
         {
             String message = I18n.err( I18n.ERR_37 );
             LOG.error( message );
@@ -192,6 +193,7 @@ public class ReferralInterceptor extends
         }
     }
 
+
     /**
      * Creates a new instance of a ReferralInterceptor.
      */
@@ -405,8 +407,9 @@ public class ReferralInterceptor extends
         if ( isReferral )
         {
             // Update the referralManager
-            LookupOperationContext lookupContext = new LookupOperationContext( renameContext.getSession(), renameContext
-                .getNewDn() );
+            LookupOperationContext lookupContext = new LookupOperationContext( renameContext.getSession(),
+                renameContext
+                    .getNewDn() );
             lookupContext.setAttrsId( SchemaConstants.ALL_ATTRIBUTES_ARRAY );
 
             Entry newEntry = nexus.lookup( lookupContext );
@@ -414,7 +417,7 @@ public class ReferralInterceptor extends
             referralManager.lockWrite();
 
             referralManager.addReferral( newEntry );
-            referralManager.removeReferral( ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry() );
+            referralManager.removeReferral( ( ( ClonedServerEntry ) renameContext.getEntry() ).getOriginalEntry() );
 
             referralManager.unlock();
         }



Mime
View raw message