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/deployer DefaultDeployer.java
Date Mon, 28 Oct 2002 07:13:34 GMT
donaldp     2002/10/27 23:13:34

  Modified:    src/java/org/apache/avalon/phoenix/interfaces Kernel.java
               src/java/org/apache/avalon/phoenix/components/kernel/beanshell
                        BeanShellKernelProxy.java
               src/java/org/apache/avalon/phoenix/components/kernel
                        SarEntry.java DefaultKernel.java
               src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
  Log:
  No need for kernel to be passed the environment config.
  
  Revision  Changes    Path
  1.16      +1 -2      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Kernel.java	2 Oct 2002 11:25:56 -0000	1.15
  +++ Kernel.java	28 Oct 2002 07:13:34 -0000	1.16
  @@ -25,8 +25,7 @@
       void addApplication( SarMetaData metaData,
                            File workDirectory,
                            ClassLoader classLoader,
  -                         Logger hierarchy,
  -                         Configuration server )
  +                         Logger logger )
           throws Exception;
   
       /**
  
  
  
  1.6       +1 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java
  
  Index: BeanShellKernelProxy.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/beanshell/BeanShellKernelProxy.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BeanShellKernelProxy.java	9 Sep 2002 01:17:37 -0000	1.5
  +++ BeanShellKernelProxy.java	28 Oct 2002 07:13:34 -0000	1.6
  @@ -30,8 +30,7 @@
       public void addApplication( final SarMetaData metaData,
                                   final File workDirectory,
                                   final ClassLoader classLoader,
  -                                final Logger hierarchy,
  -                                final Configuration server )
  +                                final Logger logger )
           throws Exception
       {
           throw new UnsupportedOperationException( "This is not supported for non-kernel
visitors" );
  
  
  
  1.14      +2 -9      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java
  
  Index: SarEntry.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/kernel/SarEntry.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SarEntry.java	2 Oct 2002 11:25:55 -0000	1.13
  +++ SarEntry.java	28 Oct 2002 07:13:34 -0000	1.14
  @@ -21,7 +21,6 @@
   final class SarEntry
   {
       private SarMetaData m_metaData;
  -    private Configuration m_configuration;
       private ClassLoader m_classLoader;
       private Application m_application;
       private Logger m_logger;
  @@ -31,8 +30,8 @@
       protected SarEntry( final SarMetaData metaData,
                           final File workDirectory,
                           final ClassLoader classLoader,
  -                        final Logger logger,
  -                        final Configuration configuration )
  +                        final Logger logger
  +                        )
       {
           if( null == metaData )
           {
  @@ -54,7 +53,6 @@
           m_metaData = metaData;
           m_classLoader = classLoader;
           m_logger = logger;
  -        m_configuration = configuration;
           m_workDirectory = workDirectory;
       }
   
  @@ -86,10 +84,5 @@
       public ClassLoader getClassLoader()
       {
           return m_classLoader;
  -    }
  -
  -    public Configuration getConfiguration()
  -    {
  -        return m_configuration;
       }
   }
  
  
  
  1.81      +3 -4      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.80
  retrieving revision 1.81
  diff -u -r1.80 -r1.81
  --- DefaultKernel.java	2 Oct 2002 11:25:55 -0000	1.80
  +++ DefaultKernel.java	28 Oct 2002 07:13:34 -0000	1.81
  @@ -240,18 +240,17 @@
       public void addApplication( final SarMetaData metaData,
                                   final File workDirectory,
                                   final ClassLoader classLoader,
  -                                final Logger logger,
  -                                final Configuration server )
  +                                final Logger logger )
           throws Exception
       {
           final String name = metaData.getName();
           final SarEntry entry =
  -            new SarEntry( metaData, workDirectory, classLoader, logger, server );
  +            new SarEntry( metaData, workDirectory, classLoader, logger );
           m_entries.put( name, entry );
   
           try
           {
  -            startup( (SarEntry)entry );
  +            startup( entry );
           }
           catch( final Exception e )
           {
  
  
  
  1.59      +1 -2      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- DefaultDeployer.java	21 Sep 2002 02:43:51 -0000	1.58
  +++ DefaultDeployer.java	28 Oct 2002 07:13:34 -0000	1.59
  @@ -273,8 +273,7 @@
               m_kernel.addApplication( metaData,
                                        installation.getWorkDirectory(),
                                        classLoader,
  -                                     logger,
  -                                     environment );
  +                                     logger );
   
               m_installations.put( metaData.getName(), installation );
   
  
  
  

--
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