You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2002/05/10 13:40:04 UTC
cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends CLIMain.java ComposableServlet.java PhoenixServlet.java
donaldp 02/05/10 04:40:04
Modified: src/java/org/apache/avalon/phoenix/frontends CLIMain.java
ComposableServlet.java PhoenixServlet.java
Log:
Make the frontends use LifecycleUtil to help with embeddors lifecycle.
Revision Changes Path
1.31 +9 -28 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- CLIMain.java 10 May 2002 02:43:04 -0000 1.30
+++ CLIMain.java 10 May 2002 11:40:04 -0000 1.31
@@ -14,18 +14,15 @@
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.ExceptionUtil;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.Contextualizable;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AvalonFormatter;
-import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.LogKitLogger;
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.phoenix.Constants;
+import org.apache.avalon.phoenix.components.LifecycleUtil;
import org.apache.avalon.phoenix.interfaces.Embeddor;
import org.apache.log.Hierarchy;
import org.apache.log.LogTarget;
@@ -181,29 +178,13 @@
final String embeddorClassname = configuration.getAttribute( "class" );
m_embeddor = (Embeddor)Class.forName( embeddorClassname ).newInstance();
- if( m_embeddor instanceof LogEnabled )
- {
- final Logger logger = createLogger( parameters );
- ( (LogEnabled)m_embeddor ).enableLogging( logger );
- }
-
- if( m_embeddor instanceof Contextualizable )
- {
- final DefaultContext context = new DefaultContext( data );
- ( (Contextualizable)m_embeddor ).contextualize( context );
- }
-
- if( m_embeddor instanceof Parameterizable )
- {
- ( (Parameterizable)m_embeddor ).parameterize( parameters );
- }
-
- if( m_embeddor instanceof Configurable )
- {
- ( (Configurable)m_embeddor ).configure( configuration );
- }
-
- m_embeddor.initialize();
+ LifecycleUtil.logEnable( m_embeddor,
+ createLogger( parameters ) );
+ LifecycleUtil.contextualize( m_embeddor,
+ new DefaultContext( data ) );
+ LifecycleUtil.parameterize( m_embeddor, parameters );
+ LifecycleUtil.configure( m_embeddor, configuration );
+ LifecycleUtil.initialize( m_embeddor );
}
catch( final Throwable throwable )
{
@@ -285,7 +266,7 @@
try
{
- m_embeddor.dispose();
+ LifecycleUtil.shutdown( m_embeddor );
}
catch( final Throwable throwable )
{
1.6 +0 -1 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/ComposableServlet.java
Index: ComposableServlet.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/ComposableServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ComposableServlet.java 18 Mar 2002 04:29:26 -0000 1.5
+++ ComposableServlet.java 10 May 2002 11:40:04 -0000 1.6
@@ -40,7 +40,6 @@
if ( null == m_embeddor )
{
final String message = REZ.getString( "servlet.error.load" );
-
throw new ServletException( message );
}
1.12 +14 -24 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java
Index: PhoenixServlet.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PhoenixServlet.java 27 Mar 2002 14:30:39 -0000 1.11
+++ PhoenixServlet.java 10 May 2002 11:40:04 -0000 1.12
@@ -11,18 +11,17 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.avalon.framework.ExceptionUtil;
-import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.avalon.framework.logger.AvalonFormatter;
import org.apache.avalon.framework.logger.LogKitLogger;
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.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.avalon.phoenix.components.LifecycleUtil;
import org.apache.avalon.phoenix.components.embeddor.SingleAppEmbeddor;
import org.apache.avalon.phoenix.interfaces.Embeddor;
import org.apache.log.Hierarchy;
@@ -54,7 +53,7 @@
final String defaultValue )
{
final String value = getInitParameter( name );
- if ( null == value )
+ if( null == value )
{
return defaultValue;
}
@@ -93,24 +92,15 @@
m_embeddor = (SingleAppEmbeddor)Class.forName( embeddorClassname ).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( embeddorConf );
- }
-
- m_embeddor.initialize();
+ LifecycleUtil.logEnable( m_embeddor, createLogger( m_parameters ) );
+ LifecycleUtil.parameterize( m_embeddor, m_parameters );
+ LifecycleUtil.configure( m_embeddor, embeddorConf );
+ LifecycleUtil.initialize( m_embeddor );
final Thread thread = new Thread( this, "Phoenix-Monitor" );
thread.start();
}
- catch ( final Throwable throwable )
+ catch( final Throwable throwable )
{
log( REZ.getString( "main.exception.header" ) );
log( "---------------------------------------------------------" );
@@ -129,7 +119,7 @@
{
m_embeddor.execute();
}
- catch ( final Throwable throwable )
+ catch( final Throwable throwable )
{
log( REZ.getString( "main.exception.header" ) );
log( "---------------------------------------------------------" );
@@ -148,11 +138,9 @@
try
{
- m_embeddor.dispose();
- m_embeddor = null;
- m_parameters = null;
+ LifecycleUtil.shutdown( m_embeddor );
}
- catch ( final Throwable throwable )
+ catch( final Throwable throwable )
{
log( REZ.getString( "main.exception.header" ) );
log( "---------------------------------------------------------" );
@@ -160,6 +148,8 @@
log( "---------------------------------------------------------" );
log( REZ.getString( "main.exception.footer" ) );
}
+ m_embeddor = null;
+ m_parameters = null;
}
private Logger createLogger( final Parameters parameters )
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>