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 2001/11/17 08:06:53 UTC

cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends CLIMain.java CLISetup.java PhoenixServlet.java

donaldp     01/11/16 23:06:53

  Modified:    src/java/org/apache/avalon/phoenix/metadata
                        BlockListenerMetaData.java BlockMetaData.java
                        DependencyMetaData.java SarMetaData.java
               src/java/org/apache/avalon/phoenix/interfaces
                        Application.java ApplicationContext.java
                        ClassLoaderManager.java
                        ConfigurationRepository.java Deployer.java
                        DeploymentRecorder.java Kernel.java LogManager.java
               src/java/org/apache/avalon/phoenix/frontends CLIMain.java
                        CLISetup.java PhoenixServlet.java
  Log:
  Ran style formatter over codebase.
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockListenerMetaData.java
  
  Index: BlockListenerMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockListenerMetaData.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BlockListenerMetaData.java	2001/09/22 07:01:42	1.1
  +++ BlockListenerMetaData.java	2001/11/17 07:06:53	1.2
  @@ -14,8 +14,8 @@
    */
   public final class BlockListenerMetaData
   {
  -    private final String        m_name;
  -    private final String        m_classname;
  +    private final String m_name;
  +    private final String m_classname;
   
       public BlockListenerMetaData( final String name, final String classname )
       {
  
  
  
  1.7       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockMetaData.java
  
  Index: BlockMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/BlockMetaData.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BlockMetaData.java	2001/09/26 06:44:59	1.6
  +++ BlockMetaData.java	2001/11/17 07:06:53	1.7
  @@ -7,7 +7,7 @@
    */
   package org.apache.avalon.phoenix.metadata;
   
  -import  org.apache.avalon.phoenix.metainfo.BlockInfo;
  +import org.apache.avalon.phoenix.metainfo.BlockInfo;
   
   /**
    * This is the structure describing each block.
  @@ -16,11 +16,11 @@
    */
   public class BlockMetaData
   {
  -    private final String               m_name;
  -    private final String               m_classname;
  +    private final String m_name;
  +    private final String m_classname;
       private final DependencyMetaData[] m_dependencies;
   
  -    private BlockInfo                  m_blockInfo;
  +    private BlockInfo m_blockInfo;
   
       public BlockMetaData( final String name,
                             final String classname,
  
  
  
  1.2       +2 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/DependencyMetaData.java
  
  Index: DependencyMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/DependencyMetaData.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DependencyMetaData.java	2001/09/23 02:09:41	1.1
  +++ DependencyMetaData.java	2001/11/17 07:06:53	1.2
  @@ -14,8 +14,8 @@
    */
   public final class DependencyMetaData
   {
  -    private final String        m_name;
  -    private final String        m_role;
  +    private final String m_name;
  +    private final String m_role;
   
       public DependencyMetaData( final String name, final String role )
       {
  
  
  
  1.5       +4 -4      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/SarMetaData.java
  
  Index: SarMetaData.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metadata/SarMetaData.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SarMetaData.java	2001/10/27 22:45:13	1.4
  +++ SarMetaData.java	2001/11/17 07:06:53	1.5
  @@ -10,15 +10,15 @@
   import java.io.File;
   
   /**
  - * MetaData for the application. 
  + * MetaData for the application.
    *
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
    */
   public class SarMetaData
   {
  -    private String                  m_name;
  -    private File                    m_homeDirectory;
  -    private BlockMetaData[]         m_blocks;
  +    private String m_name;
  +    private File m_homeDirectory;
  +    private BlockMetaData[] m_blocks;
       private BlockListenerMetaData[] m_listeners;
   
       public SarMetaData( final String name,
  
  
  
  1.2       +2 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Application.java
  
  Index: Application.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Application.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Application.java	2001/09/27 04:47:26	1.1
  +++ Application.java	2001/11/17 07:06:53	1.2
  @@ -29,6 +29,8 @@
       String ROLE = "org.apache.avalon.phoenix.interfaces.Application";
   
       void setApplicationContext( ApplicationContext frame );
  +
       String[] getBlockNames();
  +
       Block getBlock( String name );
   }
  
  
  
  1.2       +1 -0      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java
  
  Index: ApplicationContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ApplicationContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ApplicationContext.java	2001/09/27 04:47:26	1.1
  +++ ApplicationContext.java	2001/11/17 07:06:53	1.2
  @@ -26,6 +26,7 @@
       String ROLE = "org.apache.avalon.phoenix.interfaces.ApplicationContext";
   
       SarMetaData getMetaData();
  +
       ThreadContext getThreadContext();
   
       /**
  
  
  
  1.5       +7 -8      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ClassLoaderManager.java
  
  Index: ClassLoaderManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ClassLoaderManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ClassLoaderManager.java	2001/10/27 22:48:28	1.4
  +++ ClassLoaderManager.java	2001/11/17 07:06:53	1.5
  @@ -8,15 +8,14 @@
   package org.apache.avalon.phoenix.interfaces;
   
   import java.io.File;
  -import java.net.URL;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
   
   /**
  - * Interface for component that creates and manages the 
  + * Interface for component that creates and manages the
    * <code>ClassLoader</code> for an Application. The specific
    * mechanism by which the <code>ClassLoader</code> is created
  - * is dependent on the type of <code>Embeddor</code> and the 
  + * is dependent on the type of <code>Embeddor</code> and the
    * deployment format.
    *
    * @author <a href="mailto:donaldp@apache.org">Peter Donald</a>
  @@ -28,18 +27,18 @@
   
       /**
        * Create a <code>ClassLoader</code> for a specific application.
  -     * 
  +     *
        * @param server the configuration "server.xml" for the application
  -     * @param source the source of application. (usually the name of the .sar file 
  +     * @param source the source of application. (usually the name of the .sar file
        *               or else the same as baseDirectory)
        * @param baseDirectory the base directory of application
        * @param classPath the list of URLs in applications deployment
        * @return the ClassLoader created
        * @exception Exception if an error occurs
        */
  -    ClassLoader createClassLoader( Configuration server, 
  -                                   File source, 
  -                                   File baseDirectory, 
  +    ClassLoader createClassLoader( Configuration server,
  +                                   File source,
  +                                   File baseDirectory,
                                      String[] classPath )
           throws Exception;
   }
  
  
  
  1.4       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationRepository.java
  
  Index: ConfigurationRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/ConfigurationRepository.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ConfigurationRepository.java	2001/10/24 16:18:55	1.3
  +++ ConfigurationRepository.java	2001/11/17 07:06:53	1.4
  @@ -7,7 +7,6 @@
    */
   package org.apache.avalon.phoenix.interfaces;
   
  -import org.apache.avalon.excalibur.container.Entry;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
  
  
  
  1.2       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Deployer.java
  
  Index: Deployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Deployer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Deployer.java	2001/09/27 04:47:26	1.1
  +++ Deployer.java	2001/11/17 07:06:53	1.2
  @@ -9,7 +9,6 @@
   
   import java.net.URL;
   import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.phoenix.tools.installer.Installation;
   
   /**
    * A Deployer is responsible for taking a URL (ie a jar/war/ear) and deploying
  
  
  
  1.2       +7 -6      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/DeploymentRecorder.java
  
  Index: DeploymentRecorder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/DeploymentRecorder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DeploymentRecorder.java	2001/10/31 21:59:57	1.1
  +++ DeploymentRecorder.java	2001/11/17 07:06:53	1.2
  @@ -15,15 +15,16 @@
    *
    * @author <a href="mailto:mirceatoma@home.com">Mircea Toma</a>
    */
  -public interface DeploymentRecorder extends Component {
  +public interface DeploymentRecorder extends Component
  +{
   
       String ROLE = "org.apache.avalon.phoenix.interfaces.DeploymentRecorder";
  -    
  -    void recordInstallation( String name, Installation installation ) 
  +
  +    void recordInstallation( String name, Installation installation )
           throws DeploymentException;
  -    
  -    Installation fetchInstallation( String name ) 
  +
  +    Installation fetchInstallation( String name )
           throws DeploymentException;
  -    
  +
   }
   
  
  
  
  1.4       +2 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java
  
  Index: Kernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/Kernel.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Kernel.java	2001/10/06 06:26:33	1.3
  +++ Kernel.java	2001/11/17 07:06:53	1.4
  @@ -11,7 +11,6 @@
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
  -import org.apache.avalon.phoenix.interfaces.Application;
   import org.apache.avalon.phoenix.metadata.SarMetaData;
   import org.apache.log.Hierarchy;
   
  @@ -29,8 +28,8 @@
                            Hierarchy hierarchy,
                            Configuration server )
           throws Exception;
  -    
  -    void removeApplication( String name ) 
  +
  +    void removeApplication( String name )
           throws Exception;
   
       Application getApplication( String name );
  
  
  
  1.2       +0 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/LogManager.java
  
  Index: LogManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/interfaces/LogManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LogManager.java	2001/09/27 04:47:26	1.1
  +++ LogManager.java	2001/11/17 07:06:53	1.2
  @@ -7,8 +7,6 @@
    */
   package org.apache.avalon.phoenix.interfaces;
   
  -import java.io.File;
  -import java.net.URL;
   import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.phoenix.metadata.SarMetaData;
  
  
  
  1.12      +9 -13     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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CLIMain.java	2001/09/28 23:42:28	1.11
  +++ CLIMain.java	2001/11/17 07:06:53	1.12
  @@ -7,10 +7,6 @@
    */
   package org.apache.avalon.phoenix.frontends;
   
  -import org.apache.avalon.excalibur.cli.CLArgsParser;
  -import org.apache.avalon.excalibur.cli.CLOption;
  -import org.apache.avalon.excalibur.cli.CLOptionDescriptor;
  -import org.apache.avalon.excalibur.cli.CLUtil;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.parameters.Parameterizable;
  @@ -31,12 +27,12 @@
           ResourceManager.getPackageResources( CLIMain.class );
   
       ///The embeddor attached to frontend
  -    private Embeddor      m_embeddor;
  +    private Embeddor m_embeddor;
   
       ///The code to return to system using exit code
  -    private int           m_exitCode;
  +    private int m_exitCode;
   
  -    private ShutdownHook  m_hook;
  +    private ShutdownHook m_hook;
   
       /**
        * Main entry point.
  @@ -119,12 +115,12 @@
               m_embeddor = new DefaultEmbeddor();
               //m_embeddor = new SingleAppEmbeddor();
               //parameters.setParameter( "application-location", "../apps/avalon-demo.sar" );
  -            
  +
               if( m_embeddor instanceof Parameterizable )
               {
  -                ((Parameterizable)m_embeddor).parameterize( parameters );
  +                ( (Parameterizable)m_embeddor ).parameterize( parameters );
               }
  -                
  +
               m_embeddor.initialize();
           }
           catch( final Throwable throwable )
  @@ -144,7 +140,7 @@
           final String message = REZ.getString( "main.abnormal-exit.notice" );
           System.out.println( message );
           System.out.flush();
  -        
  +
           //Null hook so it is not tried to be removed
           //when we are shutting down. (Attempting to remove
           //hook during shutdown raises an exception).
  @@ -185,7 +181,7 @@
           System.out.println( REZ.getString( "main.exception.header" ) );
           System.out.println( "---------------------------------------------------------" );
           System.out.println( "--- Message ---" );
  -        System.out.println( throwable.getMessage() );                
  +        System.out.println( throwable.getMessage() );
           System.out.println( "--- Stack Trace ---" );
           throwable.printStackTrace( System.out );
           System.out.println( "---------------------------------------------------------" );
  @@ -198,7 +194,7 @@
   final class ShutdownHook
       extends Thread
   {
  -    private CLIMain   m_main;
  +    private CLIMain m_main;
   
       protected ShutdownHook( CLIMain main )
       {
  
  
  
  1.8       +52 -53    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java
  
  Index: CLISetup.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLISetup.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CLISetup.java	2001/10/21 01:31:17	1.7
  +++ CLISetup.java	2001/11/17 07:06:53	1.8
  @@ -28,19 +28,19 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( CLISetup.class );
   
  -    private static final int DEBUG_LOG_OPT       = 'd';
  -    private static final int HELP_OPT            = 'h';
  -    private static final int LOG_FILE_OPT        = 'l';
  -    private static final int APPS_PATH_OPT       = 'a';
  -    private static final int REMOTE_MANAGER_OPT  = 1;
  -    private static final int DISABLE_HOOK_OPT    = 2;
  -    private static final int APPLICATION_OPT     = 3;
  +    private static final int DEBUG_LOG_OPT = 'd';
  +    private static final int HELP_OPT = 'h';
  +    private static final int LOG_FILE_OPT = 'l';
  +    private static final int APPS_PATH_OPT = 'a';
  +    private static final int REMOTE_MANAGER_OPT = 1;
  +    private static final int DISABLE_HOOK_OPT = 2;
  +    private static final int APPLICATION_OPT = 3;
   
       ///Parameters created by parsing CLI options
  -    private Parameters    m_parameters   = new Parameters();
  +    private Parameters m_parameters = new Parameters();
   
       ///Command used to execute program
  -    private String        m_command;
  +    private String m_command;
   
       public CLISetup( final String command )
       {
  @@ -63,43 +63,42 @@
       private CLOptionDescriptor[] createCLOptions()
       {
           final CLOptionDescriptor options[] = new CLOptionDescriptor[ 7 ];
  -        options[0] =
  +        options[ 0 ] =
               new CLOptionDescriptor( "help",
                                       CLOptionDescriptor.ARGUMENT_DISALLOWED,
                                       HELP_OPT,
                                       REZ.getString( "cli.opt.help.desc" ) );
  -        options[1] =
  +        options[ 1 ] =
               new CLOptionDescriptor( "log-file",
                                       CLOptionDescriptor.ARGUMENT_REQUIRED,
                                       LOG_FILE_OPT,
                                       REZ.getString( "cli.opt.log-file.desc" ) );
   
  -        options[2] =
  +        options[ 2 ] =
               new CLOptionDescriptor( "apps-path",
                                       CLOptionDescriptor.ARGUMENT_REQUIRED,
                                       APPS_PATH_OPT,
                                       REZ.getString( "cli.opt.apps-path.desc" ) );
   
  -        options[3] =
  +        options[ 3 ] =
               new CLOptionDescriptor( "debug-init",
                                       CLOptionDescriptor.ARGUMENT_DISALLOWED,
                                       DEBUG_LOG_OPT,
                                       REZ.getString( "cli.opt.debug-init.desc" ) );
   
  -        options[4] =
  +        options[ 4 ] =
               new CLOptionDescriptor( "remote-manager",
                                       CLOptionDescriptor.ARGUMENT_DISALLOWED,
                                       REMOTE_MANAGER_OPT,
                                       REZ.getString( "cli.opt.remote-manager.desc" ) );
   
  -
  -        options[5] =
  +        options[ 5 ] =
               new CLOptionDescriptor( "disable-hook",
                                       CLOptionDescriptor.ARGUMENT_DISALLOWED,
                                       DISABLE_HOOK_OPT,
                                       REZ.getString( "cli.opt.disable-hook.desc" ) );
   
  -        options[6] =
  +        options[ 6 ] =
               new CLOptionDescriptor( "application",
                                       CLOptionDescriptor.ARGUMENT_REQUIRED,
                                       APPLICATION_OPT,
  @@ -134,42 +133,42 @@
   
               switch( option.getId() )
               {
  -            case 0:
  -                {
  -                    final String message =
  -                        REZ.getString( "cli.error.unknown.arg", option.getArgument() );
  -                    System.err.println( message );
  -                }
  -                return false;
  -
  -            case HELP_OPT:
  -                usage( options );
  -                return false;
  -
  -            case DEBUG_LOG_OPT:
  -                m_parameters.setParameter( "log-priority", "DEBUG" );
  -                break;
  -
  -            case LOG_FILE_OPT:
  -                m_parameters.setParameter( "log-destination",  option.getArgument() );
  -                break;
  -
  -            case APPS_PATH_OPT:
  -                m_parameters.setParameter( "applications-directory", option.getArgument() );
  -                break;
  -
  -            case REMOTE_MANAGER_OPT:
  -                m_parameters.setParameter( SystemManager.ROLE,
  -                                           "org.apache.avalon.phoenix.components.manager.DefaultManager" );
  -                break;
  -
  -            case APPLICATION_OPT:
  -                m_parameters.setParameter( "application-location", option.getArgument() );
  -                break;
  -
  -            case DISABLE_HOOK_OPT:
  -                m_parameters.setParameter( "disable-hook", "true" );
  -                break;
  +                case 0:
  +                    {
  +                        final String message =
  +                            REZ.getString( "cli.error.unknown.arg", option.getArgument() );
  +                        System.err.println( message );
  +                    }
  +                    return false;
  +
  +                case HELP_OPT:
  +                    usage( options );
  +                    return false;
  +
  +                case DEBUG_LOG_OPT:
  +                    m_parameters.setParameter( "log-priority", "DEBUG" );
  +                    break;
  +
  +                case LOG_FILE_OPT:
  +                    m_parameters.setParameter( "log-destination", option.getArgument() );
  +                    break;
  +
  +                case APPS_PATH_OPT:
  +                    m_parameters.setParameter( "applications-directory", option.getArgument() );
  +                    break;
  +
  +                case REMOTE_MANAGER_OPT:
  +                    m_parameters.setParameter( SystemManager.ROLE,
  +                                               "org.apache.avalon.phoenix.components.manager.DefaultManager" );
  +                    break;
  +
  +                case APPLICATION_OPT:
  +                    m_parameters.setParameter( "application-location", option.getArgument() );
  +                    break;
  +
  +                case DISABLE_HOOK_OPT:
  +                    m_parameters.setParameter( "disable-hook", "true" );
  +                    break;
               }
           }
   
  
  
  
  1.2       +11 -18    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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PhoenixServlet.java	2001/10/13 03:35:02	1.1
  +++ PhoenixServlet.java	2001/11/17 07:06:53	1.2
  @@ -7,19 +7,12 @@
    */
   package org.apache.avalon.phoenix.frontends;
   
  -import java.io.IOException;
  -import javax.servlet.ServletContext;
  -import javax.servlet.ServletException;
  -import javax.servlet.http.HttpServlet;
  -import javax.servlet.http.HttpServletRequest;
  -import javax.servlet.http.HttpServletResponse;
  +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.parameters.ParameterException;
   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.embeddor.SingleAppEmbeddor;
   import org.apache.avalon.phoenix.interfaces.Embeddor;
   
  @@ -35,14 +28,14 @@
       private static final Resources REZ =
           ResourceManager.getPackageResources( PhoenixServlet.class );
   
  -    private Parameters              m_parameters;
  -    private SingleAppEmbeddor       m_embeddor;
  +    private Parameters m_parameters;
  +    private SingleAppEmbeddor m_embeddor;
   
       private String getInitParameter( final String name,
                                        final String defaultValue )
       {
           final String value = getInitParameter( name );
  -        if ( null == value )
  +        if( null == value )
           {
               return defaultValue;
           }
  @@ -51,7 +44,7 @@
               return value;
           }
       }
  -    
  +
       public void init()
           throws ServletException
       {
  @@ -73,15 +66,15 @@
           try
           {
               m_embeddor = new SingleAppEmbeddor();
  -            if ( m_embeddor instanceof Parameterizable )
  +            if( m_embeddor instanceof Parameterizable )
               {
  -                ((Parameterizable)m_embeddor).parameterize( m_parameters );
  +                ( (Parameterizable)m_embeddor ).parameterize( m_parameters );
               }
               m_embeddor.initialize();
   
               new Thread( this ).start();
           }
  -        catch ( final Throwable throwable )
  +        catch( final Throwable throwable )
           {
               log( REZ.getString( "main.exception.header" ) );
               log( "---------------------------------------------------------" );
  @@ -100,7 +93,7 @@
           {
               m_embeddor.execute();
           }
  -        catch ( final Throwable throwable )
  +        catch( final Throwable throwable )
           {
               log( REZ.getString( "main.exception.header" ) );
               log( "---------------------------------------------------------" );
  @@ -123,7 +116,7 @@
               m_embeddor = null;
               m_parameters = null;
           }
  -        catch ( final Throwable throwable )
  +        catch( final Throwable throwable )
           {
               log( REZ.getString( "main.exception.header" ) );
               log( "---------------------------------------------------------" );
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>