directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1203604 [7/8] - in /directory/apacheds/branches/apacheds-osgi: ./ all/ apache-felix/ component-hub/ component-hub/src/ component-hub/src/main/ component-hub/src/main/java/ component-hub/src/main/java/org/ component-hub/src/main/java/org/ap...
Date Fri, 18 Nov 2011 11:21:59 GMT
Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/admin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/admin:965203-965686
 /directory/apacheds/branches/milestones/interceptors/admin:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/admin:945827-946347
-/directory/apacheds/trunk/interceptors/admin:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/admin:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/admin:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/authn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/authn:965203-965686
 /directory/apacheds/branches/milestones/interceptors/authn:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/authn:945827-946347
-/directory/apacheds/trunk/interceptors/authn:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/authn:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/authn:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/authz/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/authz:965203-965686
 /directory/apacheds/branches/milestones/interceptors/authz:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/authz:945827-946347
-/directory/apacheds/trunk/interceptors/authz:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201349
+/directory/apacheds/trunk/interceptors/authz:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201349,1201371-1203550
 /directory/studio/trunk/interceptors/authz:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/changelog/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/changelog:965203-965686
 /directory/apacheds/branches/milestones/interceptors/changelog:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/changelog:945827-946347
-/directory/apacheds/trunk/interceptors/changelog:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/changelog:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/changelog:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/collective/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/collective:965203-965686
 /directory/apacheds/branches/milestones/interceptors/collective:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/collective:945827-946347
-/directory/apacheds/trunk/interceptors/collective:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/collective:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/collective:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/event:965203-965686
 /directory/apacheds/branches/milestones/interceptors/event:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/event:945827-946347
-/directory/apacheds/trunk/interceptors/event:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/event:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/event:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/exception/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/exception:965203-965686
 /directory/apacheds/branches/milestones/interceptors/exception:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/exception:945827-946347
-/directory/apacheds/trunk/interceptors/exception:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/exception:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/exception:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/hash/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/hash:965203-965686
 /directory/apacheds/branches/milestones/interceptors/hash:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/hash:945827-946347
-/directory/apacheds/trunk/interceptors/hash:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/hash:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/hash:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/journal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/journal:965203-965686
 /directory/apacheds/branches/milestones/interceptors/journal:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/journal:945827-946347
-/directory/apacheds/trunk/interceptors/journal:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/journal:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/journal:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/logger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/logger:965203-965686
 /directory/apacheds/branches/milestones/interceptors/logger:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/logger:945827-946347
-/directory/apacheds/trunk/interceptors/logger:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/logger:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/logger:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/normalization/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/normalization:965203-965686
 /directory/apacheds/branches/milestones/interceptors/normalization:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/normalization:945827-946347
-/directory/apacheds/trunk/interceptors/normalization:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/normalization:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/normalization:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/operational/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/operational:965203-965686
 /directory/apacheds/branches/milestones/interceptors/operational:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/operational:945827-946347
-/directory/apacheds/trunk/interceptors/operational:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/operational:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/operational:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/operational/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeInterceptor.java Fri Nov 18 11:21:55 2011
@@ -256,16 +256,46 @@ public class OperationalAttributeInterce
     public Entry lookup( LookupOperationContext lookupContext ) throws LdapException
     {
         Entry result = next( lookupContext );
-
-        if ( lookupContext.getAttrsId() == null )
+        
+        if ( lookupContext.hasAllUser() )
         {
-            filterOperationalAttributes( result );
+            if ( lookupContext.hasAllOperational() )
+            {
+                // The user has requested '+' and '*', return everything.
+                return result;
+            }
+            else
+            {
+                filter( lookupContext, result );
+            }
         }
-        else if ( !lookupContext.hasAllOperational() )
+        else
         {
-            filter( lookupContext, result );
+            if ( lookupContext.hasAllOperational() )
+            {
+                // Select the user attrinbutes from the result, depending on the returning attributes list
+                filterUserAttributes( lookupContext, result );
+            }
+            else if ( ( lookupContext.getAttrsId() == null ) || ( lookupContext.getAttrsId().size() == 0 ) )
+            {
+                // No returning attributes, return all the user attributes
+                // unless the user has requested no attributes
+                if ( lookupContext.hasNoAttribute() )
+                {
+                    result.clear();
+                }
+                else
+                {
+                    filterOperationalAttributes( result );
+                }
+            }
+            else
+            {
+                // Deal with the returning attributes
+                filterList( lookupContext, result );
+            }
         }
-
+        
         denormalizeEntryOpAttrs( result );
 
         return result;
@@ -426,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 );
@@ -490,13 +519,52 @@ public class OperationalAttributeInterce
     }
 
 
+    /**
+     * Filters out the user attributes within a search results attributes. The attributes are directly
+     * modified.
+     *
+     * @param attributes the resultant attributes to filter
+     * @return true always
+     * @throws Exception if there are failures in evaluation
+     */
+    private boolean filterUserAttributes( LookupOperationContext lookupContext, Entry attributes ) throws LdapException
+    {
+        Set<String> removedAttributes = new HashSet<String>();
+
+        // Build a list of attributeType to remove
+        for ( Attribute attribute : attributes.getAttributes() )
+        {
+            AttributeType attributeType = attribute.getAttributeType();
+
+            if ( attributeType.getUsage() == UsageEnum.USER_APPLICATIONS )
+            {
+                removedAttributes.add( attributeType.getOid() );
+            }
+        }
+
+        // Now remove the attributes which are not in the list to be returned
+        for ( String returningAttribute : lookupContext.getAttrsId() )
+        {
+            removedAttributes.remove( returningAttribute );
+        }
+        
+        // Now, remove the attributes from the result
+        for ( String attribute : removedAttributes )
+        {
+            attributes.removeAttributes( attribute );
+        }
+
+        return true;
+    }
+
+
     private void filter( LookupOperationContext lookupContext, Entry entry ) throws LdapException
     {
         Dn dn = lookupContext.getDn();
         List<String> ids = lookupContext.getAttrsId();
 
         // still need to protect against returning op attrs when ids is null
-        if ( ids == null || ids.isEmpty() )
+        if ( ( ids == null ) || ids.isEmpty() )
         {
             filterOperationalAttributes( entry );
             return;
@@ -504,15 +572,67 @@ public class OperationalAttributeInterce
 
         if ( dn.size() == 0 )
         {
+            Set<AttributeType> removedAttributes = new HashSet<AttributeType>();
+
             for ( Attribute attribute : entry.getAttributes() )
             {
                 AttributeType attributeType = attribute.getAttributeType();
+                
+                if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
+                {
+                    // If it's not in the list of returning attribute, remove it
+                    if ( !ids.contains( attributeType.getOid() ) )
+                    {
+                        removedAttributes.add( attributeType );
+                    }
+                }
+            }
+            
+            for ( AttributeType attributeType : removedAttributes )
+            {
+                entry.removeAttributes( attributeType );
+            }
+        }
+
+        denormalizeEntryOpAttrs( entry );
+
+        // do nothing past here since this explicity specifies which
+        // attributes to include - backends will automatically populate
+        // with right set of attributes using ids array
+    }
 
+
+    private void filterList( LookupOperationContext lookupContext, Entry entry ) throws LdapException
+    {
+        Dn dn = lookupContext.getDn();
+        List<String> ids = lookupContext.getAttrsId();
+
+        // still need to protect against returning op attrs when ids is null
+        if ( ( ids == null ) || ids.isEmpty() )
+        {
+            filterOperationalAttributes( entry );
+            return;
+        }
+
+        if ( dn.size() == 0 )
+        {
+            Set<AttributeType> removedAttributes = new HashSet<AttributeType>();
+
+            for ( Attribute attribute : entry.getAttributes() )
+            {
+                AttributeType attributeType = attribute.getAttributeType();
+                
+                // If it's not in the list of returning attribute, remove it
                 if ( !ids.contains( attributeType.getOid() ) )
                 {
-                    entry.removeAttributes( attributeType );
+                    removedAttributes.add( attributeType );
                 }
             }
+            
+            for ( AttributeType attributeType : removedAttributes )
+            {
+                entry.removeAttributes( attributeType );
+            }
         }
 
         denormalizeEntryOpAttrs( entry );
@@ -523,7 +643,7 @@ public class OperationalAttributeInterce
     }
 
 
-    public void denormalizeEntryOpAttrs( Entry entry ) throws LdapException
+    private void denormalizeEntryOpAttrs( Entry entry ) throws LdapException
     {
         if ( directoryService.isDenormalizeOpAttrsEnabled() )
         {

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/referral/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/referral:965203-965686
 /directory/apacheds/branches/milestones/interceptors/referral:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/referral:945827-946347
-/directory/apacheds/trunk/interceptors/referral:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/referral:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/referral:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/schema:965203-965686
 /directory/apacheds/branches/milestones/interceptors/schema:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/schema:945827-946347
-/directory/apacheds/trunk/interceptors/schema:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/schema:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/schema:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaInterceptor.java Fri Nov 18 11:21:55 2011
@@ -1375,7 +1375,7 @@ public class SchemaInterceptor extends B
             }
 
             modifyContext.setModItems( cleanMods );
-
+            
             // Now that the entry has been modified, update the SSSE
             schemaSubEntryManager.modifySchemaSubentry( modifyContext, modifyContext
                 .hasRequestControl( Cascade.OID ) );

Modified: directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryManager.java Fri Nov 18 11:21:55 2011
@@ -22,10 +22,15 @@ package org.apache.directory.server.core
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.directory.server.core.api.DirectoryService;
 import org.apache.directory.server.core.api.DnFactory;
+import org.apache.directory.server.core.api.InterceptorEnum;
+import org.apache.directory.server.core.api.OperationEnum;
+import org.apache.directory.server.core.api.interceptor.Interceptor;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.server.core.api.schema.DescriptionParsers;
 import org.apache.directory.server.i18n.I18n;
@@ -85,17 +90,17 @@ public class SchemaSubentryManager
     /** The description parsers */
     private final DescriptionParsers parsers;
     
-    /** 
-     * Maps the OID of a subschemaSubentry operational attribute to the index of 
+    /**
+     * Maps the OID of a subschemaSubentry operational attribute to the index of
      * the handler in the schemaObjectHandlers array.
-     */ 
+     */
     private final Map<String, Integer> opAttr2handlerIndex = new HashMap<String, Integer>( 11 );
     private static final String CASCADING_ERROR =
             "Cascading has not yet been implemented: standard operation is in effect.";
 
     private static AttributeType ENTRY_CSN_ATTRIBUTE_TYPE;
     
-    static 
+    static
     {
         VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.NORMALIZERS_AT ) );
         VALID_OU_VALUES.add( Strings.toLowerCase( SchemaConstants.COMPARATORS_AT ) );
@@ -155,11 +160,94 @@ public class SchemaSubentryManager
     }
 
     
-    /* (non-Javadoc)
-     * @see org.apache.directory.server.core.schema.SchemaChangeManager#modifySchemaSubentry(org.apache.directory.server.core.interceptor.context.ModifyOperationContext, org.apache.directory.server.core.entry.Entry, org.apache.directory.server.core.entry.Entry, boolean)
+    /**
+     * Find the next interceptor in an operation's list of interceptors, assuming that
+     * we are already processing an operation, and we have stopped in a specific
+     * interceptor.<br/>
+     * For instance, if the list of all the interceptors is : <br/>
+     * [A, B, C, D, E, F]<br/>
+     * and we ave two operations op1 and op2 with the following interceptors list : <br/>
+     * op1 -> [A, D, F]<br/>
+     * op2 -> [B, C, E]<br/>
+     * then assuming that we have stopped at D, then op1.next -> F and op2.next -> E.
+     */
+    private Interceptor findNextInterceptor( OperationEnum operation, DirectoryService directoryService )
+    {
+        Interceptor interceptor = null;
+        
+        List<Interceptor> allInterceptors = directoryService.getInterceptors();
+        List<String> operationInterceptors = directoryService.getInterceptors( operation );
+        int position = 0;
+        String addInterceptor = operationInterceptors.get( position );
+        
+        for ( Interceptor inter : allInterceptors )
+        {
+            String interName = inter.getName();
+            
+            if ( interName.equals( InterceptorEnum.SCHEMA_INTERCEPTOR.getName() ) )
+            {
+                // Found, get out
+                position++;
+                
+                if ( position < operationInterceptors.size() )
+                {
+                    interceptor = directoryService.getInterceptor( operationInterceptors.get( position ) );
+                }
+                
+                break;
+            }
+            
+            if ( interName.equals( addInterceptor ) )
+            {
+                position++;
+                addInterceptor = operationInterceptors.get( position );
+            }
+        }
+        
+        return interceptor;
+    }
+    
+    
+    /**
+     * Find the position in the operation's list knowing the inteceptor name.
      */
-    public void modifySchemaSubentry( ModifyOperationContext modifyContext, boolean doCascadeModify ) throws LdapException 
+    private int findPosition( OperationEnum operation, Interceptor interceptor, DirectoryService directoryService )
     {
+        int position = 1;
+        
+        List<String> interceptors = directoryService.getInterceptors( operation );
+        
+        String interceptorName = interceptor.getName();
+        
+        for ( String name : interceptors )
+        {
+            if ( name.equals( interceptorName ) )
+            {
+                break;
+            }
+            
+            position++;
+        }
+        
+        return position;
+    }
+    
+    
+    /**
+     * Update the SubschemaSubentry with all the modifications
+     */
+    public void modifySchemaSubentry( ModifyOperationContext modifyContext, boolean doCascadeModify ) throws LdapException
+    {
+        DirectoryService directoryService = modifyContext.getSession().getDirectoryService();
+        
+        // Compute the next interceptor for the Add and Delete operation, starting from
+        // the schemaInterceptor. We also need to get the position of this next interceptor
+        // in the operation's list.
+        Interceptor nextAdd = findNextInterceptor( OperationEnum.ADD, directoryService );
+        int positionAdd = findPosition( OperationEnum.ADD, nextAdd, directoryService );
+        Interceptor nextDelete = findNextInterceptor( OperationEnum.DELETE, directoryService );
+        int positionDelete = findPosition( OperationEnum.DELETE, nextDelete, directoryService );
+
         for ( Modification mod : modifyContext.getModItems() )
         {
             String opAttrOid = schemaManager.getAttributeTypeRegistry().getOidByName( mod.getAttribute().getId() );
@@ -169,12 +257,12 @@ public class SchemaSubentryManager
             switch ( mod.getOperation() )
             {
                 case ADD_ATTRIBUTE :
-                    modifyAddOperation( modifyContext, opAttrOid, serverAttribute, doCascadeModify );
+                    modifyAddOperation( nextAdd, positionAdd, modifyContext, opAttrOid, serverAttribute, doCascadeModify );
                     break;
                     
                 case REMOVE_ATTRIBUTE :
-                    modifyRemoveOperation( modifyContext, opAttrOid, serverAttribute );
-                    break; 
+                    modifyRemoveOperation( nextDelete, positionDelete, modifyContext, opAttrOid, serverAttribute );
+                    break;
                     
                 case REPLACE_ATTRIBUTE :
                     // a hack to allow entryCSN modification
@@ -194,7 +282,7 @@ public class SchemaSubentryManager
     
     
     /**
-     * Handles the modify remove operation on the subschemaSubentry for schema entities. 
+     * Handles the modify remove operation on the subschemaSubentry for schema entities.
      * 
      * @param opAttrOid the numeric id of the operational attribute modified
      * @param mods the attribute with the modifications
@@ -202,7 +290,7 @@ public class SchemaSubentryManager
      * @throws Exception if there are problems updating the registries and the
      * schema partition
      */
-    private void modifyRemoveOperation( ModifyOperationContext modifyContext, String opAttrOid, 
+    private void modifyRemoveOperation( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, String opAttrOid,
         Attribute mods ) throws LdapException
     {
         int index = opAttr2handlerIndex.get( opAttrOid );
@@ -214,15 +302,17 @@ public class SchemaSubentryManager
                 
                 for ( LdapComparatorDescription comparatorDescription : comparatorDescriptions )
                 {
-                    subentryModifier.delete( modifyContext, comparatorDescription );
+                    subentryModifier.delete( nextInterceptor, position, modifyContext, comparatorDescription );
                 }
+                
                 break;
+                
             case( NORMALIZER_INDEX ):
                 NormalizerDescription[] normalizerDescriptions = parsers.parseNormalizers( mods );
                 
                 for ( NormalizerDescription normalizerDescription : normalizerDescriptions )
                 {
-                    subentryModifier.delete( modifyContext, normalizerDescription );
+                    subentryModifier.delete( nextInterceptor, position, modifyContext, normalizerDescription );
                 }
                 
                 break;
@@ -232,7 +322,7 @@ public class SchemaSubentryManager
                 
                 for ( SyntaxCheckerDescription syntaxCheckerDescription : syntaxCheckerDescriptions )
                 {
-                    subentryModifier.delete( modifyContext, syntaxCheckerDescription );
+                    subentryModifier.delete( nextInterceptor, position, modifyContext, syntaxCheckerDescription );
                 }
                 
                 break;
@@ -242,7 +332,7 @@ public class SchemaSubentryManager
                 
                 for ( LdapSyntax syntax : syntaxes )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, syntax );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, syntax );
                 }
                 
                 break;
@@ -252,7 +342,7 @@ public class SchemaSubentryManager
                 
                 for ( MatchingRule mr : mrs )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, mr );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, mr );
                 }
                 
                 break;
@@ -262,7 +352,7 @@ public class SchemaSubentryManager
                 
                 for ( AttributeType at : ats )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, at );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, at );
                 }
                 
                 break;
@@ -272,7 +362,7 @@ public class SchemaSubentryManager
 
                 for ( ObjectClass oc : ocs )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, oc );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, oc );
                 }
                 
                 break;
@@ -282,7 +372,7 @@ public class SchemaSubentryManager
                 
                 for ( MatchingRuleUse mru : mrus )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, mru );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, mru );
                 }
                 
                 break;
@@ -292,7 +382,7 @@ public class SchemaSubentryManager
                 
                 for ( DITStructureRule dsr : dsrs )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, dsr );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, dsr );
                 }
                 
                 break;
@@ -302,7 +392,7 @@ public class SchemaSubentryManager
                 
                 for ( DITContentRule dcr : dcrs )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, dcr );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, dcr );
                 }
                 
                 break;
@@ -312,7 +402,7 @@ public class SchemaSubentryManager
                 
                 for ( NameForm nf : nfs )
                 {
-                    subentryModifier.deleteSchemaObject( modifyContext, nf );
+                    subentryModifier.deleteSchemaObject( nextInterceptor, position, modifyContext, nf );
                 }
                 
                 break;
@@ -324,7 +414,7 @@ public class SchemaSubentryManager
     
     
     /**
-     * Handles the modify add operation on the subschemaSubentry for schema entities. 
+     * Handles the modify add operation on the subschemaSubentry for schema entities.
      * 
      * @param opAttrOid the numeric id of the operational attribute modified
      * @param mods the attribute with the modifications
@@ -333,7 +423,7 @@ public class SchemaSubentryManager
      * @throws Exception if there are problems updating the registries and the
      * schema partition
      */
-    private void modifyAddOperation( ModifyOperationContext modifyContext, String opAttrOid, 
+    private void modifyAddOperation( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, String opAttrOid,
         Attribute mods, boolean doCascadeModify ) throws LdapException
     {
         if ( doCascadeModify )
@@ -350,7 +440,7 @@ public class SchemaSubentryManager
                 
                 for ( LdapComparatorDescription comparatorDescription : comparatorDescriptions )
                 {
-                    subentryModifier.add( modifyContext, comparatorDescription );
+                    subentryModifier.add( nextInterceptor, position, modifyContext, comparatorDescription );
                 }
                 
                 break;
@@ -360,7 +450,7 @@ public class SchemaSubentryManager
                 
                 for ( NormalizerDescription normalizerDescription : normalizerDescriptions )
                 {
-                    subentryModifier.add( modifyContext, normalizerDescription );
+                    subentryModifier.add( nextInterceptor, position, modifyContext, normalizerDescription );
                 }
                 
                 break;
@@ -370,7 +460,7 @@ public class SchemaSubentryManager
                 
                 for ( SyntaxCheckerDescription syntaxCheckerDescription : syntaxCheckerDescriptions )
                 {
-                    subentryModifier.add( modifyContext, syntaxCheckerDescription );
+                    subentryModifier.add( nextInterceptor, position, modifyContext, syntaxCheckerDescription );
                 }
                 
                 break;
@@ -380,7 +470,7 @@ public class SchemaSubentryManager
                 
                 for ( LdapSyntax syntax : syntaxes )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, syntax );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, syntax );
                 }
                 
                 break;
@@ -390,7 +480,7 @@ public class SchemaSubentryManager
                 
                 for ( MatchingRule mr : mrs )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, mr );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, mr );
                 }
                 
                 break;
@@ -400,7 +490,7 @@ public class SchemaSubentryManager
                 
                 for ( AttributeType at : ats )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, at );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, at );
                 }
                 
                 break;
@@ -410,7 +500,7 @@ public class SchemaSubentryManager
 
                 for ( ObjectClass oc : ocs )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, oc );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, oc );
                 }
                 
                 break;
@@ -420,7 +510,7 @@ public class SchemaSubentryManager
                 
                 for ( MatchingRuleUse mru : mrus )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, mru );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, mru );
                 }
                 
                 break;
@@ -430,7 +520,7 @@ public class SchemaSubentryManager
                 
                 for ( DITStructureRule dsr : dsrs )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, dsr );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, dsr );
                 }
                 
                 break;
@@ -440,7 +530,7 @@ public class SchemaSubentryManager
                 
                 for ( DITContentRule dcr : dcrs )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, dcr );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, dcr );
                 }
                 
                 break;
@@ -450,7 +540,7 @@ public class SchemaSubentryManager
                 
                 for ( NameForm nf : nfs )
                 {
-                    subentryModifier.addSchemaObject( modifyContext, nf );
+                    subentryModifier.addSchemaObject( nextInterceptor, position, modifyContext, nf );
                 }
                 
                 break;

Modified: directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java (original)
+++ directory/apacheds/branches/apacheds-osgi/interceptors/schema/src/main/java/org/apache/directory/server/core/schema/SchemaSubentryModifier.java Fri Nov 18 11:21:55 2011
@@ -20,14 +20,11 @@
 package org.apache.directory.server.core.schema;
 
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.directory.server.core.api.DnFactory;
-import org.apache.directory.server.core.api.InterceptorEnum;
-import org.apache.directory.server.core.api.interceptor.context.OperationContext;
+import org.apache.directory.server.core.api.interceptor.Interceptor;
+import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
 import org.apache.directory.shared.ldap.model.constants.MetaSchemaConstants;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -60,19 +57,6 @@ import org.apache.directory.shared.util.
  */
 public class SchemaSubentryModifier
 {
-    private static final Collection<String> BYPASS;
-    
-    static
-    {
-        Set<String> c = new HashSet<String>();
-        c.add( InterceptorEnum.AUTHENTICATION_INTERCEPTOR.getName() );
-        c.add( InterceptorEnum.ACI_AUTHORIZATION_INTERCEPTOR.getName() );
-        c.add( InterceptorEnum.DEFAULT_AUTHORIZATION_INTERCEPTOR.getName() );
-        c.add( InterceptorEnum.EXCEPTION_INTERCEPTOR.getName() );
-        c.add( InterceptorEnum.SCHEMA_INTERCEPTOR.getName() );
-        BYPASS = Collections.unmodifiableCollection( c );
-    }
-    
     private AttributesFactory factory = new AttributesFactory();
 
     /** The server schemaManager */
@@ -139,7 +123,7 @@ public class SchemaSubentryModifier
     }
     
 
-    public void add( OperationContext opContext, LdapComparatorDescription comparatorDescription ) throws LdapException
+    public void add( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, LdapComparatorDescription comparatorDescription ) throws LdapException
     {
         String schemaName = getSchema( comparatorDescription );
         Dn dn = dnFactory.create(
@@ -150,11 +134,14 @@ public class SchemaSubentryModifier
         
         Entry entry = getEntry( dn, comparatorDescription );
 
-        opContext.add( entry, BYPASS );
+        AddOperationContext addContext = new AddOperationContext( modifyContext.getSession(), entry );
+        addContext.setCurrentInterceptor( position );
+
+        nextInterceptor.add( addContext );
     }
     
     
-    public void add( OperationContext opContext, NormalizerDescription normalizerDescription ) throws LdapException
+    public void add( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, NormalizerDescription normalizerDescription ) throws LdapException
     {
         String schemaName = getSchema( normalizerDescription );
         Dn dn = dnFactory.create(
@@ -165,11 +152,14 @@ public class SchemaSubentryModifier
         
         Entry entry = getEntry( dn, normalizerDescription );
 
-        opContext.add( entry, BYPASS );
+        AddOperationContext addContext = new AddOperationContext( modifyContext.getSession(), entry );
+        addContext.setCurrentInterceptor( position );
+
+        nextInterceptor.add( addContext );
     }
     
     
-    public void add( OperationContext opContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws LdapException
+    public void add( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws LdapException
     {
         String schemaName = getSchema( syntaxCheckerDescription );
         Dn dn = dnFactory.create(
@@ -179,29 +169,41 @@ public class SchemaSubentryModifier
             SchemaConstants.OU_SCHEMA );
         
         Entry entry = getEntry( dn, syntaxCheckerDescription );
-        opContext.add( entry, BYPASS );
+
+        AddOperationContext addContext = new AddOperationContext( modifyContext.getSession(), entry );
+        addContext.setCurrentInterceptor( position );
+
+        nextInterceptor.add( addContext );
     }
     
     
-    public void addSchemaObject( OperationContext opContext, SchemaObject obj ) throws LdapException
+    public void addSchemaObject( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, SchemaObject obj ) throws LdapException
     {
         Schema schema = schemaManager.getLoadedSchema( obj.getSchemaName() );
         Dn dn = getDn( obj );
         Entry entry = factory.getAttributes( obj, schema, schemaManager );
         entry.setDn( dn );
+        
+        AddOperationContext addContext = new AddOperationContext( modifyContext.getSession(), entry );
+        addContext.setCurrentInterceptor( position );
 
-        opContext.add( entry, BYPASS );
+        nextInterceptor.add( addContext );
     }
 
 
-    public void deleteSchemaObject( OperationContext opContext, SchemaObject obj ) throws LdapException
+    public void deleteSchemaObject( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, SchemaObject obj ) throws LdapException
     {
         Dn dn = getDn( obj );
-        opContext.delete( dn );
+
+        DeleteOperationContext deleteContext = new DeleteOperationContext( modifyContext.getSession(), dn );
+        deleteContext.setEntry( modifyContext.getSession().lookup( dn ) );
+        deleteContext.setCurrentInterceptor( position );
+
+        nextInterceptor.delete( deleteContext );
     }
 
     
-    public void delete( OperationContext opContext, NormalizerDescription normalizerDescription ) throws LdapException
+    public void delete( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, NormalizerDescription normalizerDescription ) throws LdapException
     {
         String schemaName = getSchema( normalizerDescription );
         Dn dn = dnFactory.create(
@@ -210,11 +212,15 @@ public class SchemaSubentryModifier
             "cn=" + schemaName,
             SchemaConstants.OU_SCHEMA );
         
-        opContext.delete( dn );
+        DeleteOperationContext deleteContext = new DeleteOperationContext( modifyContext.getSession(), dn );
+        deleteContext.setEntry( modifyContext.getSession().lookup( dn ) );
+        deleteContext.setCurrentInterceptor( position );
+
+        nextInterceptor.delete( deleteContext );
     }
 
 
-    public void delete( OperationContext opContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws LdapException
+    public void delete( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, SyntaxCheckerDescription syntaxCheckerDescription ) throws LdapException
     {
         String schemaName = getSchema( syntaxCheckerDescription );
         Dn dn = dnFactory.create(
@@ -222,11 +228,16 @@ public class SchemaSubentryModifier
             SchemaConstants.SYNTAX_CHECKERS_PATH,
             "cn=" + schemaName,
             SchemaConstants.OU_SCHEMA );
-        opContext.delete( dn );
+
+        DeleteOperationContext deleteContext = new DeleteOperationContext( modifyContext.getSession(), dn );
+        deleteContext.setEntry( modifyContext.getSession().lookup( dn ) );
+        deleteContext.setCurrentInterceptor( position );
+
+        nextInterceptor.delete( deleteContext );
     }
 
 
-    public void delete( OperationContext opContext, LdapComparatorDescription comparatorDescription ) throws LdapException
+    public void delete( Interceptor nextInterceptor, int position, ModifyOperationContext modifyContext, LdapComparatorDescription comparatorDescription ) throws LdapException
     {
         String schemaName = getSchema( comparatorDescription );
         Dn dn = dnFactory.create(
@@ -235,7 +246,11 @@ public class SchemaSubentryModifier
             "cn=" + schemaName,
             SchemaConstants.OU_SCHEMA );
         
-        opContext.delete( dn );
+        DeleteOperationContext deleteContext = new DeleteOperationContext( modifyContext.getSession(), dn );
+        deleteContext.setEntry( modifyContext.getSession().lookup( dn ) );
+        deleteContext.setCurrentInterceptor( position );
+
+        nextInterceptor.delete( deleteContext );
     }
 
 

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/subtree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/subtree:965203-965686
 /directory/apacheds/branches/milestones/interceptors/subtree:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/subtree:945827-946347
-/directory/apacheds/trunk/interceptors/subtree:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/subtree:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/subtree:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/interceptors/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/interceptors/trigger:965203-965686
 /directory/apacheds/branches/milestones/interceptors/trigger:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/interceptors/trigger:945827-946347
-/directory/apacheds/trunk/interceptors/trigger:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/interceptors/trigger:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/interceptors/trigger:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/jdbm:1160768-1164076
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm:1072812-1075328
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/jdbm:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/jdbm-partition:1160768-1164080
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm-partition:1072812-1075328
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/jdbm-partition:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/kerberos-codec:965203-965686
 /directory/apacheds/branches/milestones/kerberos-codec:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec:945827-946347
-/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
 /directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-test:1072812-1075328
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/kerberos-test:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/ldap-client-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-jdbm/ldap-client-test:1160768-1164092
-/directory/apacheds/trunk/ldap-client-test:1185681-1201348
+/directory/apacheds/trunk/ldap-client-test:1185681-1201348,1201371-1203550

Propchange: directory/apacheds/branches/apacheds-osgi/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/ldif-partition:1160768-1164092
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
 /directory/apacheds/branches/milestones/ldif-partition:1072812-1075328
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/ldif-partition:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/pom.xml?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-osgi/pom.xml Fri Nov 18 11:21:55 2011
@@ -78,8 +78,8 @@
     <mina.core.version>2.0.4</mina.core.version>
     <plexus.utils.version>3.0</plexus.utils.version>
     <quartz.version>1.6.3</quartz.version>
-    <slf4j.api.version>1.6.2</slf4j.api.version>
-    <slf4j.log4j12.version>1.6.2</slf4j.log4j12.version>
+    <slf4j.api.version>1.6.4</slf4j.api.version>
+    <slf4j.log4j12.version>1.6.4</slf4j.log4j12.version>
     <velocity.version>1.7-beta1</velocity.version>
     <wrapper.version>3.2.3</wrapper.version>
     <xercesImpl.version>2.10.0</xercesImpl.version>
@@ -156,6 +156,7 @@
     <module>service-osgi</module>
     <module>component-annotations</module>
     <module>component-ipojo-handlers</module>
+    <module>component-hub</module>
   </modules>
 
   <build>

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-changepw:1072812-1075328
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059,1201371-1203550
 /directory/studio/trunk/protocol-changepw:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-dhcp:1072812-1075328
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-dhcp:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-dns:1072812-1075328
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-dns:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-kerberos:1072812-1075328
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-jdbm/protocol-ldap:1160768-1164080
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-ldap:1072812-1075328
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-ldap:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -10,5 +10,5 @@
 /directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
 /directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072800-1075329
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1185681-1201347
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-ntp:1072812-1075328
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-ntp:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/protocol-shared:1160768-1164092
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-shared:1072812-1075328
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/protocol-shared:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/server-annotations:1160768-1164092
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/server-annotations:1072812-1075328
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/server-annotations:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
 /directory/apacheds/branches/milestones/server-config:1072812-1075328
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/server-config:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -10,5 +10,5 @@
 /directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1072812-1075328
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java (original)
+++ directory/apacheds/branches/apacheds-osgi/server-config/src/main/java/org/apache/directory/server/config/beans/InterceptorBean.java Fri Nov 18 11:21:55 2011
@@ -120,7 +120,7 @@ public class InterceptorBean extends Ads
     /**
      * @param interceptorClassName the interceptor ClassName to set
      */
-    public void setFqcn( String interceptorClassName )
+    public void setInterceptorClassName( String interceptorClassName )
     {
         this.interceptorClassName = interceptorClassName;
     }

Propchange: directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -13,5 +13,5 @@
 /directory/apacheds/branches/milestones/server-config/src/main/resources:1072812-1075328
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/server-config/src/main/resources:1067786-1067997

Modified: directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/config.ldif
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/config.ldif?rev=1203604&r1=1203603&r2=1203604&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/config.ldif (original)
+++ directory/apacheds/branches/apacheds-osgi/server-config/src/main/resources/config.ldif Fri Nov 18 11:21:55 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

Propchange: directory/apacheds/branches/apacheds-osgi/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -12,5 +12,5 @@
 /directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1072812-1075328
 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201347,1201371-1203550
 /directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-jdbm/server-integ:1160768-1164092
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
 /directory/apacheds/branches/milestones/server-integ:1072812-1075328
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550
 /directory/studio/trunk/server-integ:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-jdbm/server-jndi:1160768-1164092
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/server-jndi:1072812-1075328
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550
 /directory/studio/trunk/server-jndi:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
 /directory/apacheds/branches/milestones/server-replication:1072812-1075328
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550
 /directory/studio/trunk/server-replication:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
 /directory/apacheds/branches/milestones/server-tools:1072812-1075328
-/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329,1185682-1188093,1188104-1197059,1201371-1203550
 /directory/studio/trunk/server-tools:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-osgi/service/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-jdbm/service:1160768-1164092
-/directory/apacheds/trunk/service:1185681-1201348
+/directory/apacheds/trunk/service:1185681-1201348,1201371-1203550

Propchange: directory/apacheds/branches/apacheds-osgi/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 18 11:21:55 2011
@@ -1,4 +1,4 @@
 /directory/apacheds/branches/antoine/service-builder:1038305-1044163
 /directory/apacheds/branches/milestones/service-builder:1072812-1075328
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1185681-1201348,1201371-1203550
 /directory/studio/trunk/service-builder:1067786-1067997



Mime
View raw message