directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1053670 - in /directory/apacheds/branches/apacheds-AP: kerberos-codec/ kerberos-codec/src/main/java/org/apache/directory/server/ kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/ kerberos-codec/src/main/java/org/a...
Date Wed, 29 Dec 2010 16:37:47 GMT
Author: elecharny
Date: Wed Dec 29 16:37:46 2010
New Revision: 1053670

URL: http://svn.apache.org/viewvc?rev=1053670&view=rev
Log:
Merged back some fixes from trunk into the branch

Modified:
    directory/apacheds/branches/apacheds-AP/kerberos-codec/   (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/server/
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/KerberosException.java
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
    directory/apacheds/branches/apacheds-AP/kerberos-codec/src/test/java/org/apache/directory/server/
  (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
  (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
  (props changed)

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -0,0 +1,8 @@
+/directory/apacheds/branches/apacheds-codec-merge/kerberos-codec:982369-987590
+/directory/apacheds/branches/apacheds-config/kerberos-codec:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/kerberos-codec:749790-764110
+/directory/apacheds/branches/apacheds-schema/kerberos-codec:806623-896441
+/directory/apacheds/branches/apacheds-subtree/kerberos-codec:965203-965686
+/directory/apacheds/branches/xdbm-refactoring/kerberos-codec:945827-946347
+/directory/apacheds/trunk/kerberos-codec:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -1,3 +1,4 @@
 /directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:982369-987590
 /directory/apacheds/branches/apacheds-config/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -1,3 +1,4 @@
 /directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:982369-987590
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1049007-1053669

Modified: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java?rev=1053670&r1=1053669&r2=1053670&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
(original)
+++ directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KdcReqBody.java
Wed Dec 29 16:37:46 2010
@@ -464,6 +464,8 @@ public class KdcReqBody extends Abstract
      */
     public int computeLength()
     {
+    	reset();
+    	
         // The KdcOptions length
         kdcOptionsLength = 1 + 1 + kdcOptions.getBytes().length;
         kdcReqBodySeqLength = 1 + TLV.getNbBytes( kdcOptionsLength ) + kdcOptionsLength;

@@ -725,6 +727,33 @@ public class KdcReqBody extends Abstract
 
     
     /**
+     * reset the transient fields used while computing length
+     */
+    private void reset()
+    {
+        kdcOptionsLength = 0;
+        cNameLength = 0;
+        realmLength = 0;
+        realmBytes = null;
+        sNameLength = 0;
+        fromLength = 0;
+        tillLength = 0;
+        rtimeLength = 0;
+        nonceLength = 0;
+        eTypeLength = 0;
+        eTypeSeqLength = 0;
+        eTypeLengths = null;
+        addressesLength = 0;
+        encAuthzDataLength = 0;
+        additionalTicketLength = 0;
+        additionalTicketSeqLength = 0;
+        additionalTicketsLengths = null;
+        kdcReqBodySeqLength = 0;
+        kdcReqBodyLength = 0;
+    }
+    
+    
+    /**
      * @see Object#toString()
      */
     public String toString()

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1049007-1053669

Modified: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/KerberosException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/KerberosException.java?rev=1053670&r1=1053669&r2=1053670&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/KerberosException.java
(original)
+++ directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/exceptions/KerberosException.java
Wed Dec 29 16:37:46 2010
@@ -19,6 +19,8 @@
  */
 package org.apache.directory.shared.kerberos.exceptions;
 
+import org.apache.directory.shared.kerberos.messages.KrbError;
+
 
 /**
  * The root of the Kerberos exception hierarchy.
@@ -29,6 +31,9 @@ public class KerberosException extends E
 {
     private static final long serialVersionUID = 2968072183596955597L;
 
+    /** the kerberos error */
+    private KrbError error;
+    
     /**
      * The Kerberos error code associated with this exception.
      */
@@ -53,7 +58,21 @@ public class KerberosException extends E
         this.errorCode = errorType.getValue();
     }
 
+    
+    /**
+     * 
+     * Creates a new instance of KerberosException.
+     *
+     * @param error the KrbError message
+     */
+    public KerberosException( KrbError error )
+    {
+        super( error.getMessageType().getMessage() );
+        this.errorCode = error.getErrorCode().getValue();
+        this.error = error;
+    }
 
+    
     /**
      * Creates a KerberosException with an {@link ErrorType} and an
      * underlying {@link Throwable} that caused this fault.
@@ -217,4 +236,15 @@ public class KerberosException extends E
         this.errorCode = errorCode;
         this.explanatoryData = explanatoryData;
     }
+
+
+    /**
+     * returns the KrbError message associated with this exception
+     * 
+     * @return the error, can be null
+     */
+    public KrbError getError()
+    {
+        return error;
+    }
 }

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1049007-1053669

Modified: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java?rev=1053670&r1=1053669&r2=1053670&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
(original)
+++ directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/ApReq.java
Wed Dec 29 16:37:46 2010
@@ -216,6 +216,8 @@ public class ApReq extends KerberosMessa
      */
     public int computeLength()
     {
+    	reset();
+    	
         // Compute the PVNO length.
         pvnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
 
@@ -327,6 +329,21 @@ public class ApReq extends KerberosMessa
 
 
     /**
+     * reset the transient fields used while computing length
+     */
+    private void reset()
+    {
+    	pvnoLength = 0;
+        msgTypeLength = 0;
+        apOptionsLength = 0;
+        ticketLength = 0;
+        authenticatorLength = 0;
+        apReqLength = 0;
+        apReqSeqLength = 0;	
+    }
+    
+    
+    /**
      * @see Object#toString()
      */
     public String toString()

Modified: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java?rev=1053670&r1=1053669&r2=1053670&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
(original)
+++ directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/Authenticator.java
Wed Dec 29 16:37:46 2010
@@ -326,6 +326,8 @@ public class Authenticator extends Kerbe
     @Override
     public int computeLength()
     {
+    	reset();
+    	
         // Compute the Authenticator version length.
         authenticatorVnoLength = 1 + 1 + Value.getNbBytes( getProtocolVersionNumber() );
         authenticatorSeqLength =  1 + TLV.getNbBytes( authenticatorVnoLength ) + authenticatorVnoLength;
@@ -530,7 +532,26 @@ public class Authenticator extends Kerbe
     }
 
 
-
+    /**
+     * reset the transient fields used while computing length
+     */
+    private void reset()
+    {
+    	authenticatorVnoLength = 0;
+        crealmLength = 0;
+        crealmBytes = null;
+        cnameLength = 0;
+        cksumLength = 0;
+        cusecLength = 0;
+        ctimeLength = 0;
+        subkeyLength = 0;
+        seqNumberLength = 0;
+        authorizationDataLength = 0;
+        authenticatorSeqLength = 0;
+        authenticatorLength = 0;	
+    }
+    
+    
     /**
      * @see Object#toString()
      */

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -5,3 +5,4 @@
 /directory/apacheds/branches/apacheds-schema/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1049007-1053669

Modified: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java?rev=1053670&r1=1053669&r2=1053670&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
(original)
+++ directory/apacheds/branches/apacheds-AP/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/TgsReq.java
Wed Dec 29 16:37:46 2010
@@ -27,6 +27,7 @@ import org.apache.directory.shared.asn1.
 import org.apache.directory.shared.kerberos.KerberosConstants;
 import org.apache.directory.shared.kerberos.KerberosMessageType;
 import org.apache.directory.shared.kerberos.components.KdcReq;
+import org.apache.directory.shared.ldap.util.StringTools;
 
 
 /**
@@ -64,6 +65,9 @@ public class TgsReq extends KdcReq
      */
     public int computeLength()
     {
+    	kdcReqLength = 0;
+    	tgsReqLength = 0;
+    	
         kdcReqLength = super.computeLength();
         tgsReqLength = 1 + TLV.getNbBytes( kdcReqLength ) + kdcReqLength;
         
@@ -87,7 +91,7 @@ public class TgsReq extends KdcReq
         
         // The TGS-REQ SEQ Tag
         buffer.put( (byte)KerberosConstants.TGS_REQ_TAG );
-        buffer.put( TLV.getBytes( tgsReqLength ) );
+        buffer.put( TLV.getBytes( kdcReqLength ) );
         
         // The KDC-REQ --------------------------------------------------------
         super.encode( buffer );

Propchange: directory/apacheds/branches/apacheds-AP/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -2,3 +2,4 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/test/java/org/apache/directory/server:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -4,4 +4,4 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1049007-1051102
+/directory/apacheds/trunk/server-config:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -8,4 +8,4 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1051102
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -11,4 +11,4 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1049007-1051102
+/directory/apacheds/trunk/server-config/src/main/resources:1049007-1053669

Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 29 16:37:46 2010
@@ -10,4 +10,4 @@
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1051102
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1053669



Mime
View raw message