mcconnell    2002/08/12 13:34:33

  Modified:    assembly/demo/src/java/org/apache/excalibur/playground
                        CustomContainer.java CustomContainer.xinfo
               assembly/src/etc kernel.xml
               assembly/src/java/org/apache/excalibur/merlin/assembly
                        ContainerManager.java
  Log:
  Impovement to logging information.
  
  Revision  Changes    Path
  1.3       +1 -1      
jakarta-avalon-excalibur/assembly/demo/src/java/org/apache/excalibur/playground/CustomContainer.java
  
  Index: CustomContainer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/assembly/demo/src/java/org/apache/excalibur/playground/CustomContainer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CustomContainer.java      3 Aug 2002 09:58:07 -0000       1.2
  +++ CustomContainer.java      12 Aug 2002 20:34:32 -0000      1.3
  @@ -21,7 +21,7 @@
   
       public void initialize() throws Exception
       {
  -        getLogger().info("this is the initialization of a custom container");
  +        getLogger().info("initialization of a custom container");
           super.initialize();
       }
   
  
  
  
  1.3       +2 -1      
jakarta-avalon-excalibur/assembly/demo/src/java/org/apache/excalibur/playground/CustomContainer.xinfo
  
  Index: CustomContainer.xinfo
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/assembly/demo/src/java/org/apache/excalibur/playground/CustomContainer.xinfo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CustomContainer.xinfo     12 Aug 2002 02:00:08 -0000      1.2
  +++ CustomContainer.xinfo     12 Aug 2002 20:34:33 -0000      1.3
  @@ -14,6 +14,7 @@
         type="org.apache.excalibur.merlin.model.ContainerDescriptor" />
       <entry key="merlin:container.manager"
         type="org.apache.excalibur.merlin.assembly.ContainerManager"/>
  +    <entry key="merlin:container.services" type="java.util.Map"/>
       <entry key="merlin:container.state-listener" 
         type="org.apache.excalibur.merlin.container.StateListener" 
         optional="true"/>
  @@ -21,7 +22,7 @@
         type="org.apache.excalibur.merlin.container.ContainerListener" 
         optional="true"/>
       <entry key="merlin:container.logging" 
  -      type="org.apache.excalibur.merlin.assembly.DefaultLoggingManager"/>
  +      type="org.apache.excalibur.merlin.assembly.DefaultLoggerManager"/>
     </context>
   
     <services>
  
  
  
  1.32      +1 -1      jakarta-avalon-excalibur/assembly/src/etc/kernel.xml
  
  Index: kernel.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/assembly/src/etc/kernel.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- kernel.xml        12 Aug 2002 17:36:15 -0000      1.31
  +++ kernel.xml        12 Aug 2002 20:34:33 -0000      1.32
  @@ -123,7 +123,7 @@
        child container instances.
        -->
   
  -     <container name="sub" >
  +     <container name="sub" class="org.apache.excalibur.playground.CustomContainer">
   
          <categories priority="INFO">
            <category priority="WARN"  name="loader" />
  
  
  
  1.14      +1 -2      
jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/assembly/src/java/org/apache/excalibur/merlin/assembly/ContainerManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ContainerManager.java     12 Aug 2002 17:36:16 -0000      1.13
  +++ ContainerManager.java     12 Aug 2002 20:34:33 -0000      1.14
  @@ -406,7 +406,6 @@
               try
               {
                   Resource resource = getResource( profile );
  -                getLogger().info( "stopping: " + profile ); 
                   resource.dispose();
               }
               catch ( Throwable e )
  
  
  

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

Reply via email to