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/appliance DefaultAppliance.java
Date Sun, 20 Apr 2003 12:01:54 GMT
mcconnell    2003/04/20 05:01:54

  Modified:    merlin/assembly/src/java/org/apache/avalon/assembly/appliance
                        DefaultAppliance.java
  Log:
  Linking context keys to source interfaces.
  
  Revision  Changes    Path
  1.13      +27 -9     avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java
  
  Index: DefaultAppliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly/src/java/org/apache/avalon/assembly/appliance/DefaultAppliance.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- DefaultAppliance.java	17 Apr 2003 03:38:36 -0000	1.12
  +++ DefaultAppliance.java	20 Apr 2003 12:01:54 -0000	1.13
  @@ -141,7 +141,25 @@
       // static
       //=====================================================================
   
  -    protected static String PROTOCOL = "native";
  +    protected static String PROTOCOL = "block";
  +
  +    /**
  +     * Appliance engine key.
  +     */
  +    static final String APPLIANCE_ENGINE_KEY =
  +            "urn:assembly:engine";
  +
  +    /**
  +     * Appliance system context key.
  +     */
  +    static final String APPLIANCE_SYSTEM_KEY =
  +            "urn:assembly:appliance.system";
  +
  +    /**
  +     * Appliance repository key.
  +     */
  +    static final String APPLIANCE_REPOSITORY_KEY =
  +            "urn:assembly:appliance.repository";
   
       //=====================================================================
       // state
  @@ -245,11 +263,11 @@
        */
       public void contextualize( Locator context ) throws ContextException
       {
  -        m_applianceContext = (ApplianceContext) context.get( "urn:assembly:appliance.context"
);
  -        m_engine = (EngineClassLoader) context.get( "urn:assembly:engine" );
  -        m_lifestyle = (LifestyleService) context.get( "urn:assembly:lifestyle.service"
);
  -        m_system = (Locator) context.get( "urn:assembly:appliance.system" );
  -        m_repository = (ApplianceRepository) context.get( "urn:assembly:appliance.repository"
);
  +        m_applianceContext = (ApplianceContext) context.get( ApplianceContext.KEY );
  +        m_lifestyle = (LifestyleService) context.get( LifestyleService.KEY );
  +        m_engine = (EngineClassLoader) context.get( APPLIANCE_ENGINE_KEY );
  +        m_system = (Locator) context.get( APPLIANCE_SYSTEM_KEY );
  +        m_repository = (ApplianceRepository) context.get( APPLIANCE_REPOSITORY_KEY );
       }
   
       //=====================================================================
  @@ -363,8 +381,8 @@
           } catch( Throwable e )
           {
               final String error =
  -                    "Internal lifestyle handler error during qualified resolution "
  -                    + " relative to reference: " + ref;
  +                    "Internal lifestyle handler error in appliance: "
  +                    + this;
               throw new LocatorException( ref, error, e );
           }
       }
  
  
  

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


Mime
View raw message