Return-Path: Delivered-To: apmail-avalon-cvs-archive@www.apache.org Received: (qmail 86721 invoked from network); 17 Feb 2004 12:17:31 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 17 Feb 2004 12:17:31 -0000 Received: (qmail 36378 invoked by uid 500); 17 Feb 2004 12:17:29 -0000 Delivered-To: apmail-avalon-cvs-archive@avalon.apache.org Received: (qmail 36314 invoked by uid 500); 17 Feb 2004 12:17:29 -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 36300 invoked from network); 17 Feb 2004 12:17:28 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 17 Feb 2004 12:17:28 -0000 Received: (qmail 86637 invoked by uid 1438); 17 Feb 2004 12:17:29 -0000 Date: 17 Feb 2004 12:17:29 -0000 Message-ID: <20040217121729.86636.qmail@minotaur.apache.org> From: mcconnell@apache.org To: avalon-cvs@apache.org Subject: cvs commit: avalon/repository/main/src/java/org/apache/avalon/repository/main DefaultInitialContextFactory.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/02/17 04:17:29 Modified: repository/main/src/java/org/apache/avalon/repository/main DefaultInitialContextFactory.java Log: Add protperty expansion. Revision Changes Path 1.2 +5 -1 avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContextFactory.java Index: DefaultInitialContextFactory.java =================================================================== RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContextFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DefaultInitialContextFactory.java 17 Feb 2004 11:06:16 -0000 1.1 +++ DefaultInitialContextFactory.java 17 Feb 2004 12:17:29 -0000 1.2 @@ -61,6 +61,7 @@ import org.apache.avalon.util.env.EnvAccessException; import org.apache.avalon.util.exception.ExceptionHelper; import org.apache.avalon.util.defaults.DefaultsBuilder; +import org.apache.avalon.util.defaults.Defaults; /** @@ -160,9 +161,12 @@ m_defaults = new DefaultsBuilder( key, work ); Properties defaults = getDefaultProperties(); m_properties = - m_defaults.getConsolidatedProperties( + m_defaults.getConsolidatedProperties( defaults, KEYS ); + Defaults.macroExpand( + m_properties, + new Properties[]{ m_properties } ); String spec = m_properties.getProperty( InitialContext.IMPLEMENTATION_KEY ); --------------------------------------------------------------------- To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org For additional commands, e-mail: cvs-help@avalon.apache.org