directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r373109 - in /directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon: Bootstrapper.java MainBootstrapper.java ProcrunBootstrapper.java
Date Sat, 28 Jan 2006 09:49:24 GMT
Author: akarasulu
Date: Sat Jan 28 01:49:18 2006
New Revision: 373109

URL: http://svn.apache.org/viewcvs?rev=373109&view=rev
Log:
changes ...

 o stopObjectClass field not needed in Bootstrapper
 o corrected javadocs on Boostrapper
 o removed static bootstrapper instance


Modified:
    directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
    directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/MainBootstrapper.java
    directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/ProcrunBootstrapper.java

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java?rev=373109&r1=373108&r2=373109&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/Bootstrapper.java
Sat Jan 28 01:49:18 2006
@@ -28,7 +28,7 @@
 
 
 /**
- * The main bootstrapper used when invoked as an application.
+ * The base bootstrapper extended by all frameworks and java applications.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
@@ -39,8 +39,6 @@
     private static final String[] EMPTY_STRARRY = new String[0];
     private static final String START_CLASS_PROP = "bootstrap.start.class";
     private static final String STOP_CLASS_PROP = "bootstrap.stop.class";
-
-    protected static Bootstrapper instance;
     
     private InstallationLayout install;
     private ClassLoader appLoader;
@@ -48,7 +46,6 @@
     private String startClassName;
     private String stopClassName;
     private Class startObjectClass;
-    private Class stopObjectClass;
     private Object startObject;
     private Object stopObject;
 

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/MainBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/MainBootstrapper.java?rev=373109&r1=373108&r2=373109&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/MainBootstrapper.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/MainBootstrapper.java
Sat Jan 28 01:49:18 2006
@@ -42,15 +42,6 @@
     {
         log.debug( "main(String[]) called" );
         
-        // Noticed that some starts with jar2exe.exe pass in a null arguement list
-        if ( args == null )
-        {
-            System.err.println( "Arguements are null - how come?" );
-            log.error( "main() args were null shutting down!" );
-            printHelp();
-            System.exit( 1 );
-        }
-
         if ( log.isDebugEnabled() )
         {
             log.debug( "main() recieved args:" );
@@ -60,16 +51,13 @@
             }
         }
 
+        MainBootstrapper instance = new MainBootstrapper();
         if ( args.length > 1 )
         {
-            if ( instance == null )
-            {
-                log.debug( "main(String[]) initializing Bootstrapper ... )" );
-                instance = new Bootstrapper();
-                instance.setInstallationLayout( args[0] );
-                instance.setParentLoader( Bootstrapper.class.getClassLoader() );
-                log.debug( "Bootstrapper initialized" );
-            }
+            log.debug( "main(String[]) initializing Bootstrapper ... )" );
+            instance.setInstallationLayout( args[0] );
+            instance.setParentLoader( Bootstrapper.class.getClassLoader() );
+            log.debug( "Bootstrapper initialized" );
         }
         else
         {

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/ProcrunBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/ProcrunBootstrapper.java?rev=373109&r1=373108&r2=373109&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/ProcrunBootstrapper.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/ProcrunBootstrapper.java
Sat Jan 28 01:49:18 2006
@@ -31,7 +31,7 @@
 public class ProcrunBootstrapper extends Bootstrapper
 {
     private final static Logger log = LoggerFactory.getLogger( ProcrunBootstrapper.class
);
-
+    
     
     // -----------------------------------------------------------------------
     // Procrun Entry Points
@@ -54,7 +54,7 @@
         try
         {
             log.debug( "prunsrvStart(String[]) initializing Bootstrapper ... )" );
-            instance = new Bootstrapper();
+            ProcrunBootstrapper instance = new ProcrunBootstrapper();
             instance.setInstallationLayout( args[0] );
             instance.setParentLoader( Bootstrapper.class.getClassLoader() );
 
@@ -87,7 +87,7 @@
         try
         {
             log.debug( "prunsrvStop(String[]) initializing Bootstrapper ... )" );
-            instance = new Bootstrapper();
+            ProcrunBootstrapper instance = new ProcrunBootstrapper();
             instance.setInstallationLayout( args[0] );
             instance.setParentLoader( Bootstrapper.class.getClassLoader() );
 



Mime
View raw message