directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1200292 [3/3] - in /directory: apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ apacheds/branches/apacheds-txns/jdbm-partition/src/main/java/org/apache/directory/server/core/parti...
Date Thu, 10 Nov 2011 12:30:00 GMT
Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Thu Nov 10 12:29:58 2011
@@ -32,7 +32,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
 import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
@@ -44,6 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -125,7 +126,7 @@ public class SubstringTest
 
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
         
         LOG.debug( "Created new store" );
     }
@@ -162,29 +163,29 @@ public class SubstringTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -200,29 +201,29 @@ public class SubstringTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -236,29 +237,29 @@ public class SubstringTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -270,29 +271,29 @@ public class SubstringTest
         cursor.last();
         assertTrue( cursor.available() );
 
-        assertEquals( StoreUtils.getUUIDString( 11 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 11 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "johnny walker", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 8 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 8 ), cursor.get().getId() );
         assertEquals( "jack daniels", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -313,15 +314,15 @@ public class SubstringTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -333,15 +334,15 @@ public class SubstringTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -355,15 +356,15 @@ public class SubstringTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -375,15 +376,15 @@ public class SubstringTest
         cursor.last();
         assertTrue( cursor.available() );
 
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -404,15 +405,15 @@ public class SubstringTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );;
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );;
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -424,15 +425,15 @@ public class SubstringTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -446,15 +447,15 @@ public class SubstringTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -466,15 +467,15 @@ public class SubstringTest
         cursor.last();
         assertTrue( cursor.available() );
 
-        assertEquals( StoreUtils.getUUIDString( 10 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 10 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 9 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 9 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "jim bean", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -495,7 +496,7 @@ public class SubstringTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "bean", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -508,7 +509,7 @@ public class SubstringTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "bean", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -522,7 +523,7 @@ public class SubstringTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "bean", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -535,7 +536,7 @@ public class SubstringTest
         assertTrue( cursor.available() );
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 6 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 6 ), cursor.get().getId() );
         assertEquals( "bean", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -556,7 +557,7 @@ public class SubstringTest
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -568,7 +569,7 @@ public class SubstringTest
         cursor.first();
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.next() );
@@ -582,7 +583,7 @@ public class SubstringTest
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -595,7 +596,7 @@ public class SubstringTest
         assertTrue( cursor.available() );
 
         assertTrue( cursor.available() );
-        assertEquals( StoreUtils.getUUIDString( 5 ), cursor.get().getId() );
+        assertEquals( Strings.getUUIDString( 5 ), cursor.get().getId() );
         assertEquals( "walker", cursor.get().getValue() );
 
         assertFalse( cursor.previous() );
@@ -609,48 +610,48 @@ public class SubstringTest
         SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "walk", null );
         SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
+        indexEntry.setId( Strings.getUUIDString( 5 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
-        indexEntry.setId( StoreUtils.getUUIDString( 3 ) );
+        indexEntry.setId( Strings.getUUIDString( 3 ) );
         indexEntry.setEntry( null );
         assertFalse( evaluator.evaluate( indexEntry ) );
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         indexEntry.setEntry( null );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "wa", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 5 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 5 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 5 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 5 ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "searchGuide" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 6 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 6 ) ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "st" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 6 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 6 ) ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "name" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 6 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 6 ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "name" ), "s", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 6 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 6 ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -661,24 +662,24 @@ public class SubstringTest
         SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "jim", null );
         SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager );
         ForwardIndexEntry<String> indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
-        indexEntry.setId( StoreUtils.getUUIDString( 3 ) );
+        indexEntry.setId( Strings.getUUIDString( 3 ) );
         indexEntry.setEntry( null );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "j", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 6 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 6 ) ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "s", null );
         evaluator = new SubstringEvaluator( node, store, schemaManager );
         indexEntry = new ForwardIndexEntry<String>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
-        indexEntry.setEntry( store.lookup( StoreUtils.getUUIDString( 6 ) ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
+        indexEntry.setEntry( store.lookup( Strings.getUUIDString( 6 ) ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Thu Nov 10 12:29:58 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.partition.index.ForwardIndexEntry;
 import org.apache.directory.server.core.api.partition.index.IndexEntry;
 import org.apache.directory.server.xdbm.Store;
-import org.apache.directory.server.xdbm.StoreUtils;
+import org.apache.directory.server.xdbm.XdbmStoreUtils;
 import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.csn.CsnFactory;
@@ -53,6 +53,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.util.Strings;
 import org.apache.directory.shared.util.exception.Exceptions;
 import org.junit.After;
 import org.junit.Before;
@@ -133,7 +134,7 @@ public class SubtreeScopeTest
 
         ((Partition)store).initialize();
 
-        StoreUtils.loadExampleData( store, schemaManager );
+        XdbmStoreUtils.loadExampleData( store, schemaManager );
         
         LOG.debug( "Created new store" );
     }
@@ -174,22 +175,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -203,22 +204,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -233,22 +234,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -262,22 +263,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -291,22 +292,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 5 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 5 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 2 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 2 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -330,22 +331,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -359,22 +360,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -389,22 +390,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -418,22 +419,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -447,22 +448,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -476,22 +477,22 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -516,15 +517,15 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -538,15 +539,15 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -561,15 +562,15 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -583,15 +584,15 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -605,15 +606,15 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -631,7 +632,7 @@ public class SubtreeScopeTest
         entry.add( "cn", "jd" );
         entry.add( "aliasedObjectName", "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        entry.add( "entryUUID", StoreUtils.getUUIDString( 12 ).toString() );
+        entry.add( "entryUUID", Strings.getUUIDString( 12 ).toString() );
 
         AddOperationContext addContext = new AddOperationContext( null, entry );
         ((Partition)store).add( addContext );
@@ -644,7 +645,7 @@ public class SubtreeScopeTest
         entry.add( "cn", "jdoe" );
         entry.add( "sn", "doe" );
         entry.add( "entryCSN", new CsnFactory( 1 ).newInstance().toString() );
-        entry.add( "entryUUID", StoreUtils.getUUIDString( 13 ).toString() );
+        entry.add( "entryUUID", Strings.getUUIDString( 13 ).toString() );
         
         addContext = new AddOperationContext( null, entry );
         ((Partition)store).add( addContext );
@@ -663,36 +664,36 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         IndexEntry<UUID> indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -707,29 +708,29 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -744,36 +745,36 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -787,36 +788,36 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -830,36 +831,36 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.previous() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.previous() );
         assertFalse( cursor.available() );
@@ -873,36 +874,36 @@ public class SubtreeScopeTest
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 7 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 7 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 13 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 13 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 6 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 6 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertTrue( cursor.next() );
         assertTrue( cursor.available() );
         indexEntry = cursor.get();
         assertNotNull( indexEntry );
-        assertEquals( StoreUtils.getUUIDString( 8 ), indexEntry.getId() );
-        assertEquals( StoreUtils.getUUIDString( 3 ), indexEntry.getValue() );
+        assertEquals( Strings.getUUIDString( 8 ), indexEntry.getId() );
+        assertEquals( Strings.getUUIDString( 3 ), indexEntry.getValue() );
 
         assertFalse( cursor.next() );
         assertFalse( cursor.available() );
@@ -917,7 +918,7 @@ public class SubtreeScopeTest
         SubtreeScopeEvaluator evaluator = new SubtreeScopeEvaluator( store, node );
 
         ForwardIndexEntry<UUID> indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
     }
 
@@ -935,15 +936,15 @@ public class SubtreeScopeTest
          * are aliases.  This is done to filter out aliases from the results.
          */
         ForwardIndexEntry<UUID> indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 11 ) );
+        indexEntry.setId( Strings.getUUIDString( 11 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 8 ) );
+        indexEntry.setId( Strings.getUUIDString( 8 ) );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
         indexEntry = new ForwardIndexEntry<UUID>();
-        indexEntry.setId( StoreUtils.getUUIDString( 6 ) );
+        indexEntry.setId( Strings.getUUIDString( 6 ) );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
 
@@ -969,7 +970,7 @@ public class SubtreeScopeTest
 
         // test before()
         ForwardIndexEntry<UUID> entry = new ForwardIndexEntry<UUID>();
-        entry.setValue( StoreUtils.getUUIDString( 3 ) );
+        entry.setValue( Strings.getUUIDString( 3 ) );
         cursor.before( entry );
     }
 
@@ -984,7 +985,7 @@ public class SubtreeScopeTest
 
         // test after()
         ForwardIndexEntry<UUID> entry = new ForwardIndexEntry<UUID>();
-        entry.setValue( StoreUtils.getUUIDString( 3 ) );
+        entry.setValue( Strings.getUUIDString( 3 ) );
         cursor.after( entry );
     }
 

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.400.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.400.ldif?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.400.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.400.ldif Thu Nov 10 12:29:58 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.400,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-krbAllowableClockSkew
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.400
 m-description: The allowable clock skew
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-krbAllowableClockSkew
-creatorsname: uid=admin,ou=system
 m-equality: integerMatch
+m-ordering: integerOrderingMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.4.ldif?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.4.ldif Thu Nov 10 12:29:58 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.4,ou=attributeTypes,cn=apache,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+m-name: apacheOneLevel
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.4
-m-obsolete: FALSE
 m-description: Index attribute used to track one level searches
-m-nousermodification: TRUE
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+objectclass: metaTop
+objectclass: metaAttributeType
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.40
+m-equality: uuidMatch
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: TRUE
 m-usage: DSA_OPERATION
-m-name: apacheOneLevel
 creatorsname: uid=admin,ou=system
-m-equality: integerMatch

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.43.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.43.ldif?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.43.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.43.ldif Thu Nov 10 12:29:58 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.43,ou=attributeTypes,cn=apache,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+m-name: apacheSubLevel
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.43
-m-obsolete: FALSE
 m-description: Index attribute used to track sub level searches
-m-nousermodification: TRUE
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+objectclass: metaTop
+objectclass: metaAttributeType
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.40
+m-equality: uuidMatch
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: TRUE
 m-usage: DSA_OPERATION
-m-name: apacheSubLevel
 creatorsname: uid=admin,ou=system
-m-equality: integerMatch

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.5.ldif?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.5.ldif Thu Nov 10 12:29:58 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.5,ou=attributeTypes,cn=apache,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+m-name: apacheOneAlias
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.5
-m-obsolete: FALSE
 m-description: Index attribute used to track single level aliases
-m-nousermodification: TRUE
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+objectclass: metaTop
+objectclass: metaAttributeType
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.40
+m-equality: uuidMatch
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: TRUE
 m-usage: DSA_OPERATION
-m-name: apacheOneAlias
 creatorsname: uid=admin,ou=system
-m-equality: integerMatch

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dapache/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.6.ldif?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=apache/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.6.ldif Thu Nov 10 12:29:58 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.6,ou=attributeTypes,cn=apache,ou=schema
-m-collective: FALSE
-m-singlevalue: FALSE
+m-name: apacheSubAlias
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.6
-m-obsolete: FALSE
 m-description: Index attribute used to track sub level aliases
-m-nousermodification: TRUE
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
+objectclass: metaTop
+objectclass: metaAttributeType
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.40
+m-equality: uuidMatch
+m-singlevalue: FALSE
+m-collective: FALSE
+m-obsolete: FALSE
+m-nousermodification: TRUE
 m-usage: DSA_OPERATION
-m-name: apacheSubAlias
 creatorsname: uid=admin,ou=system
-m-equality: integerMatch

Modified: directory/shared/branches/shared-txns/util/src/main/java/org/apache/directory/shared/util/Strings.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/util/src/main/java/org/apache/directory/shared/util/Strings.java?rev=1200292&r1=1200291&r2=1200292&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/util/src/main/java/org/apache/directory/shared/util/Strings.java (original)
+++ directory/shared/branches/shared-txns/util/src/main/java/org/apache/directory/shared/util/Strings.java Thu Nov 10 12:29:58 2011
@@ -34,6 +34,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 
 import org.apache.directory.shared.i18n.I18n;
 import org.slf4j.Logger;
@@ -1874,6 +1875,24 @@ public final class Strings
         return true;
     }
 
+    
+    /**
+     * Construct an UUID based on an integer value
+     * @param idx The value
+     * @return A UUID
+     */
+    public static UUID getUUIDString( int idx )
+    {
+        /** UUID string */
+        UUID baseUUID = UUID.fromString( "00000000-0000-0000-0000-000000000000" );
+        
+        long low = baseUUID.getLeastSignificantBits();
+        long high = baseUUID.getMostSignificantBits();
+        low = low + idx;
+        
+        return new UUID( high, low );
+    }
+
 
     /**
      * Checks to see if a String is a valid UUID.



Mime
View raw message