directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1028542 - in /directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server: AbstractLayout.java ApacheDsService.java InstallationLayout.java InstanceLayout.java UberjarMain.java
Date Thu, 28 Oct 2010 23:31:39 GMT
Author: elecharny
Date: Thu Oct 28 23:31:39 2010
New Revision: 1028542

URL: http://svn.apache.org/viewvc?rev=1028542&view=rev
Log:
Moved the InstanceLayout from this project

Removed:
    directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/AbstractLayout.java
    directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/InstanceLayout.java
Modified:
    directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/InstallationLayout.java
    directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/UberjarMain.java

Modified: directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/ApacheDsService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/ApacheDsService.java?rev=1028542&r1=1028541&r2=1028542&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/ApacheDsService.java
(original)
+++ directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/ApacheDsService.java
Thu Oct 28 23:31:39 2010
@@ -41,6 +41,7 @@ import org.apache.directory.server.confi
 import org.apache.directory.server.config.beans.NtpServerBean;
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.InstanceLayout;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.ModifyOperationContext;
@@ -182,7 +183,7 @@ public class ApacheDsService
         startKerberos( directoryServiceBean.getKdcServerBean(), directoryService );
 
         // start the jetty http server
-        startHttpServer( directoryServiceBean.getHttpServerBean(), directoryService );
+        //startHttpServer( directoryServiceBean.getHttpServerBean(), directoryService );
     }
 
 
@@ -266,8 +267,7 @@ public class ApacheDsService
         
         long startTime = System.currentTimeMillis();
 
-        DirectoryService directoryService = ConfigBuilder.createDirectoryService( directoryServiceBean,
instanceLayout.getInstanceDirectory() );
-        directoryService.setSchemaManager( schemaManager );
+        DirectoryService directoryService = ConfigBuilder.createDirectoryService( directoryServiceBean,
instanceLayout, schemaManager );
 
         SchemaPartition schemaPartition = directoryService.getSchemaService().getSchemaPartition();
         schemaPartition.setWrappedPartition( schemaLdifPartition );
@@ -275,7 +275,8 @@ public class ApacheDsService
 
         directoryService.addPartition( configPartition );
 
-        directoryService.setWorkingDirectory( instanceLayout.getInstanceDirectory() );
+        // Store the default directories
+        directoryService.setInstanceLayout( instanceLayout );
 
         directoryService.startup();
 

Modified: directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/InstallationLayout.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/InstallationLayout.java?rev=1028542&r1=1028541&r2=1028542&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/InstallationLayout.java
(original)
+++ directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/InstallationLayout.java
Thu Oct 28 23:31:39 2010
@@ -23,6 +23,8 @@ package org.apache.directory.server;
 
 import java.io.File;
 
+import org.apache.directory.server.core.AbstractLayout;
+
 
 /**
  * Convenience class to encapsulate paths to various directories and files within

Modified: directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/UberjarMain.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/UberjarMain.java?rev=1028542&r1=1028541&r2=1028542&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/UberjarMain.java
(original)
+++ directory/apacheds/branches/apacheds-config/service/src/main/java/org/apache/directory/server/UberjarMain.java
Thu Oct 28 23:31:39 2010
@@ -20,6 +20,7 @@
 package org.apache.directory.server;
 
 
+import org.apache.directory.server.core.InstanceLayout;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,12 +59,14 @@ public class UberjarMain
             }
             catch ( Exception e )
             {
+                e.printStackTrace();
                 LOG.error( "Failed to start the service.", e );
                 System.exit( 1 );
             }
         }
         else
         {
+            // TODO default to the current directory.
             throw new IllegalArgumentException(
                 "Program must be launched with 1 arguement, the path to the instance directory."
);
         }



Mime
View raw message