cvs commit: avalon/repository/main/src/java/org/apache/avalon/repository/main DefaultInitialContextFactory.java

[mcconnell]

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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]