directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r811321 - in /directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition: avl/AvlPartition.java ldif/LdifPartition.java
Date Fri, 04 Sep 2009 09:29:44 GMT
Author: elecharny
Date: Fri Sep  4 09:29:44 2009
New Revision: 811321

URL: http://svn.apache.org/viewvc?rev=811321&view=rev
Log:
Fixed the breakage due to the Partition modifications

Modified:
    directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
    directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java

Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java?rev=811321&r1=811320&r2=811321&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
(original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/avl/AvlPartition.java
Fri Sep  4 09:29:44 2009
@@ -59,7 +59,6 @@
 {
     private boolean optimizerEnabled = true;
     private Set<AvlIndex<?, ServerEntry>> indexedAttributes;
-    private String suffix;
 
     private AvlStore<ServerEntry> store;
 
@@ -109,7 +108,7 @@
 
         // initialize the store
         store.setName( getId() );
-        store.setSuffixDn( suffix );
+        store.setSuffixDn( suffix.getUpName() );
 
         Set<Index<?, ServerEntry>> userIndices = new HashSet<Index<?, ServerEntry>>();
 
@@ -476,21 +475,9 @@
     }
 
 
-    public String getSuffix()
+    public LdapDN getSuffix()
     {
-        return super.suffix;
-    }
-
-
-    public LdapDN getSuffixDn() throws Exception
-    {
-        return store.getSuffix();
-    }
-
-
-    public LdapDN getUpSuffixDn() throws Exception
-    {
-        return store.getUpSuffix();
+        return suffix;
     }
 
 

Modified: directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=811321&r1=811320&r2=811321&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
(original)
+++ directory/apacheds/branches/apacheds-schema/avl-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
Fri Sep  4 09:29:44 2009
@@ -26,6 +26,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import javax.naming.InvalidNameException;
+
 import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
@@ -209,7 +211,7 @@
      */
     public void loadConfig() throws Exception
     {
-        File dir = new File( configParentDirectory, wrappedPartition.getSuffixDn().getUpName()
);
+        File dir = new File( configParentDirectory, wrappedPartition.getSuffix().getUpName()
);
 
         //        if( ! dir.exists() )
         //        {
@@ -581,24 +583,12 @@
     }
 
 
-    public String getSuffix()
+    public LdapDN getSuffix()
     {
         return wrappedPartition.getSuffix();
     }
 
 
-    public LdapDN getSuffixDn() throws Exception
-    {
-        return wrappedPartition.getSuffixDn();
-    }
-
-
-    public LdapDN getUpSuffixDn() throws Exception
-    {
-        return wrappedPartition.getUpSuffixDn();
-    }
-
-
     public void unbind( UnbindOperationContext unbindContext ) throws Exception
     {
         wrappedPartition.unbind( unbindContext );
@@ -630,7 +620,7 @@
 
 
     @Override
-    public void setSuffix( String suffix )
+    public void setSuffix( String suffix ) throws InvalidNameException
     {
         super.setSuffix( suffix );
         wrappedPartition.setSuffix( suffix );



Mime
View raw message