donaldp     02/05/19 06:24:14

  Modified:    src/java/org/apache/avalon/phoenix/components/deployer
                        DefaultDeployer.java
               src/java/org/apache/avalon/phoenix/components/logger
                        DefaultLogManager.java
               src/java/org/apache/avalon/phoenix/interfaces
                        LogManager.java
  Log:
  Pass in applications ClassLoader to LogManager in preparation for allowing
  the LogManager to load Targets/Formatters etc from the applications 
ClassLoader and thus from within the SAR file.
  
  Revision  Changes    Path
  1.32      +2 -1      
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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DefaultDeployer.java      15 May 2002 12:21:55 -0000      1.31
  +++ DefaultDeployer.java      19 May 2002 13:24:14 -0000      1.32
  @@ -284,7 +284,8 @@
               setupConfiguration( metaData, config.getChildren() );
   
               final Configuration logs = environment.getChild( "logs" );
  -            final Hierarchy hierarchy = m_logManager.createHierarchy( 
metaData, logs );
  +            final Hierarchy hierarchy =
  +                m_logManager.createHierarchy( metaData, logs, classLoader );
   
               //Finally add application to kernel
               m_kernel.addApplication( metaData, classLoader, hierarchy, 
environment );
  
  
  
  1.12      +4 -2      
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java
  
  Index: DefaultLogManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultLogManager.java    16 Mar 2002 00:11:55 -0000      1.11
  +++ DefaultLogManager.java    19 May 2002 13:24:14 -0000      1.12
  @@ -31,7 +31,8 @@
           ResourceManager.getPackageResources( SimpleLogKitManager.class );
   
       public Hierarchy createHierarchy( final SarMetaData metaData,
  -                                      final Configuration logs )
  +                                      final Configuration logs,
  +                                      final ClassLoader classLoader )
           throws Exception
       {
           final DefaultContext context = new DefaultContext();
  @@ -57,7 +58,8 @@
           }
           else if( version.equals( "1.1" ) )
           {
  -            final DefaultLogKitManager manager = new DefaultLogKitManager();
  +            final DefaultLogKitManager manager =
  +                new DefaultLogKitManager();
               setupLogger( manager );
               manager.contextualize( context );
               manager.configure( logs );
  
  
  
  1.8       +12 -1     
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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LogManager.java   10 May 2002 13:09:38 -0000      1.7
  +++ LogManager.java   19 May 2002 13:24:14 -0000      1.8
  @@ -20,6 +20,17 @@
   {
       String ROLE = LogManager.class.getName();
   
  -    Hierarchy createHierarchy( SarMetaData metaData, Configuration logs )
  +    /**
  +     * Create a Logger hierarchy for an applicaiton.
  +     *
  +     * @param metaData the metaData describing applicaiton
  +     * @param logs the configuration data for logs
  +     * @param classLoader the ClassLoader for aapplication
  +     * @return the configured Logger hierarchy
  +     * @throws Exception if an error occurs
  +     */
  +    Hierarchy createHierarchy( SarMetaData metaData,
  +                               Configuration logs,
  +                               ClassLoader classLoader )
           throws Exception;
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to