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/composition/src/java/org/apache/avalon/composition/model/impl DefaultDeploymentModel.java
Date Sat, 02 Aug 2003 09:13:27 GMT
mcconnell    2003/08/02 02:13:27

  Modified:    merlin/composition/src/java/org/apache/avalon/composition/model/impl
                        DefaultDeploymentModel.java
  Log:
  Logging categories accessor.
  
  Revision  Changes    Path
  1.18      +12 -2     avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
  
  Index: DefaultDeploymentModel.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- DefaultDeploymentModel.java	24 Jul 2003 22:14:55 -0000	1.17
  +++ DefaultDeploymentModel.java	2 Aug 2003 09:13:27 -0000	1.18
  @@ -67,6 +67,7 @@
   import org.apache.avalon.composition.model.StageModel;
   import org.apache.avalon.composition.data.DependencyDirective;
   import org.apache.avalon.composition.data.StageDirective;
  +import org.apache.avalon.composition.data.CategoriesDirective;
   import org.apache.avalon.composition.repository.Repository;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  @@ -158,6 +159,7 @@
             context.getProfile().getMode() );
   
           m_context = context;
  +        m_activation = m_context.getProfile().getActivationPolicy();
   
           ClassLoader classLoader = m_context.getClassLoader();
   
  @@ -211,7 +213,6 @@
               m_contextModel = null;
           }
   
  - 
           //
           // create the dependency models for subsequent assembly
           // management
  @@ -295,6 +296,15 @@
       //==============================================================
       // DeploymentModel
       //==============================================================
  +
  +   /**
  +    * Return the logging categories. 
  +    * @return the logging categories
  +    */
  +    public CategoriesDirective getCategories()
  +    {
  +        return m_context.getProfile().getCategories();
  +    }
   
      /**
       * Return the activation policy for the model. 
  
  
  

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


Mime
View raw message