Index: build.xml =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/build.xml,v retrieving revision 1.102 diff -u -r1.102 build.xml --- build.xml 16 Mar 2002 00:06:42 -0000 1.102 +++ build.xml 18 Mar 2002 22:03:52 -0000 @@ -228,6 +228,7 @@ + @@ -241,6 +242,7 @@ + + + + + + + + + + + \ No newline at end of file Index: src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v retrieving revision 1.46 diff -u -r1.46 DefaultEmbeddor.java --- src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java 15 Feb 2002 07:56:07 -0000 1.46 +++ src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java 18 Mar 2002 22:03:52 -0000 @@ -6,7 +6,6 @@ * the LICENSE.txt file. */ package org.apache.avalon.phoenix.components.embeddor; - import java.util.Observable; import java.util.Observer; import java.io.File; @@ -23,6 +22,9 @@ import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.component.DefaultComponentManager; import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.configuration.Configurable; +import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.ContextException; @@ -42,18 +44,19 @@ import org.apache.avalon.phoenix.interfaces.LogManager; import org.apache.avalon.phoenix.interfaces.PackageRepository; import org.apache.avalon.phoenix.interfaces.SystemManager; - /** * This is the object that is interacted with to create, manage and * dispose of the kernel and related resources. * * @author Leo Simons * @author Peter Donald + * @author Joerg Bauer */ public class DefaultEmbeddor extends AbstractLogEnabled - implements Embeddor, Contextualizable, Parameterizable, EmbeddorMBean + implements Embeddor, Contextualizable, Parameterizable, Configurable, EmbeddorMBean { + private static final Resources REZ = ResourceManager.getPackageResources( DefaultEmbeddor.class ); @@ -63,14 +66,7 @@ private Parameters m_parameters; private String m_phoenixHome; - private ClassLoaderManager m_classLoaderManager; - private ConfigurationRepository m_repository; - private Kernel m_kernel; - private Deployer m_deployer; - private DeploymentRecorder m_recorder; - private LogManager m_logManager; - private SystemManager m_systemManager; - private PackageRepository m_packageRepository; + private EmbeddorComponent[] components; /** * If true, flag indicates that the Embeddor should continue running @@ -84,8 +80,8 @@ private long m_startTime; - public void contextualize( final Context context ) - throws ContextException + public void contextualize( final Context context ) + throws ContextException { try { @@ -98,7 +94,6 @@ getLogger().warn( message ); } } - /** * Set parameters for this component. * This must be called after contextualize() and before initialize() @@ -135,35 +130,40 @@ public synchronized void parameterize( final Parameters parameters ) throws ParameterException { - m_parameters = createDefaultParameters(); - m_parameters.merge( parameters ); - + m_parameters = parameters; + m_parameters.setParameter( "phoenix.home", "..") ; + m_parameters.setParameter( "persistent", "false" ); m_phoenixHome = m_parameters.getParameter( "phoenix.home" ); m_persistent = m_parameters.getParameterAsBoolean( "persistent" ); } + public void configure( Configuration conf ) + throws ConfigurationException + { + Configuration[] childs = conf.getChildren( "component" ); + components = new EmbeddorComponent[ childs.length ]; + for( int i = 0; i < childs.length; i++ ) + { + components[ i ] = new EmbeddorComponent(); + components[ i ].setRole( childs[ i ].getAttribute( "role" ) ); + components[ i ].setClassName( childs[ i ].getAttribute( "class" ) ); + components[ i ].setLoggerName( childs[ i ].getAttribute( "logger" ) ); + components[ i ].setConfiguration( childs[ i ] ); + } + } /** * Creates the core handlers - logger, deployer, Manager and * Kernel. Note that these are not set up properly until you have * called the run() method. */ - public void initialize() - throws Exception + public void initialize() + throws Exception { m_startTime = System.currentTimeMillis(); try { createComponents(); - - // setup core handler components - setupComponent( m_packageRepository, "packages" ); - setupComponent( m_logManager, "logs" ); - setupComponent( m_classLoaderManager, "classes" ); - setupComponent( m_repository, "config" ); - setupComponent( m_deployer, "deployer" ); - setupComponent( m_recorder, "recorder" ); - setupComponent( m_systemManager, "manager" ); - setupComponent( m_kernel, "kernel" ); + setupComponents(); } catch( final Exception e ) { @@ -183,16 +183,15 @@ * finished, as well as all the applications running in it, it * is shut down, after which the PhoenixEmbeddor is as well. */ - public void execute() - throws Exception + public void execute() + throws Exception { deployDefaultApplications(); - // If the kernel is empty at this point, it is because the server was // started without supplying any applications, display a message to // give the user a clue as to why the server is shutting down // immediately. - if ( emptyKernel() ) + if( emptyKernel() ) { final String message = REZ.getString( "embeddor.error.start.no-apps" ); getLogger().fatalError( message ); @@ -203,11 +202,10 @@ while( true ) { // wait() for shutdown() to take action... - if( m_shutdown || - ( emptyKernel() && !m_persistent ) ) + if( m_shutdown || ( emptyKernel() && !m_persistent ) ) { // The server will shut itself down when all applications are disposed. - if ( emptyKernel() ) + if( emptyKernel() ) { final String message = REZ.getString( "embeddor.shutdown.all-apps-disposed" ); getLogger().info( message ); @@ -221,9 +219,10 @@ private boolean emptyKernel() { - if( null != m_kernel ) + Kernel kernel = (Kernel)getEmbeddorComponent( Kernel.ROLE ); + if( null != kernel ) { - final String[] names = m_kernel.getApplicationNames(); + final String[] names = kernel.getApplicationNames(); return ( 0 == names.length ); } else @@ -256,14 +255,7 @@ shutdown(); try { - shutdownComponent( m_systemManager ); - shutdownComponent( m_recorder ); - shutdownComponent( m_deployer ); - shutdownComponent( m_kernel ); - shutdownComponent( m_repository ); - shutdownComponent( m_logManager ); - shutdownComponent( m_classLoaderManager ); - shutdownComponent( m_packageRepository ); + shutdownComponents(); } catch( final Exception e ) { @@ -271,14 +263,10 @@ final String message = REZ.getString( "embeddor.error.shutdown.failed" ); getLogger().fatalError( message, e ); } - - m_packageRepository = null; - m_systemManager = null; - m_kernel = null; - m_repository = null; - m_classLoaderManager = null; - m_logManager = null; - m_deployer = null; + for( int i = 0; i < components.length; i++ ) + { + components[ i ].setObject( null ); + } System.gc(); // make sure resources are released } @@ -299,8 +287,8 @@ * * @exception UnsupportedOperationException if restart not supported */ - public void restart() - throws UnsupportedOperationException + public void restart() + throws UnsupportedOperationException { try { @@ -380,44 +368,30 @@ return "(" + Constants.DATE + ")"; } - ////////////////////// /// HELPER METHODS /// ////////////////////// - /** * Create the logger, deployer and kernel components. * Note that these components are not ready to be used * until setupComponents() is called. */ private synchronized void createComponents() - throws Exception { - String component = null; - - component = m_parameters.getParameter( PackageRepository.ROLE ); - m_packageRepository = (PackageRepository)createComponent( component, PackageRepository.class ); - - component = m_parameters.getParameter( ConfigurationRepository.ROLE ); - m_repository = (ConfigurationRepository)createComponent( component, ConfigurationRepository.class ); - - component = m_parameters.getParameter( LogManager.ROLE ); - m_logManager = (LogManager)createComponent( component, LogManager.class ); - - component = m_parameters.getParameter( ClassLoaderManager.ROLE ); - m_classLoaderManager = (ClassLoaderManager)createComponent( component, ClassLoaderManager.class ); - - component = m_parameters.getParameter( Deployer.ROLE ); - m_deployer = (Deployer)createComponent( component, Deployer.class ); - - component = m_parameters.getParameter( DeploymentRecorder.ROLE ); - m_recorder = (DeploymentRecorder)createComponent( component, DeploymentRecorder.class ); - - component = m_parameters.getParameter( SystemManager.ROLE ); - m_systemManager = (SystemManager)createComponent( component, SystemManager.class ); - - component = m_parameters.getParameter( Kernel.ROLE ); - m_kernel = (Kernel)createComponent( component, Kernel.class ); + Object object; + try + { + for( int i = 0; i < components.length; i++ ) + { + object = createComponent( components[ i ].getClassName(), Class.forName( components[ i ].getClassName() ) ); + components[ i ].setObject( object ); + } + } + catch( Exception e ) + { + final String message = REZ.getString( "embeddor.error.createComponents.failed" ); + getLogger().fatalError( message, e ); + } } /** @@ -427,8 +401,8 @@ * * @exception Exception if an error occurs */ - protected void deployDefaultApplications() - throws Exception + protected void deployDefaultApplications() + throws Exception { //Name of optional application specified on CLI final String application = m_parameters.getParameter( "application-location", null ); @@ -437,8 +411,7 @@ final File file = new File( application ); deployFile( file ); } - final String defaultAppsLocation = - m_parameters.getParameter( "applications-directory", m_phoenixHome + DEFAULT_APPS_PATH ); + final String defaultAppsLocation = m_parameters.getParameter( "applications-directory", m_phoenixHome + DEFAULT_APPS_PATH ); if( null != defaultAppsLocation ) { final File directory = new File( defaultAppsLocation ); @@ -451,8 +424,8 @@ } } - private void deployFiles( final File[] files ) - throws Exception + private void deployFiles( final File[] files ) + throws Exception { for( int i = 0; i < files.length; i++ ) { @@ -460,8 +433,8 @@ } } - private void deployFile( final File file ) - throws Exception + private void deployFile( final File file ) + throws Exception { final String filename = file.getName(); int index = filename.lastIndexOf( '.' ); @@ -474,7 +447,16 @@ protected final synchronized void deployFile( final String name, final File file ) throws Exception { - m_deployer.deploy( name, file.toURL() ); + ((Deployer)getEmbeddorComponent( Deployer.ROLE )).deploy( name, file.toURL() ); + } + + private void setupComponents() + throws Exception + { + for(int i = 0; i < components.length; i++) + { + setupComponent( (Component)(components[ i ].getObject()), components[ i ].getLoggerName(), components[ i ].getConfiguration() ); + } } /** @@ -484,7 +466,7 @@ * @param component the component * @exception Exception if an error occurs */ - private void setupComponent( final Component component, final String loggerName ) + private void setupComponent( final Component component, final String loggerName, Configuration config ) throws Exception { setupLogger( component, loggerName ); @@ -497,6 +479,10 @@ { ( (Parameterizable)component ).parameterize( m_parameters ); } + if( component instanceof Configurable ) + { + ( (Configurable)component ).configure( config ); + } if( component instanceof Initializable ) { ( (Initializable)component ).initialize(); @@ -507,6 +493,15 @@ } } + private void shutdownComponents() + throws Exception + { + for( int i = 0; i < components.length; i++ ) + { + shutdownComponent( (Component)components[ i ] ); + } + } + /** * Shutdown a component and run it through al of it's * shutdown lifecycle stages. @@ -514,8 +509,8 @@ * @param component the component * @exception Exception if an error occurs */ - private void shutdownComponent( final Component component ) - throws Exception + private void shutdownComponent( final Component component ) + throws Exception { if( null == component ) return; if( component instanceof Startable ) @@ -556,14 +551,12 @@ } catch( final InstantiationException ie ) { - final String message = - REZ.getString( "no-instantiate.error", clazz.getName(), component ); + final String message = REZ.getString( "no-instantiate.error", clazz.getName(), component ); throw new CascadingException( message, ie ); } catch( final ClassNotFoundException cnfe ) { - final String message = - REZ.getString( "no-class.error", clazz.getName(), component ); + final String message = REZ.getString( "no-class.error", clazz.getName(), component ); throw new CascadingException( message, cnfe ); } } @@ -572,53 +565,21 @@ { final DefaultComponentManager componentManager = new DefaultComponentManager(); componentManager.put( Embeddor.ROLE, this ); - componentManager.put( LogManager.ROLE, m_logManager ); - componentManager.put( PackageRepository.ROLE, m_packageRepository ); - componentManager.put( ClassLoaderManager.ROLE, m_classLoaderManager ); - componentManager.put( ConfigurationRepository.ROLE, m_repository ); - componentManager.put( Deployer.ROLE, m_deployer ); - componentManager.put( DeploymentRecorder.ROLE, m_recorder ); - componentManager.put( SystemManager.ROLE, m_systemManager ); - componentManager.put( Kernel.ROLE, m_kernel ); + for( int i = 0; i < components.length; i++ ) + { + componentManager.put( components[ i ].getRole(), (Component)getEmbeddorComponent( components[ i ].getRole() ) ); + } return componentManager; } /** - * Create default properties which includes default names of all components. - * Overide this in sub-classes to change values. - * - * @return the Parameters - */ - protected Parameters createDefaultParameters() - { - final Parameters defaults = new Parameters(); - defaults.setParameter( "phoenix.home", ".." ); - defaults.setParameter( "persistent", "false" ); - - final String PREFIX = "org.apache.avalon.phoenix.components."; - defaults.setParameter( Deployer.ROLE, PREFIX + "deployer.DefaultDeployer" ); - defaults.setParameter( DeploymentRecorder.ROLE, PREFIX + "deployer.DefaultDeploymentRecorder" ); - //defaults.setParameter( DeploymentRecorder.ROLE, PREFIX + "deployer.PersistentDeploymentRecorder" ); - defaults.setParameter( LogManager.ROLE, PREFIX + "logger.DefaultLogManager" ); - defaults.setParameter( Kernel.ROLE, PREFIX + "kernel.DefaultKernel" ); - defaults.setParameter( SystemManager.ROLE, PREFIX + "manager.NoopSystemManager" ); - defaults.setParameter( ConfigurationRepository.ROLE, - PREFIX + "configuration.DefaultConfigurationRepository" ); - defaults.setParameter( ClassLoaderManager.ROLE, - PREFIX + "classloader.DefaultClassLoaderManager" ); - defaults.setParameter( PackageRepository.ROLE, - PREFIX + "extensions.PhoenixPackageRepository" ); - return defaults; - } - - /** * Allow subclasses to get access to kernel. * * @return the Kernel */ protected final Kernel getKernel() { - return m_kernel; + return ( Kernel )getEmbeddorComponent( Kernel.ROLE ); } /** @@ -631,26 +592,26 @@ return m_parameters; } - /** - * Helper method to retrieve configuration from a location on filesystem. - * - * @param location the location of configuration - * @return the configuration - * @exception Exception if an error occurs - */ - private Configuration getConfigurationFor( final String location ) - throws Exception + private Object getEmbeddorComponent( String role ) { - final DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); - return builder.buildFromFile( location ); + for( int i = 0; i < components.length; i++ ) + { + if( components[ i ].getRole().equals( role ) ) + { + return components[ i ].getObject(); + } + } + // Should never happen + // TODO: create error / warning + return null; } } -class EmbeddorObservable - extends Observable +class EmbeddorObservable + extends Observable { public void change() { super.setChanged(); } -} +} \ No newline at end of file Index: src/java/org/apache/avalon/phoenix/components/embeddor/EmbeddorComponent.java =================================================================== RCS file: src/java/org/apache/avalon/phoenix/components/embeddor/EmbeddorComponent.java diff -N src/java/org/apache/avalon/phoenix/components/embeddor/EmbeddorComponent.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/java/org/apache/avalon/phoenix/components/embeddor/EmbeddorComponent.java 18 Mar 2002 22:03:52 -0000 @@ -0,0 +1,76 @@ +/* + * Copyright (C) The Apache Software Foundation. All rights reserved. + * + * This software is published under the terms of the Apache Software License + * version 1.1, a copy of which has been included with this distribution in + * the LICENSE.txt file. + */ + +package org.apache.avalon.phoenix.components.embeddor; + +import org.apache.avalon.framework.configuration.Configuration; + +/** + * @version 1.0 + * @author + */ +public class EmbeddorComponent +{ + + private String role; + private Configuration conf; + private String className; + private String loggerName; + private Object object; + + public String getRole() + { + return role; + } + + public void setRole( String role ) + { + this.role = role; + } + + public Configuration getConfiguration() + { + return conf; + } + + public void setConfiguration( Configuration conf ) + { + this.conf = conf; + } + + public String getClassName() + { + return className; + } + + public void setClassName( String name ) + { + this.className = name; + } + + public Object getObject() + { + return object; + } + + public void setObject( Object obj ) + { + this.object = obj; + } + + public String getLoggerName() + { + return loggerName; + } + + public void setLoggerName( String logger ) + { + this.loggerName = logger; + } + +} \ No newline at end of file Index: src/java/org/apache/avalon/phoenix/components/embeddor/Resources.properties =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/Resources.properties,v retrieving revision 1.5 diff -u -r1.5 Resources.properties --- src/java/org/apache/avalon/phoenix/components/embeddor/Resources.properties 7 Feb 2002 07:05:06 -0000 1.5 +++ src/java/org/apache/avalon/phoenix/components/embeddor/Resources.properties 18 Mar 2002 22:03:52 -0000 @@ -1,6 +1,7 @@ embeddor.error.start.failed=There was a fatal error while starting Embeddor. embeddor.error.start.no-apps=Unable to start because there are not any applications in the apps directory. embeddor.error.shutdown.failed=There was an unexpected error while shutting down Embeddor. +embeddor.error.createComponents.failed=There was an unexpected error while creating Components for Embeddor. embeddor.notice.no-restart=Phoenix was not started by the daemon thus it will not be possible to restart the JVM via the Management interface. embeddor.shutdown.all-apps-disposed=Shutting down because there are not any applications running. bad-type.error=Object {0} is not an instance of {1}. Index: src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java,v retrieving revision 1.17 diff -u -r1.17 SingleAppEmbeddor.java --- src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java 11 Dec 2001 10:13:33 -0000 1.17 +++ src/java/org/apache/avalon/phoenix/components/embeddor/SingleAppEmbeddor.java 18 Mar 2002 22:03:52 -0000 @@ -34,21 +34,6 @@ ///Sole application hosted in kernel private Application m_application; - /** - * Use ContextClassLoaderManager for ClassLoaderManager. - * - * @return the Parameters - */ - protected Parameters createDefaultParameters() - { - final Parameters defaults = super.createDefaultParameters(); - final String PREFIX = "org.apache.avalon.phoenix.components."; - defaults.setParameter( ClassLoaderManager.ROLE, - PREFIX + "classloader.ContextClassLoaderManager" ); - defaults.setParameter( PackageRepository.ROLE, - PREFIX + "extensions.NoopPackageRepository" ); - return defaults; - } /** * Deploy a single application. Index: src/java/org/apache/avalon/phoenix/frontends/CLIMain.java =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v retrieving revision 1.24 diff -u -r1.24 CLIMain.java --- src/java/org/apache/avalon/phoenix/frontends/CLIMain.java 16 Mar 2002 00:11:55 -0000 1.24 +++ src/java/org/apache/avalon/phoenix/frontends/CLIMain.java 18 Mar 2002 22:03:52 -0000 @@ -22,6 +22,11 @@ import org.apache.avalon.framework.logger.Logger; import org.apache.avalon.framework.parameters.Parameterizable; import org.apache.avalon.framework.parameters.Parameters; +import org.apache.avalon.framework.configuration.Configuration; +import org.apache.avalon.framework.configuration.Configurable; +import org.apache.avalon.framework.configuration.ConfigurationException; +import org.apache.avalon.framework.configuration.DefaultConfiguration; +import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder; import org.apache.avalon.phoenix.Constants; import org.apache.avalon.phoenix.components.embeddor.DefaultEmbeddor; import org.apache.avalon.phoenix.interfaces.Embeddor; @@ -162,7 +167,9 @@ { try { - m_embeddor = new DefaultEmbeddor(); + Configuration conf = getConfigurationFor( parameters.getParameter( "phoenix.configfile" ) ).getChild( "embeddor" ); + m_embeddor = ( Embeddor ) Class.forName( conf.getAttribute( "class" ) ).newInstance(); + if( m_embeddor instanceof LogEnabled ) { @@ -180,7 +187,10 @@ { ( (Parameterizable)m_embeddor ).parameterize( parameters ); } - + if ( m_embeddor instanceof Configurable ) { + ( (Configurable)m_embeddor ).configure( conf ); + } + m_embeddor.initialize(); } catch( final Throwable throwable ) @@ -298,6 +308,12 @@ m_exitCode = 1; } + + private Configuration getConfigurationFor(final String location) + throws Exception { + final DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); + return builder.buildFromFile( location ); + } } final class ShutdownHook Index: src/java/org/apache/avalon/phoenix/frontends/CLISetup.java =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v retrieving revision 1.11 diff -u -r1.11 CLISetup.java --- src/java/org/apache/avalon/phoenix/frontends/CLISetup.java 2 Feb 2002 09:41:06 -0000 1.11 +++ src/java/org/apache/avalon/phoenix/frontends/CLISetup.java 18 Mar 2002 22:03:52 -0000 @@ -33,6 +33,7 @@ private static final int LOG_FILE_OPT = 'l'; private static final int APPS_PATH_OPT = 'a'; private static final int PERSISTENT_OPT = 'p'; + private static final int CONFIGFILE_OPT = 'f'; private static final int REMOTE_MANAGER_OPT = 1; private static final int DISABLE_HOOK_OPT = 2; private static final int APPLICATION_OPT = 3; @@ -63,7 +64,7 @@ */ private CLOptionDescriptor[] createCLOptions() { - final CLOptionDescriptor options[] = new CLOptionDescriptor[ 8 ]; + final CLOptionDescriptor options[] = new CLOptionDescriptor[ 9 ]; options[ 0 ] = new CLOptionDescriptor( "help", CLOptionDescriptor.ARGUMENT_DISALLOWED, @@ -111,6 +112,13 @@ PERSISTENT_OPT, REZ.getString( "cli.opt.persistent.desc" ) ); + options[ 8 ] = + new CLOptionDescriptor( "configfile", + CLOptionDescriptor.ARGUMENT_REQUIRED, + CONFIGFILE_OPT, + REZ.getString( "cli.opt.configfile.desc" ) ); + + return options; } @@ -133,6 +141,9 @@ final List clOptions = parser.getArguments(); final int size = clOptions.size(); + + m_parameters.setParameter( "phoenix.configfile", "../conf/kernel.xml"); // setting default + for( int i = 0; i < size; i++ ) { @@ -180,6 +191,11 @@ case DISABLE_HOOK_OPT: m_parameters.setParameter( "disable-hook", "true" ); break; + + case CONFIGFILE_OPT: + m_parameters.setParameter( "phoenix.configfile", option.getArgument() ); + break; + } } Index: src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java,v retrieving revision 1.8 diff -u -r1.8 PhoenixServlet.java --- src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java 16 Mar 2002 00:11:55 -0000 1.8 +++ src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java 18 Mar 2002 22:03:52 -0000 @@ -73,6 +73,7 @@ final String logPriority = getInitParameter( "log-priority", "INFO" ); final String appName = getInitParameter( "application-name", "default" ); final String appLoc = getInitParameter( "application-location", phoenixHome + "/" + appName ); + final String configFile = getInitParameter( "config-file", phoenixHome + "/conf/kernel.xml"); m_parameters = new Parameters(); m_parameters.setParameter( "phoenix.home", context.getRealPath( phoenixHome ) ); @@ -83,12 +84,17 @@ try { - m_embeddor = new SingleAppEmbeddor(); + Configuration conf = getConfigurationFor(configFile).getChild("embeddor"); + m_embeddor = (Embeddor) Class.forName(conf.getAttribute("class")).newInstance(); m_embeddor.enableLogging( createLogger( m_parameters ) ); + if( m_embeddor instanceof Parameterizable ) { ( (Parameterizable)m_embeddor ).parameterize( m_parameters ); } + if (m_embeddor instanceof Configurable) { + ((Configurable) m_embeddor).configure(conf); + } m_embeddor.initialize(); final Thread thread = new Thread( this, "Phoenix" ); Index: src/java/org/apache/avalon/phoenix/frontends/Resources.properties =================================================================== RCS file: /home/cvspublic/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/Resources.properties,v retrieving revision 1.8 diff -u -r1.8 Resources.properties --- src/java/org/apache/avalon/phoenix/frontends/Resources.properties 2 Feb 2002 09:41:06 -0000 1.8 +++ src/java/org/apache/avalon/phoenix/frontends/Resources.properties 18 Mar 2002 22:03:52 -0000 @@ -6,6 +6,7 @@ cli.opt.application.desc=Start the Application specified by path. cli.opt.disable-hook.desc=Disable the Shutdown hook for JVM. Disabling this may mean that your application is not shutdown cleanly. cli.opt.persistent.desc=If specified the Embeddor will persist even after all applications have been removed from the kernel. +cli.opt.configfile.desc=If specified Phoenix will use this configfile. cli.desc.available.header=Available options: