avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pro...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration FileSystemPersistentConfigurationRepository.java MergedConfiguration.java
Date Fri, 19 Jul 2002 18:34:04 GMT
proyal      2002/07/19 11:34:04

  Modified:    src/java/org/apache/avalon/phoenix/components/configuration
                        FileSystemPersistentConfigurationRepository.java
  Removed:     src/java/org/apache/avalon/phoenix/components/configuration
                        MergedConfiguration.java
  Log:
  * remove MergedConfiguration
  * Update FSPCR to use ConfigurationMerger
  
  Revision  Changes    Path
  1.4       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java
  
  Index: FileSystemPersistentConfigurationRepository.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/configuration/FileSystemPersistentConfigurationRepository.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FileSystemPersistentConfigurationRepository.java	16 Jul 2002 18:09:00 -0000	1.3
  +++ FileSystemPersistentConfigurationRepository.java	19 Jul 2002 18:34:04 -0000	1.4
  @@ -33,6 +33,7 @@
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.phoenix.interfaces.ConfigurationRepository;
  +import org.apache.excalibur.configuration.merged.ConfigurationMerger;
   
   /**
    * Repository which persistently stores configuration information on disk
  @@ -251,7 +252,7 @@
           }
           else
           {
  -            return new MergedConfiguration( p, c );
  +            return ConfigurationMerger.merge( p, c );
           }
       }
   }
  
  
  

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


Mime
View raw message