directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918774 [2/2] - in /directory/apacheds/trunk: jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ kerberos-shared/src/main...
Date Wed, 03 Mar 2010 23:33:14 GMT
Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
(original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
Wed Mar  3 23:33:13 2010
@@ -23,7 +23,7 @@
 
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -44,10 +44,10 @@
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testSuite,ou=system"
) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system"
) ) );
         }
 
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassB,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassB,ou=system" )
) );
     }
     
     
@@ -57,12 +57,12 @@
         // this assertion will only work if ran as part of TestSuite
         // commenting this to make maven report test success, uncomment in an IDE
         // while running the TestSuite
-        // assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testSuite,ou=system"
) ) );
+        // assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system"
) ) );
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testSuite,ou=system"
) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system"
) ) );
         }
 
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testClassB,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testClassB,ou=system" )
) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
(original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
Wed Mar  3 23:33:13 2010
@@ -23,7 +23,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -35,14 +35,14 @@
     {
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testSuite,ou=system"
) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "cn=testSuite,ou=system"
) ) );
         }
 
-        assertFalse( service.getAdminSession().exists( new LdapDN( "cn=testClassC,ou=system"
) ) );
+        assertFalse( service.getAdminSession().exists( new DN( "cn=testClassC,ou=system"
) ) );
         
         // the below DN will be injected in TestClassB when ran as suite, but that DN
         // shouldn't be present in the suite level DS cause of revert operation
-        assertFalse( service.getAdminSession().exists( new LdapDN( "cn=testClassB,ou=system"
) ) );
+        assertFalse( service.getAdminSession().exists( new DN( "cn=testClassB,ou=system"
) ) );
     }
     
     
@@ -50,7 +50,7 @@
     @ApplyLdifFiles( "test-entry.ldif" )
     public void testWithApplyLdifFiles() throws Exception
     {
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testPerson1,ou=system"
) ) );
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testPerson2,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson1,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson2,ou=system"
) ) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
(original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
Wed Mar  3 23:33:13 2010
@@ -21,7 +21,7 @@
 import static org.junit.Assert.assertTrue;
 
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -32,13 +32,13 @@
     @ApplyLdifFiles( "test-entry.ldif" )
     public void testWithApplyLdifFiles() throws Exception
     {
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testPerson1,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson1,ou=system"
) ) );
         
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "dc=example,dc=com"
) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "dc=example,dc=com" ) )
);
         }
         
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testPerson2,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson2,ou=system"
) ) );
     }
 }

Modified: directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
(original)
+++ directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
Wed Mar  3 23:33:13 2010
@@ -25,7 +25,7 @@
 import org.apache.directory.server.annotations.CreateLdapServer;
 import org.apache.directory.server.annotations.CreateTransport;
 import org.apache.directory.server.core.annotations.ApplyLdifFiles;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -41,11 +41,11 @@
     @ApplyLdifFiles( "test-entry.ldif" )
     public void testWithApplyLdifFiles() throws Exception
     {
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testPerson1,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson1,ou=system"
) ) );
         
         if ( isRunInSuite )
         {
-            assertTrue( service.getAdminSession().exists( new LdapDN( "dc=example,dc=com"
) ) );
+            assertTrue( service.getAdminSession().exists( new DN( "dc=example,dc=com" ) )
);
             // the SuiteDS is the name given to the DS instance in the enclosing TestSuite
             assertEquals( "SuiteDS", ldapServer.getDirectoryService().getInstanceId() );
         }
@@ -54,7 +54,7 @@
             assertTrue( ldapServer.getDirectoryService().getInstanceId().startsWith( "default"
) ); // after 'default' a UUID follows
         }
         
-        assertTrue( service.getAdminSession().exists( new LdapDN( "cn=testPerson2,ou=system"
) ) );
+        assertTrue( service.getAdminSession().exists( new DN( "cn=testPerson2,ou=system"
) ) );
         
         assertNotNull( ldapServer );
     }

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
Wed Mar  3 23:33:13 2010
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -94,12 +94,12 @@
 
 
     /**
-     * @see SearchEngine#cursor(LdapDN, AliasDerefMode, ExprNode, SearchControls)
+     * @see SearchEngine#cursor(DN, AliasDerefMode, ExprNode, SearchControls)
      */
-    public IndexCursor<ID, ServerEntry, ID> cursor( LdapDN base, AliasDerefMode aliasDerefMode,
ExprNode filter,
+    public IndexCursor<ID, ServerEntry, ID> cursor( DN base, AliasDerefMode aliasDerefMode,
ExprNode filter,
         SearchControls searchCtls ) throws Exception
     {
-        LdapDN effectiveBase;
+        DN effectiveBase;
         ID baseId = db.getEntryId( base.toString() );
 
         // Check that we have an entry, otherwise we can immediately get out
@@ -132,7 +132,7 @@
          */
         else
         {
-            effectiveBase = new LdapDN( aliasedBase );
+            effectiveBase = new DN( aliasedBase );
         }
 
         // --------------------------------------------------------------------

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
Wed Mar  3 23:33:13 2010
@@ -44,7 +44,7 @@
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.filter.GreaterEqNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -627,7 +627,7 @@
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getComparator() );
 
-        LdapDN dn = new LdapDN( "cn=jane doe,o=good times co." );
+        DN dn = new DN( "cn=jane doe,o=good times co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
         attrs.add( "objectClass", "person" );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
Wed Mar  3 23:33:13 2010
@@ -44,7 +44,7 @@
 import org.apache.directory.shared.ldap.csn.CsnFactory;
 import org.apache.directory.shared.ldap.cursor.InvalidCursorPositionException;
 import org.apache.directory.shared.ldap.filter.LessEqNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.schema.MatchingRule;
@@ -669,7 +669,7 @@
         assertNotNull( evaluator.getNormalizer() );
         assertNotNull( evaluator.getLdapComparator() );
 
-        LdapDN dn = new LdapDN( "cn=jane doe,o=good times co." );
+        DN dn = new DN( "cn=jane doe,o=good times co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         ServerEntry attrs = new DefaultServerEntry( schemaManager, dn );
         attrs.add( "objectClass", "person" );

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
Wed Mar  3 23:33:13 2010
@@ -44,7 +44,7 @@
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.SchemaUtils;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
@@ -662,7 +662,7 @@
     @Test
     public void testCursorWithDereferencing3() throws Exception
     {
-        LdapDN dn = new LdapDN( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID
+ "=board of directors,"
+        DN dn = new DN( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID +
"=board of directors,"
             + SchemaConstants.O_AT_OID + "=good times co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -674,7 +674,7 @@
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( attrs );
 
-        dn = new LdapDN( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID
+ "=board of directors,"
+        dn = new DN( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID + "=board
of directors,"
             + SchemaConstants.O_AT_OID + "=good times co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 

Modified: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
(original)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
Wed Mar  3 23:33:13 2010
@@ -45,7 +45,7 @@
 import org.apache.directory.shared.ldap.filter.ScopeNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
@@ -624,7 +624,7 @@
     @Test
     public void testCursorWithDereferencing3() throws Exception
     {
-        LdapDN dn = new LdapDN( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID
+ "=board of directors,"
+        DN dn = new DN( SchemaConstants.CN_AT_OID + "=jd," + SchemaConstants.OU_AT_OID +
"=board of directors,"
             + SchemaConstants.O_AT_OID + "=good times co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 
@@ -636,7 +636,7 @@
         attrs.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( attrs );
 
-        dn = new LdapDN( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID
+ "=board of directors,"
+        dn = new DN( SchemaConstants.CN_AT_OID + "=jdoe," + SchemaConstants.OU_AT_OID + "=board
of directors,"
             + SchemaConstants.O_AT_OID + "=good times co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
 

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
(original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
Wed Mar  3 23:33:13 2010
@@ -37,7 +37,7 @@
 import org.apache.directory.server.xdbm.search.Evaluator;
 import org.apache.directory.server.xdbm.search.SearchEngine;
 import org.apache.directory.shared.ldap.filter.ExprNode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 
 
 /**
@@ -195,7 +195,7 @@
 
         try
         {
-            LdapDN dn = new LdapDN( partition.getEntryDn( id ) );
+            DN dn = new DN( partition.getEntryDn( id ) );
             buf.append( "(" ).append( id ).append( ") " );
             buf.append( dn.getRdn() );
         }

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
(original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
Wed Mar  3 23:33:13 2010
@@ -72,7 +72,7 @@
 import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import org.apache.directory.shared.ldap.ldif.LdifReader;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
@@ -466,7 +466,7 @@
             {
                 String updn = entry.getDn().getName();
 
-                LdapDN ndn = new LdapDN( StringTools.deepTrimToLower( updn ) );
+                DN ndn = new DN( StringTools.deepTrimToLower( updn ) );
 
                 ServerEntry attrs = new DefaultServerEntry( schemaManager, entry.getEntry()
);
 
@@ -662,7 +662,7 @@
             limitMax = Integer.parseInt( limit );
         }
 
-        IndexCursor<Long, ServerEntry, Long> cursor = partition.getSearchEngine().cursor(
new LdapDN( base ),
+        IndexCursor<Long, ServerEntry, Long> cursor = partition.getSearchEngine().cursor(
new DN( base ),
             AliasDerefMode.DEREF_ALWAYS, root, ctls );
         String[] cols = new String[2];
         cols[0] = "id";

Modified: directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java?rev=918774&r1=918773&r2=918774&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
(original)
+++ directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/StoreUtils.java
Wed Mar  3 23:33:13 2010
@@ -36,7 +36,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 
 
@@ -68,7 +68,7 @@
     {
         store.setSuffixDn( "o=Good Times Co." );
 
-        LdapDN suffixDn = new LdapDN( "o=Good Times Co." );
+        DN suffixDn = new DN( "o=Good Times Co." );
         suffixDn.normalize( schemaManager.getNormalizerMapping() );
 
         store.init( schemaManager );
@@ -82,7 +82,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #2
-        LdapDN dn = new LdapDN( "ou=Sales,o=Good Times Co." );
+        DN dn = new DN( "ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
@@ -92,7 +92,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #3
-        dn = new LdapDN( "ou=Board of Directors,o=Good Times Co." );
+        dn = new DN( "ou=Board of Directors,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
@@ -102,7 +102,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #4
-        dn = new LdapDN( "ou=Engineering,o=Good Times Co." );
+        dn = new DN( "ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
@@ -112,7 +112,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #5
-        dn = new LdapDN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -124,7 +124,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #6
-        dn = new LdapDN( "cn=JIM BEAN,ou=Sales,o=Good Times Co." );
+        dn = new DN( "cn=JIM BEAN,ou=Sales,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -136,7 +136,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #7
-        dn = new LdapDN( "ou=Apache,ou=Board of Directors,o=Good Times Co." );
+        dn = new DN( "ou=Apache,ou=Board of Directors,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "organizationalUnit" );
@@ -146,7 +146,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #8
-        dn = new LdapDN( "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
+        dn = new DN( "cn=Jack Daniels,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "person", "organizationalPerson" );
@@ -160,7 +160,7 @@
         // aliases -------------
 
         // Entry #9
-        dn = new LdapDN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times
Co." );
+        dn = new DN( "commonName=Jim Bean,ou=Apache,ou=Board of Directors,o=Good Times Co."
);
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
@@ -170,7 +170,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #10
-        dn = new LdapDN( "commonName=Jim Bean,ou=Board of Directors,o=Good Times Co." );
+        dn = new DN( "commonName=Jim Bean,ou=Board of Directors,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );
@@ -179,7 +179,7 @@
         injectEntryInStore( store, entry );
 
         // Entry #11
-        dn = new LdapDN( "2.5.4.3=Johnny Walker,ou=Engineering,o=Good Times Co." );
+        dn = new DN( "2.5.4.3=Johnny Walker,ou=Engineering,o=Good Times Co." );
         dn.normalize( schemaManager.getNormalizerMapping() );
         entry = new DefaultServerEntry( schemaManager, dn );
         entry.add( "objectClass", "top", "alias", "extensibleObject" );



Mime
View raw message