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/impl AbstractLifestyleHandler.java PooledLifestyleHandler.java
Date Sun, 22 Jun 2003 00:27:30 GMT
mcconnell    2003/06/21 17:27:30

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl
                        AbstractLifestyleHandler.java
                        PooledLifestyleHandler.java
  Log:
  Update handlers to use common key references.
  
  Revision  Changes    Path
  1.6       +3 -3      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl/AbstractLifestyleHandler.java
  
  Index: AbstractLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl/AbstractLifestyleHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractLifestyleHandler.java	18 Jun 2003 11:16:14 -0000	1.5
  +++ AbstractLifestyleHandler.java	22 Jun 2003 00:27:30 -0000	1.6
  @@ -111,7 +111,7 @@
        *     <td>key</td><td>type</td><td>description</td>
        *   </tr>
        *   <tr>
  -     *     <td>urn:assembly:appliance.target</td>
  +     *     <td>urn:assembly:appliance</td>
        *     <td>{@link org.apache.avalon.assembly.appliance.Appliance}</td>
        *     <td>The appliance that this manager is managing.</td>
        *   </tr>
  @@ -123,7 +123,7 @@
           m_classloader = (ClassLoader) context.get( "urn:avalon:classloader" );
           m_deployment = 
             (DeploymentService) context.get( "urn:assembly:lifecycle.deployment" );
  -        Object object = context.get( "urn:assembly:appliance.target" );
  +        Object object = context.get( Appliance.KEY );
           if( object instanceof Appliance )
           {
               m_appliance = (Appliance) object;
  
  
  
  1.4       +3 -3      avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl/PooledLifestyleHandler.java
  
  Index: PooledLifestyleHandler.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/lifestyle/impl/PooledLifestyleHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PooledLifestyleHandler.java	18 Jun 2003 11:16:14 -0000	1.3
  +++ PooledLifestyleHandler.java	22 Jun 2003 00:27:30 -0000	1.4
  @@ -148,7 +148,7 @@
       public void contextualize( Locator context ) throws ContextException
       {
           super.contextualize( context );
  -        m_poolManager = (PoolManager) context.get( "urn:assembly:pool-manager" );
  +        m_poolManager = (PoolManager) context.get( PoolManager.ROLE );
           m_context = context;
       }
   
  @@ -164,7 +164,7 @@
       public void initialize() throws Exception
       {
           super.initialize();
  -        m_appliance = (Appliance) m_context.get( "urn:assembly:appliance.target" );
  +        m_appliance = (Appliance) m_context.get( Appliance.KEY );
           ClassLoader classloader = (ClassLoader) m_context.get( "urn:avalon:classloader"
);
           m_class = classloader.loadClass( m_appliance.getType().getInfo().getClassname()
);
       }
  
  
  

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


Mime
View raw message