svn commit: r697860 - in /directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core: DefaultDirectoryService.java ReferralManagerImpl.java partition/DefaultPartitionNexus.java

[el...@apache.org]

Author: elecharny
Date: Mon Sep 22 07:52:36 2008
New Revision: 697860

URL: http://svn.apache.org/viewvc?rev=697860&view=rev
Log:
Add the initialization of the referral manager in the directoryService

Modified:
    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/ReferralManagerImpl.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java

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=697860&r1=697859&r2=697860&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 Mon Sep 22 07:52:36 2008
@@ -158,6 +158,9 @@
     
     /** session used as admin for internal operations */
     private CoreSession adminSession;
+    
+    /** The referral manager */
+    private ReferralManager referralManager;
 
     /** remove me after implementation is completed */
     private static final String PARTIAL_IMPL_WARNING =
@@ -878,7 +881,18 @@
         setDefaultInterceptorConfigurations();
     }
 
+    
+    /**
+     * @return The referral manager
+     */
+    public ReferralManager getReferralManager()
+    {
+        return referralManager;
+    }
 
+    /**
+     * @return the registries
+     */
     public Registries getRegistries()
     {
         return registries;
@@ -1385,6 +1399,9 @@
         interceptorChain = new InterceptorChain();
         interceptorChain.init( this );
 
+        // Initialize the referralManager
+        referralManager = new ReferralManagerImpl( this );
+        
         if ( changeLog.isEnabled() )
         {
             changeLog.init( this );

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java?rev=697860&r1=697859&r2=697860&view=diff
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java (original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/ReferralManagerImpl.java Mon Sep 22 07:52:36 2008
@@ -52,6 +52,19 @@
 
     
     /**
+     * 
+     * Creates a new instance of ReferralManagerImpl.
+     *
+     * @param directoryService The directory service
+     * @throws Exception If we can't initialize the manager
+     */
+    public ReferralManagerImpl( DirectoryService directoryService ) throws Exception
+    {
+        init( directoryService );
+    }
+    
+    
+    /**
      * {@inheritDoc}
      */
     public void addReferral( LdapDN dn )

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=697860&r1=697859&r2=697860&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 Mon Sep 22 07:52:36 2008
@@ -284,6 +284,7 @@
         oidRegistry = registries.getOidRegistry();
         
         initializeSystemPartition();
+        
         List<Partition> initializedPartitions = new ArrayList<Partition>();
         initializedPartitions.add( 0, this.system );