mcconnell    2004/04/19 03:49:51

  Modified:    activation/impl/src/java/org/apache/avalon/activation/impl
                        DefaultComponentFactory.java
               activation/impl/src/test/org/apache/avalon/playground
                        SimpleComponent.java
  Log:
  Improve log messages.
  
  Revision  Changes    Path
  1.12      +17 -2     
avalon/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java
  
  Index: DefaultComponentFactory.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/activation/impl/src/java/org/apache/avalon/activation/impl/DefaultComponentFactory.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultComponentFactory.java      23 Mar 2004 23:34:35 -0000      1.11
  +++ DefaultComponentFactory.java      19 Apr 2004 10:49:50 -0000      1.12
  @@ -142,6 +142,13 @@
       */
       public void etherialize( final Object instance )
       {
  +        if( getLogger().isDebugEnabled() )
  +        {
  +            final String message = 
  +              "etherialization";
  +            getLogger().debug( message );
  +        }
  +
           try
           {
               applyCreateStage( instance, false );
  @@ -241,6 +248,13 @@
       */
       private Object incarnation() throws LifecycleException
       {
  +        if( getLogger().isDebugEnabled() )
  +        {
  +            final String message = 
  +              "incarnation";
  +            getLogger().debug( message );
  +        }
  +
           Class clazz = m_model.getDeploymentClass();
           final Logger logger = m_model.getLogger();
           final Configuration config = m_model.getConfiguration();
  @@ -431,7 +445,6 @@
                       ContainerUtil.execute( instance );
                   }
               }
  -            return instance;
           }
           catch( Throwable e )
           {
  @@ -441,6 +454,8 @@
                   m_model.getQualifiedName() );
                throw new LifecycleException( error, e );
           }
  +
  +        return instance;
       }
   
       private Class getContextCastingClass()
  
  
  
  1.3       +2 -2      
avalon/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.java
  
  Index: SimpleComponent.java
  ===================================================================
  RCS file: 
/home/cvs/avalon/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleComponent.java      24 Jan 2004 23:25:23 -0000      1.2
  +++ SimpleComponent.java      19 Apr 2004 10:49:50 -0000      1.3
  @@ -83,7 +83,7 @@
        */
       public void incarnate()
       {
  -        getLogger().info( "incarnation stage" );
  +        getLogger().info( "exploitation (create)" );
       }
   
       /**
  @@ -91,7 +91,7 @@
        */
       public void etherialize()
       {
  -        getLogger().info( "etherialize stage" );
  +        getLogger().info( "exploitation (destroy)" );
       }
   
   
  
  
  

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

Reply via email to