You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/07/30 23:01:14 UTC

svn commit: r980962 - in /directory/apacheds/trunk/server-config: ./ src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java src/main/resources/ src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java

Author: elecharny
Date: Fri Jul 30 21:01:14 2010
New Revision: 980962

URL: http://svn.apache.org/viewvc?rev=980962&view=rev
Log:
o Merged the modifications made by Kiran in the dnFactoryExperient branch.
o DN is now immutable.
o We have a DN cache too.

Modified:
    directory/apacheds/trunk/server-config/   (props changed)
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/trunk/server-config/src/main/resources/   (props changed)
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)

Propchange: directory/apacheds/trunk/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 21:01:14 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
+/directory/apacheds/trunk/server-config:980025-980137

Propchange: directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 21:01:14 2010
@@ -1,4 +1,6 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/ConfigPartitionReader.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /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:980025-980137

Propchange: directory/apacheds/trunk/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 21:01:14 2010
@@ -1,7 +1,9 @@
 /directory/apacheds/branches/apacheds-cidit/default-config/src/main/resources:897934-899975
+/directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/main/resources:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/resources:749790-764110
 /directory/apacheds/branches/apacheds-replication/default-config/src/main/resources:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/resources:806623-896441
 /directory/apacheds/branches/apacheds-schema/default-config/src/main/resources:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
+/directory/apacheds/trunk/server-config/src/main/resources:980025-980137

Propchange: directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 21:01:14 2010
@@ -1,5 +1,7 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:980138-980938
 /directory/apacheds/branches/apacheds-replication/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:749790-764110
 /directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/factory/CiDITDirectoryServiceFactory.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:965203-965686
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /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:980025-980137