cvs commit: avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/impl DefaultContainer.java

[mcconnell]

mcconnell    2003/01/23 15:25:03

  Modified:    merlin   default.properties
               merlin/src/java/org/apache/avalon/merlin/container/impl
                        DefaultContainer.java
  Log:
  Log message enhancements.
  
  Revision  Changes    Path
  1.10      +1 -1      avalon-sandbox/merlin/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- default.properties        22 Jan 2003 14:19:27 -0000      1.9
  +++ default.properties        23 Jan 2003 23:25:03 -0000      1.10
  @@ -89,7 +89,7 @@
   # ----- Excalibur pool -----
   excalibur-pool.home=${excalibur.home}/pool
   excalibur-pool.lib=${excalibur-pool.home}/build/lib
  -excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.1.jar
  +excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.2.jar
   
   # ----- Excalibur datasource -----
   excalibur-sourceresolve.home=${excalibur.home}/sourceresolve
  
  
  
  1.2       +15 -2     
avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.java
  
  Index: DefaultContainer.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-sandbox/merlin/src/java/org/apache/avalon/merlin/container/impl/DefaultContainer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultContainer.java     19 Jan 2003 15:53:55 -0000      1.1
  +++ DefaultContainer.java     23 Jan 2003 23:25:03 -0000      1.2
  @@ -389,7 +389,9 @@
                   if( getLogger().isDebugEnabled() )
                   {
                       final String message =
  -                      "activating component: [" + appliance.getName() + "]"; 
  +                      "activating component (" 
  +                      + (i+1) + ":" + appliances.length + ") : " 
  +                      + appliance; 
                       getLogger().debug( message );
                   }
                   try
  @@ -420,6 +422,17 @@
                            + appliance.getName() 
                            + " in container: " + this;
                       throw new ContainerException( error, e );
  +                }
  +            }
  +            else
  +            {
  +                if( getLogger().isDebugEnabled() )
  +                {
  +                    final String message =
  +                      "deferring activation of appliance (" 
  +                      + (i+1) + ":" + appliances.length + ") : " 
  +                      + appliance; 
  +                    getLogger().debug( message );
                   }
               }
           }
  
  
  

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