directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r373105 - in /directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon: Bootstrapper.java JsvcBootstrapper.java
Date Sat, 28 Jan 2006 09:03:53 GMT
Author: akarasulu
Date: Sat Jan 28 01:03:46 2006
New Revision: 373105

URL: http://svn.apache.org/viewcvs?rev=373105&view=rev
Log:
cleaniing up use of properties

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/JsvcBootstrapper.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=373105&r1=373104&r2=373105&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:03:46 2006
@@ -37,15 +37,16 @@
 {
     private static final Logger log = LoggerFactory.getLogger( Bootstrapper.class );
     private static final String[] EMPTY_STRARRY = new String[0];
-    private static final String BOOTSTRAP_START_CLASS_PROP = "bootstrap.start.class";
-    private static final String BOOTSTRAP_STOP_CLASS_PROP = "bootstrap.stop.class";
+    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 final Properties bootstrapProperties = new Properties();
     private InstallationLayout install;
     private ClassLoader appLoader;
     private ClassLoader parentLoader;
+    private String startClassName;
+    private String stopClassName;
     private Object bootstrapped;
 
     
@@ -65,7 +66,10 @@
         
         try
         {
-            bootstrapProperties.load( new FileInputStream( install.getBootstrapperConfigurationFile()
) );
+            Properties props = new Properties();
+            props.load( new FileInputStream( install.getBootstrapperConfigurationFile() )
);
+            startClassName = props.getProperty( START_CLASS_PROP );
+            stopClassName = props.getProperty( STOP_CLASS_PROP );
         }
         catch ( Exception e )
         {
@@ -250,7 +254,7 @@
             log.info( "parentLoader = " + parentLoader );
         }
         
-        callInit( bootstrapProperties.getProperty( BOOTSTRAP_START_CLASS_PROP, null ) );
+        callInit( startClassName );
 
         // This is only needed for procrun but does not harm jsvc or runs 
         // Leads me to think that we need to differentiate somehow between
@@ -276,7 +280,7 @@
     public void stop() throws Exception
     {
         log.debug( "stop() called" );
-        callStop( bootstrapProperties.getProperty( BOOTSTRAP_STOP_CLASS_PROP, null )  );
+        callStop( stopClassName  );
     }
 
 

Modified: directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/JsvcBootstrapper.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/JsvcBootstrapper.java?rev=373105&r1=373104&r2=373105&view=diff
==============================================================================
--- directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/JsvcBootstrapper.java
(original)
+++ directory/trunks/apacheds/standalone/daemon/src/main/java/org/apache/directory/server/standalone/daemon/JsvcBootstrapper.java
Sat Jan 28 01:03:46 2006
@@ -25,7 +25,7 @@
 
 
 /**
- * The bootstrapper used by the 
+ * The bootstrapper used by the jsvc process manager.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$



Mime
View raw message