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/02/15 18:07:30 UTC
svn commit: r1244596 - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/
apacheds/trunk/core-sha...
Author: elecharny
Date: Wed Feb 15 17:07:29 2012
New Revision: 1244596
URL: http://svn.apache.org/viewvc?rev=1244596&view=rev
Log: (empty)
Added:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DitStructureRule.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitContentRuleRegistry.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITContentRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitStructureRuleRegistry.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java
- copied, changed from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java
Removed:
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITContentRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/DescriptionParsers.java
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SchemaService.java
directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
directory/shared/trunk/ldap/model/src/main/antlr/schema.g
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributesFactory.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java
directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java
directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/DescriptionParsers.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/DescriptionParsers.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/DescriptionParsers.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/DescriptionParsers.java Wed Feb 15 17:07:29 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
@@ -74,7 +74,7 @@ public class DescriptionParsers
private static final AttributeType[] EMPTY_ATTRIBUTE_TYPES = new AttributeType[0];
private static final ObjectClass[] EMPTY_OBJECT_CLASSES = new ObjectClass[0];
private static final MatchingRuleUse[] EMPTY_MATCHING_RULE_USES = new MatchingRuleUse[0];
- private static final DITStructureRule[] EMPTY_DIT_STRUCTURE_RULES = new DITStructureRule[0];
+ private static final DitStructureRule[] EMPTY_DIT_STRUCTURE_RULES = new DitStructureRule[0];
private static final DitContentRule[] EMPTY_DIT_CONTENT_RULES = new DitContentRule[0];
private static final NameForm[] EMPTY_NAME_FORMS = new NameForm[0];
@@ -532,23 +532,23 @@ public class DescriptionParsers
* schema entities.
*
* @param attr the attribute containing dITStructureRuleDescriptions
- * @return the set of DITStructureRule objects for the descriptions
+ * @return the set of DitStructureRule objects for the descriptions
* @throws LdapException if there are problems parsing the descriptions
*/
- public DITStructureRule[] parseDitStructureRules( Attribute attr ) throws LdapException
+ public DitStructureRule[] parseDitStructureRules( Attribute attr ) throws LdapException
{
if ( attr == null || attr.size() == 0 )
{
return EMPTY_DIT_STRUCTURE_RULES;
}
- DITStructureRule[] ditStructureRules = new DITStructureRule[attr.size()];
+ DitStructureRule[] ditStructureRules = new DitStructureRule[attr.size()];
int pos = 0;
for ( Value<?> value : attr )
{
- DITStructureRule ditStructureRule = null;
+ DitStructureRule ditStructureRule = null;
try
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitStructureRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitStructureRuleSynchronizer.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitStructureRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitStructureRuleSynchronizer.java Wed Feb 15 17:07:29 2012
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.name.Rdn;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
@@ -114,13 +114,13 @@ public class DitStructureRuleSynchronize
}
- public void add( DITStructureRule dsr )
+ public void add( DitStructureRule dsr )
{
// TODO Auto-generated method stub
}
- public void delete( DITStructureRule dsr, boolean cascade )
+ public void delete( DitStructureRule dsr, boolean cascade )
{
// TODO Auto-generated method stub
}
Modified: directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SchemaService.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SchemaService.java (original)
+++ directory/apacheds/trunk/core-shared/src/main/java/org/apache/directory/server/core/shared/SchemaService.java Wed Feb 15 17:07:29 2012
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.Dn;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapComparator;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -200,7 +200,7 @@ public class SchemaService
Attribute attr = new DefaultAttribute(
schemaManager.getAttributeType( SchemaConstants.DIT_STRUCTURE_RULES_AT ) );
- for ( DITStructureRule ditStructureRule : schemaManager.getDITStructureRuleRegistry() )
+ for ( DitStructureRule ditStructureRule : schemaManager.getDITStructureRuleRegistry() )
{
attr.add( SchemaUtils.render( ditStructureRule ).toString() );
}
Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Wed Feb 15 17:07:29 2012
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
@@ -389,9 +389,9 @@ public class SchemaSubentryManager
break;
case ( DIT_STRUCTURE_RULE_INDEX ):
- DITStructureRule[] dsrs = parsers.parseDitStructureRules( mods );
+ DitStructureRule[] dsrs = parsers.parseDitStructureRules( mods );
- for ( DITStructureRule dsr : dsrs )
+ for ( DitStructureRule dsr : dsrs )
{
subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, dsr );
}
@@ -528,9 +528,9 @@ public class SchemaSubentryManager
break;
case ( DIT_STRUCTURE_RULE_INDEX ):
- DITStructureRule[] dsrs = parsers.parseDitStructureRules( mods );
+ DitStructureRule[] dsrs = parsers.parseDitStructureRules( mods );
- for ( DITStructureRule dsr : dsrs )
+ for ( DitStructureRule dsr : dsrs )
{
subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, dsr );
}
Modified: directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/trunk/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Wed Feb 15 17:07:29 2012
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.AttributesFactory;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
@@ -106,7 +106,7 @@ public class SchemaSubentryModifier
{
buf.append( SchemaConstants.MATCHING_RULE_USE_AT );
}
- else if ( obj instanceof DITStructureRule )
+ else if ( obj instanceof DitStructureRule )
{
buf.append( SchemaConstants.DIT_STRUCTURE_RULES_AT );
}
Modified: directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/DefaultSchemaLoader.java Wed Feb 15 17:07:29 2012
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.AttributesFactory;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
@@ -326,7 +326,7 @@ public class DefaultSchemaLoader extends
try
{
- DITStructureRule ditStructureRule = DSR_DESCR_SCHEMA_PARSER.parseDITStructureRuleDescription( desc );
+ DitStructureRule ditStructureRule = DSR_DESCR_SCHEMA_PARSER.parseDITStructureRuleDescription( desc );
updateSchemas( ditStructureRule );
}
@@ -691,9 +691,9 @@ public class DefaultSchemaLoader extends
{
SchemaObject schemaObject = schemaObjectWrapper.get();
- if ( schemaObject instanceof DITStructureRule )
+ if ( schemaObject instanceof DitStructureRule )
{
- DITStructureRule ditStructureRule = ( DITStructureRule ) schemaObject;
+ DitStructureRule ditStructureRule = ( DitStructureRule ) schemaObject;
Entry ditStructureRuleEntry = factory.convert( ditStructureRule, schema, null );
Modified: directory/shared/trunk/ldap/model/src/main/antlr/schema.g
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/antlr/schema.g?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/antlr/schema.g (original)
+++ directory/shared/trunk/ldap/model/src/main/antlr/schema.g Wed Feb 15 17:07:29 2012
@@ -28,7 +28,7 @@ import java.util.Map;
import org.apache.directory.shared.ldap.model.schema.parsers.LdapComparatorDescription;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributesFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributesFactory.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributesFactory.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/AttributesFactory.java Wed Feb 15 17:07:29 2012
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapComparator;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
@@ -77,9 +77,9 @@ public class AttributesFactory
{
return convert( ( MatchingRuleUse ) obj, schema, schemaManager );
}
- else if ( obj instanceof DITStructureRule )
+ else if ( obj instanceof DitStructureRule )
{
- return convert( ( DITStructureRule ) obj, schema, schemaManager );
+ return convert( ( DitStructureRule ) obj, schema, schemaManager );
}
else if ( obj instanceof DitContentRule )
{
@@ -220,7 +220,7 @@ public class AttributesFactory
}
- public Entry convert( DITStructureRule dITStructureRule, Schema schema, SchemaManager schemaManager )
+ public Entry convert( DitStructureRule ditStructureRule, Schema schema, SchemaManager schemaManager )
{
Entry entry = new DefaultEntry( schemaManager );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DescriptionUtils.java Wed Feb 15 17:07:29 2012
@@ -32,7 +32,7 @@ import java.util.Map;
* <ul>
* <li><a href="./AttributeType.html">AttributeType</a></li>
* <li><a href="./DitContentRule.html">DitContentRule</a></li>
- * <li><a href="./DitContentRule.html">DITStructureRule</a></li>
+ * <li><a href="./DitContentRule.html">DitStructureRule</a></li>
* <li><a href="./LdapComparator.html">Syntax</a></li>
* <li><a href="./MatchingRule.html">MatchingRule</a></li>
* <li><a href="./MatchingRuleUse.html">MatchingRuleUse</a></li>
@@ -298,7 +298,7 @@ public final class DescriptionUtils
/**
- * Generates the DITStructureRuleDescription for a DITStructureRule as
+ * Generates the DITStructureRuleDescription for a DitStructureRule as
* defined by the syntax: 1.3.6.1.4.1.1466.115.121.1.17. Only the right hand
* side of the description starting at the opening parenthesis is
* generated: that is 'DITStructureRuleDescription = ' is not generated.
@@ -315,40 +315,40 @@ public final class DescriptionUtils
* ")"
* </pre>
*
- * @param dITStructureRule
- * the DITStructureRule to generate the description for
+ * @param ditStructureRule
+ * the DitStructureRule to generate the description for
* @return the description in the DITStructureRuleDescription syntax
*/
- public static String getDescription( DITStructureRule dITStructureRule )
+ public static String getDescription( DitStructureRule ditStructureRule )
{
StringBuilder buf = new StringBuilder( "( " );
- buf.append( dITStructureRule.getOid() );
+ buf.append( ditStructureRule.getOid() );
buf.append( '\n' );
- if ( dITStructureRule.getNames() != null )
+ if ( ditStructureRule.getNames() != null )
{
buf.append( " NAME " );
- getQDescrs( buf, dITStructureRule.getNames() );
+ getQDescrs( buf, ditStructureRule.getNames() );
}
- if ( dITStructureRule.getDescription() != null )
+ if ( ditStructureRule.getDescription() != null )
{
buf.append( " DESC " );
- buf.append( dITStructureRule.getDescription() );
+ buf.append( ditStructureRule.getDescription() );
buf.append( '\n' );
}
- if ( dITStructureRule.isObsolete() )
+ if ( ditStructureRule.isObsolete() )
{
buf.append( " OBSOLETE\n" );
}
buf.append( " FORM " );
- buf.append( dITStructureRule.getForm() );
+ buf.append( ditStructureRule.getForm() );
buf.append( '\n' );
// TODO : Shouldn't we get the ruleId OID ?
- List<Integer> sups = dITStructureRule.getSuperRules();
+ List<Integer> sups = ditStructureRule.getSuperRules();
if ( ( sups != null ) && ( sups.size() > 0 ) )
{
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DitStructureRule.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DitStructureRule.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DitStructureRule.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DITStructureRule.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/DitStructureRule.java Wed Feb 15 17:07:29 2012
@@ -77,12 +77,12 @@ import org.apache.directory.shared.util.
* @see <a
* href="http://www.ietf.org/internet-drafts/draft-ietf-ldapbis-models-11.txt">ldapbis
* [MODELS]</a>
- * @see DescriptionUtils#getDescription(DITStructureRule)
+ * @see DescriptionUtils#getDescription(DitStructureRule)
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
// super.hashCode is final
@SuppressWarnings("PMD.OverrideBothEqualsAndHashcode")
-public class DITStructureRule extends AbstractSchemaObject
+public class DitStructureRule extends AbstractSchemaObject
{
/** The rule ID. A DSR does not have an OID */
private int ruleId;
@@ -95,9 +95,9 @@ public class DITStructureRule extends Ab
/**
- * Creates a new instance of DITStructureRule
+ * Creates a new instance of DitStructureRule
*/
- public DITStructureRule( int ruleId )
+ public DitStructureRule( int ruleId )
{
super( SchemaObjectType.DIT_STRUCTURE_RULE, null );
this.ruleId = ruleId;
@@ -231,9 +231,9 @@ public class DITStructureRule extends Ab
/**
* {@inheritDoc}
*/
- public DITStructureRule copy()
+ public DitStructureRule copy()
{
- DITStructureRule copy = new DITStructureRule( ruleId );
+ DitStructureRule copy = new DitStructureRule( ruleId );
// Copy the SchemaObject common data
copy.copy( this );
@@ -266,13 +266,13 @@ public class DITStructureRule extends Ab
return false;
}
- if ( !( o instanceof DITStructureRule ) )
+ if ( !( o instanceof DitStructureRule ) )
{
return false;
}
@SuppressWarnings("unused")
- DITStructureRule that = ( DITStructureRule ) o;
+ DitStructureRule that = ( DitStructureRule ) o;
// TODO : complete the test
return true;
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java Wed Feb 15 17:07:29 2012
@@ -29,8 +29,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ComparatorRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.DITContentRuleRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.DITStructureRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.DitContentRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.DitStructureRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.LdapSyntaxRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.MatchingRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.MatchingRuleUseRegistry;
@@ -534,15 +534,15 @@ public interface SchemaManager
*
* @return A reference to the DitContentRule registry.
*/
- DITContentRuleRegistry getDITContentRuleRegistry();
+ DitContentRuleRegistry getDITContentRuleRegistry();
/**
- * Get an immutable reference on the DITStructureRule registry
+ * Get an immutable reference on the DitStructureRule registry
*
- * @return A reference to the DITStructureRule registry.
+ * @return A reference to the DitStructureRule registry.
*/
- DITStructureRuleRegistry getDITStructureRuleRegistry();
+ DitStructureRuleRegistry getDITStructureRuleRegistry();
/**
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java Wed Feb 15 17:07:29 2012
@@ -976,7 +976,7 @@ public final class SchemaUtils
*/
@SuppressWarnings("PMD.UnusedLocalVariable")
// Remove me when the TODO is fixed
- public static StringBuffer render( DITStructureRule dsr )
+ public static StringBuffer render( DitStructureRule dsr )
{
StringBuffer buf = new StringBuffer();
buf.append( "( " ).append( dsr.getOid() );
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/DITStructureRuleDescriptionSchemaParser.java Wed Feb 15 17:07:29 2012
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
import java.text.ParseException;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,10 +73,10 @@ public class DITStructureRuleDescription
* @return the parsed DITStructureRuleDescription bean
* @throws ParseException if there are any recognition errors (bad syntax)
*/
- public synchronized DITStructureRule parseDITStructureRuleDescription( String ditStructureRuleDescription )
+ public synchronized DitStructureRule parseDITStructureRuleDescription( String ditStructureRuleDescription )
throws ParseException
{
- LOG.debug( "Parsing a DITStructureRule : {}", ditStructureRuleDescription );
+ LOG.debug( "Parsing a DitStructureRule : {}", ditStructureRuleDescription );
if ( ditStructureRuleDescription == null )
{
@@ -88,7 +88,7 @@ public class DITStructureRuleDescription
try
{
- DITStructureRule ditStructureRule = parser.ditStructureRuleDescription();
+ DitStructureRule ditStructureRule = parser.ditStructureRuleDescription();
// Update the schemaName
updateSchemaName( ditStructureRule );
@@ -112,13 +112,13 @@ public class DITStructureRuleDescription
/**
- * Parses a DITStructureRule description.
+ * Parses a DitStructureRule description.
*
- * @param schemaDescription The DITStructureRule description to parse
- * @return An instance of DITStructureRule
+ * @param schemaDescription The DitStructureRule description to parse
+ * @return An instance of DitStructureRule
* @throws ParseException {@inheritDoc}
*/
- public DITStructureRule parse( String schemaDescription ) throws ParseException
+ public DitStructureRule parse( String schemaDescription ) throws ParseException
{
return parseDITStructureRuleDescription( schemaDescription );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/AbstractSchemaLoader.java Wed Feb 15 17:07:29 2012
@@ -586,7 +586,7 @@ public abstract class AbstractSchemaLoad
* @return the created DitStructureRule instance
* @throws Exception If the registering failed
*
- protected DITStructureRule registerDitStructureRule( Registries registries, LdifEntry entry, Schema schema)
+ protected DitStructureRule registerDitStructureRule( Registries registries, LdifEntry entry, Schema schema)
throws Exception
{
throw new NotImplementedException( "Need to implement factory " +
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITContentRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitContentRuleRegistry.java Wed Feb 15 17:07:29 2012
@@ -29,13 +29,13 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DefaultDITContentRuleRegistry extends DefaultSchemaObjectRegistry<DitContentRule>
- implements DITContentRuleRegistry
+public class DefaultDitContentRuleRegistry extends DefaultSchemaObjectRegistry<DitContentRule>
+ implements DitContentRuleRegistry
{
/**
- * Creates a new default DITContentRuleRegistry instance.
+ * Creates a new default DitContentRuleRegistry instance.
*/
- public DefaultDITContentRuleRegistry()
+ public DefaultDitContentRuleRegistry()
{
super( SchemaObjectType.DIT_CONTENT_RULE, new OidRegistry<DitContentRule>() );
}
@@ -44,9 +44,9 @@ public class DefaultDITContentRuleRegist
/**
* {@inheritDoc}
*/
- public DefaultDITContentRuleRegistry copy()
+ public DefaultDitContentRuleRegistry copy()
{
- DefaultDITContentRuleRegistry copy = new DefaultDITContentRuleRegistry();
+ DefaultDitContentRuleRegistry copy = new DefaultDitContentRuleRegistry();
// Copy the base data
copy.copy( this );
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDITStructureRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultDitStructureRuleRegistry.java Wed Feb 15 17:07:29 2012
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
import org.slf4j.Logger;
@@ -34,30 +34,30 @@ import org.slf4j.LoggerFactory;
/**
- * A DITStructureRule registry's service default implementation.
+ * A DitStructureRule registry's service default implementation.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DefaultDITStructureRuleRegistry extends DefaultSchemaObjectRegistry<DITStructureRule>
- implements DITStructureRuleRegistry
+public class DefaultDitStructureRuleRegistry extends DefaultSchemaObjectRegistry<DitStructureRule>
+ implements DitStructureRuleRegistry
{
/** static class logger */
- private static final Logger LOG = LoggerFactory.getLogger( DefaultDITStructureRuleRegistry.class );
+ private static final Logger LOG = LoggerFactory.getLogger( DefaultDitStructureRuleRegistry.class );
/** A speedup for debug */
private static final boolean DEBUG = LOG.isDebugEnabled();
- /** a map of DITStructureRule looked up by RuleId */
- protected Map<Integer, DITStructureRule> byRuleId;
+ /** a map of DitStructureRule looked up by RuleId */
+ protected Map<Integer, DitStructureRule> byRuleId;
/**
* Creates a new default NormalizerRegistry instance.
*/
- public DefaultDITStructureRuleRegistry()
+ public DefaultDitStructureRuleRegistry()
{
- super( SchemaObjectType.DIT_STRUCTURE_RULE, new OidRegistry<DITStructureRule>() );
- byRuleId = new HashMap<Integer, DITStructureRule>();
+ super( SchemaObjectType.DIT_STRUCTURE_RULE, new OidRegistry<DitStructureRule>() );
+ byRuleId = new HashMap<Integer, DitStructureRule>();
}
@@ -73,7 +73,7 @@ public class DefaultDITStructureRuleRegi
/**
* {@inheritDoc}
*/
- public Iterator<DITStructureRule> iterator()
+ public Iterator<DitStructureRule> iterator()
{
return byRuleId.values().iterator();
}
@@ -93,7 +93,7 @@ public class DefaultDITStructureRuleRegi
*/
public String getSchemaName( int ruleId ) throws LdapException
{
- DITStructureRule ditStructureRule = byRuleId.get( ruleId );
+ DitStructureRule ditStructureRule = byRuleId.get( ruleId );
if ( ditStructureRule != null )
{
@@ -109,7 +109,7 @@ public class DefaultDITStructureRuleRegi
/**
* {@inheritDoc}
*/
- public void register( DITStructureRule ditStructureRule ) throws LdapException
+ public void register( DitStructureRule ditStructureRule ) throws LdapException
{
int ruleId = ditStructureRule.getRuleId();
@@ -132,9 +132,9 @@ public class DefaultDITStructureRuleRegi
/**
* {@inheritDoc}
*/
- public DITStructureRule lookup( int ruleId ) throws LdapException
+ public DitStructureRule lookup( int ruleId ) throws LdapException
{
- DITStructureRule ditStructureRule = byRuleId.get( ruleId );
+ DitStructureRule ditStructureRule = byRuleId.get( ruleId );
if ( ditStructureRule == null )
{
@@ -157,7 +157,7 @@ public class DefaultDITStructureRuleRegi
*/
public void unregister( int ruleId ) throws LdapException
{
- DITStructureRule ditStructureRule = byRuleId.remove( ruleId );
+ DitStructureRule ditStructureRule = byRuleId.remove( ruleId );
if ( DEBUG )
{
@@ -178,7 +178,7 @@ public class DefaultDITStructureRuleRegi
// Loop on all the SchemaObjects stored and remove those associated
// with the give schemaName
- for ( DITStructureRule ditStructureRule : this )
+ for ( DitStructureRule ditStructureRule : this )
{
if ( schemaName.equalsIgnoreCase( ditStructureRule.getSchemaName() ) )
{
@@ -201,7 +201,7 @@ public class DefaultDITStructureRuleRegi
{
// Loop on all the SchemaObjects stored and remove those associated
// with the give schemaName
- for ( DITStructureRule ditStructureRule : this )
+ for ( DitStructureRule ditStructureRule : this )
{
if ( originalSchemaName.equalsIgnoreCase( ditStructureRule.getSchemaName() ) )
{
@@ -219,9 +219,9 @@ public class DefaultDITStructureRuleRegi
/**
* {@inheritDoc}
*/
- public DefaultDITStructureRuleRegistry copy()
+ public DefaultDitStructureRuleRegistry copy()
{
- DefaultDITStructureRuleRegistry copy = new DefaultDITStructureRuleRegistry();
+ DefaultDitStructureRuleRegistry copy = new DefaultDitStructureRuleRegistry();
// Copy the base data
copy.copy( this );
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitContentRuleRegistry.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITContentRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitContentRuleRegistry.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitContentRuleRegistry.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITContentRuleRegistry.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITContentRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitContentRuleRegistry.java Wed Feb 15 17:07:29 2012
@@ -28,11 +28,11 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface DITContentRuleRegistry extends SchemaObjectRegistry<DitContentRule>,
+public interface DitContentRuleRegistry extends SchemaObjectRegistry<DitContentRule>,
Iterable<DitContentRule>
{
/**
- * Copy the DITContentRuleRegistry
+ * Copy the DitContentRuleRegistry
*/
- DITContentRuleRegistry copy();
+ DitContentRuleRegistry copy();
}
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitStructureRuleRegistry.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitStructureRuleRegistry.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitStructureRuleRegistry.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DITStructureRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DitStructureRuleRegistry.java Wed Feb 15 17:07:29 2012
@@ -23,23 +23,23 @@ package org.apache.directory.shared.ldap
import java.util.Iterator;
import org.apache.directory.shared.ldap.model.exception.LdapException;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
/**
- * An DITStructureRule registry service interface.
+ * An DitStructureRule registry service interface.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface DITStructureRuleRegistry extends SchemaObjectRegistry<DITStructureRule>,
- Iterable<DITStructureRule>
+public interface DitStructureRuleRegistry extends SchemaObjectRegistry<DitStructureRule>,
+ Iterable<DitStructureRule>
{
/**
- * Checks to see if an DITStructureRule exists in the registry, by its
+ * Checks to see if an DitStructureRule exists in the registry, by its
* ruleId.
*
- * @param ruleId the rule identifier of the DITStructureRule
- * @return true if a DITStructureRule definition exists for the ruleId, false
+ * @param ruleId the rule identifier of the DitStructureRule
+ * @return true if a DitStructureRule definition exists for the ruleId, false
* otherwise
*/
boolean contains( int ruleId );
@@ -50,7 +50,7 @@ public interface DITStructureRuleRegistr
*
* @return an Iterator of descriptions
*/
- Iterator<DITStructureRule> iterator();
+ Iterator<DitStructureRule> iterator();
/**
@@ -72,31 +72,31 @@ public interface DITStructureRuleRegistr
/**
- * Registers a new DITStructureRule with this registry.
+ * Registers a new DitStructureRule with this registry.
*
- * @param ditStructureRule the DITStructureRule to register
- * @throws LdapException if the DITStructureRule is already registered or
+ * @param ditStructureRule the DitStructureRule to register
+ * @throws LdapException if the DitStructureRule is already registered or
* the registration operation is not supported
*/
- void register( DITStructureRule ditStructureRule ) throws LdapException;
+ void register( DitStructureRule ditStructureRule ) throws LdapException;
/**
* Looks up an dITStructureRule by its unique Object IDentifier or by its
* name.
*
- * @param ruleId the rule identifier for the DITStructureRule
- * @return the DITStructureRule instance for rule identifier
- * @throws LdapException if the DITStructureRule does not exist
+ * @param ruleId the rule identifier for the DitStructureRule
+ * @return the DitStructureRule instance for rule identifier
+ * @throws LdapException if the DitStructureRule does not exist
*/
- DITStructureRule lookup( int ruleId ) throws LdapException;
+ DitStructureRule lookup( int ruleId ) throws LdapException;
/**
- * Unregisters a DITStructureRule using it's rule identifier.
+ * Unregisters a DitStructureRule using it's rule identifier.
*
- * @param ruleId the rule identifier for the DITStructureRule to unregister
- * @throws LdapException if no such DITStructureRule exists
+ * @param ruleId the rule identifier for the DitStructureRule to unregister
+ * @throws LdapException if no such DitStructureRule exists
*/
void unregister( int ruleId ) throws LdapException;
@@ -112,7 +112,7 @@ public interface DITStructureRuleRegistr
/**
- * Modify all the DITStructureRule using a schemaName when this name changes.
+ * Modify all the DitStructureRule using a schemaName when this name changes.
*
* @param originalSchemaName The original Schema name
* @param newSchemaName The new Schema name
@@ -122,7 +122,7 @@ public interface DITStructureRuleRegistr
/**
- * Copy the DITStructureRuleRegistry
+ * Copy the DitStructureRuleRegistry
*/
- DITStructureRuleRegistry copy();
+ DitStructureRuleRegistry copy();
}
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITContentRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitContentRuleRegistry.java Wed Feb 15 17:07:29 2012
@@ -35,18 +35,18 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ImmutableDITContentRuleRegistry implements DITContentRuleRegistry
+public class ImmutableDitContentRuleRegistry implements DitContentRuleRegistry
{
/** The wrapped DitContentRule registry */
- DITContentRuleRegistry immutableDITContentRuleRegistry;
+ DitContentRuleRegistry immutableDITContentRuleRegistry;
/**
- * Creates a new instance of ImmutableDITContentRuleRegistry.
+ * Creates a new instance of ImmutableDitContentRuleRegistry.
*
* @param ditContentRuleRegistry The wrapped DitContentRule registry
*/
- public ImmutableDITContentRuleRegistry( DITContentRuleRegistry ditContentRuleRegistry )
+ public ImmutableDitContentRuleRegistry( DitContentRuleRegistry ditContentRuleRegistry )
{
immutableDITContentRuleRegistry = ditContentRuleRegistry;
}
@@ -55,9 +55,9 @@ public class ImmutableDITContentRuleRegi
/**
* {@inheritDoc}
*/
- public ImmutableDITContentRuleRegistry copy()
+ public ImmutableDitContentRuleRegistry copy()
{
- return ( ImmutableDITContentRuleRegistry ) immutableDITContentRuleRegistry.copy();
+ return ( ImmutableDitContentRuleRegistry ) immutableDITContentRuleRegistry.copy();
}
Copied: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java (from r1244586, directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java)
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java?p2=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java&p1=directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java&r1=1244586&r2=1244596&rev=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDITStructureRuleRegistry.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableDitStructureRuleRegistry.java Wed Feb 15 17:07:29 2012
@@ -26,27 +26,27 @@ import org.apache.directory.shared.i18n.
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
/**
- * An immutable wrapper of the DITStructureRule registry.
+ * An immutable wrapper of the DitStructureRule registry.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ImmutableDITStructureRuleRegistry implements DITStructureRuleRegistry
+public class ImmutableDitStructureRuleRegistry implements DitStructureRuleRegistry
{
- /** The wrapped DITStructureRule registry */
- DITStructureRuleRegistry immutableDITStructureRuleRegistry;
+ /** The wrapped DitStructureRule registry */
+ DitStructureRuleRegistry immutableDITStructureRuleRegistry;
/**
- * Creates a new instance of ImmutableDITStructureRuleRegistry.
+ * Creates a new instance of ImmutableDitStructureRuleRegistry.
*
- * @param ditStructureRuleRegistry The wrapped DITStructureRule registry
+ * @param ditStructureRuleRegistry The wrapped DitStructureRule registry
*/
- public ImmutableDITStructureRuleRegistry( DITStructureRuleRegistry ditStructureRuleRegistry )
+ public ImmutableDitStructureRuleRegistry( DitStructureRuleRegistry ditStructureRuleRegistry )
{
immutableDITStructureRuleRegistry = ditStructureRuleRegistry;
}
@@ -64,7 +64,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public Iterator<DITStructureRule> iterator()
+ public Iterator<DitStructureRule> iterator()
{
return immutableDITStructureRuleRegistry.iterator();
}
@@ -91,7 +91,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public void register( DITStructureRule ditStructureRule ) throws LdapException
+ public void register( DitStructureRule ditStructureRule ) throws LdapException
{
}
@@ -99,7 +99,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public DITStructureRule lookup( int ruleId ) throws LdapException
+ public DitStructureRule lookup( int ruleId ) throws LdapException
{
return immutableDITStructureRuleRegistry.lookup( ruleId );
}
@@ -135,9 +135,9 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public ImmutableDITStructureRuleRegistry copy()
+ public ImmutableDitStructureRuleRegistry copy()
{
- return ( ImmutableDITStructureRuleRegistry ) immutableDITStructureRuleRegistry.copy();
+ return ( ImmutableDitStructureRuleRegistry ) immutableDITStructureRuleRegistry.copy();
}
@@ -189,7 +189,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public DITStructureRule lookup( String oid ) throws LdapException
+ public DitStructureRule lookup( String oid ) throws LdapException
{
return immutableDITStructureRuleRegistry.lookup( oid );
}
@@ -207,7 +207,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public DITStructureRule unregister( String numericOid ) throws LdapException
+ public DitStructureRule unregister( String numericOid ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
}
@@ -216,7 +216,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public DITStructureRule get( String oid )
+ public DitStructureRule get( String oid )
{
return immutableDITStructureRuleRegistry.get( oid );
}
@@ -234,7 +234,7 @@ public class ImmutableDITStructureRuleRe
/**
* {@inheritDoc}
*/
- public DITStructureRule unregister( DITStructureRule schemaObject ) throws LdapException
+ public DitStructureRule unregister( DitStructureRule schemaObject ) throws LdapException
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04278 ) );
}
Modified: directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java Wed Feb 15 17:07:29 2012
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.DitContentRule;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.LdapComparator;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
@@ -86,10 +86,10 @@ public class Registries implements Schem
protected ComparatorRegistry comparatorRegistry;
/** The DitContentRule registry */
- protected DITContentRuleRegistry ditContentRuleRegistry;
+ protected DitContentRuleRegistry ditContentRuleRegistry;
/** The DitStructureRule registry */
- protected DITStructureRuleRegistry ditStructureRuleRegistry;
+ protected DitStructureRuleRegistry ditStructureRuleRegistry;
/** The MatchingRule registry */
protected MatchingRuleRegistry matchingRuleRegistry;
@@ -154,8 +154,8 @@ public class Registries implements Schem
globalOidRegistry = new OidRegistry<SchemaObject>();
attributeTypeRegistry = new DefaultAttributeTypeRegistry();
comparatorRegistry = new DefaultComparatorRegistry();
- ditContentRuleRegistry = new DefaultDITContentRuleRegistry();
- ditStructureRuleRegistry = new DefaultDITStructureRuleRegistry();
+ ditContentRuleRegistry = new DefaultDitContentRuleRegistry();
+ ditStructureRuleRegistry = new DefaultDitStructureRuleRegistry();
ldapSyntaxRegistry = new DefaultLdapSyntaxRegistry();
matchingRuleRegistry = new DefaultMatchingRuleRegistry();
matchingRuleUseRegistry = new DefaultMatchingRuleUseRegistry();
@@ -194,16 +194,16 @@ public class Registries implements Schem
/**
* @return The DitContentRule registry
*/
- public DITContentRuleRegistry getDitContentRuleRegistry()
+ public DitContentRuleRegistry getDitContentRuleRegistry()
{
return ditContentRuleRegistry;
}
/**
- * @return The DITStructureRule registry
+ * @return The DitStructureRule registry
*/
- public DITStructureRuleRegistry getDitStructureRuleRegistry()
+ public DitStructureRuleRegistry getDitStructureRuleRegistry()
{
return ditStructureRuleRegistry;
}
@@ -398,10 +398,10 @@ public class Registries implements Schem
// Fall down to the next registry
}
- // DITStructureRule
+ // DitStructureRule
try
{
- DITStructureRule ditStructureRule = ditStructureRuleRegistry.lookup( name );
+ DitStructureRule ditStructureRule = ditStructureRuleRegistry.lookup( name );
if ( ditStructureRule != null )
{
@@ -624,7 +624,7 @@ public class Registries implements Schem
private void buildDitStructureRuleReferences( List<Throwable> errors )
{
for ( @SuppressWarnings("unused")
- DITStructureRule ditStructureRule : ditStructureRuleRegistry )
+ DitStructureRule ditStructureRule : ditStructureRuleRegistry )
{
// TODO
}
@@ -1539,7 +1539,7 @@ public class Registries implements Schem
break;
case DIT_STRUCTURE_RULE:
- ditStructureRuleRegistry.register( ( DITStructureRule ) schemaObject );
+ ditStructureRuleRegistry.register( ( DitStructureRule ) schemaObject );
break;
case LDAP_SYNTAX:
@@ -1757,7 +1757,7 @@ public class Registries implements Schem
break;
case DIT_STRUCTURE_RULE:
- unregistered = ditStructureRuleRegistry.unregister( ( DITStructureRule ) schemaObject );
+ unregistered = ditStructureRuleRegistry.unregister( ( DitStructureRule ) schemaObject );
break;
case LDAP_SYNTAX:
@@ -2514,7 +2514,7 @@ public class Registries implements Schem
clone.globalOidRegistry.put( ditContentRule );
}
- for ( DITStructureRule ditStructureRule : clone.ditStructureRuleRegistry )
+ for ( DitStructureRule ditStructureRule : clone.ditStructureRuleRegistry )
{
clone.globalOidRegistry.put( ditStructureRule );
}
Modified: directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/trunk/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/DITStructureRuleDescriptionSchemaParserTest.java Wed Feb 15 17:07:29 2012
@@ -29,7 +29,7 @@ import java.text.ParseException;
import com.mycila.junit.concurrent.Concurrency;
import com.mycila.junit.concurrent.ConcurrentJunitRunner;
-import org.apache.directory.shared.ldap.model.schema.DITStructureRule;
+import org.apache.directory.shared.ldap.model.schema.DitStructureRule;
import org.apache.directory.shared.ldap.model.schema.parsers.DITStructureRuleDescriptionSchemaParser;
import org.junit.After;
import org.junit.Before;
@@ -73,7 +73,7 @@ public class DITStructureRuleDescription
public void testNumericRuleId() throws ParseException
{
String value = null;
- DITStructureRule ditStructureRule = null;
+ DitStructureRule ditStructureRule = null;
// null test
value = null;
@@ -198,7 +198,7 @@ public class DITStructureRuleDescription
public void testForm() throws ParseException
{
String value = null;
- DITStructureRule ditStructureRule = null;
+ DitStructureRule ditStructureRule = null;
// numeric oid
value = "( 1 FORM 1.2.3.4.5.6.7.8.9.0 )";
@@ -285,7 +285,7 @@ public class DITStructureRuleDescription
public void testSup() throws ParseException
{
String value = null;
- DITStructureRule ditStructureRule = null;
+ DitStructureRule ditStructureRule = null;
// no SUP
value = "( 1 FORM 1.1 )";
@@ -360,7 +360,7 @@ public class DITStructureRuleDescription
public void testFull() throws ParseException
{
String value = null;
- DITStructureRule ditStructureRule = null;
+ DitStructureRule ditStructureRule = null;
value = "( 1234567890 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE FORM 2.3.4.5.6.7.8.9.0.1 SUP ( 1 1234567890 5 ) X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )";
ditStructureRule = parser.parseDITStructureRuleDescription( value );
@@ -414,7 +414,7 @@ public class DITStructureRuleDescription
public void testRequiredElements() throws ParseException
{
String value = null;
- DITStructureRule ditStructureRule = null;
+ DitStructureRule ditStructureRule = null;
value = "( 1 FORM 1.1 )";
ditStructureRule = parser.parseDITStructureRuleDescription( value );
Modified: directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Wed Feb 15 17:07:29 2012
@@ -55,12 +55,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
import org.apache.directory.shared.ldap.model.schema.registries.AttributeTypeRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ComparatorRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.DITContentRuleRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.DITStructureRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.DitContentRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.DitStructureRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ImmutableAttributeTypeRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ImmutableComparatorRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.ImmutableDITContentRuleRegistry;
-import org.apache.directory.shared.ldap.model.schema.registries.ImmutableDITStructureRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.ImmutableDitContentRuleRegistry;
+import org.apache.directory.shared.ldap.model.schema.registries.ImmutableDitStructureRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ImmutableLdapSyntaxRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ImmutableMatchingRuleRegistry;
import org.apache.directory.shared.ldap.model.schema.registries.ImmutableMatchingRuleUseRegistry;
@@ -1512,18 +1512,18 @@ public class DefaultSchemaManager implem
/**
* {@inheritDoc}
*/
- public DITContentRuleRegistry getDITContentRuleRegistry()
+ public DitContentRuleRegistry getDITContentRuleRegistry()
{
- return new ImmutableDITContentRuleRegistry( registries.getDitContentRuleRegistry() );
+ return new ImmutableDitContentRuleRegistry( registries.getDitContentRuleRegistry() );
}
/**
* {@inheritDoc}
*/
- public DITStructureRuleRegistry getDITStructureRuleRegistry()
+ public DitStructureRuleRegistry getDITStructureRuleRegistry()
{
- return new ImmutableDITStructureRuleRegistry( registries.getDitStructureRuleRegistry() );
+ return new ImmutableDitStructureRuleRegistry( registries.getDitStructureRuleRegistry() );
}
Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Wed Feb 15 17:07:29 2012
@@ -928,7 +928,7 @@ public class SchemaManagerAddTest
// TODO
//=========================================================================
- // DITStructureRule addition tests
+ // DitStructureRule addition tests
//-------------------------------------------------------------------------
// TODO
Modified: directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1244596&r1=1244595&r2=1244596&view=diff
==============================================================================
--- directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/trunk/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Wed Feb 15 17:07:29 2012
@@ -464,7 +464,7 @@ public class SchemaManagerDelTest
// TODO
//=========================================================================
- // DITStructureRule deletion tests
+ // DitStructureRule deletion tests
//-------------------------------------------------------------------------
// TODO