RE: cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java CompositeConfiguration.java Configuration.java

2004-10-19 Thread Eric Pugh 
Unfortunantly, it only works when I can slip the change in without anyone
knowing...

ERic

 -Original Message-
 From: Henning P. Schmiedehausen [mailto:[EMAIL PROTECTED]
 Sent: Tuesday, October 19, 2004 12:31 AM
 To: [EMAIL PROTECTED]
 Subject: Re: cvs commit:
 jakarta-commons/configuration/src/java/org/apache/commons/configuration
 AbstractConfiguration.java CompositeConfiguration.java
 Configuration.java


 [EMAIL PROTECTED] writes:

   +  action dev=ebourg type=remove

 Hehe, so they will blame Emmanuel when everything breaks.
 Clever move. ;-)

   Regards
   Henning

 --
 Dipl.-Inf. (Univ.) Henning P. Schmiedehausen  INTERMETA GmbH
 [EMAIL PROTECTED]+49 9131 50 654 0   http://www.intermeta.de/

 RedHat Certified Engineer -- Jakarta Turbine Development  -- hero for hire
Linux, Java, perl, Solaris -- Consulting, Training, Development

 Fighting for one's political stand is an honorable action, but re-
  fusing to acknowledge that there might be weaknesses in one's
  position - in order to identify them so that they can be remedied -
  is a large enough problem with the Open Source movement that it
  deserves to be on this list of the top five problems.
-- Michelle Levesque, Fundamental Issues with
 Open Source Software Development

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


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

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java CompositeConfiguration.java Configuration.java

2004-10-18 Thread epugh 
epugh   2004/10/18 14:38:45

  Modified:configuration/xdocs changes.xml
   configuration/src/test/org/apache/commons/configuration
TestDatabaseConfiguration.java
TestBaseConfiguration.java TestEqualBehaviour.java
TestCompositeConfiguration.java
TestPropertiesConfiguration.java
TestSubsetConfiguration.java
TestXMLConfiguration.java
BaseNonStringProperties.java
TestConfigurationConverter.java
TestThreesomeConfiguration.java
TestBaseNullConfiguration.java
TestNullCompositeConfiguration.java
NonStringTestHolder.java
   configuration/src/java/org/apache/commons/configuration
AbstractConfiguration.java
CompositeConfiguration.java Configuration.java
  Log:
  Remove deprecated Vector related methods.
  
  Revision  ChangesPath
  1.63  +3 -0  jakarta-commons/configuration/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- changes.xml   18 Oct 2004 15:45:10 -  1.62
  +++ changes.xml   18 Oct 2004 21:38:45 -  1.63
  @@ -8,6 +8,9 @@
 body
   
   release version=1.1-dev date=in CVS
  +  action dev=ebourg type=remove
  +Remove deprecated getVector() implementations. 
  +  /action
 action dev=ebourg type=add issue=25661
   File based configurations can now be automatically reloaded when the
   underlying file is modified.
  
  
  
  1.11  +1 -10 
jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDatabaseConfiguration.java
  
  Index: TestDatabaseConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDatabaseConfiguration.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestDatabaseConfiguration.java18 Oct 2004 14:05:23 -  1.10
  +++ TestDatabaseConfiguration.java18 Oct 2004 21:38:45 -  1.11
  @@ -20,7 +20,6 @@
   import java.sql.SQLException;
   import java.util.Iterator;
   import java.util.List;
  -import java.util.Vector;
   
   import javax.sql.DataSource;
   
  @@ -28,7 +27,6 @@
   
   import org.apache.commons.configuration.test.HsqlDB;
   import org.apache.commons.dbcp.BasicDataSource;
  -
   import org.dbunit.database.DatabaseConnection;
   import org.dbunit.database.IDatabaseConnection;
   import org.dbunit.dataset.IDataSet;
  @@ -220,13 +218,6 @@
   DatabaseConfiguration config1 = new DatabaseConfiguration(datasource, 
configurationList, key, value);
   List list = config1.getList(key3);
   assertEquals(3,list.size());
  -}
  -
  -public void testGetVector()
  -{
  -DatabaseConfiguration config1 = new DatabaseConfiguration(datasource, 
configurationList, key, value);
  -Vector vector = config1.getVector(key3);
  -assertEquals(3,vector.size());
   }
   
   public void testGetKeys()
  
  
  
  1.17  +1 -26 
jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestBaseConfiguration.java
  
  Index: TestBaseConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestBaseConfiguration.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TestBaseConfiguration.java18 Oct 2004 10:44:31 -  1.16
  +++ TestBaseConfiguration.java18 Oct 2004 21:38:45 -  1.17
  @@ -22,7 +22,6 @@
   import java.util.List;
   import java.util.NoSuchElementException;
   import java.util.Properties;
  -import java.util.Vector;
   
   import junit.framework.TestCase;
   import junitx.framework.ObjectAssert;
  @@ -402,30 +401,6 @@
   /*
*  now test dan's new fix where we get the first scalar
*  when we access a list valued property
  - */
  -try
  -{
  -config.getString(number);
  -}
  -catch (NoSuchElementException nsse)
  -{
  -fail(Should return a string);
  -}
  -}
  -
  -public void testGetVector()
  -{
  -config.addProperty(number, 1);
  -config.addProperty(number, 2);
  -Vector vector = config.getVector(number);
  -assertNotNull(The vector is null, vector);
  -assertEquals(Vector

Re: cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java CompositeConfiguration.java Configuration.java

2004-10-18 Thread Henning P. Schmiedehausen 
[EMAIL PROTECTED] writes:

  +  action dev=ebourg type=remove

Hehe, so they will blame Emmanuel when everything breaks. 
Clever move. ;-)

Regards
Henning

-- 
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen  INTERMETA GmbH
[EMAIL PROTECTED]+49 9131 50 654 0   http://www.intermeta.de/

RedHat Certified Engineer -- Jakarta Turbine Development  -- hero for hire
   Linux, Java, perl, Solaris -- Consulting, Training, Development

Fighting for one's political stand is an honorable action, but re-
 fusing to acknowledge that there might be weaknesses in one's
 position - in order to identify them so that they can be remedied -
 is a large enough problem with the Open Source movement that it
 deserves to be on this list of the top five problems.
   -- Michelle Levesque, Fundamental Issues with
Open Source Software Development

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

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java

2004-08-12 Thread epugh 
epugh   2004/08/12 08:45:59

  Modified:configuration/src/java/org/apache/commons/configuration
AbstractConfiguration.java
  Log:
  findbugs fix!
  
  Revision  ChangesPath
  1.19  +2 -2  
jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- AbstractConfiguration.java12 Jul 2004 14:36:58 -  1.18
  +++ AbstractConfiguration.java12 Aug 2004 15:45:58 -  1.19
  @@ -385,7 +385,7 @@
*/
   public boolean getBoolean(String key, boolean defaultValue)
   {
  -return getBoolean(key, new Boolean(defaultValue)).booleanValue();
  +return getBoolean(key, Boolean.valueOf(defaultValue)).booleanValue();
   }
   
   /**
  
  
  

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

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java

2004-07-12 Thread ebourg 
ebourg  2004/07/12 07:36:58

  Modified:configuration/src/java/org/apache/commons/configuration
AbstractConfiguration.java
  Log:
  Simplified implementation of getKeys(String prefix)
  
  Revision  ChangesPath
  1.18  +3 -10 
jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- AbstractConfiguration.java5 Jul 2004 09:54:17 -   1.17
  +++ AbstractConfiguration.java12 Jul 2004 14:36:58 -  1.18
  @@ -290,15 +290,8 @@
   {
   public boolean evaluate(Object obj)
   {
  -boolean matching = false;
  -
  -if (obj instanceof String)
  -{
  -String key = (String) obj;
  -matching = key.startsWith(prefix + .) || key.equals(prefix);
  -}
  -
  -return matching;
  +String key = (String) obj;
  +return key.startsWith(prefix + .) || key.equals(prefix);
   }
   });
   }
  
  
  

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

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java

2004-06-22 Thread ebourg 
ebourg  2004/06/22 02:35:54

  Modified:configuration/src/java/org/apache/commons/configuration
AbstractConfiguration.java
  Log:
  Removed the hasMoreTokens() method from PropertiesTokenizer
  
  Revision  ChangesPath
  1.14  +1 -11 
jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- AbstractConfiguration.java21 Jun 2004 13:49:24 -  1.13
  +++ AbstractConfiguration.java22 Jun 2004 09:35:54 -  1.14
  @@ -1310,16 +1310,6 @@
   }
   
   /**
  - * Check whether the object has more tokens.
  - *
  - * @return True if the object has more tokens.
  - */
  -public boolean hasMoreTokens()
  -{
  -return super.hasMoreTokens();
  -}
  -
  -/**
* Get next token.
*
* @return A String.
  
  
  

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

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java CompositeConfiguration.java Configuration.java

2004-06-21 Thread ebourg 
ebourg  2004/06/21 05:37:40

  Modified:configuration/src/java/org/apache/commons/configuration
AbstractConfiguration.java
CompositeConfiguration.java Configuration.java
  Log:
  getList revamp
  - getList(key, null) in AbstractConfiguration now returns null for non existing keys
  - getList(String) has been removed from CompositeConfiguration
  - javadoc update in the Configuration interface
  
  Revision  ChangesPath
  1.12  +3 -17 
jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- AbstractConfiguration.java16 Jun 2004 18:13:53 -  1.11
  +++ AbstractConfiguration.java21 Jun 2004 12:37:40 -  1.12
  @@ -1217,27 +1217,14 @@
* Get a List of strings associated with the given configuration key.
*
* @param key The configuration key.
  - *
* @return The associated List.
*
* @throws ConversionException is thrown if the key maps to an
* object that is not a List.
  - *
  - * @throws NoSuchElementException is thrown if the key doesn't
  - * map to an existing object.
*/
   public List getList(String key)
   {
  -List list = getList(key, null);
  -if (list != null)
  -{
  -return list;
  -}
  -else
  -{
  -throw new NoSuchElementException(
  -'\'' + key + ' doesn't map to an existing object);
  -}
  +return getList(key, new ArrayList());
   }
   
   /**
  @@ -1245,7 +1232,6 @@
*
* @param key The configuration key.
* @param defaultValue The default value.
  - *
* @return The associated List.
*
* @throws ConversionException is thrown if the key maps to an
  @@ -1271,7 +1257,7 @@
   }
   else if (value == null)
   {
  -list = ((defaultValue == null) ? new ArrayList() : defaultValue);
  +list = defaultValue;
   }
   else
   {
  
  
  
  1.14  +14 -24
jakarta-commons/configuration/src/java/org/apache/commons/configuration/CompositeConfiguration.java
  
  Index: CompositeConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/CompositeConfiguration.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CompositeConfiguration.java   15 Jun 2004 15:53:58 -  1.13
  +++ CompositeConfiguration.java   21 Jun 2004 12:37:40 -  1.14
  @@ -262,11 +262,10 @@
* Get a List of strings associated with the given configuration key.
*
* @param key The configuration key.
  + * @param defaultValue The default value.
* @return The associated List.
  - * @exception ConversionException is thrown if the key maps to an
  - * object that is not a List.
*/
  -public List getList(String key)
  +public List getList(String key, List defaultValue)
   {
   List list = new ArrayList();
   
  @@ -282,25 +281,14 @@
   }
   
   // add all elements from the in memory configuration
  -list.addAll(inMemoryConfiguration.getList(key, null));
  -
  -return list;
  -}
  +list.addAll(inMemoryConfiguration.getList(key));
   
  -/**
  - * Get a List of strings associated with the given configuration key.
  - *
  - * @param key The configuration key.
  - * @param defaultValue The default value.
  - * @return The associated List.
  - * @exception ConversionException is thrown if the key maps to an
  - * object that is not a List.
  - */
  -public List getList(String key, List defaultValue)
  -{
  -List list = getList(key);
  +if (list.isEmpty())
  +{
  +return defaultValue;
  +}
   
  -return list.isEmpty() ? defaultValue : list;
  +return list;
   }
   
   /**
  @@ -308,8 +296,9 @@
*
* @param key The configuration key.
* @return The associated string array if key is found.
  - * @exception ConversionException is thrown if the key maps to an
  - * object that is not a String/List of Strings.
  + *
  + * @throws ConversionException is thrown if the key maps to an
  + * object that is not a String/List of Strings.
*/
   public String[] getStringArray(String key)
   {
  @@ -326,7 +315,8 @@

cvs commit: jakarta-commons/configuration/src/java/org/apache/commons/configuration AbstractConfiguration.java

2004-05-04 Thread epugh 
epugh   2004/05/04 15:27:10

  Modified:configuration/xdocs changes.xml
   configuration/src/test/org/apache/commons/configuration
TestSubsetConfiguration.java
   configuration/src/java/org/apache/commons/configuration
AbstractConfiguration.java
  Log:
  Bugzilla Bug 28763  

 [configuration] SubsetConfiguration.getList throws exception
  
  Revision  ChangesPath
  1.19  +4 -0  jakarta-commons/configuration/xdocs/changes.xml
  
  Index: changes.xml
  ===
  RCS file: /home/cvs/jakarta-commons/configuration/xdocs/changes.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- changes.xml   1 Apr 2004 18:43:04 -   1.18
  +++ changes.xml   4 May 2004 22:27:10 -   1.19
  @@ -7,6 +7,10 @@
   
 body
   release version=1.0-dev-4 date=  
  + action dev=epugh type=fix
  +SubsetConfiguration returns a List on getList().  AbstractConfiguration 
wouldn't properly
  +deal with a List, only with a Container for getList()!  Thanks to jschaible 
for the unit test.
  + /action   
action dev=jschaible type=add
   Direct support of XML via DOM. New classes DOMConfiguration and 
HierarchicalDOMConfiguration.
/action 
  
  
  
  1.2   +13 -1 
jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestSubsetConfiguration.java
  
  Index: TestSubsetConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestSubsetConfiguration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestSubsetConfiguration.java  9 Mar 2004 10:31:31 -   1.1
  +++ TestSubsetConfiguration.java  4 May 2004 22:27:10 -   1.2
  @@ -18,7 +18,9 @@
   
   import junit.framework.TestCase;
   
  +import java.util.ArrayList;
   import java.util.Iterator;
  +import java.util.List;
   
   /**
* Test case for the [EMAIL PROTECTED] SubsetConfiguration} class.
  @@ -104,5 +106,15 @@
   assertEquals(1st key, abc, it.next());
   assertEquals(2nd key, abc.key1, it.next());
   assertFalse(too many elements, it.hasNext());
  +}
  +
  +public void testGetList() {
  +BaseConfiguration conf = new BaseConfiguration();
  +conf.setProperty(test.abc, value0,value1);
  +conf.addProperty(test.abc,value3);
  +
  +Configuration subset = new SubsetConfiguration(conf, test, .);
  +List list = subset.getList(abc, new ArrayList());
  +assertEquals(3, list.size());
   }
   }
  
  
  
  1.8   +5 -1  
jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java
  
  Index: AbstractConfiguration.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/configuration/src/java/org/apache/commons/configuration/AbstractConfiguration.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractConfiguration.java9 Mar 2004 10:31:31 -   1.7
  +++ AbstractConfiguration.java4 May 2004 22:27:10 -   1.8
  @@ -1254,6 +1254,10 @@
   {
   list = ((Container) value).asList();
   }
  +else if (value instanceof List)
  +{
  +list = (List)value;
  +}
   else if (value == null)
   {
   list = ((defaultValue == null) ? new ArrayList() : defaultValue);
  
  
  

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