You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/08 17:38:36 UTC
svn commit: r1079424 - in /directory/apacheds/branches/milestones: ./ all/
core-annotations/ core-api/
core-api/src/main/java/org/apache/directory/server/core/ core-avl/
core-constants/ core-integ/
core-integ/src/test/java/org/apache/directory/server/c...
Author: akarasulu
Date: Tue Mar 8 16:38:34 2011
New Revision: 1079424
URL: http://svn.apache.org/viewvc?rev=1079424&view=rev
Log:
merging in from trunk to milestones
Modified:
directory/apacheds/branches/milestones/ (props changed)
directory/apacheds/branches/milestones/all/ (props changed)
directory/apacheds/branches/milestones/core/ (props changed)
directory/apacheds/branches/milestones/core-annotations/ (props changed)
directory/apacheds/branches/milestones/core-api/ (props changed)
directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java (props changed)
directory/apacheds/branches/milestones/core-avl/ (props changed)
directory/apacheds/branches/milestones/core-constants/ (props changed)
directory/apacheds/branches/milestones/core-integ/ (props changed)
directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (props changed)
directory/apacheds/branches/milestones/core-jndi/ (props changed)
directory/apacheds/branches/milestones/http-integration/ (props changed)
directory/apacheds/branches/milestones/i18n/ (props changed)
directory/apacheds/branches/milestones/installers/ (props changed)
directory/apacheds/branches/milestones/installers-maven-plugin/ (props changed)
directory/apacheds/branches/milestones/interceptor-kerberos/ (props changed)
directory/apacheds/branches/milestones/jdbm/ (props changed)
directory/apacheds/branches/milestones/jdbm-partition/ (props changed)
directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed)
directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed)
directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ (props changed)
directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed)
directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/milestones/kerberos-test/ (props changed)
directory/apacheds/branches/milestones/ldif-partition/ (props changed)
directory/apacheds/branches/milestones/protocol-changepw/ (props changed)
directory/apacheds/branches/milestones/protocol-dhcp/ (props changed)
directory/apacheds/branches/milestones/protocol-dns/ (props changed)
directory/apacheds/branches/milestones/protocol-kerberos/ (props changed)
directory/apacheds/branches/milestones/protocol-ldap/ (props changed)
directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (props changed)
directory/apacheds/branches/milestones/protocol-ntp/ (props changed)
directory/apacheds/branches/milestones/protocol-shared/ (props changed)
directory/apacheds/branches/milestones/server-annotations/ (props changed)
directory/apacheds/branches/milestones/server-config/ (props changed)
directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/milestones/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/milestones/server-integ/ (props changed)
directory/apacheds/branches/milestones/server-jndi/ (props changed)
directory/apacheds/branches/milestones/server-replication/ (props changed)
directory/apacheds/branches/milestones/server-tools/ (props changed)
directory/apacheds/branches/milestones/service-builder/ (props changed)
directory/apacheds/branches/milestones/test-framework/ (props changed)
directory/apacheds/branches/milestones/xdbm-partition/ (props changed)
directory/apacheds/branches/milestones/xdbm-tools/ (props changed)
Propchange: directory/apacheds/branches/milestones/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree:965203-965686
/directory/apacheds/branches/milestones:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk:1067786-1067997
Propchange: directory/apacheds/branches/milestones/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
/directory/apacheds/branches/milestones/all:1072812-1075328
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/all:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
/directory/apacheds/branches/milestones/core:1072812-1075328
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
/directory/apacheds/branches/milestones/core-annotations:1072812-1075328
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-annotations:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
/directory/apacheds/branches/milestones/core-api:1072812-1075328
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-api:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
/directory/apacheds/branches/milestones/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347
-/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
/directory/apacheds/branches/milestones/core-avl:1072812-1075328
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-avl:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
/directory/apacheds/branches/milestones/core-constants:1072812-1075328
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-constants:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
/directory/apacheds/branches/milestones/core-integ:1072812-1075328
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-integ:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
/directory/apacheds/branches/milestones/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
/directory/apacheds/branches/milestones/core-jndi:1072812-1075328
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/core-jndi:1067786-1067997
Propchange: directory/apacheds/branches/milestones/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
/directory/apacheds/branches/milestones/http-integration:1072812-1075328
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/http-integration:1067786-1067997
Propchange: directory/apacheds/branches/milestones/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
/directory/apacheds/branches/milestones/i18n:1072812-1075328
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/i18n:1067786-1067997
Propchange: directory/apacheds/branches/milestones/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
/directory/apacheds/branches/milestones/installers:1072812-1075328
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/installers/branches/installers-schema/apacheds:806631-896441
/directory/studio/trunk/installers:1067786-1067997
Propchange: directory/apacheds/branches/milestones/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -1,6 +1,6 @@
/directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
/directory/apacheds/branches/milestones/installers-maven-plugin:1072812-1075328
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/daemon/branches/daemon-schema/plugin:806630-896441
/directory/studio/trunk/installers-maven-plugin:1067786-1067997
Propchange: directory/apacheds/branches/milestones/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/interceptor-kerberos:1072812-1075328
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/interceptor-kerberos:1067786-1067997
Propchange: directory/apacheds/branches/milestones/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
/directory/apacheds/branches/milestones/jdbm:1072812-1075328
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/jdbm:1067786-1067997
Propchange: directory/apacheds/branches/milestones/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
/directory/apacheds/branches/milestones/jdbm-partition:1072812-1075328
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/jdbm-partition:1067786-1067997
Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997
Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1067786-1067997
Propchange: directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -7,5 +7,5 @@
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/milestones/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -2,5 +2,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 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/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -2,5 +2,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -6,5 +6,5 @@
/directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
/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/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/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/branches/milestones/kerberos-codec/src/test/java/org/apache/directory/server:1072812-1075328
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997
Propchange: directory/apacheds/branches/milestones/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
/directory/apacheds/branches/milestones/kerberos-test:1072812-1075328
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/kerberos-test:1067786-1067997
Propchange: directory/apacheds/branches/milestones/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
/directory/apacheds/branches/milestones/ldif-partition:1072812-1075328
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/ldif-partition:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
/directory/apacheds/branches/milestones/protocol-changepw:1072812-1075328
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-changepw:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
/directory/apacheds/branches/milestones/protocol-dhcp:1072812-1075328
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-dhcp:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
/directory/apacheds/branches/milestones/protocol-dns:1072812-1075328
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-dns:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
/directory/apacheds/branches/milestones/protocol-kerberos:1072812-1075328
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-kerberos:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ldap:1072812-1075328
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-ldap:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -8,5 +8,5 @@
/directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
/directory/apacheds/branches/milestones/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
/directory/apacheds/branches/milestones/protocol-ntp:1072812-1075328
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-ntp:1067786-1067997
Propchange: directory/apacheds/branches/milestones/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
/directory/apacheds/branches/milestones/protocol-shared:1072812-1075328
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/protocol-shared:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
/directory/apacheds/branches/milestones/server-annotations:1072812-1075328
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-annotations:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -5,5 +5,5 @@
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
/directory/apacheds/branches/milestones/server-config:1072812-1075328
/directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-config:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1072812-1075328
/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:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -12,5 +12,5 @@
/directory/apacheds/branches/milestones/server-config/src/main/resources:1072812-1075328
/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:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-config/src/main/resources:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -11,5 +11,5 @@
/directory/apacheds/branches/milestones/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1072812-1075328
/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:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -4,5 +4,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
/directory/apacheds/branches/milestones/server-integ:1072812-1075328
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-integ:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
/directory/apacheds/branches/milestones/server-jndi:1072812-1075328
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-jndi:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
/directory/apacheds/branches/milestones/server-replication:1072812-1075328
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-replication:1067786-1067997
Propchange: directory/apacheds/branches/milestones/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
/directory/apacheds/branches/milestones/server-tools:1072812-1075328
-/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/server-tools:1067786-1067997
Propchange: directory/apacheds/branches/milestones/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/antoine/service-builder:1038305-1044163
/directory/apacheds/branches/milestones/service-builder:1072812-1075328
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/service-builder:1067786-1067997
Propchange: directory/apacheds/branches/milestones/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -9,5 +9,5 @@
/directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
/directory/apacheds/branches/milestones/test-framework:1072812-1075328
/directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/test-framework:1067786-1067997
Propchange: directory/apacheds/branches/milestones/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
/directory/apacheds/branches/milestones/xdbm-partition:1072812-1075328
-/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/xdbm-partition:1067786-1067997
Propchange: directory/apacheds/branches/milestones/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 16:38:34 2011
@@ -3,5 +3,5 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
/directory/apacheds/branches/milestones/xdbm-tools:1072812-1075328
-/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079041
+/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1075837-1079422
/directory/studio/trunk/xdbm-tools:1067786-1067997