directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r596814 - /directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
Date Tue, 20 Nov 2007 20:32:34 GMT
Author: akarasulu
Date: Tue Nov 20 12:32:33 2007
New Revision: 596814

URL: http://svn.apache.org/viewvc?rev=596814&view=rev
Log:
fixing slight issue with UberjarMain not being able to utilize defaults

Modified:
    directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java

Modified: directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
URL: http://svn.apache.org/viewvc/directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java?rev=596814&r1=596813&r2=596814&view=diff
==============================================================================
--- directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
(original)
+++ directory/installers/branches/bigbang/apacheds-noarch/src/main/java/org/apache/directory/server/UberjarMain.java
Tue Nov 20 12:32:33 2007
@@ -20,10 +20,10 @@
 package org.apache.directory.server;
 
 
-import java.io.File;
-
 import org.apache.directory.daemon.InstallationLayout;
 
+import java.io.File;
+
 
 /**
  * The command line main for the server.  Warning this used to be a simple test
@@ -46,7 +46,9 @@
 
         if ( args.length > 0 && new File( args[0] ).isDirectory() )
         {
-            server.init( new InstallationLayout( args[0] ), new String[] {} );
+            InstallationLayout layout = new InstallationLayout( args[0] );
+            String confFile = layout.getConfigurationFile().toURI().toURL().toString();
+            server.init( layout, new String[] { confFile } );
             server.start();
         }
         else if ( args.length > 0 && new File( args[0] ).isFile() )



Mime
View raw message