directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1072788 - in /directory/apacheds/branches/m1: ./ 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/core/coll...
Date Sun, 20 Feb 2011 22:53:37 GMT
Author: akarasulu
Date: Sun Feb 20 22:53:36 2011
New Revision: 1072788

URL: http://svn.apache.org/viewvc?rev=1072788&view=rev
Log:
merging in from trunk before swapping out trunk

Modified:
    directory/apacheds/branches/m1/   (props changed)
    directory/apacheds/branches/m1/all/   (props changed)
    directory/apacheds/branches/m1/core/   (props changed)
    directory/apacheds/branches/m1/core-annotations/   (props changed)
    directory/apacheds/branches/m1/core-api/   (props changed)
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java   (props changed)
    directory/apacheds/branches/m1/core-avl/   (props changed)
    directory/apacheds/branches/m1/core-constants/   (props changed)
    directory/apacheds/branches/m1/core-integ/   (props changed)
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/branches/m1/core-jndi/   (props changed)
    directory/apacheds/branches/m1/http-integration/   (props changed)
    directory/apacheds/branches/m1/i18n/   (props changed)
    directory/apacheds/branches/m1/installers/   (props changed)
    directory/apacheds/branches/m1/installers-maven-plugin/   (props changed)
    directory/apacheds/branches/m1/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/m1/jdbm/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/m1/kerberos-test/   (props changed)
    directory/apacheds/branches/m1/ldif-partition/   (props changed)
    directory/apacheds/branches/m1/protocol-changepw/   (props changed)
    directory/apacheds/branches/m1/protocol-dhcp/   (props changed)
    directory/apacheds/branches/m1/protocol-dns/   (props changed)
    directory/apacheds/branches/m1/protocol-kerberos/   (props changed)
    directory/apacheds/branches/m1/protocol-ldap/   (props changed)
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java   (props changed)
    directory/apacheds/branches/m1/protocol-ntp/   (props changed)
    directory/apacheds/branches/m1/protocol-shared/   (props changed)
    directory/apacheds/branches/m1/server-annotations/   (props changed)
    directory/apacheds/branches/m1/server-config/   (props changed)
    directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/branches/m1/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/branches/m1/server-integ/   (props changed)
    directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/branches/m1/server-jndi/   (props changed)
    directory/apacheds/branches/m1/server-replication/   (props changed)
    directory/apacheds/branches/m1/server-tools/   (props changed)
    directory/apacheds/branches/m1/service-builder/   (props changed)
    directory/apacheds/branches/m1/test-framework/   (props changed)
    directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java
    directory/apacheds/branches/m1/xdbm-partition/   (props changed)
    directory/apacheds/branches/m1/xdbm-tools/   (props changed)

Propchange: directory/apacheds/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-schema:806623-896441
 /directory/apacheds/branches/apacheds-subtree:965203-965686
 /directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk:1066126-1067785,1068026-1072718
 /directory/studio/trunk:1067786-1067997

Propchange: directory/apacheds/branches/m1/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/all:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
-/directory/apacheds/trunk/all:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/all:1066126-1067785,1068026-1072718
 /directory/studio/trunk/all:1067786-1067997

Propchange: directory/apacheds/branches/m1/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-config/core:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
-/directory/apacheds/trunk/core:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-config/core-annotations:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
-/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core-annotations:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-annotations:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/core-api:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
-/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core-api:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-api:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
 /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-1071140
+/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/core-avl:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
-/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core-avl:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-avl:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/core-constants:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
-/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core-constants:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-constants:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/core-integ:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
-/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core-integ:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-integ:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:965202-966561
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /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-1071140
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/core-jndi:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
-/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/core-jndi:1066126-1067785,1068026-1072718
 /directory/studio/trunk/core-jndi:1067786-1067997

Propchange: directory/apacheds/branches/m1/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/http-integration:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
-/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/http-integration:1066126-1067785,1068026-1072718
 /directory/studio/trunk/http-integration:1067786-1067997

Propchange: directory/apacheds/branches/m1/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/i18n:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
-/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/i18n:1066126-1067785,1068026-1072718
 /directory/studio/trunk/i18n:1067786-1067997

Propchange: directory/apacheds/branches/m1/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-config/installers:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
-/directory/apacheds/trunk/installers:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1072718
 /directory/installers/branches/installers-schema/apacheds:806631-896441
 /directory/studio/trunk/installers:1067786-1067997

Propchange: directory/apacheds/branches/m1/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -1,5 +1,5 @@
 /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/trunk/installers-maven-plugin:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1072718
 /directory/daemon/branches/daemon-schema/plugin:806630-896441
 /directory/studio/trunk/installers-maven-plugin:1067786-1067997

Propchange: directory/apacheds/branches/m1/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/interceptor-kerberos:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785,1068026-1072718
 /directory/studio/trunk/interceptor-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/m1/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/jdbm:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
-/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/jdbm:1066126-1067785,1068026-1072718
 /directory/studio/trunk/jdbm:1067786-1067997

Propchange: directory/apacheds/branches/m1/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/jdbm-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
-/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785,1068026-1072718
 /directory/studio/trunk/jdbm-partition:1067786-1067997

Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
 /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-1071140
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785,1068026-1072718
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:1067786-1067997

Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:809853-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
 /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-1071140
+/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
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
 /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-1071140
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785,1068026-1072718
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:1067786-1067997

Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-810034
 /directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
 /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-1071140
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785,1068026-1072718
 /directory/studio/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:982369-987590
 /directory/apacheds/branches/apacheds-config/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:982369-987590
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -5,5 +5,5 @@
 /directory/apacheds/branches/apacheds-schema/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-shared/src/test/java/org/apache/directory/server:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1067786-1067997

Propchange: directory/apacheds/branches/m1/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-test:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
-/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1072718
 /directory/studio/trunk/kerberos-test:1067786-1067997

Propchange: directory/apacheds/branches/m1/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/ldif-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
-/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1072718
 /directory/studio/trunk/ldif-partition:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-changepw:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-changepw:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-dhcp:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-dhcp:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-dns:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
-/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-dns:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-kerberos:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-kerberos:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-ldap:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-ldap:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-schema/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
 /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-1071140
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-ntp:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-ntp:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-shared:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
-/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1072718
 /directory/studio/trunk/protocol-shared:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-annotations:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
-/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-annotations:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-config:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -11,5 +11,5 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-config/src/main/resources:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -10,5 +10,5 @@
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-config/server-integ:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
-/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-integ:1067786-1067997

Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1072788&r1=1072787&r2=1072788&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Sun Feb 20 22:53:36 2011
@@ -332,7 +332,7 @@ public class SaslBindIT extends Abstract
         DigestMd5Request request = new DigestMd5Request();
         request.setUsername( userDn.getRdn().getUpValue().getString() );
         request.setCredentials( "secret" );
-        request.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
+        request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
         BindResponse resp = connection.bind( request );
         assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
 
@@ -375,7 +375,7 @@ public class SaslBindIT extends Abstract
         DigestMd5Request request = new DigestMd5Request();
         request.setUsername( userDn.getRdn().getUpValue().getString() );
         request.setCredentials( "badsecret" );
-        request.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
+        request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
         BindResponse resp = connection.bind( request );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, resp.getLdapResult().getResultCode() );
 
@@ -395,7 +395,7 @@ public class SaslBindIT extends Abstract
         GssApiRequest request = new GssApiRequest();
         request.setUsername( userDn.getRdn().getUpValue().getString() );
         request.setCredentials( "secret" );
-        request.setRealmName( getLdapServer().getSaslRealms().get( 0 ).toUpperCase() );
+        request.setRealmName( ldapServer.getSaslRealms().get( 0 ).toUpperCase() );
         request.setKdcHost( "localhost" );
         request.setKdcPort( 6088 );
         BindResponse resp = connection.bind( request );
@@ -415,7 +415,7 @@ public class SaslBindIT extends Abstract
     public void testSaslGssApiBindBadRealm() throws Exception
     {
         Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
-        LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+        LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         GssApiRequest request = new GssApiRequest();
         request.setUsername( userDn.getRdn().getUpValue().getString() );
@@ -445,12 +445,12 @@ public class SaslBindIT extends Abstract
     public void testSaslGssApiBindBadPassword() throws Exception
     {
         Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
-        LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+        LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
 
         GssApiRequest request = new GssApiRequest();
         request.setUsername( userDn.getRdn().getUpValue().getString() );
         request.setCredentials( "badsecret" );
-        request.setRealmName( getLdapServer().getSaslRealms().get( 0 ).toUpperCase() );
+        request.setRealmName( ldapServer.getSaslRealms().get( 0 ).toUpperCase() );
         request.setKdcHost( "localhost" );
         request.setKdcPort( 6088 );
         try
@@ -537,11 +537,11 @@ public class SaslBindIT extends Abstract
             System.out.println( "try " + i );
 
             // Digest-MD5
-            connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+            connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
             DigestMd5Request digetDigestMd5Request = new DigestMd5Request();
             digetDigestMd5Request.setUsername( userDn.getRdn().getUpValue().getString() );
             digetDigestMd5Request.setCredentials( "secret" );
-            digetDigestMd5Request.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
+            digetDigestMd5Request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
             resp = connection.bind( digetDigestMd5Request );
             assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
             entry = connection.lookup( userDn );
@@ -549,7 +549,7 @@ public class SaslBindIT extends Abstract
             connection.close();
 
             // Cram-MD5
-            connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+            connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
             CramMd5Request cramMd5Request = new CramMd5Request();
             cramMd5Request.setUsername( userDn.getRdn().getUpValue().getString() );
             cramMd5Request.setCredentials( "secret" );
@@ -560,11 +560,11 @@ public class SaslBindIT extends Abstract
             connection.close();
 
             // GSSAPI
-            connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+            connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
             GssApiRequest gssApiRequest = new GssApiRequest();
             gssApiRequest.setUsername( userDn.getRdn().getUpValue().getString() );
             gssApiRequest.setCredentials( "secret" );
-            gssApiRequest.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
+            gssApiRequest.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
             gssApiRequest.setKdcHost( "localhost" );
             gssApiRequest.setKdcPort( 6088 );
             resp = connection.bind( gssApiRequest );
@@ -634,7 +634,7 @@ public class SaslBindIT extends Abstract
 
             // Retrieve the response back from server to my last request.
             LdapMessageContainer container = new LdapMessageContainer(
-                getLdapServer().getDirectoryService().getLdapCodecService() );
+                ldapServer.getDirectoryService().getLdapCodecService() );
             decoder.setLdapMessageContainer( container );
             return ( BindResponse ) decoder.decode( null, _input_ );
         }

Propchange: directory/apacheds/branches/m1/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-jndi:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
-/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-jndi:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-replication:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
-/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-replication:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-tools:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
-/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1072718
 /directory/studio/trunk/server-tools:1067786-1067997

Propchange: directory/apacheds/branches/m1/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -1,3 +1,3 @@
 /directory/apacheds/branches/antoine/service-builder:1038305-1044163
-/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1072718
 /directory/studio/trunk/service-builder:1067786-1067997

Propchange: directory/apacheds/branches/m1/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-schema/test-framework:806623-893782
 /directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1072718
 /directory/studio/trunk/test-framework:1067786-1067997

Modified: directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java?rev=1072788&r1=1072787&r2=1072788&view=diff
==============================================================================
--- directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java (original)
+++ directory/apacheds/branches/m1/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java Sun Feb 20 22:53:36 2011
@@ -33,10 +33,10 @@ import org.apache.directory.server.ldap.
 public abstract class AbstractLdapTestUnit
 {
     /** The used DirectoryService instance */
-    private static DirectoryService service;
+    public static DirectoryService service;
 
     /** The used LdapServer instance */
-    private static LdapServer ldapServer;
+    public static LdapServer ldapServer;
 
     /** The used KdcServer instance */
     public static KdcServer kdcServer;

Propchange: directory/apacheds/branches/m1/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/xdbm-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
-/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1072718
 /directory/studio/trunk/xdbm-partition:1067786-1067997

Propchange: directory/apacheds/branches/m1/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 20 22:53:36 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/xdbm-tools:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
-/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1071140
+/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718
 /directory/studio/trunk/xdbm-tools:1067786-1067997



Mime
View raw message