directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1187306 [3/4] - in /directory/shared/branches/shared-txns: ./ all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsm...
Date Fri, 21 Oct 2011 11:42:28 GMT
Modified: directory/shared/branches/shared-txns/ldap/client/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/client/api/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/client/api/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/client/api/pom.xml Fri Oct 21 11:42:22 2011
@@ -116,7 +116,9 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.client.api</Bundle-SymbolicName>
-            <Export-Package>org.apache.directory.ldap.client.api.*</Export-Package>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>

Propchange: directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -3,4 +3,5 @@
 /directory/shared/branches/milestones/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-config/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1023444-1029061
 /directory/shared/branches/shared-osgi/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1103720-1124653
+/directory/shared/trunk/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1177670-1187279
 /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionFactory.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionFactory.java (original)
+++ directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionFactory.java Fri Oct 21 11:42:22 2011
@@ -47,7 +47,7 @@ public final class LdapConnectionFactory
     {
         try
         {
-            Class<?> cl = Class.forName( "org.apache.directory.server.core.LdapCoreSessionConnection" );
+            Class<?> cl = Class.forName( "org.apache.directory.server.core.api.LdapCoreSessionConnection" );
             return ( LdapConnection ) cl.newInstance();
         }
         catch ( Exception e )

Propchange: directory/shared/branches/shared-txns/ldap/codec/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/codec/core:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/codec/core:1177670-1187279
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/codec/core/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/core/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/core/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/codec/core/pom.xml Fri Oct 21 11:42:22 2011
@@ -118,10 +118,10 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.ldap.codec.core</Bundle-SymbolicName>
             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+            <Bundle-SymbolicName>${project.groupId}.ldap.codec.core</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.codec.api
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
             <Bundle-Activator>
               org.apache.directory.shared.ldap.codec.osgi.DefaultActivator

Modified: directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java (original)
+++ directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java Fri Oct 21 11:42:22 2011
@@ -22,15 +22,12 @@ package org.apache.directory.shared.ldap
 
 import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.List;
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.exception.ResponseCarryingMessageException;
 import org.apache.directory.shared.ldap.model.message.Message;
-import org.apache.directory.shared.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -119,7 +116,7 @@ public class LdapDecoder
      * is stored into this container
      * @param decodedMessages The list of decoded messages
      * @throws Exception If the decoding failed
-     */
+     *
     public void decode( ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer, List<Message> decodedMessages ) throws DecoderException
     {
         buffer.mark();
@@ -190,5 +187,5 @@ public class LdapDecoder
                 }
             }
         }
-    }
+    }*/
 }

Modified: directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java (original)
+++ directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java Fri Oct 21 11:42:22 2011
@@ -88,7 +88,7 @@ public class DefaultLdapCodecService imp
     /**
      * Creates a new instance of DefaultLdapCodecService.
      */
-    DefaultLdapCodecService()
+    public DefaultLdapCodecService()
     {
         loadStockControls();
     }

Modified: directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java Fri Oct 21 11:42:22 2011
@@ -35,13 +35,16 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.ldap.codec.api.LdapDecoder;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
+import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException;
 import org.apache.directory.shared.ldap.codec.decorators.BindRequestDecorator;
 import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
+import org.apache.directory.shared.ldap.model.exception.ResponseCarryingMessageException;
 import org.apache.directory.shared.ldap.model.message.BindRequest;
 import org.apache.directory.shared.ldap.model.message.Message;
 import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.session.DummySession;
 import org.apache.mina.core.session.IoSession;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -58,6 +61,70 @@ import com.mycila.junit.concurrent.Concu
 @Concurrency()
 public class LdapDecoderTest extends AbstractCodecServiceTest
 {
+    /** The ASN 1 decoder instance */
+    private static Asn1Decoder asn1Decoder;
+
+    
+    @BeforeClass
+    public static void init()
+    {
+        asn1Decoder = new Asn1Decoder();
+    }
+    
+
+    /**
+     * Decode an incoming buffer into LDAP messages. The result can be 0, 1 or many 
+     * LDAP messages, which will be stored into the array the caller has created.
+     * 
+     * @param buffer The incoming byte buffer
+     * @param messageContainer The LdapMessageContainer which will be used to store the
+     * message being decoded. If the message is not fully decoded, the ucrrent state
+     * is stored into this container
+     * @param decodedMessages The list of decoded messages
+     * @throws Exception If the decoding failed
+     */
+    private void decode( ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer, List<Message> decodedMessages ) throws DecoderException
+    {
+        buffer.mark();
+
+        while ( buffer.hasRemaining() )
+        {
+            try
+            {
+                asn1Decoder.decode( buffer, messageContainer );
+
+                if ( messageContainer.getState() == TLVStateEnum.PDU_DECODED )
+                {
+                    Message message = messageContainer.getMessage();
+
+                    decodedMessages.add( message );
+
+                    messageContainer.clean();
+                }
+            }
+            catch ( DecoderException de )
+            {
+                buffer.clear();
+                messageContainer.clean();
+
+                if ( de instanceof ResponseCarryingException )
+                {
+                    // Transform the DecoderException message to a MessageException
+                    ResponseCarryingMessageException rcme = new ResponseCarryingMessageException( de.getMessage() );
+                    rcme.setResponse( ( ( ResponseCarryingException ) de ).getResponse() );
+
+                    throw rcme;
+                }
+                else
+                {
+                    // TODO : This is certainly not the way we should handle such an exception !
+                    throw new ResponseCarryingException( de.getMessage() );
+                }
+            }
+        }
+    }
+
+    
     /**
      * Test the decoding of a full PDU
      */
@@ -118,7 +185,6 @@ public class LdapDecoderTest extends Abs
     @Test
     public void testDecode2Messages() throws Exception
     {
-        LdapDecoder ldapDecoder = new LdapDecoder();
         LdapMessageContainer<MessageDecorator<? extends Message>> container = 
             new LdapMessageContainer<MessageDecorator<? extends Message>>( codec );
 
@@ -163,7 +229,7 @@ public class LdapDecoderTest extends Abs
         // Decode a BindRequest PDU
         try
         {
-            ldapDecoder.decode( stream, container, result );
+            decode( stream, container, result );
         }
         catch ( DecoderException de )
         {

Propchange: directory/shared/branches/shared-txns/ldap/codec/standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,5 +5,6 @@
 /directory/shared/branches/shared-osgi/ldap/codec/standalone:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/codec/standalone:1177670-1187280
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1068227
 /directory/shared/trunk/ldap-codec-standalone:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/codec/standalone/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/standalone/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/standalone/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/codec/standalone/pom.xml Fri Oct 21 11:42:22 2011
@@ -27,7 +27,7 @@
   
   <artifactId>shared-ldap-codec-standalone</artifactId>
   <name>Apache Directory Shared LDAP Codec Standalone</name>
-  <packaging>jar</packaging>
+  <packaging>bundle</packaging>
   <description>
     This module was created to fix issue DIRSHARED-91 where the embedded Felix
     instance inside the default LdapCodecService implementation was making it 
@@ -68,4 +68,25 @@
       <artifactId>org.apache.felix.framework</artifactId>
     </dependency>
   </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <inherited>true</inherited>
+        <extensions>true</extensions>
+        <configuration>
+          <manifestLocation>META-INF</manifestLocation>
+          <instructions>
+            <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: directory/shared/branches/shared-txns/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java (original)
+++ directory/shared/branches/shared-txns/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java Fri Oct 21 11:42:22 2011
@@ -81,19 +81,19 @@ public class StandaloneLdapApiService im
     private ProtocolCodecFactory protocolCodecFactory;
     
     /** The list of default controls to load at startup */ 
-    public static String DEFAULT_CONTROLS_LIST = "default.controls";
+    public static final String DEFAULT_CONTROLS_LIST = "default.controls";
 
     /** The list of extra controls to load at startup */ 
-    public static String EXTRA_CONTROLS_LIST = "extra.controls";
+    public static final String EXTRA_CONTROLS_LIST = "extra.controls";
 
     /** The list of default extended operation requests to load at startup */ 
-    public static String DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST = "default.extendedOperation.requests";
+    public static final String DEFAULT_EXTENDED_OPERATION_REQUESTS_LIST = "default.extendedOperation.requests";
 
     /** The list of default extended operation responses to load at startup */ 
-    public static String DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST = "default.extendedOperation.responses";
+    public static final String DEFAULT_EXTENDED_OPERATION_RESPONSES_LIST = "default.extendedOperation.responses";
 
     /** The list of extra controls to load at startup */ 
-    public static String EXTRA_EXTENDED_OPERATION_LIST = "extra.extendedOperations";
+    public static final String EXTRA_EXTENDED_OPERATION_LIST = "extra.extendedOperations";
 
     /**
      * Creates a new instance of StandaloneLdapCodecService. Optionally checks for

Propchange: directory/shared/branches/shared-txns/ldap/extras/aci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/aci:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/aci:1177670-1187280
 /directory/shared/trunk/ldap-extras/aci:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/aci/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/aci/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/aci/pom.xml Fri Oct 21 11:42:22 2011
@@ -85,7 +85,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.aci</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.aci*
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-txns/ldap/extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,5 +5,6 @@
 /directory/shared/branches/shared-osgi/ldap/extras/codec:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/extras/codec:1177670-1187280
 /directory/shared/trunk/ldap-codec:1067785-1067995
 /directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/ldap/extras/codec-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -6,6 +6,7 @@
 /directory/shared/branches/shared-osgi/ldap/extras/codec-api:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/extras/codec-api:1177670-1187274
 /directory/shared/trunk/ldap-codec:1067785-1067995
 /directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1073546
 /directory/shared/trunk/ldap-extras/codec-api:1073547-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/codec-api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec-api/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec-api/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec-api/pom.xml Fri Oct 21 11:42:22 2011
@@ -58,8 +58,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec.api</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.extras.controls,
-              org.apache.directory.shared.ldap.extras.extended
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/pom.xml Fri Oct 21 11:42:22 2011
@@ -101,6 +101,9 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.codec</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
             <Bundle-Activator>
               org.apache.directory.shared.ldap.extras.ExtrasBundleActivator
             </Bundle-Activator>

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java Fri Oct 21 11:42:22 2011
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory;
+import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory;
 import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory;

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyTest.java Fri Oct 21 11:42:22 2011
@@ -27,9 +27,9 @@ import static org.junit.Assert.assertTru
 
 import java.nio.ByteBuffer;
 
-import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
+import org.apache.directory.shared.ldap.extras.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicy;
-import org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyDecorator;
+import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
 

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java Fri Oct 21 11:42:22 2011
@@ -29,7 +29,7 @@ import static org.junit.Assert.fail;
 import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
+import org.apache.directory.shared.ldap.extras.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.extras.controls.SyncDoneValue;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java Fri Oct 21 11:42:22 2011
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
+import org.apache.directory.shared.ldap.extras.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.extras.controls.SyncInfoValue;
 import org.apache.directory.shared.ldap.extras.controls.SynchronizationInfoEnum;
 import org.apache.directory.shared.util.Strings;

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java Fri Oct 21 11:42:22 2011
@@ -29,7 +29,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
+import org.apache.directory.shared.ldap.extras.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.extras.controls.SyncRequestValue;
 import org.apache.directory.shared.ldap.extras.controls.SynchronizationModeEnum;
 import org.apache.directory.shared.util.Strings;

Modified: directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java Fri Oct 21 11:42:22 2011
@@ -28,7 +28,7 @@ import java.nio.ByteBuffer;
 
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.ldap.codec.osgi.AbstractCodecServiceTest;
+import org.apache.directory.shared.ldap.extras.AbstractCodecServiceTest;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateTypeEnum;
 import org.apache.directory.shared.ldap.extras.controls.SyncStateValue;
 import org.apache.directory.shared.util.Strings;

Propchange: directory/shared/branches/shared-txns/ldap/extras/sp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/sp:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/sp:1177670-1187277
 /directory/shared/trunk/ldap-extras/sp:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml Fri Oct 21 11:42:22 2011
@@ -66,6 +66,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-ldap-extras-util</artifactId>
     </dependency> 
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency> 
   </dependencies>
 
   <build>
@@ -80,7 +85,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.sp</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.sp
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Modified: directory/shared/branches/shared-txns/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java (original)
+++ directory/shared/branches/shared-txns/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java Fri Oct 21 11:42:22 2011
@@ -35,6 +35,7 @@ import javax.naming.ldap.ExtendedRespons
 import javax.naming.ldap.LdapContext;
 
 import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.codec.api.LdapApiServiceFactory;
 import org.apache.directory.shared.ldap.extras.extended.StoredProcedureRequestImpl;
@@ -80,7 +81,6 @@ public final class JavaStoredProcUtils
         try
         {
             in.read( buf );
-            in.close();
         }
         catch ( IOException e )
         {
@@ -88,6 +88,10 @@ public final class JavaStoredProcUtils
             ne.setRootCause( e );
             throw ne;
         }
+        finally
+        {
+            IOUtils.closeQuietly( in );
+        }
 
         return buf;
     }

Propchange: directory/shared/branches/shared-txns/ldap/extras/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/trigger:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/trigger:1177670-1187277
 /directory/shared/trunk/ldap-extras/trigger:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/trigger/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/trigger/pom.xml Fri Oct 21 11:42:22 2011
@@ -85,7 +85,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.trigger</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.trigger
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-txns/ldap/extras/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/extras/util:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/util:1177670-1187277
 /directory/shared/trunk/ldap-extras/util:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/extras/util/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/extras/util/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/extras/util/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/extras/util/pom.xml Fri Oct 21 11:42:22 2011
@@ -75,7 +75,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.extras.util</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.util*
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-txns/ldap/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -5,4 +5,5 @@
 /directory/shared/branches/shared-osgi/ldap/model:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067491
+/directory/shared/trunk/ldap/model:1177670-1187277
 /directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/model/pom.xml Fri Oct 21 11:42:22 2011
@@ -139,7 +139,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.model</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.ldap.model*
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -7,6 +7,7 @@
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
+/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1177670-1187277
 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
 /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java (original)
+++ directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java Fri Oct 21 11:42:22 2011
@@ -832,7 +832,7 @@ public final class SchemaConstants
     // From http://www.openldap.org/faq/data/cache/1145.html
     public final static String CSN_SID_SYNTAX                                 = "1.3.6.1.4.1.4203.666.11.2.4";
 
-    // Apache DS
+    // ApacheDS
     public final static String JAVA_BYTE_SYNTAX                               = "1.3.6.1.4.1.18060.0.4.1.0.0";
     public final static String JAVA_CHAR_SYNTAX                               = "1.3.6.1.4.1.18060.0.4.1.0.1";
     public final static String JAVA_SHORT_SYNTAX                              = "1.3.6.1.4.1.18060.0.4.1.0.2";

Propchange: directory/shared/branches/shared-txns/ldap/net/mina/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -6,5 +6,6 @@
 /directory/shared/branches/shared-osgi/ldap/net/mina:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/net/mina:1177670-1187277
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636
 /directory/shared/trunk/ldap-protocol-codec:1074637-1075328

Modified: directory/shared/branches/shared-txns/ldap/net/mina/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/net/mina/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/net/mina/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/net/mina/pom.xml Fri Oct 21 11:42:22 2011
@@ -64,8 +64,11 @@
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
-            <Bundle-SymbolicName>${project.groupId}.ldap.net.mina</Bundle-SymbolicName>
             <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
+            <Bundle-SymbolicName>${project.groupId}.ldap.net.mina</Bundle-SymbolicName>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
             <Bundle-Activator>
               org.apache.directory.shared.ldap.codec.protocol.mina.LdapProtocolCodecActivator
             </Bundle-Activator>

Modified: directory/shared/branches/shared-txns/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java (original)
+++ directory/shared/branches/shared-txns/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java Fri Oct 21 11:42:22 2011
@@ -24,14 +24,22 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.directory.shared.asn1.DecoderException;
+import org.apache.directory.shared.asn1.ber.Asn1Decoder;
+import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
 import org.apache.directory.shared.ldap.codec.api.LdapDecoder;
 import org.apache.directory.shared.ldap.codec.api.LdapMessageContainer;
 import org.apache.directory.shared.ldap.codec.api.MessageDecorator;
+import org.apache.directory.shared.ldap.codec.api.ResponseCarryingException;
+import org.apache.directory.shared.ldap.model.exception.ResponseCarryingMessageException;
 import org.apache.directory.shared.ldap.model.message.Message;
+import org.apache.directory.shared.util.Strings;
 import org.apache.mina.core.buffer.IoBuffer;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolDecoder;
 import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 
 /**
@@ -41,9 +49,15 @@ import org.apache.mina.filter.codec.Prot
  */
 public class LdapProtocolDecoder implements ProtocolDecoder
 {
-    /** The stateful decoder */
-    private LdapDecoder decoder;
-    
+    /** The logger */
+    private static Logger LOG = LoggerFactory.getLogger( LdapDecoder.class );
+
+    /** A speedup for logger */
+    private static final boolean IS_DEBUG = LOG.isDebugEnabled();
+
+    /** The ASN 1 decoder instance */
+    private Asn1Decoder asn1Decoder;
+
     
     /**
      * Creates a new instance of LdapProtocolEncoder.
@@ -52,7 +66,7 @@ public class LdapProtocolDecoder impleme
      */
     public LdapProtocolDecoder()
     {
-        this.decoder = new LdapDecoder();
+        asn1Decoder = new Asn1Decoder();
     }
 
 
@@ -76,7 +90,7 @@ public class LdapProtocolDecoder impleme
         List<Message> decodedMessages = new ArrayList<Message>();
         ByteBuffer buf = in.buf();
 
-        decoder.decode( buf, messageContainer, decodedMessages );
+        decode( buf, messageContainer, decodedMessages );
         
         for ( Message message : decodedMessages )
         {
@@ -86,6 +100,90 @@ public class LdapProtocolDecoder impleme
 
 
     /**
+     * Decode an incoming buffer into LDAP messages. The result can be 0, 1 or many 
+     * LDAP messages, which will be stored into the array the caller has created.
+     * 
+     * @param buffer The incoming byte buffer
+     * @param messageContainer The LdapMessageContainer which will be used to store the
+     * message being decoded. If the message is not fully decoded, the ucrrent state
+     * is stored into this container
+     * @param decodedMessages The list of decoded messages
+     * @throws Exception If the decoding failed
+     */
+    private void decode( ByteBuffer buffer, LdapMessageContainer<MessageDecorator<? extends Message>> messageContainer, List<Message> decodedMessages ) throws DecoderException
+    {
+        buffer.mark();
+
+        while ( buffer.hasRemaining() )
+        {
+            try
+            {
+                if ( IS_DEBUG )
+                {
+                    LOG.debug( "Decoding the PDU : " );
+
+                    int size = buffer.limit();
+                    int position = buffer.position();
+                    int pduLength = size - position;
+
+                    byte[] array = new byte[pduLength];
+
+                    System.arraycopy(buffer.array(), position, array, 0, pduLength);
+
+                    buffer.position( size );
+
+                    if ( array.length == 0 )
+                    {
+                        LOG.debug( "NULL buffer, what the HELL ???" );
+                    }
+                    else
+                    {
+                        LOG.debug( Strings.dumpBytes(array) );
+                    }
+
+                    buffer.reset();
+                }
+
+                asn1Decoder.decode( buffer, messageContainer );
+
+                if ( messageContainer.getState() == TLVStateEnum.PDU_DECODED )
+                {
+                    if ( IS_DEBUG )
+                    {
+                        LOG.debug( "Decoded LdapMessage : " + messageContainer.getMessage() );
+                    }
+
+                    Message message = messageContainer.getMessage();
+
+                    decodedMessages.add( message );
+
+                    messageContainer.clean();
+                }
+            }
+            catch ( DecoderException de )
+            {
+                buffer.clear();
+                messageContainer.clean();
+
+                if ( de instanceof ResponseCarryingException )
+                {
+                    // Transform the DecoderException message to a MessageException
+                    ResponseCarryingMessageException rcme = new ResponseCarryingMessageException( de.getMessage() );
+                    rcme.setResponse( ( ( ResponseCarryingException ) de ).getResponse() );
+
+                    throw rcme;
+                }
+                else
+                {
+                    // TODO : This is certainly not the way we should handle such an exception !
+                    throw new ResponseCarryingException( de.getMessage() );
+                }
+            }
+        }
+    }
+
+    
+    /**
      * {@inheritDoc}
      */
     public void finishDecode( IoSession session, ProtocolDecoderOutput out ) throws Exception

Propchange: directory/shared/branches/shared-txns/ldap/schema/converter/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -0,0 +1,9 @@
+/directory/shared/branches/milestones/ldap/schema/converter:1072811-1074633,1074637-1075326
+/directory/shared/branches/shared-codec-merge/ldap/schema/converter:982370-987558
+/directory/shared/branches/shared-config/ldap/schema/converter:1023444-1029061
+/directory/shared/branches/shared-osgi/ldap/schema/converter:1103720-1124653
+/directory/shared/branches/shared-replication/ldap/schema/converter:749791-764113
+/directory/shared/branches/shared-schema/ldap/schema/converter:806622-896441
+/directory/shared/branches/shared-subtree/ldap/schema/converter:965208-965686
+/directory/shared/branches/xdbm-refactoring/ldap/schema/converter:945830-946347
+/directory/shared/trunk/ldap/schema/converter:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187277

Modified: directory/shared/branches/shared-txns/ldap/schema/converter/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/converter/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/converter/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/schema/converter/pom.xml Fri Oct 21 11:42:22 2011
@@ -112,7 +112,9 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.schema.converter</Bundle-SymbolicName>
-            <Export-Package>org.apache.directory.shared.converter.schema</Export-Package>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/branches/shared-txns/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java (original)
+++ directory/shared/branches/shared-txns/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java Fri Oct 21 11:42:22 2011
@@ -31,7 +31,7 @@ import java.util.List;
 
 /**
  * A class used to translate a OpenLdap schema file to a Ldif file compatible
- * with the Apache DS meta schema format
+ * with the ApacheDS meta schema format
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */

Propchange: directory/shared/branches/shared-txns/ldap/schema/data/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -10,4 +10,5 @@
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351
+/directory/shared/trunk/ldap/schema/data:1177670-1187277
 /directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/ldap/schema/data/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/pom.xml (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/pom.xml Fri Oct 21 11:42:22 2011
@@ -139,7 +139,11 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldap.schema</Bundle-SymbolicName>
-            <Export-Package>org.apache.directory.shared.ldap.schema*</Export-Package>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true,
+                org.apache.directory.shared.ldap.schemaextractor.impl;version="${project.version}";-noimport:=true,
+                org.apache.directory.shared.ldap.schemamanager.impl;version="${project.version}";-noimport:=true
+            </Export-Package>
             <Import-Package>
               *,
               org.apache.directory.shared.ldap.aci,

Propchange: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -9,5 +9,6 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1177670-1187277
 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Fri Oct 21 11:42:22 2011
@@ -1593,13 +1593,34 @@ public class DefaultSchemaManager implem
         return new ImmutableSyntaxCheckerRegistry( registries.getSyntaxCheckerRegistry() );
     }
 
+    
+    /**
+     * Get rid of AT's options (everything after the ';'
+     * @param oid
+     * @return
+     */
+    private String stripOptions( String oid )
+    {
+        int semiColonPos = oid.indexOf( ';' );
+        
+        if ( semiColonPos != -1 )
+        {
+            return oid.substring( 0, semiColonPos );
+        }
+        else
+        {
+            return oid;
+        }
+    }
 
     /**
      * {@inheritDoc}
      */
     public AttributeType lookupAttributeTypeRegistry( String oid ) throws LdapException
     {
-        return registries.getAttributeTypeRegistry().lookup( Strings.toLowerCase( oid ).trim() );
+        String oidTrimmed = Strings.toLowerCase( oid ).trim();
+        String oidNoOption = stripOptions( oidTrimmed );
+        return registries.getAttributeTypeRegistry().lookup( oidNoOption );
     }
 
 

Propchange: directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -9,5 +9,6 @@
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351
+/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1177670-1187277
 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.0.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.0.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.0.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.0.ldif Fri Oct 21 11:42:22 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.0,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-compositeElement
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.0
 m-description: A base AttributeType for attributeType referencing composite configuration elements
-m-substr: caseExactSubstringsMatch
-m-supattributetype: name
-objectclass: metaAttributeType
-objectclass: metaTop
 objectclass: top
+objectclass: metaTop
+objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-compositeElement
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: name
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.100.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.100.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.100.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.100.ldif Fri Oct 21 11:42:22 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.100,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-directoryServiceId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.100
 m-description: The DirectoryService ID
-m-substr: caseExactSubstringsMatch
-m-supattributetype: name
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-directoryServiceId
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: name
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.101.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.101.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.101.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.101.ldif Fri Oct 21 11:42:22 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.101,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsAccessControlEnabled
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.101
 m-description: Tells if access control is activated or not
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsAccessControlEnabled
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.102.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.102.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.102.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.102.ldif Fri Oct 21 11:42:22 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.102,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsAllowAnonymousAccess
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.102
 m-description: Tells if anonymous access are allowed or not
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsAllowAnonymousAccess
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.103.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.103.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.103.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.103.ldif Fri Oct 21 11:42:22 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.103,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsDenormalizeOpAttrsEnabled
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.103
 m-description: Tells if the operational attributes are denormalized or not
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsDenormalizeOpAttrsEnabled
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.104.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.104.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.104.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.104.ldif Fri Oct 21 11:42:22 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.104,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-dsPasswordHidden
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.104
 m-description: Tells if the password is stored encrypted even for PLAIN authentication
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-dsPasswordHidden
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.105.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.105.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.105.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.105.ldif Fri Oct 21 11:42:22 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.105,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-changeLog
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.105
 m-description: The ChangeLog system
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-changeLog
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.108.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.108.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.108.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.108.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.108,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-partitions
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.108
 m-description: The set of partitions
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-partitions
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.110.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif Fri Oct 21 11:42:22 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.110,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
-m-oid: 1.3.6.1.4.1.18060.0.4.1.2.110
+m-name: ads-dsMaxPDUSize
 m-description: Gives the maximum size of a PDU
+m-oid: 1.3.6.1.4.1.18060.0.4.1.2.110
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-dsMaxPDUSize
-creatorsname: uid=admin,ou=system
 m-equality: integerMatch
+m-ordering: integerOrderingMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.111.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.111.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.111.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.111.ldif Fri Oct 21 11:42:22 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.111,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-dsSyncPeriodMillis
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.111
 m-description: Define the duration between two flushes on disk
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-dsSyncPeriodMillis
-creatorsname: uid=admin,ou=system
 m-equality: integerMatch
+m-ordering: integerOrderingMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.112.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.112.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.112.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.112.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.112,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-dsReplicaId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.112
 m-description: The server identifier, used for replication
-m-substr: caseExactSubstringsMatch
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-dsReplicaId
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.113.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.113.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.113.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.113.ldif Fri Oct 21 11:42:22 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.113,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-dsTestEntries
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.113
 m-description: The set of entries to inject at startup (may be obsolete)
-m-substr: caseExactSubstringsMatch
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-dsTestEntries
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.115.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.115.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.115.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.115.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.115,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-servers
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.115
 m-description: The references to the servers
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-servers
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.116.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.116.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.116.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.116.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.116,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
+m-name: ads-interceptors
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.116
 m-description: The references to the interceptors
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-interceptors
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.117.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.117.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.117.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.117.ldif Fri Oct 21 11:42:22 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.117,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journal
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.117
 m-description: The reference to the Journal
-m-substr: caseExactSubstringsMatch
-m-supattributetype: ads-compositeElement
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-journal
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: ads-compositeElement
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.120.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.120.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.120.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.120.ldif Fri Oct 21 11:42:22 2011
@@ -1,16 +1,16 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.120,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-changeLogId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.120
 m-description: The ChangeLog identifier
-m-substr: caseExactSubstringsMatch
-m-supattributetype: name
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-changeLogId
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-supattributetype: name
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.121.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.121.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.121.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.121.ldif Fri Oct 21 11:42:22 2011
@@ -1,13 +1,13 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.121,ou=attributeTypes,cn=adsconfig,ou=schema
-m-singlevalue: TRUE
+m-name: ads-changeLogExposed
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.121
 m-description: Tells if the changeLog system is visible by the clients
-m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
-m-name: ads-changeLogExposed
-creatorsname: uid=admin,ou=system
+m-syntax: 1.3.6.1.4.1.1466.115.121.1.7
 m-equality: booleanMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.130.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.130.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.130.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.130.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.130,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-interceptorId
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.130
 m-description: The Interceptor identifier
-m-substr: caseExactSubstringsMatch
 objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-interceptorId
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.131.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.131.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.131.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.131.ldif Fri Oct 21 11:42:22 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.131,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-interceptorOrder
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.131
 m-description: The Interceptor order number
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-interceptorOrder
-creatorsname: uid=admin,ou=system
 m-equality: integerMatch
+m-ordering: integerOrderingMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.141.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.141.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.141.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.141.ldif Fri Oct 21 11:42:22 2011
@@ -1,14 +1,14 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.141,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: integerOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journalRotation
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.141
 m-description: The size before a journal rotation occurs.
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.27
-m-name: ads-journalRotation
-creatorsname: uid=admin,ou=system
 m-equality: integerMatch
+m-ordering: integerOrderingMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system

Modified: directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.142.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dattributetypes/m-oid%3D1.3.6.1.4.1.18060.0.4.1.2.142.ldif?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.142.ldif (original)
+++ directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.142.ldif Fri Oct 21 11:42:22 2011
@@ -1,15 +1,15 @@
 version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.2.142,ou=attributeTypes,cn=adsconfig,ou=schema
-m-ordering: caseExactOrderingMatch
-m-singlevalue: TRUE
+m-name: ads-journalWorkingDir
 m-oid: 1.3.6.1.4.1.18060.0.4.1.2.142
 m-description: The place on disk where the journal is stored.
-m-substr: caseExactSubstringsMatch
+objectclass: top
 objectclass: metaTop
 objectclass: metaAttributeType
-objectclass: top
 m-syntax: 1.3.6.1.4.1.1466.115.121.1.44
-m-name: ads-journalWorkingDir
-creatorsname: uid=admin,ou=system
 m-equality: caseExactMatch
+m-ordering: caseExactOrderingMatch
+m-substr: caseExactSubstringsMatch
+m-singlevalue: TRUE
 m-length: 0
+creatorsname: uid=admin,ou=system



Mime
View raw message