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 2011/11/16 16:35:04 UTC
svn commit: r1202743 - in /directory/apacheds/trunk:
core/src/main/java/org/apache/directory/server/core/
interceptors/operational/src/main/java/org/apache/directory/server/core/operational/
server-config/src/main/resources/
Author: elecharny
Date: Wed Nov 16 15:35:03 2011
New Revision: 1202743
URL: http://svn.apache.org/viewvc?rev=1202743&view=rev
Log:
Inverted the OpAttrInterceptor with the SchemaInterceptor.
Modified:
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
directory/apacheds/trunk/server-config/src/main/resources/config.ldif
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1202743&r1=1202742&r2=1202743&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Wed Nov 16 15:35:03 2011
@@ -957,7 +957,7 @@ public class DefaultDirectoryService imp
// BackendSubsystem Interface Method Implementations
// ------------------------------------------------------------------------
/**
- * Define a default list of interceptors that has to be used if no other
+ * Define a default list of interceptors that has to be used if no other
* configuration is defined.
*/
private void setDefaultInterceptorConfigurations()
@@ -972,8 +972,8 @@ public class DefaultDirectoryService imp
list.add( new DefaultAuthorizationInterceptor() );
list.add( new AdministrativePointInterceptor() );
list.add( new ExceptionInterceptor() );
- list.add( new OperationalAttributeInterceptor() );
list.add( new SchemaInterceptor() );
+ list.add( new OperationalAttributeInterceptor() );
list.add( new CollectiveAttributeInterceptor() );
list.add( new SubentryInterceptor() );
list.add( new EventInterceptor() );
Modified: directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1202743&r1=1202742&r2=1202743&view=diff
==============================================================================
--- directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/trunk/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Wed Nov 16 15:35:03 2011
@@ -456,7 +456,6 @@ public class OperationalAttributeInterce
Entry modifiedEntry = renameContext.getOriginalEntry().clone();
modifiedEntry.put( SchemaConstants.MODIFIERS_NAME_AT, getPrincipal( renameContext ).getName() );
modifiedEntry.put( SchemaConstants.MODIFY_TIMESTAMP_AT, DateUtils.getGeneralizedTime() );
- //modifiedEntry.setDn( renameContext.getNewDn() );
renameContext.setModifiedEntry( modifiedEntry );
next( renameContext );
@@ -644,7 +643,7 @@ public class OperationalAttributeInterce
}
- public void denormalizeEntryOpAttrs( Entry entry ) throws LdapException
+ private void denormalizeEntryOpAttrs( Entry entry ) throws LdapException
{
if ( directoryService.isDenormalizeOpAttrsEnabled() )
{
Modified: directory/apacheds/trunk/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-config/src/main/resources/config.ldif?rev=1202743&r1=1202742&r2=1202743&view=diff
==============================================================================
--- directory/apacheds/trunk/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/trunk/server-config/src/main/resources/config.ldif Wed Nov 16 15:35:03 2011
@@ -185,7 +185,7 @@ objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
ads-enabled: FALSE
-ads-interceptororder: 8
+ads-interceptororder: 7
ads-interceptorclassname: org.apache.directory.server.core.kerberos.KeyDerivationInterceptor
ads-interceptorid: keyDerivationInterceptor
@@ -202,7 +202,7 @@ dn: ads-interceptorId=operationalAttribu
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 7
+ads-interceptororder: 10
ads-interceptorclassname: org.apache.directory.server.core.operational.OperationalAttributeInterceptor
ads-interceptorid: operationalAttributeInterceptor
ads-enabled: TRUE
@@ -212,7 +212,7 @@ objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
ads-enabled: TRUE
-ads-interceptororder: 9
+ads-interceptororder: 8
ads-interceptorclassname: org.apache.directory.server.core.hash.SshaPasswordHashingInterceptor
ads-interceptorid: passwordHashingInterceptor
@@ -229,7 +229,7 @@ dn: ads-interceptorId=schemaInterceptor,
objectclass: top
objectclass: ads-base
objectclass: ads-interceptor
-ads-interceptororder: 10
+ads-interceptororder: 9
ads-interceptorclassname: org.apache.directory.server.core.schema.SchemaInterceptor
ads-interceptorid: schemaInterceptor
ads-enabled: TRUE