Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C64FA9D18 for ; Sat, 12 Nov 2011 18:44:09 +0000 (UTC) Received: (qmail 29816 invoked by uid 500); 12 Nov 2011 18:44:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 29766 invoked by uid 500); 12 Nov 2011 18:44:09 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 29759 invoked by uid 99); 12 Nov 2011 18:44:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 18:44:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 18:44:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 79EFA23889CB for ; Sat, 12 Nov 2011 18:43:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201299 - in /directory/apacheds/branches/apacheds-txns: kerberos-codec/ kerberos-codec/src/main/java/org/apache/directory/server/ kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/ kerberos-codec/src/main/ja... Date: Sat, 12 Nov 2011 18:43:39 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111112184341.79EFA23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Sat Nov 12 18:43:38 2011 New Revision: 1201299 URL: http://svn.apache.org/viewvc?rev=1201299&view=rev Log: Merged back trunk into the TXN branch Modified: directory/apacheds/branches/apacheds-txns/kerberos-codec/ (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed) directory/apacheds/branches/apacheds-txns/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed) directory/apacheds/branches/apacheds-txns/kerberos-test/ (props changed) directory/apacheds/branches/apacheds-txns/ldif-partition/ (props changed) directory/apacheds/branches/apacheds-txns/protocol-dhcp/ (props changed) directory/apacheds/branches/apacheds-txns/protocol-dns/ (props changed) directory/apacheds/branches/apacheds-txns/protocol-kerberos/ (props changed) directory/apacheds/branches/apacheds-txns/protocol-ldap/ (props changed) directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java (props changed) directory/apacheds/branches/apacheds-txns/protocol-ntp/ (props changed) directory/apacheds/branches/apacheds-txns/protocol-shared/ (props changed) directory/apacheds/branches/apacheds-txns/server-annotations/ (props changed) directory/apacheds/branches/apacheds-txns/server-config/ (props changed) directory/apacheds/branches/apacheds-txns/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed) directory/apacheds/branches/apacheds-txns/server-config/src/main/resources/ (props changed) directory/apacheds/branches/apacheds-txns/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed) directory/apacheds/branches/apacheds-txns/server-integ/ (props changed) directory/apacheds/branches/apacheds-txns/server-jndi/ (props changed) directory/apacheds/branches/apacheds-txns/server-replication/ (props changed) directory/apacheds/branches/apacheds-txns/service/ (props changed) directory/apacheds/branches/apacheds-txns/service-builder/ (props changed) directory/apacheds/branches/apacheds-txns/service-osgi/ (props changed) directory/apacheds/branches/apacheds-txns/test-framework/ (props changed) directory/apacheds/branches/apacheds-txns/wrapper/ (props changed) directory/apacheds/branches/apacheds-txns/xdbm-partition/ (props changed) Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43:38 2011 @@ -7,5 +7,5 @@ /directory/apacheds/branches/milestones/kerberos-codec:1072812-1075328 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec:945827-946347 /directory/apacheds/trunk/interceptors/kerberos-codec:1183435-1186974 -/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283 +/directory/apacheds/trunk/kerberos-codec:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43:38 2011 @@ -4,5 +4,5 @@ /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072812-1075328 /directory/apacheds/trunk/interceptors/kerberos-codec/src/main/java/org/apache/directory/server:1183435-1186974 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43:38 2011 @@ -4,5 +4,5 @@ /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328 /directory/apacheds/trunk/interceptors/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1183435-1186974 /directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1181278-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/codec/KerberosProtocolCodecFactory.java:1181278-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43:38 2011 @@ -4,5 +4,5 @@ /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072812-1075328 /directory/apacheds/trunk/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1183435-1186974 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43:38 2011 @@ -3,5 +3,5 @@ /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936 /directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1072812-1075328 /directory/apacheds/trunk/interceptors/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1183435-1186974 -/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/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:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/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:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/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:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/kerberos-codec/src/test/java/org/apache/directory/server/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /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:43: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-1201283 +/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/kerberos-test:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/ldif-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/ldif-partition:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/protocol-dhcp/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/protocol-dhcp:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/protocol-dns/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/protocol-dns:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/protocol-kerberos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/protocol-kerberos:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/protocol-ldap/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/protocol-ldap:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/consumer/ReplicationConsumerImpl.java:1177661-1201298 /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:43: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-1201283 +/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/protocol-ntp:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/protocol-shared/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/protocol-shared:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/server-annotations/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/server-annotations:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/server-config/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /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:43: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-1201283 +/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /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:43: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-1201283 +/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /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:43: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-1201283 +/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /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:43: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-1201283 +/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/server-integ:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/server-jndi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/server-jndi:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/server-replication/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/server-replication:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/service/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/service:1177661-1201298 Propchange: directory/apacheds/branches/apacheds-txns/service-builder/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/service-builder:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/service-osgi/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43:38 2011 @@ -6,5 +6,5 @@ /directory/apacheds/branches/apacheds-subtree/service-osgi:965203-965686 /directory/apacheds/branches/milestones/service-osgi:1072812-1075328 /directory/apacheds/branches/xdbm-refactoring/service-osgi:945827-946347 -/directory/apacheds/trunk/service-osgi:1066126-1067785,1068026-1072718,1072800-1075329,1185396-1201283 +/directory/apacheds/trunk/service-osgi:1066126-1067785,1068026-1072718,1072800-1075329,1185396-1201298 /directory/studio/trunk/service-osgi:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/test-framework/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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-1201283 +/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/test-framework:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/wrapper/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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,1177661-1201283 +/directory/apacheds/trunk/wrapper:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/wrapper:1067786-1067997 Propchange: directory/apacheds/branches/apacheds-txns/xdbm-partition/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 12 18:43: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,1177661-1201283 +/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1177661-1201298 /directory/studio/trunk/xdbm-partition:1067786-1067997