directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918771 [4/4] - in /directory/apacheds/trunk: core-entry/src/main/java/org/apache/directory/server/core/entry/ core-entry/src/test/java/org/apache/directory/server/core/entry/ core-integ/src/main/java/org/apache/directory/server/core/integ/...
Date Wed, 03 Mar 2010 23:29:20 GMT
Modified: directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
(original)
+++ directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
Wed Mar  3 23:29:19 2010
@@ -78,7 +78,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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -183,7 +183,7 @@
         LdapServer server = new LdapServer();
         server.setServiceId( getString( "ads-serverId", ldapServerEntry ) );
 
-        LdapDN transportsDN = new LdapDN( getString( "ads-transports", ldapServerEntry )
);
+        DN transportsDN = new DN( getString( "ads-transports", ldapServerEntry ) );
         transportsDN.normalize( schemaManager.getNormalizerMapping() );
         Transport[] transports = getTransports( transportsDN );
         server.setTransports( transports );
@@ -224,7 +224,7 @@
 
         kdcServer.setServiceId( getString( "ads-serverId", kdcEntry ) );
 
-        LdapDN transportsDN = new LdapDN( getString( "ads-transports", kdcEntry ) );
+        DN transportsDN = new DN( getString( "ads-transports", kdcEntry ) );
         transportsDN.normalize( schemaManager.getNormalizerMapping() );
         Transport[] transports = getTransports( transportsDN );
         kdcServer.setTransports( transports );
@@ -366,7 +366,7 @@
 
         dnsServer.setServiceId( getString( "ads-serverId", dnsEntry ) );
 
-        LdapDN transportsDN = new LdapDN( getString( "ads-transports", dnsEntry ) );
+        DN transportsDN = new DN( getString( "ads-transports", dnsEntry ) );
         transportsDN.normalize( schemaManager.getNormalizerMapping() );
         Transport[] transports = getTransports( transportsDN );
         dnsServer.setTransports( transports );
@@ -441,7 +441,7 @@
 
         ntpServer.setServiceId( getString( "ads-serverId", ntpEntry ) );
 
-        LdapDN transportsDN = new LdapDN( getString( "ads-transports", ntpEntry ) );
+        DN transportsDN = new DN( getString( "ads-transports", ntpEntry ) );
         transportsDN.normalize( schemaManager.getNormalizerMapping() );
         Transport[] transports = getTransports( transportsDN );
         ntpServer.setTransports( transports );
@@ -497,7 +497,7 @@
 
         if ( webAppsAttr != null )
         {
-            LdapDN webAppsDN = new LdapDN( webAppsAttr.getString() );
+            DN webAppsDN = new DN( webAppsAttr.getString() );
             webAppsDN.normalize( schemaManager.getNormalizerMapping() );
 
             Set<WebApp> webApps = getWebApps( webAppsDN );
@@ -544,12 +544,12 @@
         dirService.setInstanceId( getString( "ads-directoryServiceId", dsEntry ) );
         dirService.setReplicaId( getInt( "ads-dsReplicaId", dsEntry ) );
 
-        LdapDN interceptorsDN = new LdapDN( dsEntry.get( "ads-dsInterceptors" ).getString()
);
+        DN interceptorsDN = new DN( dsEntry.get( "ads-dsInterceptors" ).getString() );
         interceptorsDN.normalize( configPartition.getSchemaManager().getNormalizerMapping()
);
         List<Interceptor> interceptors = getInterceptors( interceptorsDN );
         dirService.setInterceptors( interceptors );
 
-        LdapDN partitionsDN = new LdapDN( dsEntry.get( "ads-dsPartitions" ).getString() );
+        DN partitionsDN = new DN( dsEntry.get( "ads-dsPartitions" ).getString() );
         partitionsDN.normalize( configPartition.getSchemaManager().getNormalizerMapping()
);
 
         Map<String, Partition> partitions = getPartitions( partitionsDN );
@@ -583,7 +583,7 @@
 
         if ( changeLogAttr != null )
         {
-            LdapDN clDN = new LdapDN( changeLogAttr.getString() );
+            DN clDN = new DN( changeLogAttr.getString() );
             clDN.normalize( schemaManager.getNormalizerMapping() );
             ChangeLog cl = getChangeLog( clDN );
             dirService.setChangeLog( cl );
@@ -600,7 +600,7 @@
 
         if ( journalAttr != null )
         {
-            LdapDN journalDN = new LdapDN( journalAttr.getString() );
+            DN journalDN = new DN( journalAttr.getString() );
             journalDN.normalize( schemaManager.getNormalizerMapping() );
             dirService.setJournal( getJournal( journalDN ) );
         }
@@ -660,7 +660,7 @@
      * @return a list of instantiated Interceptor objects
      * @throws Exception
      */
-    private List<Interceptor> getInterceptors( LdapDN interceptorsDN ) throws Exception
+    private List<Interceptor> getInterceptors( DN interceptorsDN ) throws Exception
     {
         PresenceNode filter = new PresenceNode( "ads-interceptorId" );
         SearchControls controls = new SearchControls();
@@ -706,7 +706,7 @@
     }
 
 
-    private Map<String, Partition> getPartitions( LdapDN partitionsDN ) throws Exception
+    private Map<String, Partition> getPartitions( DN partitionsDN ) throws Exception
     {
         PresenceNode filter = new PresenceNode( "ads-partitionId" );
         SearchControls controls = new SearchControls();
@@ -778,14 +778,14 @@
 
         String indexesDN = partitionEntry.get( "ads-partitionIndexedAttributes" ).getString();
 
-        Set<Index<?, ServerEntry, Long>> indexedAttributes = getIndexes( new
LdapDN( indexesDN ) );
+        Set<Index<?, ServerEntry, Long>> indexedAttributes = getIndexes( new
DN( indexesDN ) );
         partition.setIndexedAttributes( indexedAttributes );
 
         return partition;
     }
 
 
-    private Set<Index<?, ServerEntry, Long>> getIndexes( LdapDN indexesDN ) throws
Exception
+    private Set<Index<?, ServerEntry, Long>> getIndexes( DN indexesDN ) throws
Exception
     {
         PresenceNode filter = new PresenceNode( "ads-indexAttributeId" );
         SearchControls controls = new SearchControls();
@@ -837,7 +837,7 @@
     }
 
 
-    private Transport[] getTransports( LdapDN transportsDN ) throws Exception
+    private Transport[] getTransports( DN transportsDN ) throws Exception
     {
         PresenceNode filter = new PresenceNode( "ads-transportId" );
         SearchControls controls = new SearchControls();
@@ -918,7 +918,7 @@
     }
 
 
-    private ChangeLog getChangeLog( LdapDN changelogDN ) throws Exception
+    private ChangeLog getChangeLog( DN changelogDN ) throws Exception
     {
         long id = configPartition.getEntryId( changelogDN.getNormName() );
         Entry clEntry = configPartition.lookup( id );
@@ -942,7 +942,7 @@
     }
 
 
-    private Journal getJournal( LdapDN journalDN ) throws Exception
+    private Journal getJournal( DN journalDN ) throws Exception
     {
         long id = configPartition.getEntryId( journalDN.getNormName() );
         Entry jlEntry = configPartition.lookup( id );
@@ -1018,7 +1018,7 @@
     }
 
 
-    private Set<WebApp> getWebApps( LdapDN webAppsDN ) throws Exception
+    private Set<WebApp> getWebApps( DN webAppsDN ) throws Exception
     {
         PresenceNode filter = new PresenceNode( "ads-httpWarFile" );
         SearchControls controls = new SearchControls();

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
(original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/KeyDerivationInterceptor.java
Wed Mar  3 23:29:19 2010
@@ -71,7 +71,7 @@
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
-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;
@@ -128,7 +128,7 @@
      */
     public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
     {
-        LdapDN normName = addContext.getDn();
+        DN normName = addContext.getDn();
 
         ServerEntry entry = addContext.getEntry();
 
@@ -286,7 +286,7 @@
     void lookupPrincipalAttributes( ModifyOperationContext modContext, ModifySubContext subContext
)
         throws Exception
     {
-        LdapDN principalDn = modContext.getDn();
+        DN principalDn = modContext.getDn();
 
         LookupOperationContext lookupContext = modContext.newLookupContext( principalDn );
         lookupContext.setByPassed( USERLOOKUP_BYPASS );

Modified: directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
(original)
+++ directory/apacheds/trunk/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyInterceptor.java
Wed Mar  3 23:29:19 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,7 +67,7 @@
      */
     public void add( NextInterceptor next, AddOperationContext addContext ) throws Exception
     {
-        LdapDN normName = addContext.getDn();
+        DN normName = addContext.getDn();
 
         ServerEntry entry = addContext.getEntry();
 
@@ -111,7 +111,7 @@
      */
     public void modify( NextInterceptor next, ModifyOperationContext modContext ) throws
Exception
     {
-        LdapDN name = modContext.getDn();
+        DN name = modContext.getDn();
 
         List<Modification> mods = modContext.getModItems();
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java?rev=918771&r1=918770&r2=918771&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
Wed Mar  3 23:29:19 2010
@@ -24,7 +24,7 @@
 
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.tree.DnBranchNode;
 import org.apache.directory.shared.ldap.util.tree.DnLeafNode;
 import org.apache.directory.shared.ldap.util.tree.DnNode;
@@ -52,7 +52,7 @@
         /** A structure to hold all the partitions */
         DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
-        LdapDN suffix = new LdapDN( "dc=example, dc=com" );
+        DN suffix = new DN( "dc=example, dc=com" );
         Partition partition = new JdbmPartition();
         partition.setSuffix( suffix.getName() );
         
@@ -79,13 +79,13 @@
         /** A structure to hold all the partitions */
         DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
-        LdapDN suffix1 = new LdapDN( "dc=example, dc=com" );
+        DN suffix1 = new DN( "dc=example, dc=com" );
         Partition partition1 = new JdbmPartition();
         partition1.setSuffix( suffix1.getName() );
         
         partitionLookupTree.add( suffix1, partition1 );
         
-        LdapDN suffix2 = new LdapDN( "ou=system" );
+        DN suffix2 = new DN( "ou=system" );
         Partition partition2 = new JdbmPartition();
         partition2.setSuffix( suffix2.getName() );
         
@@ -118,13 +118,13 @@
         /** A structure to hold all the partitions */
         DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
-        LdapDN suffix1 = new LdapDN( "dc=com" );
+        DN suffix1 = new DN( "dc=com" );
         Partition partition1 = new JdbmPartition();
         partition1.setSuffix( suffix1.getName() );
         
         partitionLookupTree.add( suffix1, partition1 );
         
-        LdapDN suffix2 = new LdapDN( "dc=example, dc=com" );
+        DN suffix2 = new DN( "dc=example, dc=com" );
         Partition partition2 = new JdbmPartition();
         partition2.setSuffix( suffix2.getName() );
         
@@ -148,13 +148,13 @@
         /** A structure to hold all the partitions */
         DnBranchNode<Partition> partitionLookupTree = new DnBranchNode<Partition>();
         
-        LdapDN suffix1 = new LdapDN( "dc=example1, dc=com" );
+        DN suffix1 = new DN( "dc=example1, dc=com" );
         Partition partition1 = new JdbmPartition();
         partition1.setSuffix( suffix1.getName() );
         
         partitionLookupTree.add( suffix1, partition1 );
         
-        LdapDN suffix2 = new LdapDN( "dc=example2, dc=com" );
+        DN suffix2 = new DN( "dc=example2, dc=com" );
         Partition partition2 = new JdbmPartition();
         partition2.setSuffix( suffix2.getName() );
         



Mime
View raw message