avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle DefaultLifestyleService.java
Date Sun, 20 Apr 2003 12:10:10 GMT
mcconnell    2003/04/20 05:10:10

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle
                        DefaultLifestyleService.java
  Log:
  Moving to <interface-class>.KEY for context lookup.
  
  Revision  Changes    Path
  1.3       +9 -8      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/DefaultLifestyleService.java
  
  Index: DefaultLifestyleService.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/DefaultLifestyleService.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultLifestyleService.java	11 Apr 2003 20:14:22 -0000	1.2
  +++ DefaultLifestyleService.java	20 Apr 2003 12:10:10 -0000	1.3
  @@ -172,7 +172,7 @@
           }
           context.put( "urn:assembly:appliance.target", new ApplianceHolder( appliance )
);
           context.put( "urn:avalon:classloader", classloader );
  -        context.put( "urn:assembly:lifecycle.deployment", m_deployment );
  +        context.put( DeploymentService.KEY, m_deployment );
           context.makeReadOnly();
   
           //
  @@ -196,14 +196,15 @@
               } catch( Throwable e )
               {
                   final String error =
  -                        "Internal error while attempting to establish the singleton lifestyle
handler.";
  +                  "Internal error while attempting to establish the singleton lifestyle
handler.";
                   throw new LifestyleRuntimeException( error, e );
               }
           } else if( policy.equals( "transient" ) )
           {
               try
               {
  -                TransientLifestyleHandler transientHandler = new TransientLifestyleHandler();
  +                TransientLifestyleHandler transientHandler = 
  +                  new TransientLifestyleHandler();
                   transientHandler.enableLogging( getLogger() );
                   transientHandler.contextualize( context );
                   transientHandler.initialize();
  @@ -211,7 +212,7 @@
               } catch( Throwable e )
               {
                   final String error =
  -                        "Internal error while attempting to establish the transient lifestyle
handler.";
  +                  "Internal error while attempting to establish the transient lifestyle
handler.";
                   throw new LifestyleRuntimeException( error, e );
               }
           } else if( policy.equals( "thread" ) )
  @@ -226,14 +227,14 @@
               } catch( Throwable e )
               {
                   final String error =
  -                        "Internal error while attempting to establish the transient lifestyle
handler.";
  +                  "Internal error while attempting to establish the transient lifestyle
handler.";
                   throw new LifestyleRuntimeException( error, e );
               }
           } else
           {
               final String error =
  -                    "Lifestyle policy argument '" + policy + "' within appliance: "
  -                    + appliance + "' is not recognized.";
  +              "Lifestyle policy argument '" + policy + "' within appliance: "
  +              + appliance + "' is not recognized.";
               throw new LifestyleRuntimeException( error );
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message