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/06/04 19:09:41 UTC
svn commit: r951494 - in /directory/apacheds/trunk:
core-api/src/main/java/org/apache/directory/server/core/interceptor/context/
core-api/src/main/java/org/apache/directory/server/core/partition/
core/src/main/java/org/apache/directory/server/core/ cor...
Author: elecharny
Date: Fri Jun 4 17:09:41 2010
New Revision: 951494
URL: http://svn.apache.org/viewvc?rev=951494&view=rev
Log:
Removed the AddContextPartitionOperation class, which is not used anymore
Removed:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddContextPartitionOperationContext.java
Modified:
directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java?rev=951494&r1=951493&r2=951494&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/partition/PartitionNexus.java Fri Jun 4 17:09:41 2010
@@ -23,7 +23,6 @@ package org.apache.directory.server.core
import java.util.Set;
import org.apache.directory.server.core.entry.ClonedServerEntry;
-import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
import org.apache.directory.server.core.interceptor.context.GetMatchedNameOperationContext;
import org.apache.directory.server.core.interceptor.context.GetRootDSEOperationContext;
@@ -67,10 +66,10 @@ public interface PartitionNexus extends
/**
* Add a partition to the server.
*
- * @param opContext The Add Partition context
+ * @param Partition The Partition to add
* @throws Exception If the addition can't be done
*/
- public void addContextPartition( AddContextPartitionOperationContext opContext ) throws LdapException;
+ public void addContextPartition( Partition partition ) throws LdapException;
/**
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=951494&r1=951493&r2=951494&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Fri Jun 4 17:09:41 2010
@@ -51,7 +51,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.exception.ExceptionInterceptor;
import org.apache.directory.server.core.interceptor.Interceptor;
import org.apache.directory.server.core.interceptor.InterceptorChain;
-import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.interceptor.context.EntryOperationContext;
@@ -593,9 +592,7 @@ public class DefaultDirectoryService imp
return;
}
- AddContextPartitionOperationContext addPartitionCtx =
- new AddContextPartitionOperationContext( adminSession, partition );
- partitionNexus.addContextPartition( addPartitionCtx );
+ partitionNexus.addContextPartition( partition );
}
Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?rev=951494&r1=951493&r2=951494&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java Fri Jun 4 17:09:41 2010
@@ -44,7 +44,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.filtering.BaseEntryFilteringCursor;
import org.apache.directory.server.core.filtering.CursorList;
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext;
import org.apache.directory.server.core.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
import org.apache.directory.server.core.interceptor.context.CompareOperationContext;
@@ -238,13 +237,8 @@ public class DefaultPartitionNexus exten
for ( Partition partition : directoryService.getPartitions() )
{
partition.setSchemaManager( schemaManager );
- CoreSession adminSession = new DefaultCoreSession( new LdapPrincipal( adminDn,
- AuthenticationLevel.STRONG ), directoryService );
-
- AddContextPartitionOperationContext opCtx = new AddContextPartitionOperationContext( adminSession,
- partition );
- addContextPartition( opCtx );
- initializedPartitions.add( opCtx.getPartition() );
+ addContextPartition( partition );
+ initializedPartitions.add( partition );
}
createContextCsnModList();
@@ -946,10 +940,8 @@ public class DefaultPartitionNexus exten
/* (non-Javadoc)
* @see org.apache.directory.server.core.partition.PartitionNexus#addContextPartition(org.apache.directory.server.core.interceptor.context.AddContextPartitionOperationContext)
*/
- public synchronized void addContextPartition( AddContextPartitionOperationContext opContext ) throws LdapException
+ public synchronized void addContextPartition( Partition partition ) throws LdapException
{
- Partition partition = opContext.getPartition();
-
// Turn on default indices
String key = partition.getSuffixDn().getNormName();