directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1201297 [9/9] - in /directory/apacheds/branches/apacheds-txns: all/ apache-felix/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/api/ core-api/src/main/java/org/apache/directory/server/core/api/intercep...
Date Sat, 12 Nov 2011 18:24:43 GMT
Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java Sat Nov 12 18:24:38 2011
@@ -463,7 +463,7 @@ public class KdcReqBody extends Abstract
     @Override
     public int computeLength()
     {
-    	reset();
+        reset();
 
         // The KdcOptions length
         kdcOptionsLength = 1 + 1 + kdcOptions.getBytes().length;

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java Sat Nov 12 18:24:38 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.shared.kerberos.messages;
 
@@ -200,11 +200,11 @@ public class ApReq extends KerberosMessa
      *        +--> 0xA1 0x03 msg-type tag
      *        |     |
      *        |     +--> 0x02 0x01 0x0E msg-type (14)
-     *        |     
+     *        |
      *        +--> 0xA2 0x03 APOptions tag
      *        |     |
      *        |     +--> 0x03 0x05 0x00 b1 b2 b3 b4 APOtions
-     *        |     
+     *        |
      *        +--> 0xA3 L3 ticket tag
      *        |     |
      *        |     +--> 0x61 L3-1 ticket
@@ -216,8 +216,8 @@ public class ApReq extends KerberosMessa
      */
     public int computeLength()
     {
-    	reset();
-    	
+        reset();
+        
         // Compute the PVNO length.
         pvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
 
@@ -234,10 +234,10 @@ public class ApReq extends KerberosMessa
         authenticatorLength = authenticator.computeLength();
         
         // Compute the sequence size
-        apReqLength = 
+        apReqLength =
             1 + TLV.getNbBytes( pvnoLength ) + pvnoLength +
             1 + TLV.getNbBytes( msgTypeLength ) + msgTypeLength +
-            1 + TLV.getNbBytes( apOptionsLength ) + apOptionsLength + 
+            1 + TLV.getNbBytes( apOptionsLength ) + apOptionsLength +
             1 + TLV.getNbBytes( ticketLength ) + ticketLength +
             1 + TLV.getNbBytes( authenticatorLength ) + authenticatorLength;
         
@@ -313,7 +313,7 @@ public class ApReq extends KerberosMessa
         }
         catch ( BufferOverflowException boe )
         {
-            LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength, 
+            LOG.error( I18n.err( I18n.ERR_137, 1 + TLV.getNbBytes( apReqLength ) + apReqLength,
                 buffer.capacity() ) );
             throw new EncoderException( I18n.err( I18n.ERR_138 ) );
         }
@@ -333,13 +333,13 @@ public class ApReq extends KerberosMessa
      */
     private void reset()
     {
-    	pvnoLength = 0;
+        pvnoLength = 0;
         msgTypeLength = 0;
         apOptionsLength = 0;
         ticketLength = 0;
         authenticatorLength = 0;
         apReqLength = 0;
-        apReqSeqLength = 0;	
+        apReqSeqLength = 0;
     }
     
     

Modified: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java Sat Nov 12 18:24:38 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.shared.kerberos.messages;
 
@@ -326,8 +326,8 @@ public class Authenticator extends Kerbe
     @Override
     public int computeLength()
     {
-    	reset();
-    	
+        reset();
+        
         // Compute the Authenticator version length.
         authenticatorVnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
         authenticatorSeqLength =  1 + TLV.getNbBytes( authenticatorVnoLength ) + authenticatorVnoLength;
@@ -385,15 +385,15 @@ public class Authenticator extends Kerbe
     
 
     /**
-     * Encode the Authenticator message to a PDU. 
+     * Encode the Authenticator message to a PDU.
      * <pre>
      * Authenticator :
      * 
      * 0x62 LL
      *   0x30 LL
-     *     0xA0 0x03 
-     *       0x02 0x01 0x05 authenticator-vno 
-     *     0xA1 LL 
+     *     0xA0 0x03
+     *       0x02 0x01 0x05 authenticator-vno
+     *     0xA1 LL
      *       0x1B LL abcd crealm
      *     0xA2 LL
      *       0x30 LL abcd cname
@@ -481,7 +481,7 @@ public class Authenticator extends Kerbe
             buffer.put( TLV.getBytes( ctimeLength ) );
             
             // The value
-            buffer.put( (byte)UniversalTag.GENERALIZED_TIME.getValue() );
+            buffer.put( UniversalTag.GENERALIZED_TIME.getValue() );
             buffer.put( (byte)0x0F );
             buffer.put( ctime.getBytes() );
             
@@ -537,7 +537,7 @@ public class Authenticator extends Kerbe
      */
     private void reset()
     {
-    	authenticatorVnoLength = 0;
+        authenticatorVnoLength = 0;
         crealmLength = 0;
         crealmBytes = null;
         cnameLength = 0;
@@ -548,7 +548,7 @@ public class Authenticator extends Kerbe
         seqNumberLength = 0;
         authorizationDataLength = 0;
         authenticatorSeqLength = 0;
-        authenticatorLength = 0;	
+        authenticatorLength = 0;
     }
     
     

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java Sat Nov 12 18:24:38 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.shared.kerberos.messages;
 
@@ -46,7 +46,7 @@ public class TgsReq extends KdcReq
     /**
      * Creates a new instance of TGS-REQ.
      */
-    public TgsReq() 
+    public TgsReq()
     {
         super( KerberosMessageType.TGS_REQ );
     }
@@ -64,9 +64,9 @@ public class TgsReq extends KdcReq
      */
     public int computeLength()
     {
-    	kdcReqLength = 0;
-    	tgsReqLength = 0;
-    	
+        kdcReqLength = 0;
+        tgsReqLength = 0;
+        
         kdcReqLength = super.computeLength();
         tgsReqLength = 1 + TLV.getNbBytes( kdcReqLength ) + kdcReqLength;
         

Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186962
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1200286
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/kerberos-test:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/AbstractKerberosITest.java Sat Nov 12 18:24:38 2011
@@ -105,7 +105,7 @@ public class AbstractKerberosITest exten
 
 
     /**
-     * Obtains a TGT and service tickets for the user. 
+     * Obtains a TGT and service tickets for the user.
      * Also makes some assertions on the received tickets.
      *
      * @param encryptionType the encryption type to use
@@ -151,7 +151,7 @@ public class AbstractKerberosITest exten
     }
 
 
-    protected void setupEnv( ObtainTicketParameters parameters ) 
+    protected void setupEnv( ObtainTicketParameters parameters )
         throws Exception
     {
         // Save current value of sun.security.krb5.KrbKdcReq.udpPrefLimit field.
@@ -183,7 +183,7 @@ public class AbstractKerberosITest exten
             "ldap", "randall", servicePrincipal );
     }
     
-    protected void resetEnv( ObtainTicketParameters parameters ) 
+    protected void resetEnv( ObtainTicketParameters parameters )
         throws Exception
     {
         setUdpPrefLimit( parameters.oldUdpPrefLimit );
@@ -215,12 +215,12 @@ public class AbstractKerberosITest exten
         Field udpPrefLimitField = null;
         
         try
-        { 
-        	udpPrefLimitField = krbKdcReqClass.getDeclaredField( "udpPrefLimit" );
+        {
+            udpPrefLimitField = krbKdcReqClass.getDeclaredField( "udpPrefLimit" );
         }
         catch ( NoSuchFieldException nsfe )
         {
-        	udpPrefLimitField = krbKdcReqClass.getDeclaredField( "defaultUdpPrefLimit" );
+            udpPrefLimitField = krbKdcReqClass.getDeclaredField( "defaultUdpPrefLimit" );
         }
         
         udpPrefLimitField.setAccessible( true );
@@ -275,7 +275,7 @@ public class AbstractKerberosITest exten
      * </pre>
      *
      * @param encryptionType
-     * @param checksumType 
+     * @param checksumType
      * @return the path to the krb5.conf file
      * @throws IOException
      */

Modified: directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java (original)
+++ directory/apacheds/branches/apacheds-txns/kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/SaslGssapiBindITest.java Sat Nov 12 18:24:38 2011
@@ -145,7 +145,7 @@ public class SaslGssapiBindITest extends
     protected LdapContext sysRoot;
 
     /** the context root for the rootDSE */
-    protected CoreSession rootDSE;
+    protected CoreSession rootDse;
 
     /**
      * Creates a new instance of SaslGssapiBindTest and sets JAAS system properties.
@@ -406,7 +406,7 @@ public class SaslGssapiBindITest extends
         sysRoot = new InitialLdapContext( envFinal, null );
 
         envFinal.put( Context.PROVIDER_URL, "" );
-        rootDSE = getService().getAdminSession();
+        rootDse = getService().getAdminSession();
 
         envFinal.put( Context.PROVIDER_URL, SchemaConstants.OU_SCHEMA );
         schemaRoot = new InitialLdapContext( envFinal, null );

Propchange: directory/apacheds/branches/apacheds-txns/ldap-client-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1200369
+/directory/apacheds/trunk/ldap-client-test:1177661-1201283

Propchange: directory/apacheds/branches/apacheds-txns/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186960
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/ldif-partition:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186956
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/protocol-dhcp:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186957
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/protocol-dns:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186957
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/protocol-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1200369
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/protocol-ldap:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Sat Nov 12 18:24:38 2011
@@ -245,18 +245,18 @@ public class SearchHandler extends LdapR
 
             // Position the cursor at the beginning
             cursor.beforeFirst();
-            boolean hasRootDSE = false;
+            boolean hasRootDse = false;
 
             while ( cursor.next() )
             {
-                if ( hasRootDSE )
+                if ( hasRootDse )
                 {
                     // This is an error ! We should never find more than one rootDSE !
                     LOG.error( I18n.err( I18n.ERR_167 ) );
                 }
                 else
                 {
-                    hasRootDSE = true;
+                    hasRootDse = true;
                     Entry entry = cursor.get();
                     session.getIoSession().write( generateResponse( session, req, entry ) );
                 }
@@ -1019,7 +1019,7 @@ public class SearchHandler extends LdapR
             // ===============================================================
             // Handle search in rootDSE differently.
             // ===============================================================
-            if ( isRootDSESearch( req ) )
+            if ( isRootDseSearch( req ) )
             {
                 handleRootDseSearch( session, req );
 
@@ -1297,11 +1297,11 @@ public class SearchHandler extends LdapR
      * @param req the request issued
      * @return true if the search is on the RootDSE false otherwise
      */
-    private boolean isRootDSESearch( SearchRequest req )
+    private boolean isRootDseSearch( SearchRequest req )
     {
         boolean isBaseIsRoot = req.getBase().isEmpty();
         boolean isBaseScope = req.getScope() == SearchScope.OBJECT;
-        boolean isRootDSEFilter = false;
+        boolean isRootDseFilter = false;
 
         if ( req.getFilter() instanceof PresenceNode )
         {
@@ -1310,17 +1310,17 @@ public class SearchHandler extends LdapR
             if ( filter.isSchemaAware() )
             {
                 AttributeType attributeType = ( (PresenceNode) req.getFilter() ).getAttributeType();
-                isRootDSEFilter = attributeType.equals( OBJECT_CLASS_AT );
+                isRootDseFilter = attributeType.equals( OBJECT_CLASS_AT );
             }
             else
             {
                 String attribute = ( ( PresenceNode ) req.getFilter() ).getAttribute();
-                isRootDSEFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT )
+                isRootDseFilter = attribute.equalsIgnoreCase( SchemaConstants.OBJECT_CLASS_AT )
                     || attribute.equals( SchemaConstants.OBJECT_CLASS_AT_OID );
             }
         }
 
-        return isBaseIsRoot && isBaseScope && isRootDSEFilter;
+        return isBaseIsRoot && isBaseScope && isRootDseFilter;
     }
 
 
@@ -1354,7 +1354,7 @@ public class SearchHandler extends LdapR
 
         DirectoryService ds = session.getCoreSession().getDirectoryService();
         PartitionNexus nexus = ds.getPartitionNexus();
-        Value<?> subschemaSubentry = nexus.getRootDSE( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
+        Value<?> subschemaSubentry = nexus.getRootDse( null ).get( SchemaConstants.SUBSCHEMA_SUBENTRY_AT ).get();
         Dn subschemaSubentryDn = new Dn( ds.getSchemaManager(), subschemaSubentry.getString() );
         String subschemaSubentryDnNorm = subschemaSubentryDn.getNormName();
 

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 Sat Nov 12 18:24:38 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-1200369
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186958
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/protocol-ntp:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186958
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/protocol-shared:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186953
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/server-annotations:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186949
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186949
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186949
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186949
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /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 Sat Nov 12 18:24:38 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-1186945
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/server-integ:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/server-integ/pom.xml?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/server-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/server-integ/pom.xml Sat Nov 12 18:24:38 2011
@@ -178,6 +178,12 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
         <executions>
           <execution>
             <phase>package</phase>
@@ -212,17 +218,6 @@
       </plugin>
       
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-      
-      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>

Modified: directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Sat Nov 12 18:24:38 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.operations.bind;
 
@@ -81,28 +81,28 @@ import org.junit.runner.RunWith;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
+@RunWith ( FrameworkRunner.class )
 @CreateDS( allowAnonAccess=true, name="MiscBindIT-class",
     partitions =
         {
             @CreatePartition(
                 name = "example",
                 suffix = "dc=aPache,dc=org",
-                contextEntry = @ContextEntry( 
+                contextEntry = @ContextEntry(
                     entryLdif =
                         "dn: dc=aPache,dc=org\n" +
                         "dc: aPache\n" +
                         "objectClass: top\n" +
                         "objectClass: domain\n\n" ),
-                indexes = 
+                indexes =
                 {
                     @CreateIndex( attribute = "objectClass" ),
                     @CreateIndex( attribute = "dc" ),
                     @CreateIndex( attribute = "ou" )
                 } )
         })
-@CreateLdapServer ( 
-    transports = 
+@CreateLdapServer (
+    transports =
     {
         @CreateTransport( protocol = "LDAP" )
     })
@@ -199,7 +199,7 @@ public class MiscBindIT extends Abstract
      * @throws Exception if anything goes wrong
      */
     @Test
-    public void testEnableAnonymousBindsOnRootDSE() throws Exception
+    public void testEnableAnonymousBindsOnRootDse() throws Exception
     {
         getLdapServer().getDirectoryService().setAllowAnonymousAccess( true );
 

Modified: directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Sat Nov 12 18:24:38 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.operations.bind;
 
@@ -68,12 +68,12 @@ import org.junit.runner.RunWith;
 @ApplyLdifs(
     {
         // Entry # 1
-        "dn: uid=hnelson,ou=users,ou=system", 
-        "objectClass: inetOrgPerson", 
+        "dn: uid=hnelson,ou=users,ou=system",
+        "objectClass: inetOrgPerson",
         "objectClass: organizationalPerson",
-        "objectClass: person", 
-        "objectClass: top", 
-        "userPassword: secret", 
+        "objectClass: person",
+        "objectClass: top",
+        "userPassword: secret",
         "uid: hnelson",
         "cn: Horatio Nelson",
         "sn: Nelson" })
@@ -398,7 +398,7 @@ public class SimpleBindIT extends Abstra
      * The configuration for this test case MUST disable anonymous access.
      */
     @Test
-    public void testAnonymousRootDSESearch()
+    public void testAnonymousRootDseSearch()
     {
 
         boolean oldValue = getLdapServer().getDirectoryService().isAllowAnonymousAccess();

Modified: directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java (original)
+++ directory/apacheds/branches/apacheds-txns/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Sat Nov 12 18:24:38 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.operations.search;
 
@@ -42,7 +42,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.api.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.api.interceptor.BaseInterceptor;
 import org.apache.directory.server.core.api.interceptor.Interceptor;
-import org.apache.directory.server.core.api.interceptor.NextInterceptor;
 import org.apache.directory.server.core.api.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.SearchingOperationContext;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
@@ -57,14 +56,14 @@ import org.junit.runner.RunWith;
 
 
 /**
- * A set of tests to make sure the negation operator is working 
+ * A set of tests to make sure the negation operator is working
  * properly when included in search filters on indexed attributes.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith ( FrameworkRunner.class ) 
-@CreateLdapServer ( 
-    transports = 
+@RunWith ( FrameworkRunner.class )
+@CreateLdapServer (
+    transports =
     {
         @CreateTransport( protocol = "LDAP" )
     })
@@ -117,26 +116,31 @@ import org.junit.runner.RunWith;
     "uid: jnewbie",
     "userPassword: secret",
     "cn: Joe Newbie",
-    "sn: Newbie" 
-    }
-)
-public class SearchLimitsIT extends AbstractLdapTestUnit 
+    "sn: Newbie"
+}
+    )
+public class SearchLimitsIT extends AbstractLdapTestUnit
 {
 
     /**
-     * An {@link Interceptor} that fakes a specified amount of delay to each 
+     * An {@link Interceptor} that fakes a specified amount of delay to each
      * search iteration so we can make sure search time limits are adhered to.
      *
      * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-         */
+     */
     class DelayInducingInterceptor extends BaseInterceptor
     {
         private Long delayMillis;
-
         
-        public EntryFilteringCursor search( NextInterceptor next, SearchOperationContext searchContext ) throws LdapException
+        public DelayInducingInterceptor()
+        {
+            super( "DelayInterceptor" );
+        }
+
+
+        public EntryFilteringCursor search( SearchOperationContext searchContext ) throws LdapException
         {
-            EntryFilteringCursor cursor = next.search( searchContext );
+            EntryFilteringCursor cursor = next( searchContext );
             cursor.addEntryFilter( new EntryFilter() {
                 public boolean accept( SearchingOperationContext operation, Entry result ) throws Exception
                 {
@@ -148,51 +152,52 @@ public class SearchLimitsIT extends Abst
                     return true;
                 }
             });
+
             return cursor;
         }
-        
-        
+
+
         public void setDelayMillis( long delayMillis )
         {
             if ( delayMillis <= 0 )
             {
                 this.delayMillis = null;
             }
-            
+
             this.delayMillis = delayMillis;
         }
     }
 
-    
+
     private int oldMaxTimeLimit;
     private long oldMaxSizeLimit;
     private DelayInducingInterceptor delayInterceptor;
 
-    
+
     @Before
     public void setUp() throws Exception
     {
         oldMaxTimeLimit = getLdapServer().getMaxTimeLimit();
         oldMaxSizeLimit = getLdapServer().getMaxSizeLimit();
         delayInterceptor = new DelayInducingInterceptor();
-        getLdapServer().getDirectoryService().getInterceptorChain().addFirst( delayInterceptor );
+        getLdapServer().getDirectoryService().addFirst( delayInterceptor );
     }
-    
-    
+
+
     @After
     public void tearDown() throws Exception
     {
         getLdapServer().setMaxTimeLimit( oldMaxTimeLimit );
         getLdapServer().setMaxSizeLimit( oldMaxSizeLimit );
-        getLdapServer().getDirectoryService().getInterceptorChain().remove( DelayInducingInterceptor.class.getSimpleName() );
+        getLdapServer().getDirectoryService().remove( "DelayInterceptor" );
     }
-    
+
 
     // -----------------------------------------------------------------------
     // Time Limit Tests
     // -----------------------------------------------------------------------
-    
-    
+
+
     /**
      * Sets up the server with unlimited search time limit but constrains time
      * by request time limit value to cause a time limit exceeded exception on
@@ -203,14 +208,14 @@ public class SearchLimitsIT extends Abst
     {
         getLdapServer().setMaxTimeLimit( LdapServer.NO_TIME_LIMIT );
         delayInterceptor.setDelayMillis( 500 );
-        
+
         getActorsWithLimit( "(objectClass=*)", 499, LdapServer.NO_SIZE_LIMIT );
     }
-    
+
 
     /**
-     * Sets up the server with longer search time limit than the request's 
-     * which constrains time by request time limit value to cause a time limit 
+     * Sets up the server with longer search time limit than the request's
+     * which constrains time by request time limit value to cause a time limit
      * exceeded exception on the client.
      */
     @Test ( expected = TimeLimitExceededException.class )
@@ -218,14 +223,14 @@ public class SearchLimitsIT extends Abst
     {
         getLdapServer().setMaxTimeLimit( 10000 ); // this is in seconds
         delayInterceptor.setDelayMillis( 500 );
-        
+
         getActorsWithLimit( "(objectClass=*)", 499, LdapServer.NO_SIZE_LIMIT );
     }
 
-    
+
     /**
-     * Sets up the server with shorter search time limit than the request's 
-     * which constrains time by using server max limit value to cause a time 
+     * Sets up the server with shorter search time limit than the request's
+     * which constrains time by using server max limit value to cause a time
      * limit exceeded exception on the client.
      */
     @Test ( expected = TimeLimitExceededException.class )
@@ -233,46 +238,46 @@ public class SearchLimitsIT extends Abst
     {
         getLdapServer().setMaxTimeLimit( 1 ); // this is in seconds
         delayInterceptor.setDelayMillis( 1100 );
-        
+
         getActorsWithLimit( "(objectClass=*)", 100000, LdapServer.NO_SIZE_LIMIT );
     }
 
-    
+
     /**
      * Sets up the server with limited search time with unlimited request
      * time limit.  Should work just fine for the administrative user.
      */
-    @Test 
+    @Test
     public void testRequestUnlimitedConfigurationLimited() throws Exception
     {
         getLdapServer().setMaxTimeLimit( 1 ); // this is in seconds
         delayInterceptor.setDelayMillis( 500 );
-        
-        getActorsWithLimit( "(objectClass=*)", 
+
+        getActorsWithLimit( "(objectClass=*)",
             LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
     }
 
-    
+
     /**
      * Sets up the server with limited search time with unlimited request
      * time limit.  Should not work for non administrative users.
      */
-    @Test ( expected = TimeLimitExceededException.class ) 
+    @Test ( expected = TimeLimitExceededException.class )
     public void testNonAdminRequestUnlimitedConfigurationLimited() throws Exception
     {
         getLdapServer().setMaxTimeLimit( 1 ); // this is in seconds
         delayInterceptor.setDelayMillis( 500 );
-        
-        getActorsWithLimitNonAdmin( "(objectClass=*)", 
+
+        getActorsWithLimitNonAdmin( "(objectClass=*)",
             LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
     }
-    
-    
+
+
     // -----------------------------------------------------------------------
     // Size Limit Tests
     // -----------------------------------------------------------------------
-    
-    
+
+
     /**
      * Sets up the server with unlimited search size limit but constrains size
      * by request size limit value to cause a size limit exceeded exception on
@@ -282,78 +287,78 @@ public class SearchLimitsIT extends Abst
     public void testRequestConstrainedUnlimitByConfigurationSize() throws Exception
     {
         getLdapServer().setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT );
-        
+
         getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 1 );
     }
-    
+
 
     /**
-     * Sets up the server with longer search size limit than the request's 
-     * which constrains size by request size limit value to cause a size limit 
+     * Sets up the server with longer search size limit than the request's
+     * which constrains size by request size limit value to cause a size limit
      * exceeded exception on the client.
      */
     @Test ( expected = SizeLimitExceededException.class )
     public void testRequestConstrainedLessThanConfigurationSize() throws Exception
     {
-        getLdapServer().setMaxSizeLimit( 10000 ); 
+        getLdapServer().setMaxSizeLimit( 10000 );
 
         getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 1 );
     }
 
 
     /**
-     * Sets up the server with shorter search size limit than the request's 
-     * which constrains size by using server max limit value. Should work 
+     * Sets up the server with shorter search size limit than the request's
+     * which constrains size by using server max limit value. Should work
      * just fine for the administrative user.
      */
     @Test
     public void testRequestConstrainedGreaterThanConfigurationSize() throws Exception
     {
-        getLdapServer().setMaxSizeLimit( 1 ); 
+        getLdapServer().setMaxSizeLimit( 1 );
         Set<String> set = getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 100000 );
         assertEquals( 4, set.size() );
     }
 
 
     /**
-     * Sets up the server with shorter search size limit than the request's 
-     * which constrains size by using server max limit value to cause a size 
+     * Sets up the server with shorter search size limit than the request's
+     * which constrains size by using server max limit value to cause a size
      * limit exceeded exception on the client.
      */
-    @Test (expected = SizeLimitExceededException.class ) 
+    @Test (expected = SizeLimitExceededException.class )
     public void testNonAdminRequestConstrainedGreaterThanConfigurationSize() throws Exception
     {
-        getLdapServer().setMaxSizeLimit( 1 ); 
-        
+        getLdapServer().setMaxSizeLimit( 1 );
+
         // We are not using the admin : it should fail
         getActorsWithLimitNonAdmin( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 100000 );
     }
 
-    
+
     /**
      * Sets up the server with limited search size with unlimited request
      * size limit.  Should work just fine for the administrative user.
      */
-    @Test 
+    @Test
     public void testRequestUnlimitedConfigurationLimitedSize() throws Exception
     {
-        getLdapServer().setMaxSizeLimit( 1 ); 
-        Set<String> set = getActorsWithLimit( "(objectClass=*)", 
+        getLdapServer().setMaxSizeLimit( 1 );
+        Set<String> set = getActorsWithLimit( "(objectClass=*)",
             LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
-        
+
         assertEquals( 4, set.size() );
     }
 
-    
+
     /**
      * Sets up the server with limited search size with unlimited request
      * size limit.  Should not work for non administrative users.
      */
-    @Test ( expected = SizeLimitExceededException.class ) 
+    @Test ( expected = SizeLimitExceededException.class )
     public void testNonAdminRequestUnlimitedConfigurationLimitedSize() throws Exception
     {
         getLdapServer().setMaxSizeLimit( 1 );
-        getActorsWithLimitNonAdmin( "(objectClass=*)", 
+        getActorsWithLimitNonAdmin( "(objectClass=*)",
             LdapServer.NO_TIME_LIMIT, LdapServer.NO_SIZE_LIMIT );
     }
 
@@ -373,7 +378,7 @@ public class SearchLimitsIT extends Abst
     public void testRequestConstraintedLessThanExpectedSize() throws Exception
     {
         getLdapServer().setMaxSizeLimit( LdapServer.NO_SIZE_LIMIT );
-        
+
         getActorsWithLimit( "(objectClass=*)", LdapServer.NO_TIME_LIMIT, 3 );
     }
 
@@ -425,7 +430,7 @@ public class SearchLimitsIT extends Abst
         controls.setCountLimit( 1 );
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
 
-        NamingEnumeration<SearchResult> namingEnumeration = 
+        NamingEnumeration<SearchResult> namingEnumeration =
             ctx.search( "ou=actors,ou=system", filter, controls );
         assertTrue( namingEnumeration.hasMore() );
         namingEnumeration.next();
@@ -436,8 +441,8 @@ public class SearchLimitsIT extends Abst
     // -----------------------------------------------------------------------
     // Utility Methods
     // -----------------------------------------------------------------------
-    
-    
+
+
     /**
      * Do a search request from the ou=actors,ou=system base, with a principal
      * which is the administrator.
@@ -450,15 +455,15 @@ public class SearchLimitsIT extends Abst
         controls.setTimeLimit( timeLimitMillis );
         controls.setCountLimit( sizeLimit );
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-        
-        NamingEnumeration<SearchResult> namingEnumeration = 
+
+        NamingEnumeration<SearchResult> namingEnumeration =
             ctx.search( "ou=actors,ou=system", filter, controls );
-        
+
         while( namingEnumeration.hasMore() )
         {
             results.add( namingEnumeration.next().getNameInNamespace() );
         }
-        
+
         return results;
     }
 
@@ -466,24 +471,24 @@ public class SearchLimitsIT extends Abst
      * Do a search request from the ou=actors,ou=system base, with a principal
      * which is not the administrator.
      */
-    private Set<String> getActorsWithLimitNonAdmin( String filter, int timeLimitMillis, long sizeLimit ) 
+    private Set<String> getActorsWithLimitNonAdmin( String filter, int timeLimitMillis, long sizeLimit )
         throws Exception
-    {
+        {
         DirContext ctx = getWiredContext( getLdapServer(), "uid=jblack,ou=actors,ou=system", "secret" );
         Set<String> results = new HashSet<String>();
         SearchControls controls = new SearchControls();
         controls.setTimeLimit( timeLimitMillis );
         controls.setCountLimit( sizeLimit );
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-        
-        NamingEnumeration<SearchResult> namingEnumeration = 
+
+        NamingEnumeration<SearchResult> namingEnumeration =
             ctx.search( "ou=actors,ou=system", filter, controls );
-        
+
         while( namingEnumeration.hasMore() )
         {
             results.add( namingEnumeration.next().getNameInNamespace() );
         }
-        
+
         return results;
-    }
+        }
 }

Propchange: directory/apacheds/branches/apacheds-txns/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186943
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/server-jndi:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186942
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/server-replication:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/service/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186940
+/directory/apacheds/trunk/service:1177661-1201283

Propchange: directory/apacheds/branches/apacheds-txns/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186940
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/service-builder:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (original)
+++ directory/apacheds/branches/apacheds-txns/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Sat Nov 12 18:24:38 2011
@@ -346,8 +346,8 @@ public class ServiceBuilder
 
     /**
      * Load the entries from a Ldif file recursively
-     * @throws LdapLdifException 
-     * @throws IOException 
+     * @throws LdapLdifException
+     * @throws IOException
      */
     private static void loadEntries( File ldifFile, List<LdifEntry> entries ) throws LdapLdifException, IOException
     {
@@ -460,7 +460,7 @@ public class ServiceBuilder
             
             try
             {
-                Class authnImplClass = Class.forName( fqcn );
+                Class<?> authnImplClass = Class.forName( fqcn );
                 authenticator = ( Authenticator ) authnImplClass.newInstance();
             }
             catch( Exception e )
@@ -509,7 +509,7 @@ public class ServiceBuilder
 
     
     /**
-     * Creates the array of transports read from the DIT 
+     * Creates the array of transports read from the DIT
      * 
      * @param transportBeans The array of Transport configuration
      * @return An arry of Transport instance
@@ -528,7 +528,7 @@ public class ServiceBuilder
     }
 
     /**
-     * Creates the array of transports read from the DIT 
+     * Creates the array of transports read from the DIT
      * 
      * @param transportBeans The array of Transport configuration
      * @return An arry of Transport instance
@@ -569,7 +569,7 @@ public class ServiceBuilder
     }
 
     /**
-     * Instantiates a NtpServer based on the configuration present in the partition 
+     * Instantiates a NtpServer based on the configuration present in the partition
      *
      * @param ntpServerBean The NtpServerBean containing the NtpServer configuration
      * @return Instance of NtpServer
@@ -597,7 +597,7 @@ public class ServiceBuilder
 
 
     /**
-     * Instantiates a DhcpServer based on the configuration present in the partition 
+     * Instantiates a DhcpServer based on the configuration present in the partition
      *
      * @param dhcpServerBean The DhcpServerBean containing the DhcpServer configuration
      * @return Instance of DhcpServer
@@ -625,7 +625,7 @@ public class ServiceBuilder
 
 
     /**
-     * Instantiates a KdcServer based on the configuration present in the partition 
+     * Instantiates a KdcServer based on the configuration present in the partition
      *
      * @param kdcServerBean The KdcServerBean containing the KdcServer configuration
      * @return Instance of KdcServer
@@ -655,7 +655,7 @@ public class ServiceBuilder
         // BodyChecksumVerified
         kdcServer.setBodyChecksumVerified( kdcServerBean.isKrbBodyChecksumVerified() );
         
-        // CatalogBased 
+        // CatalogBased
         //kdcServer.setCatelogBased( kdcServerBean.is );
         
         // EmptyAddressesAllowed
@@ -704,7 +704,7 @@ public class ServiceBuilder
     
     
     /**
-     * Instantiates the HttpWebApps based on the configuration present in the partition 
+     * Instantiates the HttpWebApps based on the configuration present in the partition
      *
      * @param httpWebAppBeans The list of HttpWebAppBeans containing the HttpWebAppBeans configuration
      * @return Instances of HttpWebAppBean
@@ -742,7 +742,7 @@ public class ServiceBuilder
     
     
     /**
-     * Instantiates a HttpServer based on the configuration present in the partition 
+     * Instantiates a HttpServer based on the configuration present in the partition
      *
      * @param httpServerBean The HttpServerBean containing the HttpServer configuration
      * @return Instance of LdapServer
@@ -799,7 +799,7 @@ public class ServiceBuilder
     
     
     /**
-     * Instantiates a ChangePasswordServer based on the configuration present in the partition 
+     * Instantiates a ChangePasswordServer based on the configuration present in the partition
      *
      * @param ldapServerBean The ChangePasswordServerBean containing the ChangePasswordServer configuration
      * @return Instance of ChangePasswordServer
@@ -861,7 +861,7 @@ public class ServiceBuilder
     */
     
     /**
-     * Instantiates a LdapServer based on the configuration present in the partition 
+     * Instantiates a LdapServer based on the configuration present in the partition
      *
      * @param ldapServerBean The LdapServerBean containing the LdapServer configuration
      * @return Instance of LdapServer
@@ -937,7 +937,7 @@ public class ServiceBuilder
                 }
                 catch ( Exception e )
                 {
-                    String message = "Failed to load and instantiate ExtendedOperationHandler implementation " 
+                    String message = "Failed to load and instantiate ExtendedOperationHandler implementation "
                         + extendedpHandlerBean.getExtendedOpId() + ": " + e.getMessage();
                     LOG.error( message );
                     throw new ConfigurationException( message );
@@ -999,7 +999,7 @@ public class ServiceBuilder
             {
                 if( className == null )
                 {
-                    consumerClass = ReplicationConsumerImpl.class; 
+                    consumerClass = ReplicationConsumerImpl.class;
                 }
                 else
                 {
@@ -1129,7 +1129,7 @@ public class ServiceBuilder
      * 
      * @param jdbmPartitionBean the JdbmPartition bean
      * @return The instantiated JdbmPartition
-     * @throws LdapInvalidDnException 
+     * @throws LdapInvalidDnException
      * @throws Exception If the instance cannot be created
      */
     public static JdbmPartition createJdbmPartition( DirectoryService directoryService, JdbmPartitionBean jdbmPartitionBean ) throws ConfigurationException
@@ -1176,7 +1176,7 @@ public class ServiceBuilder
                 
                 if ( ( entries != null ) && ( entries.size() > 0 ) )
                 {
-                    LdifEntry entry = entries.get( 0 );
+                    entries.get( 0 );
                 }
             }
             catch ( LdapLdifException lle )
@@ -1246,12 +1246,12 @@ public class ServiceBuilder
 
     
     /**
-     * Instantiates a DirectoryService based on the configuration present in the partition 
+     * Instantiates a DirectoryService based on the configuration present in the partition
      *
      * @param directoryServiceBean The bean containing the configuration
-     * @param baseDirectory The working path for this DirectoryService 
+     * @param baseDirectory The working path for this DirectoryService
      * @return An instance of DirectoryService
-     * @throws Exception 
+     * @throws Exception
      */
     public static DirectoryService createDirectoryService( DirectoryServiceBean directoryServiceBean, InstanceLayout instanceLayout, SchemaManager schemaManager ) throws Exception
     {
@@ -1313,8 +1313,6 @@ public class ServiceBuilder
             directoryService.setJournal( journal );
         }
         
-        AuthenticationInterceptor authenticationInterceptor = (AuthenticationInterceptor)directoryService.getInterceptor( AuthenticationInterceptor.class.getSimpleName() );
-
         // MaxPDUSize
         directoryService.setMaxPDUSize( directoryServiceBean.getDsMaxPDUSize() );
         

Propchange: directory/apacheds/branches/apacheds-txns/service-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -0,0 +1,10 @@
+/directory/apacheds/branches/apacheds-codec-merge/service-osgi:982369-987590
+/directory/apacheds/branches/apacheds-config/service-osgi:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/service-osgi:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/service-osgi:749790-764110
+/directory/apacheds/branches/apacheds-schema/service-osgi:806623-896441
+/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-1201283
+/directory/studio/trunk/service-osgi:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/service/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/service/pom.xml?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/service/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/service/pom.xml Sat Nov 12 18:24:38 2011
@@ -51,6 +51,11 @@
     
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-codec-standalone</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap-model</artifactId>
     </dependency>
     

Propchange: directory/apacheds/branches/apacheds-txns/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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-1186938
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/test-framework:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/test-framework/pom.xml?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/test-framework/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/test-framework/pom.xml Sat Nov 12 18:24:38 2011
@@ -67,6 +67,11 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-server-annotations</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-codec-standalone</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.directory.shared</groupId>

Propchange: directory/apacheds/branches/apacheds-txns/wrapper/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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,1177937-1180716
+/directory/apacheds/trunk/wrapper:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/wrapper:1067786-1067997

Propchange: directory/apacheds/branches/apacheds-txns/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 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,1177780-1186100
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/xdbm-partition:1067786-1067997

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/pom.xml?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/pom.xml Sat Nov 12 18:24:38 2011
@@ -87,6 +87,12 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
         <executions>
           <execution>
             <id>attach-tests</id>
@@ -98,17 +104,6 @@
       </plugin>
       
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-      </plugin>
-      
-      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>

Modified: directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1201297&r1=1201296&r2=1201297&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/branches/apacheds-txns/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Sat Nov 12 18:24:38 2011
@@ -42,7 +42,7 @@ import org.apache.directory.server.core.
 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.EntryOperationContext;
+import org.apache.directory.server.core.api.interceptor.context.HasEntryOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ListOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.LookupOperationContext;
 import org.apache.directory.server.core.api.interceptor.context.ModifyOperationContext;
@@ -1792,7 +1792,7 @@ public abstract class AbstractBTreeParti
      * if it returns an entry by default.  Please override this method if
      * there is more effective way for your implementation.
      */
-    public boolean hasEntry( EntryOperationContext entryContext ) throws LdapException
+    public boolean hasEntry( HasEntryOperationContext entryContext ) throws LdapException
     {
         try
         {

Propchange: directory/apacheds/branches/apacheds-txns/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 12 18:24:38 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
 /directory/apacheds/branches/milestones/xdbm-tools:1072812-1075328
 /directory/apacheds/trunk/interceptors/xdbm-tools:1183435-1186974
-/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1180716-1186100
+/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283
 /directory/studio/trunk/xdbm-tools:1067786-1067997



Mime
View raw message