svn commit: r1868763 - in /db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque: JndiConfigurationTest.java oid/IDBrokerTest.java

[tv]

Author: tv
Date: Tue Oct 22 15:54:45 2019
New Revision: 1868763

URL: http://svn.apache.org/viewvc?rev=1868763&view=rev
Log:
Adjust for commons-configuration2

Modified:
    
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
    
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java?rev=1868763&r1=1868762&r2=1868763&view=diff
==============================================================================
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
 Tue Oct 22 15:54:45 2019
@@ -31,14 +31,15 @@ import javax.naming.NameNotFoundExceptio
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
-import junit.framework.TestCase;
-
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.FileBasedConfiguration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
+import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
+import org.apache.commons.configuration2.builder.fluent.Parameters;
+import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.dbcp2.BasicDataSource;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.torque.criteria.Criteria;
@@ -47,6 +48,8 @@ import org.apache.torque.dsfactory.DataS
 import org.apache.torque.dsfactory.JndiDataSourceFactory;
 import org.apache.torque.test.peer.BookPeer;
 
+import junit.framework.TestCase;
+
 /**
  * Test for configuration using JNDI. The test assumes that we have a
  * non-jndi configuration, and creates the data source configuration from it.
@@ -478,10 +481,13 @@ public class JndiConfigurationTest exten
     protected static Configuration getTorqueConfiguraton()
             throws ConfigurationException
     {
-        Configuration configuration = new PropertiesConfiguration(
-                System.getProperty(
-                        BaseDatabaseTestCase.CONFIG_FILE_SYSTEM_PROPERTY));
-        return configuration;
+        Parameters params = new Parameters();
+        FileBasedConfigurationBuilder<FileBasedConfiguration> builder =
+            new 
FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class)
+            .configure(params.properties()
+            
.setFileName(System.getProperty(BaseDatabaseTestCase.CONFIG_FILE_SYSTEM_PROPERTY)));
+
+        return builder.getConfiguration();
     }
 
     /**

Modified: 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
URL: 
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java?rev=1868763&r1=1868762&r2=1868763&view=diff
==============================================================================
--- 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
 (original)
+++ 
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
 Tue Oct 22 15:54:45 2019
@@ -22,8 +22,8 @@ package org.apache.torque.oid;
 import java.math.BigDecimal;
 import java.sql.Connection;
 
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration2.Configuration;
+import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.torque.BaseDatabaseTestCase;



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org