avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application LifecycleHelper.java
Date Sat, 18 May 2002 09:16:13 GMT
donaldp     02/05/18 02:16:13

  Modified:    src/java/org/apache/avalon/phoenix/frontends
                        PhoenixServlet.java CLIMain.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        DefaultKernel.java
               src/java/org/apache/avalon/phoenix/components/embeddor
                        DefaultEmbeddor.java
               src/java/org/apache/avalon/phoenix/components/application
                        LifecycleHelper.java
  Removed:     src/java/org/apache/avalon/phoenix/components
                        ContainerUtil.java
  Log:
  Update phoenix to use ContainerUtil now in framework CVS.
  
  Revision  Changes    Path
  1.16      +1 -1      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- PhoenixServlet.java	15 May 2002 21:54:45 -0000	1.15
  +++ PhoenixServlet.java	18 May 2002 09:16:12 -0000	1.16
  @@ -17,11 +17,11 @@
   import org.apache.avalon.framework.ExceptionUtil;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  +import org.apache.avalon.framework.container.ContainerUtil;
   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.Parameters;
  -import org.apache.avalon.phoenix.components.ContainerUtil;
   import org.apache.avalon.phoenix.components.embeddor.SingleAppEmbeddor;
   import org.apache.avalon.phoenix.interfaces.Embeddor;
   import org.apache.log.Hierarchy;
  
  
  
  1.35      +2 -2      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.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- CLIMain.java	15 May 2002 21:54:45 -0000	1.34
  +++ CLIMain.java	18 May 2002 09:16:12 -0000	1.35
  @@ -16,13 +16,13 @@
   import org.apache.avalon.framework.ExceptionUtil;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.context.DefaultContext;
   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.Parameters;
   import org.apache.avalon.phoenix.Constants;
  -import org.apache.avalon.phoenix.components.ContainerUtil;
   import org.apache.avalon.phoenix.interfaces.Embeddor;
   import org.apache.log.Hierarchy;
   import org.apache.log.LogTarget;
  @@ -179,7 +179,7 @@
               m_embeddor = (Embeddor)Class.forName( embeddorClassname ).newInstance();
   
               ContainerUtil.enableLogging( m_embeddor,
  -                                     createLogger( parameters ) );
  +                                         createLogger( parameters ) );
               ContainerUtil.contextualize( m_embeddor,
                                            new DefaultContext( data ) );
               ContainerUtil.parameterize( m_embeddor, parameters );
  
  
  
  1.66      +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java
  
  Index: DefaultKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/DefaultKernel.java,v
  retrieving revision 1.65
  retrieving revision 1.66
  diff -u -r1.65 -r1.66
  --- DefaultKernel.java	15 May 2002 21:54:45 -0000	1.65
  +++ DefaultKernel.java	18 May 2002 09:16:12 -0000	1.66
  @@ -11,16 +11,16 @@
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.CascadingException;
  -import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configuration;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.logger.Logger;
   import org.apache.avalon.framework.service.DefaultServiceManager;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
  -import org.apache.avalon.phoenix.components.ContainerUtil;
   import org.apache.avalon.phoenix.components.application.DefaultApplication;
   import org.apache.avalon.phoenix.interfaces.Application;
   import org.apache.avalon.phoenix.interfaces.ApplicationContext;
  
  
  
  1.65      +3 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
  
  Index: DefaultEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- DefaultEmbeddor.java	15 May 2002 21:54:45 -0000	1.64
  +++ DefaultEmbeddor.java	18 May 2002 09:16:12 -0000	1.65
  @@ -15,11 +15,12 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.excalibur.io.ExtensionFileFilter;
   import org.apache.avalon.framework.CascadingException;
  -import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -31,7 +32,6 @@
   import org.apache.avalon.framework.service.DefaultServiceManager;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.phoenix.Constants;
  -import org.apache.avalon.phoenix.components.ContainerUtil;
   import org.apache.avalon.phoenix.interfaces.Deployer;
   import org.apache.avalon.phoenix.interfaces.Embeddor;
   import org.apache.avalon.phoenix.interfaces.EmbeddorMBean;
  @@ -164,7 +164,7 @@
           m_phoenixHome = m_parameters.getParameter( "phoenix.home", ".." );
           m_persistent = m_parameters.getParameterAsBoolean( "persistent", false );
           m_appDir = m_parameters.getParameter( "phoenix.apps.dir",
  -                                               m_phoenixHome + DEFAULT_APPS_PATH );
  +                                              m_phoenixHome + DEFAULT_APPS_PATH );
       }
   
       public void configure( final Configuration configuration )
  
  
  
  1.43      +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java
  
  Index: LifecycleHelper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/application/LifecycleHelper.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- LifecycleHelper.java	15 May 2002 21:54:45 -0000	1.42
  +++ LifecycleHelper.java	18 May 2002 09:16:12 -0000	1.43
  @@ -36,7 +36,7 @@
   import org.apache.avalon.phoenix.BlockContext;
   import org.apache.avalon.phoenix.BlockEvent;
   import org.apache.avalon.phoenix.BlockListener;
  -import org.apache.avalon.phoenix.components.ContainerUtil;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.avalon.phoenix.components.lifecycle.State;
   import org.apache.avalon.phoenix.interfaces.Application;
   import org.apache.avalon.phoenix.interfaces.ApplicationContext;
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message