Return-Path: 
 <cvs-return-21504-apmail-avalon-cvs-archive=avalon.apache.org@avalon.apache.org>
Delivered-To: apmail-avalon-cvs-archive@www.apache.org
Received: (qmail 26153 invoked from network); 1 Mar 2004 13:40:22 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 1 Mar 2004 13:40:22 -0000
Received: (qmail 34480 invoked by uid 500); 1 Mar 2004 13:40:19 -0000
Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org
Received: (qmail 34431 invoked by uid 500); 1 Mar 2004 13:40:18 -0000
Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:cvs-unsubscribe@avalon.apache.org>
List-Subscribe: <mailto:cvs-subscribe@avalon.apache.org>
List-Help: <mailto:cvs-help@avalon.apache.org>
List-Post: <mailto:cvs@avalon.apache.org>
List-Id: "Avalon CVS List" <cvs.avalon.apache.org>
Reply-To: "Avalon Developers List" <dev@avalon.apache.org>
Delivered-To: mailing list cvs@avalon.apache.org
Received: (qmail 34418 invoked from network); 1 Mar 2004 13:40:18 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 1 Mar 2004 13:40:18 -0000
Received: (qmail 26121 invoked by uid 1438); 1 Mar 2004 13:40:21 -0000
Date: 1 Mar 2004 13:40:21 -0000
Message-ID: <20040301134021.26120.qmail@minotaur.apache.org>
From: mcconnell@apache.org
To: avalon-cvs@apache.org
Subject: cvs commit:
 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
 DefaultCriteria.java DefaultFactory.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

mcconnell    2004/03/01 05:40:21

  Modified:    merlin   external.xml maven.xml
               merlin/kernel/api/src/java/org/apache/avalon/merlin
                        KernelCriteria.java
               merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl
                        DefaultCriteria.java DefaultFactory.java
  Log:
  Update to sync. with logging.
  
  Revision  Changes    Path
  1.5       +5 -0      avalon/merlin/external.xml
  
  Index: external.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/external.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- external.xml	27 Feb 2004 22:39:36 -0000	1.4
  +++ external.xml	1 Mar 2004 13:40:20 -0000	1.5
  @@ -26,6 +26,11 @@
       </dependency>
       <dependency>
         <groupId>avalon-logging</groupId>
  +      <artifactId>avalon-logging-impl</artifactId>
  +      <version>1.0-SNAPSHOT</version>
  +    </dependency>
  +    <dependency>
  +      <groupId>avalon-logging</groupId>
         <artifactId>avalon-logkit-api</artifactId>
         <version>1.0-SNAPSHOT</version>
       </dependency>
  
  
  
  1.57      +2 -1      avalon/merlin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/maven.xml,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- maven.xml	23 Feb 2004 01:29:05 -0000	1.56
  +++ maven.xml	1 Mar 2004 13:40:20 -0000	1.57
  @@ -404,7 +404,7 @@
         </j:otherwise>
       </j:choose>
   
  -    <ant:echo>Building distribution: ${package.name}</ant:echo>
  +    <ant:echo>Building zip distribution: ${package.name}</ant:echo>
       <ant:zip zipfile="${maven.build.dir}/${package.name}.zip">
         <zipfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
         <fileset dir="${basedir}">
  @@ -423,6 +423,7 @@
         </ant:exec>
       </j:if>
   
  +    <ant:echo>Building tar distribution: ${package.name}</ant:echo>
       <ant:tar longfile="gnu" tarfile="${maven.build.dir}/${package.name}.tar">
         <tarfileset dir="${merlin.build.inst.dir}" prefix="merlin"/>
         <fileset dir="${basedir}">
  
  
  
  1.9       +2 -2      avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java
  
  Index: KernelCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/api/src/java/org/apache/avalon/merlin/KernelCriteria.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- KernelCriteria.java	24 Feb 2004 22:18:22 -0000	1.8
  +++ KernelCriteria.java	1 Mar 2004 13:40:20 -0000	1.9
  @@ -228,7 +228,7 @@
       * Return a external logging system configuration file
       * @return the logging configuration file (possibly null)
       */
  -    File getLoggingConfiguration();
  +    URL getLoggingConfiguration();
   
      /**
       * Return the logging system implementation artifact.
  
  
  
  1.26      +5 -5      avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java
  
  Index: DefaultCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultCriteria.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- DefaultCriteria.java	29 Feb 2004 22:34:54 -0000	1.25
  +++ DefaultCriteria.java	1 Mar 2004 13:40:20 -0000	1.26
  @@ -422,12 +422,12 @@
       }
   
      /**
  -    * Return an external logging system configuration file
  -    * @return the configuration file (possibly null)
  +    * Return an external logging system configuration source
  +    * @return the configuration url (possibly null)
       */
  -    public File getLoggingConfiguration()
  +    public URL getLoggingConfiguration()
       {
  -        return (File) get( MERLIN_LOGGING_CONFIG );
  +        return (URL) get( MERLIN_LOGGING_CONFIG );
       }
   
      /**
  
  
  
  1.35      +7 -7      avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- DefaultFactory.java	29 Feb 2004 22:34:54 -0000	1.34
  +++ DefaultFactory.java	1 Mar 2004 13:40:21 -0000	1.35
  @@ -622,16 +622,16 @@
         throws Exception
       {
           File dir = criteria.getWorkingDirectory();
  +        URL logging = criteria.getLoggingConfiguration();
           Artifact artifact = criteria.getLoggingImplementation();
  +
           Builder builder = m_context.newBuilder( m_classloader, artifact );
           Factory factory = builder.getFactory();
           
           LoggingCriteria params = getLoggingCriteria( factory );
  -        URL conf = params.getLoggingConfiguration();
  -
           params.setDebugEnabled( criteria.isDebugEnabled() );
           params.setBaseDirectory( dir );
  -        params.setLoggingConfiguration( conf );
  +        params.setLoggingConfiguration( logging );
   
           return (LoggingManager) factory.create( params );
       }
  @@ -802,12 +802,12 @@
             + criteria.getKernelURL() );
   
           buffer.append( 
  -          "\n  ${merlin.logging.config} == " 
  -          + criteria.getLoggingConfiguration() );
  -
  -        buffer.append( 
             "\n  ${merlin.logging.implementation} == " 
             + criteria.getLoggingImplementation() );
  +
  +        buffer.append( 
  +          "\n  ${merlin.logging.config} == " 
  +          + criteria.getLoggingConfiguration() );
   
           buffer.append( 
             "\n  ${merlin.runtime} == " 
  
  
  

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