Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 62643 invoked from network); 28 Jan 2006 09:04:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Jan 2006 09:04:15 -0000 Received: (qmail 42540 invoked by uid 500); 28 Jan 2006 09:04:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 42516 invoked by uid 500); 28 Jan 2006 09:04:14 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 42505 invoked by uid 99); 28 Jan 2006 09:04:14 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Jan 2006 01:04:14 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 28 Jan 2006 01:04:13 -0800 Received: (qmail 62238 invoked by uid 65534); 28 Jan 2006 09:03:53 -0000 Message-ID: <20060128090353.62237.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 Apache Directory Project * @version $Rev$