Return-Path: Delivered-To: apmail-avalon-cvs-archive@www.apache.org Received: (qmail 82729 invoked from network); 26 Nov 2003 14:34:56 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 26 Nov 2003 14:34:56 -0000 Received: (qmail 59023 invoked by uid 500); 26 Nov 2003 14:34:52 -0000 Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 58943 invoked by uid 500); 26 Nov 2003 14:34:52 -0000 Mailing-List: contact cvs-help@avalon.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list cvs@avalon.apache.org Received: (qmail 58929 invoked by uid 500); 26 Nov 2003 14:34:52 -0000 Received: (qmail 58926 invoked from network); 26 Nov 2003 14:34:52 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 26 Nov 2003 14:34:52 -0000 Received: (qmail 82639 invoked by uid 1438); 26 Nov 2003 14:34:55 -0000 Date: 26 Nov 2003 14:34:55 -0000 Message-ID: <20031126143455.82638.qmail@minotaur.apache.org> From: mcconnell@apache.org To: avalon-sandbox-cvs@apache.org Subject: cvs commit: avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/kernel/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 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