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/01/24 15:11:01 UTC
svn commit: r1235258 [4/8] - in /directory/apacheds/trunk:
core-annotations/src/main/java/org/apache/directory/server/core/annotations/
core-annotations/src/main/java/org/apache/directory/server/core/factory/
core-annotations/src/test/java/org/apache/d...
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/SearchingOperationContext.java Tue Jan 24 14:10:56 2012
@@ -54,37 +54,38 @@ public abstract class SearchingOperation
{
/** The LoggerFactory used by this Interceptor */
private static Logger LOG = LoggerFactory.getLogger( SearchingOperationContext.class );
-
+
/** A flag describing the way alias should be handled */
protected AliasDerefMode aliasDerefMode = AliasDerefMode.DEREF_ALWAYS;
/** The sizeLimit for this search operation */
protected long sizeLimit = 0;
-
+
/** The timeLimit for this search operation */
protected int timeLimit = 0;
-
+
/** The scope for this search : default to One Level */
protected SearchScope scope = ONELEVEL;
/** A flag set if the returned attributes set contains '+' */
protected boolean allOperationalAttributes = false;
-
+
/** A flag set if the returned attributes set contains '*' */
protected boolean allUserAttributes = false;
-
+
/** A flag set if the returned attributes set contains '1.1' */
protected boolean noAttributes = false;
-
+
/** A set containing the returning attributeTypesOptions */
- protected Set<AttributeTypeOptions> returningAttributes;
-
+ protected Set<AttributeTypeOptions> returningAttributes;
+
/** A flag if the search operation is abandoned */
protected boolean abandoned = false;
-
+
/** A flag to tell if only the attribute names to be returned */
protected boolean typesOnly = false;
-
+
+
/**
* Creates a new instance of SearchingOperationContext.
*/
@@ -120,19 +121,19 @@ public abstract class SearchingOperation
}
- protected void setReturningAttributes( Collection<String> attributesIds )
+ protected void setReturningAttributes( Collection<String> attributesIds )
throws LdapException
{
setReturningAttributes( attributesIds.toArray( StringConstants.EMPTY_STRINGS ) );
}
-
-
+
+
public void setReturningAttributes( String[] attributesIds ) throws LdapException
{
if ( attributesIds != null && attributesIds.length != 0 )
{
returningAttributes = new HashSet<AttributeTypeOptions>();
-
+
for ( String returnAttribute : attributesIds )
{
if ( returnAttribute.equals( SchemaConstants.NO_ATTRIBUTE ) )
@@ -140,46 +141,47 @@ public abstract class SearchingOperation
noAttributes = true;
continue;
}
-
+
if ( returnAttribute.equals( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES ) )
{
allOperationalAttributes = true;
continue;
}
-
+
if ( returnAttribute.equals( SchemaConstants.ALL_USER_ATTRIBUTES ) )
{
allUserAttributes = true;
continue;
}
-
+
try
{
String id = SchemaUtils.stripOptions( returnAttribute );
Set<String> options = SchemaUtils.getOptions( returnAttribute );
-
+
AttributeType attributeType = session.getDirectoryService()
.getSchemaManager().lookupAttributeTypeRegistry( id );
AttributeTypeOptions attrOptions = new AttributeTypeOptions( attributeType, options );
-
+
returningAttributes.add( attrOptions );
}
catch ( LdapNoSuchAttributeException nsae )
{
- LOG.warn( "Requested attribute {} does not exist in the schema, it will be ignored", returnAttribute );
+ LOG.warn( "Requested attribute {} does not exist in the schema, it will be ignored",
+ returnAttribute );
// Unknown attributes should be silently ignored, as RFC 2251 states
}
}
-
+
// reset the noAttrubte flag if it is already set cause that will be ignored if any other AT is requested
- if( noAttributes && ( allUserAttributes || allOperationalAttributes || ( ! returningAttributes.isEmpty() ) ) )
+ if ( noAttributes && ( allUserAttributes || allOperationalAttributes || ( !returningAttributes.isEmpty() ) ) )
{
noAttributes = false;
- }
+ }
}
}
-
-
+
+
/**
* @see Object#toString()
*/
@@ -188,7 +190,7 @@ public abstract class SearchingOperation
return "ListOperationContext with Dn '" + getDn().getName() + "'";
}
-
+
public AliasDerefMode getAliasDerefMode()
{
return aliasDerefMode;
@@ -341,7 +343,7 @@ public abstract class SearchingOperation
return returningAttributes;
}
-
+
/**
* Creates a new SearchControls object populated with the parameters
* contained in this SearchOperationContext in normalized form.
@@ -352,8 +354,8 @@ public abstract class SearchingOperation
{
return getSearchControls( false );
}
-
-
+
+
/**
* Creates a new SearchControls object populated with the parameters
* contained in this SearchOperationContext.
@@ -369,22 +371,22 @@ public abstract class SearchingOperation
controls.setTimeLimit( timeLimit );
Set<String> allReturningAttributes = new HashSet<String>();
-
+
if ( noAttributes )
{
allReturningAttributes.add( SchemaConstants.NO_ATTRIBUTE );
}
-
+
if ( allUserAttributes )
{
allReturningAttributes.add( SchemaConstants.ALL_USER_ATTRIBUTES );
}
-
+
if ( allOperationalAttributes )
{
allReturningAttributes.add( SchemaConstants.ALL_OPERATIONAL_ATTRIBUTES );
}
-
+
if ( returningAttributes != null )
{
for ( AttributeTypeOptions at : returningAttributes )
@@ -399,12 +401,12 @@ public abstract class SearchingOperation
}
}
}
-
+
if ( allReturningAttributes.size() > 0 )
{
controls.setReturningAttributes( allReturningAttributes.toArray( ArrayUtils.EMPTY_STRING_ARRAY ) );
}
-
+
return controls;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/context/UnbindOperationContext.java Tue Jan 24 14:10:56 2012
@@ -46,7 +46,7 @@ public class UnbindOperationContext exte
setInterceptors( session.getDirectoryService().getInterceptors( OperationEnum.UNBIND ) );
}
}
-
+
public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
{
@@ -59,7 +59,7 @@ public class UnbindOperationContext exte
}
}
-
+
/**
* @return the operation name
*/
@@ -68,7 +68,7 @@ public class UnbindOperationContext exte
return MessageTypeEnum.UNBIND_REQUEST.name();
}
-
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/Journal.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/Journal.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/Journal.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/Journal.java Tue Jan 24 14:10:56 2012
@@ -46,7 +46,7 @@ public interface Journal
* @param enabled true to enable the service, false to disable it
*/
void setEnabled( boolean enabled );
-
+
/**
* @return The underlying storage
@@ -71,7 +71,7 @@ public interface Journal
*/
void log( LdapPrincipal principal, long revision, LdifEntry entry ) throws LdapException;
-
+
/**
* Records a ack for a change
*
@@ -79,7 +79,7 @@ public interface Journal
*/
void ack( long revision );
-
+
/**
* Records a nack for a change
*
@@ -87,7 +87,7 @@ public interface Journal
*/
void nack( long revision );
-
+
/**
* Initialize the Journal.
*
@@ -96,7 +96,7 @@ public interface Journal
*/
void init( DirectoryService service ) throws Exception;
-
+
/**
* Destroy the journal service
* @throws Exception If something went wrong
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalEvent.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalEvent.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalEvent.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalEvent.java Tue Jan 24 14:10:56 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.journal;
+
/**
* TODO JournalEvent.
*
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalStore.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalStore.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/journal/JournalStore.java Tue Jan 24 14:10:56 2012
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface JournalStore
+public interface JournalStore
{
/**
* Initialize the store.
@@ -84,8 +84,8 @@ public interface JournalStore
* @return <code>true</code> if the ack has been written
*/
boolean ack( long revision );
-
-
+
+
/**
* Records a nack for a change
*
@@ -94,16 +94,16 @@ public interface JournalStore
* @throws Exception if there are problems logging the nack
*/
boolean nack( long revision );
-
-
+
+
/**
* The file name to use as the journal file. Default to
* 'journal.ldif'
* @param fileName the fileName to set
*/
void setFileName( String fileName );
-
-
+
+
/**
* The working directory on which the journal file will be stored. Default
* to 'server-work'
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/normalization/FilterNormalizingVisitor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/normalization/FilterNormalizingVisitor.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/normalization/FilterNormalizingVisitor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/normalization/FilterNormalizingVisitor.java Tue Jan 24 14:10:56 2012
@@ -76,22 +76,127 @@ public class FilterNormalizingVisitor im
*/
private static final boolean[] FILTER_CHAR =
{ true, false, false, false, false, false, false, false, // 00 -> 07 NULL
- false, false, false, false, false, false, false, false, // 08 -> 0F
- false, false, false, false, false, false, false, false, // 10 -> 17
- false, false, false, false, false, false, false, false, // 18 -> 1F
- false, false, false, false, false, false, false, false, // 20 -> 27
- true, true, true, false, false, false, false, false, // 28 -> 2F '(', ')', '*'
- false, false, false, false, false, false, false, false, // 30 -> 37
- false, false, false, false, false, false, false, false, // 38 -> 3F
- false, false, false, false, false, false, false, false, // 40 -> 47
- false, false, false, false, false, false, false, false, // 48 -> 4F
- false, false, false, false, false, false, false, false, // 50 -> 57
- false, false, false, false, true, false, false, false, // 58 -> 5F '\'
- false, false, false, false, false, false, false, false, // 60 -> 67
- false, false, false, false, false, false, false, false, // 68 -> 6F
- false, false, false, false, false, false, false, false, // 70 -> 77
- false, false, false, false, false, false, false, false // 78 -> 7F
- };
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 08 -> 0F
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 10 -> 17
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 18 -> 1F
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 20 -> 27
+ true,
+ true,
+ true,
+ false,
+ false,
+ false,
+ false,
+ false, // 28 -> 2F '(', ')', '*'
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 30 -> 37
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 38 -> 3F
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 40 -> 47
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 48 -> 4F
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 50 -> 57
+ false,
+ false,
+ false,
+ false,
+ true,
+ false,
+ false,
+ false, // 58 -> 5F '\'
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 60 -> 67
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 68 -> 6F
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false, // 70 -> 77
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false,
+ false // 78 -> 7F
+ };
/**
@@ -139,7 +244,8 @@ public class FilterNormalizingVisitor im
if ( attributeType.getSyntax().isHumanReadable() )
{
- normalized = new StringValue( ( String ) ncn.normalizeByName( attributeType.getOid(), value.getString() ) );
+ normalized = new StringValue(
+ ( String ) ncn.normalizeByName( attributeType.getOid(), value.getString() ) );
}
else
{
@@ -199,10 +305,10 @@ public class FilterNormalizingVisitor im
{
return null;
}
-
+
node.setAttributeType( schemaManager.lookupAttributeTypeRegistry( node.getAttribute() ) );
}
-
+
Value<?> normalized = normalizeValue( node.getAttributeType(), node.getValue() );
if ( normalized == null )
@@ -363,7 +469,7 @@ public class FilterNormalizingVisitor im
node.setChildren( newChildren );
return node;
}
- else if ( result instanceof LeafNode)
+ else if ( result instanceof LeafNode )
{
List<ExprNode> newChildren = new ArrayList<ExprNode>( 1 );
newChildren.add( result );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/AbstractPartition.java Tue Jan 24 14:10:56 2012
@@ -48,17 +48,18 @@ public abstract class AbstractPartition
/** The SchemaManager instance */
protected SchemaManager schemaManager;
-
+
/** The partition ID */
protected String id;
-
+
/** The root Dn for this partition */
protected Dn suffixDn;
+
/**
* {@inheritDoc}
*/
- public void initialize( ) throws LdapException
+ public void initialize() throws LdapException
{
if ( initialized )
{
@@ -176,8 +177,8 @@ public abstract class AbstractPartition
{
return suffixDn;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -192,8 +193,8 @@ public abstract class AbstractPartition
this.suffixDn.apply( schemaManager );
}
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -202,7 +203,7 @@ public abstract class AbstractPartition
stream.write( Strings.getBytesUtf8( "Nothing to dump for index " + name ) );
}
-
+
/**
* Check that the operation is done on an initialized store
* @param property
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java Tue Jan 24 14:10:56 2012
@@ -278,8 +278,8 @@ public interface Partition
* @throws Exception if something goes wrong
*/
void unbind( UnbindOperationContext unbindContext ) throws LdapException;
-
-
+
+
/**
* Dump the requested index to a given stream
* @param name The index to dump to stdout
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/partition/PartitionNexus.java Tue Jan 24 14:10:56 2012
@@ -43,11 +43,11 @@ public interface PartitionNexus extends
/** the admin super user uid */
public static final String ADMIN_UID = "admin";
-
+
/** the initial admin passwd set on startup */
public static final String ADMIN_PASSWORD_STRING = "secret";
-
- public static final byte[] ADMIN_PASSWORD_BYTES = Strings.getBytesUtf8(ADMIN_PASSWORD_STRING);
+
+ public static final byte[] ADMIN_PASSWORD_BYTES = Strings.getBytesUtf8( ADMIN_PASSWORD_STRING );
/**
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=1235258&r1=1235257&r2=1235258&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 Tue Jan 24 14:10:56 2012
@@ -69,34 +69,35 @@ import org.apache.directory.shared.ldap.
public class DescriptionParsers
{
/** Empty arrays of SchemaObjects */
- private static final LdapComparatorDescription[] EMPTY_COMPARATORS = new LdapComparatorDescription[0];
- private static final NormalizerDescription[] EMPTY_NORMALIZERS = new NormalizerDescription[0];
- private static final SyntaxCheckerDescription[] EMPTY_SYNTAX_CHECKERS = new SyntaxCheckerDescription[0];
- private static final LdapSyntax[] EMPTY_SYNTAXES = new LdapSyntax[0];
- private static final MatchingRule[] EMPTY_MATCHING_RULES = new MatchingRule[0];
- 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 DITContentRule[] EMPTY_DIT_CONTENT_RULES = new DITContentRule[0];
- private static final NameForm[] EMPTY_NAME_FORMS = new NameForm[0];
+ private static final LdapComparatorDescription[] EMPTY_COMPARATORS = new LdapComparatorDescription[0];
+ private static final NormalizerDescription[] EMPTY_NORMALIZERS = new NormalizerDescription[0];
+ private static final SyntaxCheckerDescription[] EMPTY_SYNTAX_CHECKERS = new SyntaxCheckerDescription[0];
+ private static final LdapSyntax[] EMPTY_SYNTAXES = new LdapSyntax[0];
+ private static final MatchingRule[] EMPTY_MATCHING_RULES = new MatchingRule[0];
+ 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 DITContentRule[] EMPTY_DIT_CONTENT_RULES = new DITContentRule[0];
+ private static final NameForm[] EMPTY_NAME_FORMS = new NameForm[0];
/** The SchemaObject description's parsers */
- private final LdapComparatorDescriptionSchemaParser comparatorParser = new LdapComparatorDescriptionSchemaParser();
- private final NormalizerDescriptionSchemaParser normalizerParser = new NormalizerDescriptionSchemaParser();
- private final SyntaxCheckerDescriptionSchemaParser syntaxCheckerParser = new SyntaxCheckerDescriptionSchemaParser();
- private final LdapSyntaxDescriptionSchemaParser syntaxParser = new LdapSyntaxDescriptionSchemaParser();
- private final MatchingRuleDescriptionSchemaParser matchingRuleParser = new MatchingRuleDescriptionSchemaParser();
- private final AttributeTypeDescriptionSchemaParser attributeTypeParser = new AttributeTypeDescriptionSchemaParser();
- private final ObjectClassDescriptionSchemaParser objectClassParser = new ObjectClassDescriptionSchemaParser();
- private final MatchingRuleUseDescriptionSchemaParser matchingRuleUseParser = new MatchingRuleUseDescriptionSchemaParser();
+ private final LdapComparatorDescriptionSchemaParser comparatorParser = new LdapComparatorDescriptionSchemaParser();
+ private final NormalizerDescriptionSchemaParser normalizerParser = new NormalizerDescriptionSchemaParser();
+ private final SyntaxCheckerDescriptionSchemaParser syntaxCheckerParser = new SyntaxCheckerDescriptionSchemaParser();
+ private final LdapSyntaxDescriptionSchemaParser syntaxParser = new LdapSyntaxDescriptionSchemaParser();
+ private final MatchingRuleDescriptionSchemaParser matchingRuleParser = new MatchingRuleDescriptionSchemaParser();
+ private final AttributeTypeDescriptionSchemaParser attributeTypeParser = new AttributeTypeDescriptionSchemaParser();
+ private final ObjectClassDescriptionSchemaParser objectClassParser = new ObjectClassDescriptionSchemaParser();
+ private final MatchingRuleUseDescriptionSchemaParser matchingRuleUseParser = new MatchingRuleUseDescriptionSchemaParser();
private final DITStructureRuleDescriptionSchemaParser ditStructureRuleParser = new DITStructureRuleDescriptionSchemaParser();
- private final DITContentRuleDescriptionSchemaParser ditContentRuleParser = new DITContentRuleDescriptionSchemaParser();
- private final NameFormDescriptionSchemaParser nameFormParser = new NameFormDescriptionSchemaParser();
+ private final DITContentRuleDescriptionSchemaParser ditContentRuleParser = new DITContentRuleDescriptionSchemaParser();
+ private final NameFormDescriptionSchemaParser nameFormParser = new NameFormDescriptionSchemaParser();
/** The SchemaManager instance */
private final SchemaManager schemaManager;
+
/**
* Creates a description parser.
*
@@ -135,7 +136,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_405,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_405,
value ) );
iave.initCause( e );
throw iave;
@@ -165,7 +167,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_406,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_406,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -195,7 +198,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_407,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_407,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -235,42 +239,48 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_408,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_408,
value.getString() ) );
iave.initCause( e );
throw iave;
}
// if the supertype is provided make sure it exists in some schema
- if ( ( attributeType.getSuperiorOid() != null ) && !schemaManager.getAttributeTypeRegistry().contains( attributeType.getSuperiorOid() ) )
+ if ( ( attributeType.getSuperiorOid() != null )
+ && !schemaManager.getAttributeTypeRegistry().contains( attributeType.getSuperiorOid() ) )
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
I18n.err( I18n.ERR_409, attributeType.getSuperiorOid() ) );
}
// if the syntax is provided by the description make sure it exists in some schema
- if ( ( attributeType.getSyntaxOid() != null ) && !schemaManager.getLdapSyntaxRegistry().contains( attributeType.getSyntaxOid() ) )
+ if ( ( attributeType.getSyntaxOid() != null )
+ && !schemaManager.getLdapSyntaxRegistry().contains( attributeType.getSyntaxOid() ) )
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
I18n.err( I18n.ERR_410, attributeType.getSyntaxOid() ) );
}
// if the matchingRule is provided make sure it exists in some schema
- if ( ( attributeType.getEqualityOid() != null ) && !schemaManager.getMatchingRuleRegistry().contains( attributeType.getEqualityOid() ) )
+ if ( ( attributeType.getEqualityOid() != null )
+ && !schemaManager.getMatchingRuleRegistry().contains( attributeType.getEqualityOid() ) )
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
I18n.err( I18n.ERR_411, attributeType.getEqualityOid() ) );
}
// if the matchingRule is provided make sure it exists in some schema
- if ( ( attributeType.getOrderingOid() != null ) && !schemaManager.getMatchingRuleRegistry().contains( attributeType.getOrderingOid() ) )
+ if ( ( attributeType.getOrderingOid() != null )
+ && !schemaManager.getMatchingRuleRegistry().contains( attributeType.getOrderingOid() ) )
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
I18n.err( I18n.ERR_412, attributeType.getOrderingOid() ) );
}
// if the matchingRule is provided make sure it exists in some schema
- if ( ( attributeType.getSubstringOid() != null ) && !schemaManager.getMatchingRuleRegistry().contains( attributeType.getSubstringOid() ) )
+ if ( ( attributeType.getSubstringOid() != null )
+ && !schemaManager.getMatchingRuleRegistry().contains( attributeType.getSubstringOid() ) )
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM,
I18n.err( I18n.ERR_413, attributeType.getSubstringOid() ) );
@@ -313,7 +323,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_417,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_417,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -403,7 +414,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_421,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_421,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -446,7 +458,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_422,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_422,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -495,7 +508,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_424,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_424,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -544,7 +558,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_426,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_426,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -587,7 +602,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_427,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_427,
value.getString() ) );
iave.initCause( e );
throw iave;
@@ -630,7 +646,8 @@ public class DescriptionParsers
}
catch ( ParseException e )
{
- LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_428,
+ LdapInvalidAttributeValueException iave = new LdapInvalidAttributeValueException(
+ ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, I18n.err( I18n.ERR_428,
value.getString() ) );
iave.initCause( e );
throw iave;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Tue Jan 24 14:10:56 2012
@@ -125,10 +125,11 @@ public final class SchemaPartition exten
/** A static Dn for the ou=schema partition */
private static Dn SCHEMA_DN;
-
+
/** The ObjectClass AttributeType */
private static AttributeType OBJECT_CLASS_AT;
+
public SchemaPartition( SchemaManager schemaManager )
{
try
@@ -139,14 +140,14 @@ public final class SchemaPartition exten
{
// Nothing to do : this is a valid DN anyways
}
-
+
id = SCHEMA_ID;
suffixDn = SCHEMA_DN;
this.schemaManager = schemaManager;
OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT_OID );
}
-
-
+
+
/**
* Sets the wrapped {@link Partition} which must be supplied or
* {@link Partition#initialize()} will fail with a NullPointerException.
@@ -213,11 +214,11 @@ public final class SchemaPartition exten
wrapped.setId( SCHEMA_ID );
wrapped.setSuffixDn( SCHEMA_DN );
wrapped.setSchemaManager( schemaManager );
-
+
try
{
wrapped.initialize();
-
+
synchronizer = new RegistrySynchronizerAdaptor( schemaManager );
}
catch ( Exception e )
@@ -225,7 +226,7 @@ public final class SchemaPartition exten
LOG.error( I18n.err( I18n.ERR_90 ), e );
throw new RuntimeException( e );
}
-
+
SCHEMA_MODIFICATION_DN = new Dn( schemaManager, SchemaConstants.SCHEMA_MODIFICATIONS_DN );
}
}
@@ -246,7 +247,7 @@ public final class SchemaPartition exten
LOG.error( I18n.err( I18n.ERR_91 ), e );
throw new RuntimeException( e );
}
-
+
initialized = false;
}
@@ -281,7 +282,7 @@ public final class SchemaPartition exten
updateSchemaModificationAttributes( addContext );
}
-
+
/**
* {@inheritDoc}
*/
@@ -296,19 +297,20 @@ public final class SchemaPartition exten
searchRequest.setFilter( node );
searchRequest.setTypesOnly( true );
searchRequest.setScope( SearchScope.ONELEVEL );
-
- SearchOperationContext searchContext = new SearchOperationContext( deleteContext.getSession(), searchRequest );
-
+
+ SearchOperationContext searchContext = new SearchOperationContext( deleteContext.getSession(),
+ searchRequest );
+
EntryFilteringCursor cursor = wrapped.search( searchContext );
-
+
cursor.beforeFirst();
int nbEntry = 0;
-
+
while ( cursor.next() && ( nbEntry < 2 ) )
{
nbEntry++;
}
-
+
return nbEntry;
}
catch ( Exception e )
@@ -325,7 +327,7 @@ public final class SchemaPartition exten
public void delete( DeleteOperationContext deleteContext ) throws LdapException
{
boolean cascade = deleteContext.hasRequestControl( Cascade.OID );
-
+
// We have to check if the entry we want to delete has children, or not
int nbChild = getChildCount( deleteContext );
@@ -333,7 +335,7 @@ public final class SchemaPartition exten
{
throw new LdapUnwillingToPerformException();
}
-
+
// The SchemaObject always exist when we reach this method.
synchronizer.delete( deleteContext, cascade );
@@ -378,7 +380,8 @@ public final class SchemaPartition exten
if ( entry == null )
{
- LookupOperationContext lookupCtx = new LookupOperationContext( modifyContext.getSession(), modifyContext.getDn() );
+ LookupOperationContext lookupCtx = new LookupOperationContext( modifyContext.getSession(),
+ modifyContext.getDn() );
entry = wrapped.lookup( lookupCtx );
modifyContext.setEntry( entry );
}
@@ -407,9 +410,10 @@ public final class SchemaPartition exten
public void move( MoveOperationContext moveContext ) throws LdapException
{
boolean cascade = moveContext.hasRequestControl( Cascade.OID );
-
+
CoreSession session = moveContext.getSession();
- LookupOperationContext lookupContext = new LookupOperationContext( session, moveContext.getDn(), SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+ LookupOperationContext lookupContext = new LookupOperationContext( session, moveContext.getDn(),
+ SchemaConstants.ALL_ATTRIBUTES_ARRAY );
Entry entry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext );
synchronizer.move( moveContext, entry, cascade );
wrapped.move( moveContext );
@@ -424,7 +428,8 @@ public final class SchemaPartition exten
{
boolean cascade = moveAndRenameContext.hasRequestControl( Cascade.OID );
CoreSession session = moveAndRenameContext.getSession();
- LookupOperationContext lookupContext = new LookupOperationContext( session, moveAndRenameContext.getDn(), SchemaConstants.ALL_ATTRIBUTES_ARRAY );
+ LookupOperationContext lookupContext = new LookupOperationContext( session, moveAndRenameContext.getDn(),
+ SchemaConstants.ALL_ATTRIBUTES_ARRAY );
Entry entry = session.getDirectoryService().getPartitionNexus().lookup( lookupContext );
synchronizer.moveAndRename( moveAndRenameContext, entry, cascade );
wrapped.moveAndRename( moveAndRenameContext );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AbstractRegistrySynchronizer.java Tue Jan 24 14:10:56 2012
@@ -78,10 +78,13 @@ public abstract class AbstractRegistrySy
// Removed the starting 'ou=' from the paths
OBJECT_TYPE_TO_PATH.put( SchemaConstants.ATTRIBUTE_TYPE, SchemaConstants.ATTRIBUTE_TYPES_PATH.substring( 3 ) );
OBJECT_TYPE_TO_PATH.put( SchemaConstants.COMPARATOR, SchemaConstants.COMPARATORS_PATH.substring( 3 ) );
- OBJECT_TYPE_TO_PATH.put( SchemaConstants.DIT_CONTENT_RULE, SchemaConstants.DIT_CONTENT_RULES_PATH.substring( 3 ) );
- OBJECT_TYPE_TO_PATH.put( SchemaConstants.DIT_STRUCTURE_RULE, SchemaConstants.DIT_STRUCTURE_RULES_PATH.substring( 3 ) );
+ OBJECT_TYPE_TO_PATH
+ .put( SchemaConstants.DIT_CONTENT_RULE, SchemaConstants.DIT_CONTENT_RULES_PATH.substring( 3 ) );
+ OBJECT_TYPE_TO_PATH.put( SchemaConstants.DIT_STRUCTURE_RULE,
+ SchemaConstants.DIT_STRUCTURE_RULES_PATH.substring( 3 ) );
OBJECT_TYPE_TO_PATH.put( SchemaConstants.MATCHING_RULE, SchemaConstants.MATCHING_RULES_PATH.substring( 3 ) );
- OBJECT_TYPE_TO_PATH.put( SchemaConstants.MATCHING_RULE_USE, SchemaConstants.MATCHING_RULE_USE_PATH.substring( 3 ) );
+ OBJECT_TYPE_TO_PATH.put( SchemaConstants.MATCHING_RULE_USE,
+ SchemaConstants.MATCHING_RULE_USE_PATH.substring( 3 ) );
OBJECT_TYPE_TO_PATH.put( SchemaConstants.NAME_FORM, SchemaConstants.NAME_FORMS_PATH.substring( 3 ) );
OBJECT_TYPE_TO_PATH.put( SchemaConstants.NORMALIZER, SchemaConstants.NORMALIZERS_PATH.substring( 3 ) );
OBJECT_TYPE_TO_PATH.put( SchemaConstants.OBJECT_CLASS, SchemaConstants.OBJECT_CLASSES_PATH.substring( 3 ) );
@@ -152,14 +155,14 @@ public abstract class AbstractRegistrySy
protected String getSchemaName( Dn dn ) throws LdapException
{
int size = dn.size();
-
+
if ( size < 2 )
{
throw new LdapInvalidDnException( I18n.err( I18n.ERR_276 ) );
}
Rdn rdn = dn.getRdn( size - 2 );
-
+
return rdn.getNormValue().getString();
}
@@ -207,7 +210,8 @@ public abstract class AbstractRegistrySy
Rdn rdn = newParent.getRdn();
- if ( ! schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals( SchemaConstants.OU_AT_OID ) )
+ if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() )
+ .equals( SchemaConstants.OU_AT_OID ) )
{
throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
I18n.err( I18n.ERR_338, objectType ) );
@@ -216,10 +220,11 @@ public abstract class AbstractRegistrySy
if ( !rdn.getNormValue().getString().equalsIgnoreCase( OBJECT_TYPE_TO_PATH.get( objectType ) ) )
{
throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
- I18n.err( I18n.ERR_339, objectType, OBJECT_TYPE_TO_PATH.get( objectType ) ) );
+ I18n.err( I18n.ERR_339, objectType, OBJECT_TYPE_TO_PATH.get( objectType ) ) );
}
}
+
protected void checkOidIsUnique( SchemaObject schemaObject ) throws Exception
{
String oid = schemaObject.getOid();
@@ -251,7 +256,8 @@ public abstract class AbstractRegistrySy
if ( isSchemaLoaded( schemaName ) )
{
// Get the set of all the SchemaObjects associated with this schema
- Set<SchemaObjectWrapper> schemaObjects = schemaManager.getRegistries().getObjectBySchemaName().get( schemaName );
+ Set<SchemaObjectWrapper> schemaObjects = schemaManager.getRegistries().getObjectBySchemaName()
+ .get( schemaName );
if ( schemaObjects == null )
{
@@ -270,7 +276,7 @@ public abstract class AbstractRegistrySy
}
schemaObjects.add( schemaObjectWrapper );
- LOG.debug( "The SchemaObject {} has been added to the schema {}", schemaObject, schemaName );
+ LOG.debug( "The SchemaObject {} has been added to the schema {}", schemaObject, schemaName );
}
else
{
@@ -282,8 +288,6 @@ public abstract class AbstractRegistrySy
}
-
-
/**
* Delete a SchemaObject from the schema registry, assuming that
* it has an associated schema and that this schema is loaded
@@ -292,7 +296,8 @@ public abstract class AbstractRegistrySy
{
if ( isSchemaLoaded( schemaName ) )
{
- Set<SchemaObjectWrapper> schemaObjects = schemaManager.getRegistries().getObjectBySchemaName().get( schemaName );
+ Set<SchemaObjectWrapper> schemaObjects = schemaManager.getRegistries().getObjectBySchemaName()
+ .get( schemaName );
SchemaObjectWrapper schemaObjectWrapper = new SchemaObjectWrapper( schemaObject );
@@ -305,7 +310,7 @@ public abstract class AbstractRegistrySy
}
schemaObjects.remove( schemaObjectWrapper );
- LOG.debug( "The SchemaObject {} has been removed from the schema {}", schemaObject, schemaName );
+ LOG.debug( "The SchemaObject {} has been removed from the schema {}", schemaObject, schemaName );
}
else
{
@@ -388,7 +393,7 @@ public abstract class AbstractRegistrySy
Set<SchemaObjectWrapper> useds = schemaManager.getRegistries().getUsedBy( schemaObject );
- for ( SchemaObjectWrapper used:useds )
+ for ( SchemaObjectWrapper used : useds )
{
sb.append( used );
sb.append( '\n' );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/AttributeTypeSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -96,7 +96,8 @@ public class AttributeTypeSynchronizer e
else
{
// We have some error : reject the addition and get out
- String msg = I18n.err( I18n.ERR_345, entry.getDn().getName(), Strings.listToString(schemaManager.getErrors()) );
+ String msg = I18n.err( I18n.ERR_345, entry.getDn().getName(),
+ Strings.listToString( schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
@@ -157,12 +158,12 @@ public class AttributeTypeSynchronizer e
if ( schema.isDisabled() )
{
// The schema is disabled, nothing to do.
- LOG.debug( "The AttributeType {} cannot be removed from the disabled schema {}.",
+ LOG.debug( "The AttributeType {} cannot be removed from the disabled schema {}.",
dn.getName(), schemaName );
-
+
return;
}
-
+
// Test that the Oid exists
AttributeType attributeType = ( AttributeType ) checkOidExists( entry );
@@ -175,8 +176,8 @@ public class AttributeTypeSynchronizer e
else
{
// We have some error : reject the deletion and get out
- String msg = I18n.err( I18n.ERR_346, entry.getDn().getName(),
- Strings.listToString(schemaManager.getErrors()) );
+ String msg = I18n.err( I18n.ERR_346, entry.getDn().getName(),
+ Strings.listToString( schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ComparatorSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -129,7 +129,7 @@ public class ComparatorSynchronizer exte
{
// We have some error : reject the addition and get out
String msg = I18n.err( I18n.ERR_350, entry.getDn().getName(), Strings.listToString(
- schemaManager.getErrors()) );
+ schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
@@ -162,7 +162,7 @@ public class ComparatorSynchronizer exte
{
// The schema is disabled, nothing to do.
LOG.debug( "The Comparator {} cannot be deleted from the disabled schema {}", dn.getName(), schemaName );
-
+
return;
}
@@ -206,7 +206,7 @@ public class ComparatorSynchronizer exte
else
{
String msg = I18n.err( I18n.ERR_352, entry.getDn().getName(), Strings.listToString(
- errors) );
+ errors ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitContentRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitContentRuleSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitContentRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/DitContentRuleSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -54,7 +54,7 @@ public class DitContentRuleSynchronizer
* {@inheritDoc}
*/
@Override
- public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
+ public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascade )
throws LdapException
{
// TODO Auto-generated method stub
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=1235258&r1=1235257&r2=1235258&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 Tue Jan 24 14:10:56 2012
@@ -53,7 +53,7 @@ public class DitStructureRuleSynchronize
* {@inheritDoc}
*/
@Override
- public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry,
+ public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry,
boolean cascade ) throws LdapException
{
// TODO Auto-generated method stub
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -110,7 +110,7 @@ public class MatchingRuleSynchronizer ex
MatchingRule matchingRule = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(),
schemaName );
-
+
// At this point, the constructed MatchingRule has not been checked against the
// existing Registries. It may be broken (missing SUP, or such), it will be checked
// there, if the schema and the MatchingRule are both enabled.
@@ -125,8 +125,8 @@ public class MatchingRuleSynchronizer ex
else
{
// We have some error : reject the addition and get out
- String msg = I18n.err( I18n.ERR_360, entry.getDn().getName(),
- Strings.listToString(schemaManager.getErrors()) );
+ String msg = I18n.err( I18n.ERR_360, entry.getDn().getName(),
+ Strings.listToString( schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
@@ -154,13 +154,13 @@ public class MatchingRuleSynchronizer ex
// Get the schema
Schema schema = schemaManager.getLoadedSchema( schemaName );
-
+
if ( schema.isDisabled() )
{
// The schema is disabled, nothing to do.
- LOG.debug( "The MatchingRule {} cannot be removed from the disabled schema {}.",
+ LOG.debug( "The MatchingRule {} cannot be removed from the disabled schema {}.",
dn.getName(), schemaName );
-
+
return;
}
@@ -177,8 +177,8 @@ public class MatchingRuleSynchronizer ex
{
// We have some error : reject the deletion and get out
// The schema is disabled. We still have to update the backend
- String msg = I18n.err( I18n.ERR_360, entry.getDn().getName(),
- Strings.listToString(schemaManager.getErrors()) );
+ String msg = I18n.err( I18n.ERR_360, entry.getDn().getName(),
+ Strings.listToString( schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
@@ -197,7 +197,7 @@ public class MatchingRuleSynchronizer ex
{
String schemaName = getSchemaName( entry.getDn() );
MatchingRule oldMr = factory.getMatchingRule( schemaManager, entry, schemaManager.getRegistries(), schemaName );
- Entry targetEntry = (Entry) entry.clone();
+ Entry targetEntry = ( Entry ) entry.clone();
String newOid = newRdn.getNormValue().getString();
checkOidIsUnique( newOid );
@@ -293,7 +293,7 @@ public class MatchingRuleSynchronizer ex
}
Rdn rdn = newParent.getRdn();
-
+
if ( !schemaManager.getAttributeTypeRegistry().getOidByName( rdn.getNormType() ).equals(
SchemaConstants.OU_AT_OID ) )
{
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/MatchingRuleUseSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -53,7 +53,7 @@ public class MatchingRuleUseSynchronizer
* {@inheritDoc}
*/
@Override
- public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry,
+ public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry,
boolean cascade ) throws LdapException
{
// TODO Auto-generated method stub
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NameFormSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NameFormSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NameFormSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NameFormSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -52,7 +52,7 @@ public class NameFormSynchronizer extend
* {@inheritDoc}
*/
@Override
- public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry,
+ public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry,
boolean cascade ) throws LdapException
{
return SCHEMA_UNCHANGED;
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/NormalizerSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -126,10 +126,10 @@ public class NormalizerSynchronizer exte
}
else
{
- String msg = I18n.err( I18n.ERR_364, entry.getDn().getName(),
- Strings.listToString(errors) );
+ String msg = I18n.err( I18n.ERR_364, entry.getDn().getName(),
+ Strings.listToString( errors ) );
LOG.info( msg );
- throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
+ throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
}
else
@@ -140,7 +140,7 @@ public class NormalizerSynchronizer exte
if ( !errors.isEmpty() )
{
String msg = I18n.err( I18n.ERR_365, entry.getDn().getName(),
- Strings.listToString(errors) );
+ Strings.listToString( errors ) );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/ObjectClassSynchronizer.java Tue Jan 24 14:10:56 2012
@@ -121,8 +121,8 @@ public class ObjectClassSynchronizer ext
else
{
// We have some error : reject the addition and get out
- String msg = I18n.err( I18n.ERR_373, entry.getDn().getName(),
- Strings.listToString(schemaManager.getErrors()) );
+ String msg = I18n.err( I18n.ERR_373, entry.getDn().getName(),
+ Strings.listToString( schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
@@ -148,19 +148,19 @@ public class ObjectClassSynchronizer ext
// Get the ObjectClass from the given entry ( it has been grabbed from the server earlier)
String schemaName = getSchemaName( entry.getDn() );
-
+
// Get the schema
Schema schema = schemaManager.getLoadedSchema( schemaName );
if ( schema.isDisabled() )
{
// The schema is disabled, nothing to do.
- LOG.debug( "The ObjectClass {} cannot be removed from the disabled schema {}.",
+ LOG.debug( "The ObjectClass {} cannot be removed from the disabled schema {}.",
dn.getName(), schemaName );
-
+
return;
}
-
+
// Test that the Oid exists
ObjectClass objectClass = ( ObjectClass ) checkOidExists( entry );
@@ -174,7 +174,7 @@ public class ObjectClassSynchronizer ext
{
// We have some error : reject the deletion and get out
String msg = I18n.err( I18n.ERR_374, entry.getDn().getName(),
- Strings.listToString(schemaManager.getErrors()) );
+ Strings.listToString( schemaManager.getErrors() ) );
LOG.info( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
@@ -206,7 +206,7 @@ public class ObjectClassSynchronizer ext
// ResultCodeEnum.UNWILLING_TO_PERFORM );
// }
- Entry targetEntry = (Entry) entry.clone();
+ Entry targetEntry = ( Entry ) entry.clone();
String newOid = newRdn.getNormValue().getString();
targetEntry.put( MetaSchemaConstants.M_OID_AT, newOid );
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizer.java Tue Jan 24 14:10:56 2012
@@ -40,8 +40,8 @@ public interface RegistrySynchronizer
/** A constant to tell the caller that the schema has not been modified */
static final boolean SCHEMA_UNCHANGED = false;
-
-
+
+
/**
* Adds a new SchemaObject to its registry
*
@@ -49,8 +49,8 @@ public interface RegistrySynchronizer
* @throws Exception If the addition failed
*/
void add( Entry entry ) throws LdapException;
-
-
+
+
/**
* Delete the schema object and update the registries
*
@@ -59,8 +59,8 @@ public interface RegistrySynchronizer
* @throws Exception If the deletion failed
*/
void delete( Entry entry, boolean cascaded ) throws LdapException;
-
-
+
+
/**
* Rename a schemaObject. It is not supposed to have any child
*
@@ -70,7 +70,7 @@ public interface RegistrySynchronizer
* @throws Exception If the rename failed
*/
void rename( Entry entry, Rdn newRdn, boolean cascaded ) throws LdapException;
-
+
/**
* Applies a set of modification to an entry
@@ -83,9 +83,11 @@ public interface RegistrySynchronizer
*/
boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean cascaded )
throws LdapException;
-
+
+
void moveAndRename( Dn oriChildName, Dn newParentName, Rdn newRn, boolean deleteOldRn, Entry entry,
boolean cascaded ) throws LdapException;
-
+
+
void move( Dn oriChildName, Dn newParentName, Entry entry, boolean cascaded ) throws LdapException;
}
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java?rev=1235258&r1=1235257&r2=1235258&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/api/schema/registries/synchronizers/RegistrySynchronizerAdaptor.java Tue Jan 24 14:10:56 2012
@@ -84,18 +84,19 @@ public class RegistrySynchronizerAdaptor
private static final int NAME_FORM_INDEX = 10;
private static final Set<String> VALID_OU_VALUES = new HashSet<String>();
- private static final String[] META_OBJECT_CLASSES = new String[] {
- MetaSchemaConstants.META_COMPARATOR_OC,
- MetaSchemaConstants.META_NORMALIZER_OC,
- MetaSchemaConstants.META_SYNTAX_CHECKER_OC,
- MetaSchemaConstants.META_SYNTAX_OC,
- MetaSchemaConstants.META_MATCHING_RULE_OC,
- MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC,
- MetaSchemaConstants.META_OBJECT_CLASS_OC,
- MetaSchemaConstants.META_MATCHING_RULE_USE_OC,
- MetaSchemaConstants.META_DIT_STRUCTURE_RULE_OC,
- MetaSchemaConstants.META_DIT_CONTENT_RULE_OC,
- MetaSchemaConstants.META_NAME_FORM_OC
+ private static final String[] META_OBJECT_CLASSES = new String[]
+ {
+ MetaSchemaConstants.META_COMPARATOR_OC,
+ MetaSchemaConstants.META_NORMALIZER_OC,
+ MetaSchemaConstants.META_SYNTAX_CHECKER_OC,
+ MetaSchemaConstants.META_SYNTAX_OC,
+ MetaSchemaConstants.META_MATCHING_RULE_OC,
+ MetaSchemaConstants.META_ATTRIBUTE_TYPE_OC,
+ MetaSchemaConstants.META_OBJECT_CLASS_OC,
+ MetaSchemaConstants.META_MATCHING_RULE_USE_OC,
+ MetaSchemaConstants.META_DIT_STRUCTURE_RULE_OC,
+ MetaSchemaConstants.META_DIT_CONTENT_RULE_OC,
+ MetaSchemaConstants.META_NAME_FORM_OC
};
private final Registries registries;
@@ -104,7 +105,7 @@ public class RegistrySynchronizerAdaptor
private final Map<String, RegistrySynchronizer> objectClass2synchronizerMap = new HashMap<String, RegistrySynchronizer>();
private final SchemaSynchronizer schemaSynchronizer;
- static
+ static
{
VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.NORMALIZERS_AT ) );
VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.COMPARATORS_AT ) );
@@ -126,8 +127,8 @@ public class RegistrySynchronizerAdaptor
this.schemaSynchronizer = new SchemaSynchronizer( schemaManager );
this.objectClassAT = this.registries.getAttributeTypeRegistry()
.lookup( SchemaConstants.OBJECT_CLASS_AT );
-
- this.registrySynchronizers[COMPARATOR_INDEX] = new ComparatorSynchronizer( schemaManager );
+
+ this.registrySynchronizers[COMPARATOR_INDEX] = new ComparatorSynchronizer( schemaManager );
this.registrySynchronizers[NORMALIZER_INDEX] = new NormalizerSynchronizer( schemaManager );
this.registrySynchronizers[SYNTAX_CHECKER_INDEX] = new SyntaxCheckerSynchronizer( schemaManager );
this.registrySynchronizers[SYNTAX_INDEX] = new SyntaxSynchronizer( schemaManager );
@@ -135,9 +136,9 @@ public class RegistrySynchronizerAdaptor
this.registrySynchronizers[ATTRIBUTE_TYPE_INDEX] = new AttributeTypeSynchronizer( schemaManager );
this.registrySynchronizers[OBJECT_CLASS_INDEX] = new ObjectClassSynchronizer( schemaManager );
this.registrySynchronizers[MATCHING_RULE_USE_INDEX] = new MatchingRuleUseSynchronizer( schemaManager );
- this.registrySynchronizers[DIT_STRUCTURE_RULE_INDEX] = new DitStructureRuleSynchronizer( schemaManager );
- this.registrySynchronizers[DIT_CONTENT_RULE_INDEX] = new DitContentRuleSynchronizer( schemaManager );
- this.registrySynchronizers[NAME_FORM_INDEX] = new NameFormSynchronizer( schemaManager );
+ this.registrySynchronizers[DIT_STRUCTURE_RULE_INDEX] = new DitStructureRuleSynchronizer( schemaManager );
+ this.registrySynchronizers[DIT_CONTENT_RULE_INDEX] = new DitContentRuleSynchronizer( schemaManager );
+ this.registrySynchronizers[NAME_FORM_INDEX] = new NameFormSynchronizer( schemaManager );
ObjectClassRegistry ocReg = registries.getObjectClassRegistry();
for ( int ii = 0; ii < META_OBJECT_CLASSES.length; ii++ )
@@ -157,13 +158,13 @@ public class RegistrySynchronizerAdaptor
public void add( AddOperationContext addContext ) throws LdapException
{
Attribute oc = addContext.getEntry().get( objectClassAT );
-
+
// First check if we are adding a schemaObject
- for ( Value<?> value:oc )
+ for ( Value<?> value : oc )
{
String oid = registries.getObjectClassRegistry().getOidByName( value.getString() );
-
+
if ( objectClass2synchronizerMap.containsKey( oid ) )
{
// This is one of the eleven SchemaObject :
@@ -171,21 +172,21 @@ public class RegistrySynchronizerAdaptor
RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
Entry entry = addContext.getEntry();
synchronizer.add( entry );
-
+
return;
}
}
-
+
// This is a Schema
// e.g. ou=my custom schema,ou=schema
if ( oc.contains( MetaSchemaConstants.META_SCHEMA_OC ) )
{
Entry entry = addContext.getEntry();
schemaSynchronizer.add( entry );
-
+
return;
}
-
+
// Check if it is a valid container for AT, C, DCR, DSR, MR, MRU, NF, N, OC, S, SC
// e.g. ou=attributeTypes,ou=my custom schema,ou=schema
if ( oc.contains( SchemaConstants.ORGANIZATIONAL_UNIT_OC ) )
@@ -196,42 +197,41 @@ public class RegistrySynchronizerAdaptor
LOG.error( msg );
throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, msg );
}
-
+
String ouValue = addContext.getDn().getRdn().getNormValue().getString();
ouValue = Strings.toLowerCase( Strings.trim( ouValue ) );
-
- if ( ! VALID_OU_VALUES.contains( ouValue ) )
+
+ if ( !VALID_OU_VALUES.contains( ouValue ) )
{
String msg = I18n.err( I18n.ERR_82, VALID_OU_VALUES );
LOG.error( msg );
throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION, msg );
}
-
+
// this is a valid container.
return;
}
-
String msg = I18n.err( I18n.ERR_83, addContext.getDn() );
LOG.error( msg );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, msg );
}
-
+
/**
* {@inheritDoc}
*/
- public void delete( DeleteOperationContext deleteContext, boolean doCascadeDelete )
+ public void delete( DeleteOperationContext deleteContext, boolean doCascadeDelete )
throws LdapException
{
Entry entry = deleteContext.getEntry();
-
+
Attribute oc = entry.get( objectClassAT );
-
- for ( Value<?> value:oc )
+
+ for ( Value<?> value : oc )
{
String oid = registries.getObjectClassRegistry().getOidByName( value.getString() );
-
+
if ( objectClass2synchronizerMap.containsKey( oid ) )
{
RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
@@ -245,29 +245,29 @@ public class RegistrySynchronizerAdaptor
schemaSynchronizer.delete( entry, doCascadeDelete );
return;
}
-
+
if ( oc.contains( SchemaConstants.ORGANIZATIONAL_UNIT_OC ) )
{
if ( deleteContext.getDn().size() != 3 )
{
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM, I18n.err( I18n.ERR_378 ) );
}
-
+
String ouValue = deleteContext.getDn().getRdn().getNormValue().getString();
ouValue = Strings.toLowerCase( Strings.trim( ouValue ) );
-
- if ( ! VALID_OU_VALUES.contains( ouValue ) )
+
+ if ( !VALID_OU_VALUES.contains( ouValue ) )
{
throw new LdapInvalidDnException( ResultCodeEnum.NAMING_VIOLATION,
I18n.err( I18n.ERR_379, VALID_OU_VALUES ) );
}
-
+
return;
}
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM );
}
-
+
/**
* Modify the schema
@@ -277,15 +277,16 @@ public class RegistrySynchronizerAdaptor
* @param doCascadeModify Not used
* @throws Exception If the modification failed
*/
- public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean doCascadeModify ) throws LdapException
+ public boolean modify( ModifyOperationContext modifyContext, Entry targetEntry, boolean doCascadeModify )
+ throws LdapException
{
Entry entry = modifyContext.getEntry();
Attribute oc = entry.get( objectClassAT );
-
- for ( Value<?> value:oc )
+
+ for ( Value<?> value : oc )
{
String oid = registries.getObjectClassRegistry().getOidByName( value.getString() );
-
+
if ( objectClass2synchronizerMap.containsKey( oid ) )
{
RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
@@ -300,12 +301,12 @@ public class RegistrySynchronizerAdaptor
return hasModification;
}
- if ( oc.contains( ApacheSchemaConstants.SCHEMA_MODIFICATION_ATTRIBUTES_OC ) )
+ if ( oc.contains( ApacheSchemaConstants.SCHEMA_MODIFICATION_ATTRIBUTES_OC ) )
{
return false;
}
-
- LOG.error( String.format( I18n.err( I18n.ERR_84 ),
+
+ LOG.error( String.format( I18n.err( I18n.ERR_84 ),
modifyContext.getDn(), entry, modifyContext.getModItems() ) );
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM );
}
@@ -318,16 +319,16 @@ public class RegistrySynchronizerAdaptor
* @param doCascadeModify unused
* @throws Exception If the rename failed
*/
- public void rename( RenameOperationContext renameContext, boolean doCascadeModify )
+ public void rename( RenameOperationContext renameContext, boolean doCascadeModify )
throws LdapException
{
- Entry originalEntry = ((ClonedServerEntry)renameContext.getEntry()).getOriginalEntry();
+ Entry originalEntry = ( ( ClonedServerEntry ) renameContext.getEntry() ).getOriginalEntry();
Attribute oc = originalEntry.get( objectClassAT );
-
- for ( Value<?> value:oc )
+
+ for ( Value<?> value : oc )
{
String oid = registries.getObjectClassRegistry().getOidByName( value.getString() );
-
+
if ( objectClass2synchronizerMap.containsKey( oid ) )
{
RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
@@ -341,7 +342,7 @@ public class RegistrySynchronizerAdaptor
schemaSynchronizer.rename( originalEntry, renameContext.getNewRdn(), doCascadeModify );
return;
}
-
+
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM );
}
@@ -352,11 +353,11 @@ public class RegistrySynchronizerAdaptor
public void move( MoveOperationContext moveContext, Entry entry, boolean cascade ) throws LdapException
{
Attribute oc = entry.get( objectClassAT );
-
- for ( Value<?> value:oc )
+
+ for ( Value<?> value : oc )
{
String oid = registries.getObjectClassRegistry().getOidByName( value.getString() );
-
+
if ( objectClass2synchronizerMap.containsKey( oid ) )
{
RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
@@ -370,7 +371,7 @@ public class RegistrySynchronizerAdaptor
schemaSynchronizer.move( moveContext.getDn(), moveContext.getNewSuperior(), entry, cascade );
return;
}
-
+
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM );
}
@@ -378,18 +379,20 @@ public class RegistrySynchronizerAdaptor
/* (non-Javadoc)
* @see org.apache.directory.server.core.schema.SchemaChangeManager#move(org.apache.directory.server.core.interceptor.context.MoveAndRenameOperationContext, org.apache.directory.server.core.entry.Entry, boolean)
*/
- public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext, Entry entry, boolean cascade ) throws LdapException
+ public void moveAndRename( MoveAndRenameOperationContext moveAndRenameContext, Entry entry, boolean cascade )
+ throws LdapException
{
Attribute oc = entry.get( objectClassAT );
-
- for ( Value<?> value:oc )
+
+ for ( Value<?> value : oc )
{
String oid = registries.getObjectClassRegistry().getOidByName( value.getString() );
-
+
if ( objectClass2synchronizerMap.containsKey( oid ) )
{
RegistrySynchronizer synchronizer = objectClass2synchronizerMap.get( oid );
- synchronizer.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperiorDn(), moveAndRenameContext.getNewRdn(),
+ synchronizer.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperiorDn(),
+ moveAndRenameContext.getNewRdn(),
moveAndRenameContext.getDeleteOldRdn(), entry, cascade );
return;
}
@@ -397,11 +400,12 @@ public class RegistrySynchronizerAdaptor
if ( oc.contains( MetaSchemaConstants.META_SCHEMA_OC ) )
{
- schemaSynchronizer.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperiorDn(), moveAndRenameContext.getNewRdn(),
+ schemaSynchronizer.moveAndRename( moveAndRenameContext.getDn(), moveAndRenameContext.getNewSuperiorDn(),
+ moveAndRenameContext.getNewRdn(),
moveAndRenameContext.getDeleteOldRdn(), entry, cascade );
return;
}
-
+
throw new LdapUnwillingToPerformException( ResultCodeEnum.UNWILLING_TO_PERFORM );
}
}