directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r980957 - in /directory/apacheds/trunk: http-integration/ i18n/ interceptor-kerberos/ jdbm-partition/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-partition/src/test/java/org/apache/directory...
Date Fri, 30 Jul 2010 20:54:36 GMT
Author: elecharny
Date: Fri Jul 30 20:54:35 2010
New Revision: 980957

URL: http://svn.apache.org/viewvc?rev=980957&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/http-integration/   (props changed)
    directory/apacheds/trunk/i18n/   (props changed)
    directory/apacheds/trunk/interceptor-kerberos/   (props changed)
    directory/apacheds/trunk/jdbm/   (props changed)
    directory/apacheds/trunk/jdbm-partition/   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
  (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
  (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
  (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
  (props changed)
    directory/apacheds/trunk/kerberos-shared/   (props changed)
    directory/apacheds/trunk/kerberos-test/   (props changed)
    directory/apacheds/trunk/ldif-partition/   (props changed)

Propchange: directory/apacheds/trunk/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
+/directory/apacheds/trunk/http-integration:980025-980137

Propchange: directory/apacheds/trunk/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
+/directory/apacheds/trunk/i18n:980025-980137

Propchange: directory/apacheds/trunk/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935

Propchange: directory/apacheds/trunk/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
+/directory/apacheds/trunk/jdbm:980025-980137

Propchange: directory/apacheds/trunk/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
+/directory/apacheds/trunk/jdbm-partition:980025-980137

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=980957&r1=980956&r2=980957&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
Fri Jul 30 20:54:35 2010
@@ -575,7 +575,7 @@ public class JdbmStoreTest
 
         DN newParentDn = new DN( "ou=Board of Directors,o=Good Times Co.", schemaManager
);
         
-        DN newDn = ((DN)newParentDn.clone()).add( martinDn.getRdn() );
+        DN newDn = newParentDn.add( martinDn.getRdn() );
 
         store.move( martinDn, newParentDn, newDn, entry );
         cursor = idx.forwardCursor( 3L );
@@ -602,7 +602,7 @@ public class JdbmStoreTest
         entry.add( "entryUUID", UUID.randomUUID().toString() );
         store.add( entry );
 
-        newDn = ((DN)newParentDn.clone()).add( marketingDn.getRdn() );
+        newDn = newParentDn.add( marketingDn.getRdn() );
 
         store.move( marketingDn, newParentDn, newDn, entry );
 
@@ -763,7 +763,7 @@ public class JdbmStoreTest
 
         assertEquals( 3, store.getSubAliasIndex().count() );
 
-        DN newDn = ((DN)parentDn.clone()).add( childDn.getRdn() );
+        DN newDn = parentDn.add( childDn.getRdn() );
         
         store.move( childDn, parentDn, newDn, childEntry );
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java?rev=980957&r1=980956&r2=980957&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
Fri Jul 30 20:54:35 2010
@@ -156,8 +156,7 @@ public class ServerEntrySerializerTest
 
         Entry result = ( Entry ) ses.deserialize( data );
 
-        DN newDn = new DN();
-        newDn.add( dn.getRdn() );
+        DN newDn = new DN( dn.getRdn() );
         entry.setDn( newDn );
 
         assertEquals( entry, result );
@@ -180,7 +179,7 @@ public class ServerEntrySerializerTest
         Entry result = ( Entry ) ses.deserialize( data );
 
         DN newDn = new DN();
-        newDn.add( dn.getRdn() );
+        newDn = newDn.add( dn.getRdn() );
         entry.setDn( newDn );
 
         assertEquals( entry, result );
@@ -206,7 +205,7 @@ public class ServerEntrySerializerTest
         Entry result = ( Entry ) ses.deserialize( data );
 
         DN newDn = new DN();
-        newDn.add( dn.getRdn() );
+        newDn = newDn.add( dn.getRdn() );
         entry.setDn( newDn );
 
         assertEquals( entry, result );

Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -1,5 +1,6 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:980138-980935
 /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:749790-764110
 /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*
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,980025-980137

Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -1,4 +1,5 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:980138-980935
 /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:749790-764110
 /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
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,980025-980137

Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -1,5 +1,6 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:980138-980935
 /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:749790-764110
 /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*
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,980025-980137

Propchange: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -1,5 +1,6 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:980138-980935
 /directory/apacheds/branches/apacheds-replication/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:749790-764110
 /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
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,980025-980137

Propchange: directory/apacheds/trunk/kerberos-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared:980138-980936
+/directory/apacheds/trunk/kerberos-shared:980025-980137

Propchange: directory/apacheds/trunk/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
+/directory/apacheds/trunk/kerberos-test:980025-980137

Propchange: directory/apacheds/trunk/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 30 20:54:35 2010
@@ -0,0 +1,2 @@
+/directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
+/directory/apacheds/trunk/ldif-partition:980025-980137



Mime
View raw message