directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r947695 - in /directory: apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ shared/trunk/ldap-schema/src/main/resources/sc...
Date Mon, 24 May 2010 16:04:38 GMT
Author: kayyagari
Date: Mon May 24 16:04:38 2010
New Revision: 947695

URL: http://svn.apache.org/viewvc?rev=947695&view=rev
Log:
o renamed the attribute 'ads-replBase' to 'ads-searchBaseDN'
o updated the referring objectclasses and java sources

Modified:
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
    directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
    directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.820.ldif
    directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
    directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif

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=947695&r1=947694&r2=947695&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
Mon May 24 16:04:38 2010
@@ -822,7 +822,7 @@ public class ConfigPartitionReader
             // mandatory attribues
             config.setReplicaId( getInt( ConfigSchemaConstants.ADS_DS_REPLICA_ID, entry )
);
             config.setProviderHost( entry.get( ConfigSchemaConstants.ADS_REPL_PROV_HOST_NAME
).getString() );
-            config.setBaseDn( entry.get( ConfigSchemaConstants.ADS_REPL_BASE ).getString()
);
+            config.setBaseDn( entry.get( ConfigSchemaConstants.ADS_SEARCH_BASE ).getString()
);
             
             // optional attributes
             

Modified: directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java?rev=947695&r1=947694&r2=947695&view=diff
==============================================================================
--- directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
(original)
+++ directory/apacheds/trunk/default-config/src/main/java/org/apache/directory/server/config/ConfigSchemaConstants.java
Mon May 24 16:04:38 2010
@@ -181,7 +181,7 @@ public interface ConfigSchemaConstants
     
     String ADS_REPL_ALIAS_DEREF_MODE = "ads-replAliasDerefMode";
     
-    String ADS_REPL_BASE = "ads-replBase";
+    String ADS_SEARCH_BASE = "ads-searchBaseDN";
     
     String ADS_REPL_SEARCH_SCOPE = "ads-replSearchScope";
     

Modified: directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java?rev=947695&r1=947694&r2=947695&view=diff
==============================================================================
--- directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
(original)
+++ directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
Mon May 24 16:04:38 2010
@@ -112,7 +112,7 @@ public class ReplicaDitStoreUtil
         entry.add( "ads-dsReplicaId", String.valueOf( replica.getId() ) );
         entry.add( "ads-replAliasDerefMode", String
             .valueOf( replica.getSearchCriteria().getAliasDerefMode().getValue() ) );
-        entry.add( "ads-replBase", replica.getSearchCriteria().getBase().getName() );
+        entry.add( "ads-searchBaseDN", replica.getSearchCriteria().getBase().getName() );
         entry.add( "ads-replLastSentCsn", replica.getLastSentCsn() );
         entry.add( "ads-replSearchScope", String.valueOf( replica.getSearchCriteria().getScope().getScope()
) );
         entry.add( "ads-replSearchFilter", replica.getSearchFilter() );
@@ -177,7 +177,7 @@ public class ReplicaDitStoreUtil
         String aliasMode = entry.get( "ads-replAliasDerefMode" ).getString();
         searchCriteria.setAliasDerefMode( AliasDerefMode.getDerefMode( Integer.parseInt(
aliasMode ) ) );
         
-        String baseDn = entry.get( "ads-replBase" ).getString();
+        String baseDn = entry.get( "ads-searchBaseDN" ).getString();
         searchCriteria.setBase( baseDn );
         
         String lastSentCsn = entry.get( "ads-replLastSentCsn" ).getString();

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.820.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.820.ldif?rev=947695&r1=947694&r2=947695&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.820.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.820.ldif
Mon May 24 16:04:38 2010
@@ -5,7 +5,7 @@ objectclass: metaTop
 objectclass: top
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.820
 entrycsn: 20100509111919.472000Z#000000#000#000000
-m-name: ads-replBase
+m-name: ads-searchBaseDN
 m-description: base DN of the DIT to be replicated
 m-supAttributeType: distinguishedName
 m-equality: distinguishedNameMatch

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.805.ldif?rev=947695&r1=947694&r2=947695&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.805.ldif
Mon May 24 16:04:38 2010
@@ -9,7 +9,7 @@ m-name: ads-replConsumer
 m-description: class to hold a replication consumer details
 m-must: ads-dsReplicaId
 m-must: ads-replAliasDerefMode
-m-must: ads-replBase
+m-must: ads-searchBaseDN
 m-must: ads-replLastSentCsn
 m-must: ads-replSearchScope
 m-must: ads-replSearchFilter

Modified: directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.806.ldif?rev=947695&r1=947694&r2=947695&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
(original)
+++ directory/shared/trunk/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.806.ldif
Mon May 24 16:04:38 2010
@@ -8,7 +8,7 @@ entrycsn: 20100511145902.546000Z#000000#
 m-name: ads-replProvider
 m-description: replication provider configuration
 m-must: ads-dsReplicaId
-m-must: ads-replBase
+m-must: ads-searchBaseDN
 m-must: ads-replProvHostName
 m-may: ads-replAliasDerefMode
 m-may: ads-replAttribute



Mime
View raw message