You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/08/24 08:33:21 UTC
svn commit: r569271 - in
/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema:
SchemaManager.java SchemaService.java
Author: akarasulu
Date: Thu Aug 23 23:33:21 2007
New Revision: 569271
URL: http://svn.apache.org/viewvc?rev=569271&view=rev
Log:
pass in cascade parameter to handle cascade control based operations in the schema manager: for DIRSERVER-1030
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java?rev=569271&r1=569270&r2=569271&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaManager.java Thu Aug 23 23:33:21 2007
@@ -124,7 +124,7 @@
"metaDITContentRule",
"metaNameForm"
};
- private static final Collection SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS;
+ private static final Collection<String> SCHEMA_MODIFICATION_ATTRIBUTES_UPDATE_BYPASS;
private final PartitionSchemaLoader loader;
private final MetaSchemaHandler metaSchemaHandler;
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java?rev=569271&r1=569270&r2=569271&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/schema/SchemaService.java Thu Aug 23 23:33:21 2007
@@ -78,6 +78,7 @@
import org.apache.directory.shared.ldap.filter.SimpleNode;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
+import org.apache.directory.shared.ldap.message.CascadeControl;
import org.apache.directory.shared.ldap.message.ModificationItemImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.ServerSearchResult;
@@ -1221,8 +1222,8 @@
if ( name.startsWith( schemaBaseDN ) )
{
- // @TODO DIRSERVER-1030 make this conditional based on the presence of the CascadeControl
- schemaManager.modifyRn( name, newRdn, deleteOldRn, entry, false );
+ schemaManager.modifyRn( name, newRdn, deleteOldRn, entry,
+ opContext.hasRequestControl( CascadeControl.CONTROL_OID ) );
}
next.rename( opContext );
@@ -1534,13 +1535,13 @@
if ( name.startsWith( schemaBaseDN ) )
{
- // @TODO DIRSERVER-1030 make this conditional based on the presence of the CascadeControl
- schemaManager.modify( name, mods, entry, targetEntry, false );
+ schemaManager.modify( name, mods, entry, targetEntry,
+ opContext.hasRequestControl( CascadeControl.CONTROL_OID ));
}
else if ( subschemaSubentryDnNorm.equals( name.getNormName() ) )
{
- // @TODO DIRSERVER-1030 make this conditional based on the presence of the CascadeControl
- schemaManager.modifySchemaSubentry( name, mods, entry, targetEntry, false );
+ schemaManager.modifySchemaSubentry( name, mods, entry, targetEntry,
+ opContext.hasRequestControl( CascadeControl.CONTROL_OID ) );
return;
}
@@ -1801,8 +1802,7 @@
if ( name.startsWith( schemaBaseDN ) )
{
- // @TODO DIRSERVER-1030 make this conditional based on the presence of the CascadeControl
- schemaManager.delete( name, entry, false );
+ schemaManager.delete( name, entry, opContext.hasRequestControl( CascadeControl.CONTROL_OID ) );
}
next.delete( opContext );