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/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl DefaultCriteria.java DefaultFactory.java
Date Wed, 26 Nov 2003 14:34:55 GMT
mcconnell    2003/11/26 06:34:55

  Modified:    kernel/impl/conf merlin.properties
               kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
                        DefaultCriteria.java DefaultFactory.java
  Log:
  Add logging subsytem creation.
  
  Revision  Changes    Path
  1.3       +5 -0      avalon-sandbox/kernel/impl/conf/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/impl/conf/merlin.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- merlin.properties	25 Nov 2003 18:57:29 -0000	1.2
  +++ merlin.properties	26 Nov 2003 14:34:55 -0000	1.3
  @@ -14,6 +14,11 @@
   merlin.system = ${merlin.home}/system
   
   #
  +# The default common repository root directory. 
  +#
  +merlin.repository = ${avalon.home}
  +
  +#
   # The default merlin system configuration root directory. 
   #
   merlin.config = ${merlin.home}/config
  
  
  
  1.9       +4 -4      avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultCriteria.java
  
  Index: DefaultCriteria.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultCriteria.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DefaultCriteria.java	26 Nov 2003 14:13:28 -0000	1.8
  +++ DefaultCriteria.java	26 Nov 2003 14:34:55 -0000	1.9
  @@ -131,7 +131,7 @@
           Properties system = System.getProperties();
   
           printProperties( avalon, "avalon" );
  -        printProperties( merlin, "merin" );
  +        printProperties( merlin, "merlin" );
           printProperties( env, "environment" );
   
           //
  @@ -142,15 +142,15 @@
           final DefaultsFinder[] finders = 
             new DefaultsFinder[]{
               new SimpleDefaultsFinder( 
  -              new Properties[] { avalon, merlin, env }, 
  +              new Properties[] { merlin, avalon, env }, 
                 false ), 
               new SystemDefaultsFinder() 
             };
           
           Defaults defaults = new Defaults( SINGLE_KEYS, MULTI_VALUE_KEYS, finders );
           printProperties( defaults, "defaults (unresolved)" );
  -        Defaults.macroExpand( defaults, new Properties[]{ system, env } );
  -        Defaults.macroExpand( defaults, new Properties[]{ system, env } );
  +        Defaults.macroExpand( defaults, new Properties[]{ system, avalon, env } );
  +        Defaults.macroExpand( defaults, new Properties[]{ system, avalon, env } );
           printProperties( defaults, "defaults (resolved)" );
           System.out.print( "" );
   
  
  
  
  1.7       +2 -1      avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultFactory.java
  
  Index: DefaultFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultFactory.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultFactory.java	26 Nov 2003 14:13:28 -0000	1.6
  +++ DefaultFactory.java	26 Nov 2003 14:34:55 -0000	1.7
  @@ -117,7 +117,8 @@
   
           m_kernelLogger = m_logging.getLoggerForCategory( loggingDescriptor.getName() );
           m_logger = m_kernelLogger.getChildLogger( CATEGORY_NAME );
  -        getLogger().debug( "logging system established" );
  +
  +        getLogger().info( "logging system established" );
   
           return null;
       }
  
  
  

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


Mime
View raw message