directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1447069 [3/3] - in /directory/apacheds/trunk: core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/directory/server/core/api/filtering/ core-avl/src/main/java/org/apache/directory/server/core/avltr...
Date Sun, 17 Feb 2013 20:26:30 GMT
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/GreaterEqCursor.java
Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.xdbm
 
 import java.io.IOException;
 
+import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.cursor.Cursor;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -50,7 +51,7 @@ import org.slf4j.LoggerFactory;
 public class GreaterEqCursor<V> extends AbstractIndexCursor<V>
 {
     /** A dedicated log for cursors */
-    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName()
);
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -87,7 +88,7 @@ public class GreaterEqCursor<V> extends 
         {
             LOG_CURSOR.debug( "Creating GreaterEqCursor {}", this );
         }
-        
+
         this.greaterEqEvaluator = greaterEqEvaluator;
 
         AttributeType attributeType = greaterEqEvaluator.getExpression().getAttributeType();
@@ -370,7 +371,7 @@ public class GreaterEqCursor<V> extends 
         {
             LOG_CURSOR.debug( "Closing GreaterEqCursor {}", this );
         }
-        
+
         super.close();
 
         if ( userIdxCursor != null )
@@ -394,7 +395,7 @@ public class GreaterEqCursor<V> extends 
         {
             LOG_CURSOR.debug( "Closing GreaterEqCursor {}", this );
         }
-        
+
         super.close( cause );
 
         if ( userIdxCursor != null )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/LessEqCursor.java
Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.xdbm
 
 import java.io.IOException;
 
+import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.cursor.Cursor;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -50,7 +51,7 @@ import org.slf4j.LoggerFactory;
 public class LessEqCursor<V> extends AbstractIndexCursor<V>
 {
     /** A dedicated log for cursors */
-    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName()
);
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -81,7 +82,7 @@ public class LessEqCursor<V> extends Abs
         {
             LOG_CURSOR.debug( "Creating LessEqCursor {}", this );
         }
-        
+
         this.lessEqEvaluator = lessEqEvaluator;
 
         AttributeType attributeType = lessEqEvaluator.getExpression().getAttributeType();
@@ -215,7 +216,7 @@ public class LessEqCursor<V> extends Abs
         setAvailable( false );
     }
 
-    
+
     /**
      * {@inheritDoc}
      */
@@ -255,7 +256,7 @@ public class LessEqCursor<V> extends Abs
     public boolean last() throws LdapException, CursorException, IOException
     {
         afterLast();
-        
+
         return previous();
     }
 
@@ -380,7 +381,7 @@ public class LessEqCursor<V> extends Abs
         {
             LOG_CURSOR.debug( "Closing LessEqCursor {}", this );
         }
-        
+
         super.close();
 
         if ( userIdxCursor != null )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/NotCursor.java
Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.xdbm
 
 import java.io.IOException;
 
+import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
 import org.apache.directory.api.ldap.model.exception.LdapException;
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
 public class NotCursor<V> extends AbstractIndexCursor<V>
 {
     /** A dedicated log for cursors */
-    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName()
);
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -61,7 +62,7 @@ public class NotCursor<V> extends Abstra
         {
             LOG_CURSOR.debug( "Creating NotCursor {}", this );
         }
-        
+
         this.childEvaluator = childEvaluator;
         this.uuidCursor = new AllEntriesCursor( store );
 
@@ -186,7 +187,7 @@ public class NotCursor<V> extends Abstra
         {
             LOG_CURSOR.debug( "Closing NotCursor {}", this );
         }
-        
+
         super.close();
         uuidCursor.close();
     }
@@ -201,7 +202,7 @@ public class NotCursor<V> extends Abstra
         {
             LOG_CURSOR.debug( "Closing NotCursor {}", this );
         }
-        
+
         super.close( cause );
         uuidCursor.close( cause );
     }

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
Sun Feb 17 20:26:29 2013
@@ -26,6 +26,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.cursor.Cursor;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -47,7 +48,7 @@ import org.slf4j.LoggerFactory;
 public class OrCursor<V> extends AbstractIndexCursor<V>
 {
     /** A dedicated log for cursors */
-    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName()
);
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -295,7 +296,7 @@ public class OrCursor<V> extends Abstrac
         {
             LOG_CURSOR.debug( "Closing OrCursor {}", this );
         }
-        
+
         super.close();
 
         for ( Cursor<?> cursor : cursors )
@@ -314,7 +315,7 @@ public class OrCursor<V> extends Abstrac
         {
             LOG_CURSOR.debug( "Closing OrCursor {}", this );
         }
-        
+
         super.close( cause );
 
         for ( Cursor<?> cursor : cursors )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/PresenceCursor.java
Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.xdbm
 
 import java.io.IOException;
 
+import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.cursor.Cursor;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -44,7 +45,7 @@ import org.slf4j.LoggerFactory;
 public class PresenceCursor extends AbstractIndexCursor<String>
 {
     /** A dedicated log for cursors */
-    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName()
);
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -64,7 +65,7 @@ public class PresenceCursor extends Abst
         {
             LOG_CURSOR.debug( "Creating PresenceCursor {}", this );
         }
-        
+
         this.presenceEvaluator = presenceEvaluator;
         AttributeType type = presenceEvaluator.getAttributeType();
 
@@ -314,7 +315,7 @@ public class PresenceCursor extends Abst
         {
             LOG_CURSOR.debug( "Closing PresenceCursor {}", this );
         }
-        
+
         super.close();
 
         if ( presenceCursor != null )
@@ -337,7 +338,7 @@ public class PresenceCursor extends Abst
         {
             LOG_CURSOR.debug( "Closing PresenceCursor {}", this );
         }
-        
+
         super.close( cause );
 
         if ( presenceCursor != null )

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java?rev=1447069&r1=1447068&r2=1447069&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubstringCursor.java
Sun Feb 17 20:26:29 2013
@@ -22,6 +22,7 @@ package org.apache.directory.server.xdbm
 
 import java.io.IOException;
 
+import org.apache.directory.api.ldap.model.constants.Loggers;
 import org.apache.directory.api.ldap.model.cursor.Cursor;
 import org.apache.directory.api.ldap.model.cursor.CursorException;
 import org.apache.directory.api.ldap.model.cursor.InvalidCursorPositionException;
@@ -45,7 +46,7 @@ import org.slf4j.LoggerFactory;
 public class SubstringCursor extends AbstractIndexCursor<String>
 {
     /** A dedicated log for cursors */
-    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+    private static final Logger LOG_CURSOR = LoggerFactory.getLogger( Loggers.CURSOR_LOG.getName()
);
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = LOG_CURSOR.isDebugEnabled();
@@ -65,7 +66,7 @@ public class SubstringCursor extends Abs
         {
             LOG_CURSOR.debug( "Creating SubstringCursor {}", this );
         }
-        
+
         evaluator = substringEvaluator;
         hasIndex = store.hasIndexOn( evaluator.getExpression().getAttributeType() );
 
@@ -176,7 +177,7 @@ public class SubstringCursor extends Abs
     public boolean last() throws LdapException, CursorException, IOException
     {
         afterLast();
-        
+
         return previous();
     }
 
@@ -257,7 +258,7 @@ public class SubstringCursor extends Abs
         {
             LOG_CURSOR.debug( "Closing SubstringCursor {}", this );
         }
-        
+
         super.close();
         wrapped.close();
         clear();
@@ -273,7 +274,7 @@ public class SubstringCursor extends Abs
         {
             LOG_CURSOR.debug( "Closing SubstringCursor {}", this );
         }
-        
+
         super.close( cause );
         wrapped.close( cause );
         clear();



Mime
View raw message