You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/03/19 18:51:36 UTC
svn commit: r1302570 - in /directory:
apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/
apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/
shared/trunk/integ/src/test/java/org/apache/directory...
Author: elecharny
Date: Mon Mar 19 17:51:35 2012
New Revision: 1302570
URL: http://svn.apache.org/viewvc?rev=1302570&view=rev
Log:
o Removed the apacheNDn and apacheUpDn index and declarations, as they are not used anymore
o Fixed some tests accordingly
Removed:
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.1.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.2.ldif
Modified:
directory/apacheds/trunk/core-constants/src/main/java/org/apache/directory/server/constants/ApacheSchemaConstants.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
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=1302570&r1=1302569&r2=1302570&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 Mon Mar 19 17:51:35 2012
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.constants;
@@ -94,14 +94,6 @@ public final class ApacheSchemaConstants
public final static String WINDOWS_FILE_OC_OID = "1.3.6.1.4.1.18060.0.4.1.3.6";
// ---- AttributeType ----------------------------------------------------------
- // ApacheNdn
- public final static String APACHE_N_DN_AT = "apacheNdn";
- public final static String APACHE_N_DN_AT_OID = "1.3.6.1.4.1.18060.0.4.1.2.1";
-
- // ApacheUpdn
- 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";
-
// 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";
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1302570&r1=1302569&r2=1302570&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Mon Mar 19 17:51:35 2012
@@ -6,16 +6,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
- *
+ * under the License.
+ *
*/
package org.apache.directory.server.xdbm;
@@ -94,7 +94,6 @@ public interface Store<E, ID extends Com
ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID,
ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID,
ApacheSchemaConstants.APACHE_RDN_AT_OID,
- ApacheSchemaConstants.APACHE_N_DN_AT_OID,
ApacheSchemaConstants.APACHE_ALIAS_AT_OID,
ApacheSchemaConstants.APACHE_ONE_ALIAS_AT_OID,
ApacheSchemaConstants.APACHE_SUB_ALIAS_AT_OID,
@@ -134,14 +133,14 @@ public interface Store<E, ID extends Com
/**
* Sets the flag telling the server to flush on disk when some
* modification has been done.
- * @param isSyncOnWrite A boolean set to true if we have to flush on disk
+ * @param isSyncOnWrite A boolean set to true if we have to flush on disk
* when a modification occurs
*/
void setSyncOnWrite( boolean isSyncOnWrite );
/**
- * @return <code>true</code> if we write to disk for every modification
+ * @return <code>true</code> if we write to disk for every modification
*/
boolean isSyncOnWrite();
@@ -162,9 +161,9 @@ public interface Store<E, ID extends Com
/**
- * Adds a (system or user) index to the list of index for this store.
+ * Adds a (system or user) index to the list of index for this store.
* Note that the attribute id returned by Index.getAttributeId() must be
- * the numeric OID.
+ * the numeric OID.
* @param index The index to add
* @throws Exception If the addition failed
*/
@@ -250,7 +249,7 @@ public interface Store<E, ID extends Com
* Tells if an index is already present in the User's <strong>or</strong> System's index list
* @param id The index we are looking for
* @return <code>true</code> if the index is already present in the
- * User's <strong>or</strong> System's index list
+ * User's <strong>or</strong> System's index list
* @throws Exception If something went wrong
*/
boolean hasIndexOn( AttributeType attributeType ) throws Exception;
@@ -260,7 +259,7 @@ public interface Store<E, ID extends Com
* Tells if an index is already present in the User's index list
* @param attributeType The attributeType index we are looking for
* @return <code>true</code> if the index is already present in the
- * User's index list
+ * User's index list
* @throws Exception If something went wrong
*/
boolean hasUserIndexOn( AttributeType attributeType ) throws Exception;
@@ -270,7 +269,7 @@ public interface Store<E, ID extends Com
* Tells if an index is already present in the System's index list
* @param attributeType The index we are looking for
* @return <code>true</code> if the index is already present in the
- * System's index list
+ * System's index list
* @throws Exception If something went wrong
*/
boolean hasSystemIndexOn( AttributeType attributeType ) throws Exception;
@@ -375,7 +374,7 @@ public interface Store<E, ID extends Com
* Gets the count of immediate children of the given entry ID.
*
* @param id the entry ID
- * @return the child count
+ * @return the child count
* @throws Exception on failures to access the underlying store
*/
int getChildCount( ID id ) throws Exception;
@@ -431,7 +430,7 @@ public interface Store<E, ID extends Com
* <li><b>oneAlias</b> index</li>
* <li><b>subAlias</b> index</li>
* </ul>
- * <p>The <b>Alias</b> index is not updated, as the entry ID won't change.</p>
+ * <p>The <b>Alias</b> index is not updated, as the entry ID won't change.</p>
* <p>We have a few check we must do before moving the entry :
* <ul>
* <li>The destination must not exist
Modified: directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java?rev=1302570&r1=1302569&r2=1302570&view=diff
==============================================================================
--- directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java (original)
+++ directory/shared/trunk/integ/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java Mon Mar 19 17:51:35 2012
@@ -2013,7 +2013,7 @@ public class DnTest
assertEquals(
( result ).getNormName(),
- "2.5.4.11=some people+0.9.2342.19200300.100.1.25=and some animals,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com" );
+ "0.9.2342.19200300.100.1.25=and some animals+2.5.4.11=some people,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com" );
assertTrue( ( result )
.getName()
.equals(
@@ -2035,7 +2035,7 @@ public class DnTest
assertTrue( result
.getNormName()
.equals(
- "2.5.4.11=some people+0.9.2342.19200300.100.1.25=and some animals,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com" ) );
+ "0.9.2342.19200300.100.1.25=and some animals+2.5.4.11=some people,0.9.2342.19200300.100.1.25=example,0.9.2342.19200300.100.1.25=com" ) );
assertTrue( result
.getName()
.equals(
Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java?rev=1302570&r1=1302569&r2=1302570&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerEnableDisableLoadTest.java Mon Mar 19 17:51:35 2012
@@ -156,14 +156,14 @@ public class SchemaManagerEnableDisableL
assertEquals( 0, disabled.size() );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 427, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 425, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 48, schemaManager.getComparatorRegistry().size() );
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 120, schemaManager.getObjectClassRegistry().size() );
assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 666, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -201,14 +201,14 @@ public class SchemaManagerEnableDisableL
assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 454, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 452, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 49, schemaManager.getComparatorRegistry().size() );
assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
assertEquals( 133, schemaManager.getObjectClassRegistry().size() );
assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 711, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 709, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 13, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -241,14 +241,14 @@ public class SchemaManagerEnableDisableL
}
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 427, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 425, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 48, schemaManager.getComparatorRegistry().size() );
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 120, schemaManager.getObjectClassRegistry().size() );
assertEquals( 68, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 73, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 668, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 666, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 12, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
@@ -293,14 +293,14 @@ public class SchemaManagerEnableDisableL
assertNotNull( schemaManager.lookupAttributeTypeRegistry( "gecos" ) );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 501, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 499, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 49, schemaManager.getComparatorRegistry().size() );
assertEquals( 49, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 49, schemaManager.getNormalizerRegistry().size() );
assertEquals( 144, schemaManager.getObjectClassRegistry().size() );
assertEquals( 70, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 75, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 769, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 767, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 14, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "samba" ) );
Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java?rev=1302570&r1=1302569&r2=1302570&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadTest.java Mon Mar 19 17:51:35 2012
@@ -284,14 +284,14 @@ public class SchemaManagerLoadTest
assertTrue( schemaManager.load( "apache" ) );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 147, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 145, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 43, schemaManager.getComparatorRegistry().size() );
assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 309, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java?rev=1302570&r1=1302569&r2=1302570&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerLoadWithDepsTest.java Mon Mar 19 17:51:35 2012
@@ -170,14 +170,14 @@ public class SchemaManagerLoadWithDepsTe
schemaManager.loadWithDeps( "apache" );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 147, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 145, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 43, schemaManager.getComparatorRegistry().size() );
assertEquals( 43, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 43, schemaManager.getNormalizerRegistry().size() );
assertEquals( 53, schemaManager.getObjectClassRegistry().size() );
assertEquals( 62, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 66, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 309, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 307, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 3, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
@@ -254,14 +254,14 @@ public class SchemaManagerLoadWithDepsTe
schemaManager.loadWithDeps( "other" );
assertTrue( schemaManager.getErrors().isEmpty() );
- assertEquals( 179, schemaManager.getAttributeTypeRegistry().size() );
+ assertEquals( 177, schemaManager.getAttributeTypeRegistry().size() );
assertEquals( 48, schemaManager.getComparatorRegistry().size() );
assertEquals( 48, schemaManager.getMatchingRuleRegistry().size() );
assertEquals( 48, schemaManager.getNormalizerRegistry().size() );
assertEquals( 66, schemaManager.getObjectClassRegistry().size() );
assertEquals( 66, schemaManager.getSyntaxCheckerRegistry().size() );
assertEquals( 71, schemaManager.getLdapSyntaxRegistry().size() );
- assertEquals( 364, schemaManager.getGlobalOidRegistry().size() );
+ assertEquals( 362, schemaManager.getGlobalOidRegistry().size() );
assertEquals( 5, schemaManager.getRegistries().getLoadedSchemas().size() );
assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );