directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1214249 [1/2] - in /directory/apacheds/branches/apacheds-txns: all/ apache-felix/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/api/interceptor/ core-api/src/main/java/org/apache/directory/server/core/...
Date Wed, 14 Dec 2011 14:18:03 GMT
Author: elecharny
Date: Wed Dec 14 14:18:01 2011
New Revision: 1214249

URL: http://svn.apache.org/viewvc?rev=1214249&view=rev
Log:
o Merge back trunk into the Txns branch

Modified:
    directory/apacheds/branches/apacheds-txns/all/   (props changed)
    directory/apacheds/branches/apacheds-txns/apache-felix/   (props changed)
    directory/apacheds/branches/apacheds-txns/core/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-annotations/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-api/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
    directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
    directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
    directory/apacheds/branches/apacheds-txns/core-avl/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-constants/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-integ/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/apacheds-txns/core-jndi/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-shared/   (props changed)
    directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
    directory/apacheds/branches/apacheds-txns/dependencies/   (props changed)
    directory/apacheds/branches/apacheds-txns/http-directory-bridge/   (props changed)
    directory/apacheds/branches/apacheds-txns/http-integration/   (props changed)
    directory/apacheds/branches/apacheds-txns/i18n/   (props changed)
    directory/apacheds/branches/apacheds-txns/installers/   (props changed)
    directory/apacheds/branches/apacheds-txns/installers-maven-plugin/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/admin/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/authn/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/authz/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/changelog/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/collective/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/event/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/exception/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/hash/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/journal/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/logger/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/normalization/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/operational/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/referral/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/schema/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/subtree/   (props changed)
    directory/apacheds/branches/apacheds-txns/interceptors/trigger/   (props changed)
    directory/apacheds/branches/apacheds-txns/jdbm/   (props changed)
    directory/apacheds/branches/apacheds-txns/jdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-codec/src/test/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/apacheds-txns/kerberos-test/   (props changed)
    directory/apacheds/branches/apacheds-txns/ldap-client-test/   (props changed)
    directory/apacheds/branches/apacheds-txns/ldif-partition/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-dhcp/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-dns/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-kerberos/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-ldap/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-ntp/   (props changed)
    directory/apacheds/branches/apacheds-txns/protocol-shared/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-annotations/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-config/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/branches/apacheds-txns/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/branches/apacheds-txns/server-integ/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-jndi/   (props changed)
    directory/apacheds/branches/apacheds-txns/server-replication/   (props changed)
    directory/apacheds/branches/apacheds-txns/service/   (props changed)
    directory/apacheds/branches/apacheds-txns/service-builder/   (props changed)
    directory/apacheds/branches/apacheds-txns/service-osgi/   (props changed)
    directory/apacheds/branches/apacheds-txns/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/branches/apacheds-txns/test-framework/   (props changed)
    directory/apacheds/branches/apacheds-txns/wrapper/   (props changed)
    directory/apacheds/branches/apacheds-txns/xdbm-partition/   (props changed)
    directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/branches/apacheds-txns/xdbm-tools/   (props changed)

Propchange: directory/apacheds/branches/apacheds-txns/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -3,6 +3,6 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
 /directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/all:1183435-1186974
 /directory/studio/trunk/all:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/apache-felix/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/apache-felix:965203-965686
 /directory/apacheds/branches/milestones/apache-felix:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/apache-felix:945827-946347
-/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1185228-1201283
+/directory/apacheds/trunk/apache-felix:1066126-1067785,1068026-1072718,1072800-1075329,1185228-1201283,1209070-1214194
 /directory/studio/trunk/apache-felix:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,6 +5,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core:1160768-1164072
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
 /directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047,1209070-1214194
 /directory/apacheds/trunk/interceptors/core:1183435-1186974
 /directory/studio/trunk/core:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,6 +5,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-annotations:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-annotations:1183435-1186974
 /directory/studio/trunk/core-annotations:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,6 +5,6 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
 /directory/apacheds/branches/apacheds-osgi/core-api:1185681-1199319
 /directory/apacheds/branches/milestones/core-api:1072812-1075328
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-api:1183435-1186974
 /directory/studio/trunk/core-api:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java?rev=1214249&r1=1214248&r2=1214249&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/interceptor/BaseInterceptor.java Wed Dec 14 14:18:01 2011
@@ -157,7 +157,7 @@ public abstract class BaseInterceptor im
          */
         public void bind( BindOperationContext bindContext ) throws LdapException
         {
-            nexus.bind( bindContext );
+            // Do nothing here : there is no support for the Bind operation in Partition
         }
 
 

Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java?rev=1214249&r1=1214248&r2=1214249&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/Partition.java Wed Dec 14 14:18:01 2011
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.server.core.api.partition;
 
@@ -27,7 +27,6 @@ import java.util.UUID;
 import org.apache.directory.server.core.api.entry.ServerSearchResult;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
@@ -50,7 +49,7 @@ import org.apache.directory.shared.ldap.
 
 
 /**
- * Interface for entry stores containing a part of the DIB (Directory 
+ * Interface for entry stores containing a part of the DIB (Directory
  * Information Base).  Partitions are associated with a specific suffix, and
  * all entries contained in the them have the same Dn suffix in common.
  *
@@ -155,7 +154,7 @@ public interface Partition
 
 
     /**
-     * Deletes a leaf entry from this ContextPartition: non-leaf entries cannot be 
+     * Deletes a leaf entry from this ContextPartition: non-leaf entries cannot be
      * deleted until this operation has been applied to their children.
      *
      * @param deleteContext the context of the entry to
@@ -177,8 +176,8 @@ public interface Partition
     /**
      * Modifies an entry by adding, removing or replacing a set of attributes.
      *
-     * @param modifyContext The context containing the modification operation 
-     * to perform on the entry which is one of constants specified by the 
+     * @param modifyContext The context containing the modification operation
+     * to perform on the entry which is one of constants specified by the
      * DirContext interface:
      * <code>ADD_ATTRIBUTE, REMOVE_ATTRIBUTE, REPLACE_ATTRIBUTE</code>.
      * 
@@ -192,9 +191,9 @@ public interface Partition
 
 
     /**
-     * A specialized form of one level search used to return a minimal set of 
+     * A specialized form of one level search used to return a minimal set of
      * information regarding child entries under a base.  Convenience method
-     * used to optimize operations rather than conducting a full search with 
+     * used to optimize operations rather than conducting a full search with
      * retrieval.
      *
      * @param listContext the context containing the distinguished/absolute name for the search/listing
@@ -214,7 +213,7 @@ public interface Partition
      *
      * @param searchContext The context containing the information used by the operation
      * @throws Exception if there are any problems
-     * @return a NamingEnumeration containing objects of type 
+     * @return a NamingEnumeration containing objects of type
      */
     EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException;
 
@@ -282,17 +281,6 @@ public interface Partition
 
 
     /**
-     * Represents a bind operation issued to authenticate a client.  Partitions
-     * need not support this operation.  This operation is here to enable those
-     * interested in implementing virtual directories with ApacheDS.
-     * 
-     * @param bindContext the bind context, containing all the needed informations to bind
-     * @throws LdapException if something goes wrong
-     */
-    void bind( BindOperationContext bindContext ) throws LdapException;
-
-
-    /**
      * Represents an unbind operation issued by an authenticated client.  Partitions
      * need not support this operation.  This operation is here to enable those
      * interested in implementing virtual directories with ApacheDS.

Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java?rev=1214249&r1=1214248&r2=1214249&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/schema/SchemaPartition.java Wed Dec 14 14:18:01 2011
@@ -27,7 +27,6 @@ import org.apache.directory.server.const
 import org.apache.directory.server.core.api.CoreSession;
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
-import org.apache.directory.server.core.api.interceptor.context.BindOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.DeleteOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
@@ -54,6 +53,12 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
+import org.apache.directory.shared.ldap.model.filter.ExprNode;
+import org.apache.directory.shared.ldap.model.filter.PresenceNode;
+import org.apache.directory.shared.ldap.model.message.SearchRequest;
+import org.apache.directory.shared.ldap.model.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.model.message.SearchScope;
 import org.apache.directory.shared.ldap.model.message.controls.Cascade;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
@@ -68,13 +73,13 @@ import org.slf4j.LoggerFactory;
  * A special partition designed to contain the portion of the DIT where schema
  * information for the server is stored.
  * 
- * In an effort to make sure that all Partition implementations are equal 
- * citizens to ApacheDS we want to be able to swap in and out any kind of 
+ * In an effort to make sure that all Partition implementations are equal
+ * citizens to ApacheDS we want to be able to swap in and out any kind of
  * Partition to store schema.  This also has the added advantage of making
- * sure the core, and hence the server is not dependent on any specific 
+ * sure the core, and hence the server is not dependent on any specific
  * partition, which reduces coupling in the server's modules.
  * 
- * The SchemaPartition achieves this by not really being a backing store 
+ * The SchemaPartition achieves this by not really being a backing store
  * itself for the schema entries.  It instead delegates to another Partition
  * via containment.  It delegates all calls to this contained Partition. While
  * doing so it also manages certain things:
@@ -84,21 +89,21 @@ import org.slf4j.LoggerFactory;
  *   <li>Updates the schema Registries on valid schema changes making sure
  *       the schema on disk is in sync with the schema in memory.
  *   </li>
- *   <li>Will eventually manage transaction based changes to schema where 
+ *   <li>Will eventually manage transaction based changes to schema where
  *       between some sequence of operations the schema may be inconsistent.
  *   </li>
  *   <li>Delegates read/write operations to contained Partition.</li>
  *   <li>
  *       Responsible for initializing schema for the entire server.  ApacheDS
- *       cannot start up other partitions until this Partition is started 
+ *       cannot start up other partitions until this Partition is started
  *       without having access to the Registries.  This Partition supplies the
  *       Registries on initialization for the server.  That's one of it's core
  *       responsibilities.
  *   </li>
- *   
- * So by containing another Partition, we abstract the storage mechanism away 
+ * 
+ * So by containing another Partition, we abstract the storage mechanism away
  * from the management responsibilities while decoupling the server from a
- * specific partition implementation and removing complexity in the Schema 
+ * specific partition implementation and removing complexity in the Schema
  * interceptor service which before managed synchronization.
  * </ol>
  *
@@ -123,7 +128,9 @@ public final class SchemaPartition exten
 
     /** A static Dn for the ou=schema partition */
     private static Dn SCHEMA_DN;
-
+    
+    /** The ObjectClass AttributeType */
+    private static AttributeType OBJECT_CLASS_AT;
 
     public SchemaPartition( SchemaManager schemaManager )
     {
@@ -139,11 +146,12 @@ public final class SchemaPartition exten
         id = SCHEMA_ID;
         suffixDn = SCHEMA_DN;
         this.schemaManager = schemaManager;
+        OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT_OID );
     }
     
     
     /**
-     * Sets the wrapped {@link Partition} which must be supplied or 
+     * Sets the wrapped {@link Partition} which must be supplied or
      * {@link Partition#initialize()} will fail with a NullPointerException.
      *
      * @param wrapped the Partition being wrapped
@@ -263,13 +271,41 @@ public final class SchemaPartition exten
         updateSchemaModificationAttributes( addContext );
     }
 
-
+   
     /**
      * {@inheritDoc}
      */
-    public void bind( BindOperationContext bindContext ) throws LdapException
+    public final int getChildCount( DeleteOperationContext deleteContext ) throws LdapException
     {
-        wrapped.bind( bindContext );
+        try
+        {
+            Dn dn = deleteContext.getDn();
+            SearchRequest searchRequest = new SearchRequestImpl();
+            searchRequest.setBase( dn );
+            ExprNode node = new PresenceNode( OBJECT_CLASS_AT );
+            searchRequest.setFilter( node );
+            searchRequest.setTypesOnly( true );
+            searchRequest.setScope( SearchScope.ONELEVEL );
+            
+            SearchOperationContext searchContext = new SearchOperationContext( deleteContext.getSession(), searchRequest );
+            
+            EntryFilteringCursor cursor = wrapped.search( searchContext );
+            
+            cursor.beforeFirst();
+            int nbEntry = 0;
+            
+            while ( cursor.next() && ( nbEntry < 2 ) )
+            {
+                nbEntry++;
+            }
+            
+            return nbEntry;
+        }
+        catch ( Exception e )
+        {
+            e.printStackTrace();
+            return 0;
+        }
     }
 
 
@@ -279,7 +315,15 @@ public final class SchemaPartition exten
     public void delete( DeleteOperationContext deleteContext ) throws LdapException
     {
         boolean cascade = deleteContext.hasRequestControl( Cascade.OID );
+        
+        // We have to check if the entry we want to delete has children, or not
+        int nbChild = getChildCount( deleteContext );
 
+        if ( nbChild > 1 )
+        {
+            throw new LdapUnwillingToPerformException();
+        }
+        
         // The SchemaObject always exist when we reach this method.
         synchronizer.delete( deleteContext, cascade );
 
@@ -319,7 +363,7 @@ public final class SchemaPartition exten
             modifyContext.setEntry( entry );
         }
 
-        Entry targetEntry = ( Entry ) SchemaUtils.getTargetEntry( modifyContext.getModItems(), entry );
+        Entry targetEntry = SchemaUtils.getTargetEntry( modifyContext.getModItems(), entry );
 
         boolean cascade = modifyContext.hasRequestControl( Cascade.OID );
 
@@ -522,8 +566,8 @@ public final class SchemaPartition exten
 
     /**
      * Updates the schemaModifiersName and schemaModifyTimestamp attributes of
-     * the schemaModificationAttributes entry for the global schema at 
-     * ou=schemaModifications,ou=schema.  This entry is hardcoded at that 
+     * the schemaModificationAttributes entry for the global schema at
+     * ou=schemaModifications,ou=schema.  This entry is hardcoded at that
      * position for now.
      * 
      * The current time is used to set the timestamp and the Dn of current user

Propchange: directory/apacheds/branches/apacheds-txns/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,6 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-avl:1160768-1164073
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
 /directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-avl:1183435-1186974
 /directory/studio/trunk/core-avl:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,6 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-constants:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
 /directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-constants:1183435-1186974
 /directory/studio/trunk/core-constants:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,6 +5,6 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
 /directory/apacheds/branches/apacheds-osgi/core-integ:1185681-1199322
 /directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-integ:1183435-1186974
 /directory/studio/trunk/core-integ:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -10,6 +10,6 @@
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1183435-1186974
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -9,6 +9,6 @@
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1180717-1209047
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1180717-1209047,1209070-1214194
 /directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,6 +4,6 @@
 /directory/apacheds/branches/apacheds-jdbm/core-jndi:1160768-1164075
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209047,1209070-1214194
 /directory/apacheds/trunk/interceptors/core-jndi:1183435-1186974
 /directory/studio/trunk/core-jndi:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/core-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/core-shared:965203-965686
 /directory/apacheds/branches/milestones/core-shared:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/core-shared:945827-946347
-/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1183559-1209047
+/directory/apacheds/trunk/core-shared:1066126-1067785,1068026-1072718,1072800-1075329,1183559-1209047,1209070-1214194
 /directory/studio/trunk/core-shared:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java?rev=1214249&r1=1214248&r2=1214249&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-shared/src/main/java/org/apache/directory/server/core/shared/partition/DefaultPartitionNexus.java Wed Dec 14 14:18:01 2011
@@ -465,16 +465,6 @@ public class DefaultPartitionNexus exten
     /**
      * {@inheritDoc}
      */
-    public void bind( BindOperationContext bindContext ) throws LdapException
-    {
-        Partition partition = getPartition( bindContext.getDn() );
-        partition.bind( bindContext );
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     public boolean compare( CompareOperationContext compareContext ) throws LdapException
     {
         Attribute attr = compareContext.getOriginalEntry().get( compareContext.getAttributeType() );

Propchange: directory/apacheds/branches/apacheds-txns/dependencies/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/dependencies:965203-965686
 /directory/apacheds/branches/milestones/dependencies:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/dependencies:945827-946347
-/directory/apacheds/trunk/dependencies:1066126-1067785,1068026-1072718,1072800-1075329,1185228-1201283
+/directory/apacheds/trunk/dependencies:1066126-1067785,1068026-1072718,1072800-1075329,1185228-1201283,1209070-1214194
 /directory/studio/trunk/dependencies:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/http-directory-bridge/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,6 +6,6 @@
 /directory/apacheds/branches/apacheds-subtree/http-directory-bridge:965203-965686
 /directory/apacheds/branches/milestones/http-directory-bridge:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/http-directory-bridge:945827-946347
-/directory/apacheds/trunk/http-directory-bridge:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/http-directory-bridge:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/http-directory-bridge:1183435-1186974
 /directory/studio/trunk/http-directory-bridge:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -3,6 +3,6 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
 /directory/apacheds/branches/milestones/http-integration:1072812-1075328
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/http-integration:1183435-1186974
 /directory/studio/trunk/http-integration:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -3,6 +3,6 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
 /directory/apacheds/branches/milestones/i18n:1072812-1075328
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/i18n:1183435-1186974
 /directory/studio/trunk/i18n:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1,7 +1,7 @@
 /directory/apacheds/branches/apacheds-config/installers:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
 /directory/apacheds/branches/milestones/installers:1072812-1075328
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/installers:1183435-1186974
 /directory/installers/branches/installers-schema/apacheds:806631-896441
 /directory/studio/trunk/installers:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1,7 +1,7 @@
 /directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
 /directory/apacheds/branches/milestones/installers-maven-plugin:1072812-1075328
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283,1209070-1214194
 /directory/apacheds/trunk/interceptors/installers-maven-plugin:1183435-1186974
 /directory/daemon/branches/daemon-schema/plugin:806630-896441
 /directory/studio/trunk/installers-maven-plugin:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,6 +4,6 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
 /directory/apacheds/branches/apacheds-osgi/interceptor-kerberos:1185681-1197579
 /directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201301
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201301,1209070-1214194
 /directory/apacheds/trunk/interceptors/interceptor-kerberos:1183435-1186974
 /directory/studio/trunk/interceptor-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/admin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/admin:1183435-1209047
+/directory/apacheds/trunk/interceptors/admin:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/authn/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/authn:1183435-1209047
+/directory/apacheds/trunk/interceptors/authn:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/authz/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/authz:1183435-1209047
+/directory/apacheds/trunk/interceptors/authz:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/changelog/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/changelog:1183435-1209047
+/directory/apacheds/trunk/interceptors/changelog:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/collective/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/collective:1183435-1209047
+/directory/apacheds/trunk/interceptors/collective:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/event/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/event:1183435-1209047
+/directory/apacheds/trunk/interceptors/event:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/exception/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/exception:1183435-1209047
+/directory/apacheds/trunk/interceptors/exception:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/hash/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/hash:1183435-1201301
+/directory/apacheds/trunk/interceptors/hash:1183435-1201301,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/journal/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/journal:1183435-1209047
+/directory/apacheds/trunk/interceptors/journal:1183435-1209047,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/logger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/logger:1183435-1201301
+/directory/apacheds/trunk/interceptors/logger:1183435-1201301,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/normalization/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/normalization:1183435-1209046
+/directory/apacheds/trunk/interceptors/normalization:1183435-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/operational/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/operational:1183435-1209046
+/directory/apacheds/trunk/interceptors/operational:1183435-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/referral/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/referral:1183435-1209046
+/directory/apacheds/trunk/interceptors/referral:1183435-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/schema:1183435-1209046
+/directory/apacheds/trunk/interceptors/schema:1183435-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/subtree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/subtree:1183435-1209046
+/directory/apacheds/trunk/interceptors/subtree:1183435-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/interceptors/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1 +1 @@
-/directory/apacheds/trunk/interceptors/trigger:1183435-1209046
+/directory/apacheds/trunk/interceptors/trigger:1183435-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm:1072812-1075328
 /directory/apacheds/trunk/interceptors/jdbm:1183435-1186974
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201301
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201301,1209070-1214194
 /directory/studio/trunk/jdbm:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
 /directory/apacheds/branches/milestones/jdbm-partition:1072812-1075328
 /directory/apacheds/trunk/interceptors/jdbm-partition:1183435-1186974
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/jdbm-partition:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -9,5 +9,5 @@
 /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/interceptors/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1183435-1186974
-/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,1177661-1209046
+/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,1177661-1209046,1209070-1214194
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/milestones/kerberos-codec:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec:945827-946347
 /directory/apacheds/trunk/interceptors/kerberos-codec:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/server:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
 /directory/apacheds/trunk/interceptors/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1183435-1186974
 /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:1181278-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1181278-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 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/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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -7,5 +7,5 @@
 /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/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /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/interceptors/kerberos-codec/src/test/java/org/apache/directory/server:1183435-1186974
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
 /directory/apacheds/branches/milestones/kerberos-test:1072812-1075328
 /directory/apacheds/trunk/interceptors/kerberos-test:1183435-1186974
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/kerberos-test:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/ldap-client-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1,3 +1,3 @@
 /directory/apacheds/branches/apacheds-jdbm/ldap-client-test:1160768-1164092
 /directory/apacheds/trunk/interceptors/ldap-client-test:1183435-1186974
-/directory/apacheds/trunk/ldap-client-test:1177661-1209046
+/directory/apacheds/trunk/ldap-client-test:1177661-1209046,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
 /directory/apacheds/branches/milestones/ldif-partition:1072812-1075328
 /directory/apacheds/trunk/interceptors/ldif-partition:1183435-1186974
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/ldif-partition:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-dhcp:1072812-1075328
 /directory/apacheds/trunk/interceptors/protocol-dhcp:1183435-1186974
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/protocol-dhcp:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-dns:1072812-1075328
 /directory/apacheds/trunk/interceptors/protocol-dns:1183435-1186974
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/protocol-dns:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-kerberos:1072812-1075328
 /directory/apacheds/trunk/interceptors/protocol-kerberos:1183435-1186974
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/protocol-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-ldap:1072812-1075328
 /directory/apacheds/trunk/interceptors/protocol-ldap:1183435-1186974
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209049
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209049,1209070-1214194
 /directory/studio/trunk/protocol-ldap:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -11,5 +11,5 @@
 /directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
 /directory/apacheds/trunk/interceptors/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1183435-1186974
 /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:1177661-1209049
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1177661-1209049,1209070-1214194
 /directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-ntp:1072812-1075328
 /directory/apacheds/trunk/interceptors/protocol-ntp:1183435-1186974
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/protocol-ntp:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
 /directory/apacheds/branches/milestones/protocol-shared:1072812-1075328
 /directory/apacheds/trunk/interceptors/protocol-shared:1183435-1186974
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/protocol-shared:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
 /directory/apacheds/branches/milestones/server-annotations:1072812-1075328
 /directory/apacheds/trunk/interceptors/server-annotations:1183435-1186974
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/server-annotations:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/milestones/server-config:1072812-1075328
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
 /directory/apacheds/trunk/interceptors/server-config:1183435-1186974
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/server-config:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -11,5 +11,5 @@
 /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/interceptors/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1183435-1186974
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -14,5 +14,5 @@
 /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/interceptors/server-config/src/main/resources:1183435-1186974
-/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/server-config/src/main/resources:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -13,5 +13,5 @@
 /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/interceptors/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1183435-1186974
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
 /directory/apacheds/branches/milestones/server-integ:1072812-1075328
 /directory/apacheds/trunk/interceptors/server-integ:1183435-1186974
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/server-integ:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
 /directory/apacheds/branches/milestones/server-jndi:1072812-1075328
 /directory/apacheds/trunk/interceptors/server-jndi:1183435-1186974
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/server-jndi:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
 /directory/apacheds/branches/milestones/server-replication:1072812-1075328
 /directory/apacheds/trunk/interceptors/server-replication:1183435-1186974
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/server-replication:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/service/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1,3 +1,3 @@
 /directory/apacheds/branches/apacheds-jdbm/service:1160768-1164092
 /directory/apacheds/trunk/interceptors/service:1183435-1186974
-/directory/apacheds/trunk/service:1177661-1201298
+/directory/apacheds/trunk/service:1177661-1201298,1209070-1214194

Propchange: directory/apacheds/branches/apacheds-txns/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/antoine/service-builder:1038305-1044163
 /directory/apacheds/branches/milestones/service-builder:1072812-1075328
 /directory/apacheds/trunk/interceptors/service-builder:1183435-1186974
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/service-builder:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/service-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-subtree/service-osgi:965203-965686
 /directory/apacheds/branches/milestones/service-osgi:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/service-osgi:945827-946347
-/directory/apacheds/trunk/service-osgi:1066126-1067785,1068026-1072718,1072800-1075329,1185396-1201298
+/directory/apacheds/trunk/service-osgi:1066126-1067785,1068026-1072718,1072800-1075329,1185396-1201298,1209070-1214194
 /directory/studio/trunk/service-osgi:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1214249&r1=1214248&r2=1214249&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/service/src/main/java/org/apache/directory/server/ApacheDsService.java (original)
+++ directory/apacheds/branches/apacheds-txns/service/src/main/java/org/apache/directory/server/ApacheDsService.java Wed Dec 14 14:18:01 2011
@@ -6,16 +6,16 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- *  
+ * 
  *    http://www.apache.org/licenses/LICENSE-2.0
- *  
+ * 
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  *  KIND, either express or implied.  See the License for the
  *  specific language governing permissions and limitations
- *  under the License. 
- *  
+ *  under the License.
+ * 
  */
 package org.apache.directory.server;
 
@@ -146,7 +146,7 @@ public class ApacheDsService
     private OperationExecutionManagerFactory executionManagerFactory;
 
     /**
-     * starts various services configured according to the 
+     * starts various services configured according to the
      * configuration present in the given instance's layout
      *
      * @param instanceLayout the on disk location's layout of the intance to be started
@@ -159,6 +159,7 @@ public class ApacheDsService
         if ( !partitionsDir.exists() )
         {
             LOG.info( "partition directory doesn't exist, creating {}", partitionsDir.getAbsolutePath() );
+            
             if ( !partitionsDir.mkdirs() )
             {
                 throw new IOException(I18n.err( I18n.ERR_112_COULD_NOT_CREATE_DIRECORY, partitionsDir ) );
@@ -234,7 +235,7 @@ public class ApacheDsService
         schemaManager = new DefaultSchemaManager( loader );
 
         // We have to load the schema now, otherwise we won't be able
-        // to initialize the Partitions, as we won't be able to parse 
+        // to initialize the Partitions, as we won't be able to parse
         // and normalize their suffix Dn
         schemaManager.loadAllEnabled();
 
@@ -443,10 +444,10 @@ public class ApacheDsService
     //            LOG.info( "Cannot find any reference to the DNS Server in the configuration : the server won't be started" );
     //            return;
     //        }
-    //        
+    //
     //        System.out.println( "Starting the DNS server" );
     //        LOG.info( "Starting the DNS server" );
-    //        
+    //
     //        printBanner( BANNER_DNS );
     //        long startTime = System.currentTimeMillis();
     //
@@ -621,7 +622,7 @@ public class ApacheDsService
     //        + "       /_/   \\_\\ .__/ \\__,_|\\___|_| |_|\\___|____/|_|\\__|____/   \n"
     //        + "               |_|                                              \n";
     //
-    //    
+    //
     //    private static final String BANNER_DHCP =
     //          "           _                     _          ____  _   _  ___ ____  \n"
     //        + "          / \\   _ __    ___  ___| |__   ___|  _ \\| | | |/ __|  _ \\ \n"
@@ -652,11 +653,11 @@ public class ApacheDsService
      * adds mandatory operational attributes {@link #MANDATORY_ENTRY_ATOP_MAP} and updates all the LDIF files.
      * WARN: this method is only called for the first time when schema and config files are bootstrapped
      *       afterwards it is the responsibility of the user to ensure correctness of LDIF files if modified
-     *       by hand 
+     *       by hand
      * 
      * Note: we do these modifications explicitly cause we have no idea if each entry's LDIF file has the
      *       correct values for all these mandatory attributes
-     *       
+     * 
      * @param partition instance of the partition Note: should only be those which are loaded before starting the DirectoryService
      * @param dirService the DirectoryService instance
      * @throws Exception

Propchange: directory/apacheds/branches/apacheds-txns/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -10,5 +10,5 @@
 /directory/apacheds/branches/milestones/test-framework:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
 /directory/apacheds/trunk/interceptors/test-framework:1183435-1186974
-/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/test-framework:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/wrapper/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/milestones/wrapper:1072812-1075328
 /directory/apacheds/branches/xdbm-refactoring/wrapper:945827-946347
 /directory/apacheds/trunk/interceptors/wrapper:1183435-1186974
-/directory/apacheds/trunk/wrapper:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298
+/directory/apacheds/trunk/wrapper:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298,1209070-1214194
 /directory/studio/trunk/wrapper:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:18:01 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
 /directory/apacheds/branches/milestones/xdbm-partition:1072812-1075328
 /directory/apacheds/trunk/interceptors/xdbm-partition:1183435-1186974
-/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1209046,1209070-1214194
 /directory/studio/trunk/xdbm-partition:1067786-1067997



Mime
View raw message