donaldp     01/04/20 23:12:37

  Modified:    .        build.xml
               src/java/org/apache/avalon/util PropertyUtil.java
  Removed:     src/compat/org/apache/avalon AbstractConfiguration.java
                        Configurable.java Configuration.java
                        ConfigurationBuilder.java
                        ConfigurationException.java
                        DefaultConfiguration.java
                        DefaultConfigurationBuilder.java Parameters.java
                        Reconfigurable.java SAXConfigurationHandler.java
               src/compat/org/apache/avalon/util ObjectUtil.java
               src/compat/org/apache/avalon/util/cli AbstractMain.java
  Log:
  Remove compat dir. No longer needed as 4,0 will not have any deprecated 
methods/interfaces.
  
  Revision  Changes    Path
  1.30      +0 -1      jakarta-avalon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/build.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- build.xml 2001/04/18 12:29:20     1.29
  +++ build.xml 2001/04/21 06:12:36     1.30
  @@ -220,7 +220,6 @@
              deprecation="${deprecation}">
         <classpath refid="project.class.path" />
         <src path="${test.dir}"/>
  -      <src path="${compat.dir}"/>
         <exclude name="org/apache/avalon/util/datasource/J2eeDataSource.java"
                  unless="j2ee.present"/>
       </javac>
  
  
  
  1.3       +10 -3     jakarta-avalon/src/java/org/apache/avalon/util/PropertyUtil.java
  
  Index: PropertyUtil.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/PropertyUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PropertyUtil.java 2001/04/18 13:03:28     1.2
  +++ PropertyUtil.java 2001/04/21 06:12:37     1.3
  @@ -1,3 +1,10 @@
  +/*
  + * Copyright (C) The Apache Software Foundation. All rights reserved.
  + *
  + * This software is published under the terms of the Apache Software License
  + * version 1.1, a copy of which has been included with this distribution in
  + * the LICENSE file.
  + */
   package org.apache.avalon.util;
   
   import org.apache.avalon.context.Context;
  @@ -71,9 +78,9 @@
           return sb.toString();
       }
       
  -    protected static Object resolveValue( final String key, 
  -                                          final Context context,
  -                                          final boolean ignoreUndefined )
  +    private static Object resolveValue( final String key, 
  +                                        final Context context,
  +                                        final boolean ignoreUndefined )
           throws PropertyException
       {
           Object value = context.get( key );
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to