directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1144018 - in /directory: apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/ apacheds/trunk/jdbm-partition/src/test/java/org/apache/d...
Date Thu, 07 Jul 2011 20:26:27 GMT
Author: elecharny
Date: Thu Jul  7 20:26:26 2011
New Revision: 1144018

URL: http://svn.apache.org/viewvc?rev=1144018&view=rev
Log:
o Renamed the apacheExistence AT to apachePresence

Modified:
    directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
    directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/server-config/src/main/resources/config.ldif
    directory/shared/trunk/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.3.ldif

Modified: directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java?rev=1144018&r1=1144017&r2=1144018&view=diff
==============================================================================
--- directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
(original)
+++ directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
Thu Jul  7 20:26:26 2011
@@ -102,9 +102,9 @@ public final class ApacheSchemaConstants
     public final static String APACHE_UP_DN_AT = "apacheUpdn";
     public final static String APACHE_UP_DN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.2";
 
-    // ApacheExistence
-    public final static String APACHE_EXISTENCE_AT = "apacheExistence";
-    public final static String APACHE_EXISTENCE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.3";
+    // ApachePresence
+    public final static String APACHE_PRESENCE_AT = "ApachePresence";
+    public final static String APACHE_PRESENCE_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.3";
 
     // ApacheOneLevel
     public final static String APACHE_ONE_LEVEL_AT = "apacheOneLevel";

Modified: directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=1144018&r1=1144017&r2=1144018&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
(original)
+++ directory/apacheds/trunk/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
Thu Jul  7 20:26:26 2011
@@ -28,8 +28,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import com.mycila.junit.concurrent.Concurrency;
-import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -41,6 +39,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests methods in SchemaInterceptor.
@@ -101,7 +102,7 @@ public class SchemaServiceTest
         // We should only have 19 AT
         String[] expectedNames = new String[]
             { "sn", "generationQualifier", "ou", "c", "o", "l", "c-st", "givenName", "title",
"cn", "initials",
-                "dmdName", "c-ou", "c-o", "apacheExistence", "st", "c-l", "ads-serverId",
"ads-indexAttributeId",
+                "dmdName", "c-ou", "c-o", "apachePresence", "st", "c-l", "ads-serverId",
"ads-indexAttributeId",
                 "ads-transportId", "ads-directoryServiceId", "ads-Id", "ads-extendedOpId",
"ads-pwdId", 
                 "ads-compositeElement", "ads-replConsumerId", "ads-journalId", "ads-changeLogId",
"ads-replProviderId" };
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=1144018&r1=1144017&r2=1144018&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
Thu Jul  7 20:26:26 2011
@@ -249,7 +249,7 @@ public class JdbmStoreTest
         assertEquals( 24, store.getCacheSize() );
 
         assertNull( store.getPresenceIndex() );
-        store.addIndex( new JdbmIndex<String, Attributes>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID
) );
+        store.addIndex( new JdbmIndex<String, Attributes>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID
) );
         assertNotNull( store.getPresenceIndex() );
 
         assertNull( store.getOneLevelIndex() );
@@ -326,7 +326,7 @@ public class JdbmStoreTest
         assertNotNull( store.getPresenceIndex() );
         try
         {
-            store.addIndex( new JdbmIndex<String, Entry>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID
) );
+            store.addIndex( new JdbmIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID
) );
             fail();
         }
         catch ( IllegalStateException e )

Modified: directory/apacheds/trunk/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config.ldif?rev=1144018&r1=1144017&r2=1144018&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config.ldif Thu Jul  7 20:26:26
2011
@@ -264,7 +264,7 @@ objectclass: ads-partition
 objectclass: ads-jdbmPartition
 ads-indexes: apacheRdn
 ads-indexes: apacheSubLevel
-ads-indexes: apacheExistence
+ads-indexes: apachePresence
 ads-indexes: apacheOneLevel
 ads-indexes: apacheOneAlias
 ads-indexes: apacheSubAlias
@@ -309,8 +309,8 @@ objectclass: ads-base
 objectclass: top
 ads-enabled: TRUE
 
-dn: ads-indexAttributeId=apacheExistence,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: apacheExistence
+dn: ads-indexAttributeId=apachePresence,ou=indexes,ads-partitionId=system,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apachePresence
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex
@@ -406,7 +406,7 @@ objectclass: ads-partition
 objectclass: ads-jdbmPartition
 ads-indexes: apacheRdn
 ads-indexes: apacheSubLevel
-ads-indexes: apacheExistence
+ads-indexes: apachePresence
 ads-indexes: apacheOneLevel
 ads-indexes: apacheOneAlias
 ads-indexes: apacheSubAlias
@@ -448,8 +448,8 @@ objectclass: ads-base
 objectclass: top
 ads-enabled: TRUE
 
-dn: ads-indexAttributeId=apacheExistence,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
-ads-indexattributeid: apacheExistence
+dn: ads-indexAttributeId=apachePresence,ou=indexes,ads-partitionId=example,ou=partitions,ads-directoryServiceId=default,ou=config
+ads-indexattributeid: apachePresence
 ads-indexcachesize: 100
 objectclass: ads-index
 objectclass: ads-jdbmIndex

Modified: directory/shared/trunk/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.3.ldif
URL: http://svn.apache.org/viewvc/directory/shared/trunk/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.3.ldif?rev=1144018&r1=1144017&r2=1144018&view=diff
==============================================================================
--- directory/shared/trunk/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.3.ldif
(original)
+++ directory/shared/trunk/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.3.ldif
Thu Jul  7 20:26:26 2011
@@ -13,5 +13,5 @@ m-syntax: 1.3.6.1.4.1.1466.115.121.1.15
 objectclass: metaAttributeType
 objectclass: metaTop
 objectclass: top
-m-name: apacheExistence
+m-name: apachePresence
 m-equality: caseIgnoreMatch



Mime
View raw message