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-spi/src/java/org/apache/avalon/assembly/logging LoggingManager.java
Date Sun, 20 Apr 2003 12:13:55 GMT
mcconnell    2003/04/20 05:13:55

  Modified:    merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance
                        Appliance.java ApplianceContext.java
                        ApplianceRepository.java
               merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model
                        Classpath.java
               merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging
                        LoggingManager.java
  Log:
  Moving to <interface-class>.KEY for context lookup.
  
  Revision  Changes    Path
  1.6       +14 -4     avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java
  
  Index: Appliance.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/Appliance.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Appliance.java	11 Apr 2003 20:28:31 -0000	1.5
  +++ Appliance.java	20 Apr 2003 12:13:54 -0000	1.6
  @@ -87,18 +87,28 @@
    */
   public interface Appliance extends Reclaimable
   {
  +    //-----------------------------------------------------------
  +    // static
  +    //-----------------------------------------------------------
  +
       /**
  -     * Meta-info attribute name under which an alternative appliance class may be declared.
  +     * Meta-info attribute name under which an alternative appliance 
  +     * class may be declared.
        */
       static final String APPLIANCE_CLASS_KEY =
               "urn:assembly:appliance.class";
   
       /**
  -     * Meta-info attribute name under which an custom appliance factory may be declared
  -     * by a component type.
  +     * Meta-info attribute name under which an custom appliance factory 
  +     * may be declared by a component type.
        */
       static final String APPLIANCE_FACTORY_KEY =
               "urn:assembly:appliance.factory";
  +
  +
  +    //-----------------------------------------------------------
  +    // operations
  +    //-----------------------------------------------------------
   
       /**
        * Get the appliance name.
  
  
  
  1.3       +6 -1      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java
  
  Index: ApplianceContext.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceContext.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApplianceContext.java	11 Apr 2003 20:28:31 -0000	1.2
  +++ ApplianceContext.java	20 Apr 2003 12:13:54 -0000	1.3
  @@ -75,6 +75,11 @@
       //=====================================================================
   
       /**
  +     * Standard context key.
  +     */
  +    static final String KEY = "urn:assembly:appliance.context";
  +
  +    /**
        * Activation policy.  The type of value supplied as a context argument
        * is a {@link Boolean}.  A value of TRUE establishes the appliance with
        * a policy of startup on startup of the enclosing container.  A value of
  
  
  
  1.5       +6 -1      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceRepository.java
  
  Index: ApplianceRepository.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/appliance/ApplianceRepository.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ApplianceRepository.java	13 Apr 2003 02:24:44 -0000	1.4
  +++ ApplianceRepository.java	20 Apr 2003 12:13:54 -0000	1.5
  @@ -67,6 +67,11 @@
   public interface ApplianceRepository extends ApplianceResolver
   {
       /**
  +     * Standard context key for the appliance repository.
  +     */
  +     static final String KEY = "urn:assembly:appliance.repository";
  +
  +    /**
        * Return the base URL for the repository.
        * @return the manager URL
        */
  
  
  
  1.4       +5 -2      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/Classpath.java
  
  Index: Classpath.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/engine/model/Classpath.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Classpath.java	11 Apr 2003 20:28:32 -0000	1.3
  +++ Classpath.java	20 Apr 2003 12:13:55 -0000	1.4
  @@ -56,6 +56,7 @@
   package org.apache.avalon.assembly.engine.model;
   
   import java.net.URL;
  +import java.io.File;
   
   /**
    * <p>A classpath directive that defines the contract for multiple
  @@ -67,11 +68,13 @@
   public interface Classpath
   {
   
  +    static final String KEY = "urn:assembly:engine.classpath";
  +
       /**
        * Expand a classpath to an array of URLS.
        * @param home the base directory from which relative classpath entries
        * will be resolved.
        */
  -    URL[] expand();
  +    URL[] expand( File system, File home );
   
   }
  
  
  
  1.4       +5 -0      avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/LoggingManager.java
  
  Index: LoggingManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/assembly-spi/src/java/org/apache/avalon/assembly/logging/LoggingManager.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LoggingManager.java	15 Apr 2003 02:49:43 -0000	1.3
  +++ LoggingManager.java	20 Apr 2003 12:13:55 -0000	1.4
  @@ -60,6 +60,11 @@
    */
   public interface LoggingManager
   {
  +    /**
  +     * Standard context key for the logging manager.
  +     */
  +     static final String KEY = "urn:assembly:logging";
  +
        static final String SYSTEM_CATEGORY_KEY = "urn:avalon:assembly.logging.system-category";
        static final String SYSTEM_CATEGORY_DEFAULT = "system";
   
  
  
  

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


Mime
View raw message