Author: tv
Date: Wed Jul 27 12:29:23 2016
New Revision: 1754263
URL: http://svn.apache.org/viewvc?rev=1754263&view=rev
Log:
Use commons-logging
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/datatypes/EnumTest.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=1754263&r1=1754262&r2=1754263&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
Wed Jul 27 12:29:23 2016
@@ -39,7 +39,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.dsfactory.AbstractDataSourceFactory;
import org.apache.torque.dsfactory.DataSourceFactory;
@@ -60,7 +61,7 @@ import org.apache.torque.test.peer.BookP
*/
public class JndiConfigurationTest extends TestCase
{
- private static Logger logger =
Logger.getLogger(JndiConfigurationTest.class);
+ private static Log logger = LogFactory.getLog(JndiConfigurationTest.class);
/**
* The subcontext where the data source is bound.
*/
@@ -222,17 +223,17 @@ public class JndiConfigurationTest exten
+ JndiDataSourceFactory.CLASSNAME_KEY,
BasicDataSource.class.getName());
{
- Map tempStore = new HashMap();
+ Map<String, String> tempStore = new HashMap<String, String>();
Configuration connectionConfiguration
= torqueConfiguration.subset(
Torque.TORQUE_KEY + "."
+ DataSourceFactory.DSFACTORY_KEY + "."
+ defaultDatabase + "."
+ AbstractDataSourceFactory.CONNECTION_KEY);
- for (Iterator keyIt = connectionConfiguration.getKeys();
+ for (Iterator<String> keyIt = connectionConfiguration.getKeys();
keyIt.hasNext();)
{
- String key = (String) keyIt.next();
+ String key = keyIt.next();
String value = connectionConfiguration.getString(key);
if ("user".equals(key))
@@ -256,11 +257,9 @@ public class JndiConfigurationTest exten
value);
}
// add the new keys
- for (Iterator keyIt = tempStore.keySet().iterator();
- keyIt.hasNext(); )
+ for (String key : tempStore.keySet())
{
- String key = (String) keyIt.next();
- String value = (String) tempStore.get(key);
+ String value = tempStore.get(key);
torqueConfiguration.setProperty(key, value);
}
@@ -381,9 +380,9 @@ public class JndiConfigurationTest exten
+ AbstractDataSourceFactory.CONNECTION_KEY);
BasicDataSource dataSource = new BasicDataSource();
- for (Iterator i = dsfactoryConfiguration.getKeys(); i.hasNext();)
+ for (Iterator<String> i = dsfactoryConfiguration.getKeys();
i.hasNext();)
{
- String key = (String) i.next();
+ String key = i.next();
String stringValue = dsfactoryConfiguration.getString(key);
if ("user".equals(key))
@@ -399,7 +398,7 @@ public class JndiConfigurationTest exten
key = "driverClassName";
}
- Class propertyType =
+ Class<?> propertyType =
PropertyUtils.getPropertyType(dataSource, key);
Object value =
ConvertUtils.convert(stringValue, propertyType);
@@ -462,7 +461,7 @@ public class JndiConfigurationTest exten
*/
protected InitialContext getInitialContext() throws NamingException
{
- Hashtable environment = new Hashtable();
+ Hashtable<String, String> environment = new Hashtable<String,
String>();
environment.put(
Context.INITIAL_CONTEXT_FACTORY,
org.apache.naming.java.javaURLContextFactory.class.getName());
@@ -506,11 +505,10 @@ public class JndiConfigurationTest exten
*/
public static void debugConfiguration(final Configuration configuration)
{
- for (Iterator dsKeyIt = configuration.getKeys();
+ for (Iterator<String> dsKeyIt = configuration.getKeys();
dsKeyIt.hasNext(); )
{
-
- String key = (String) dsKeyIt.next();
+ String key = dsKeyIt.next();
System.out.println(key + " = " + configuration.getString(key));
}
}
Modified:
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
URL:
http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java?rev=1754263&r1=1754262&r2=1754263&view=diff
==============================================================================
---
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
(original)
+++
db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
Wed Jul 27 12:29:23 2016
@@ -23,7 +23,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.TestEnum;
import org.apache.torque.TorqueException;
@@ -48,7 +49,7 @@ import org.apache.torque.util.JdbcTypedV
*/
public class EnumTest extends BaseDatabaseTestCase
{
- private static Logger logger = Logger.getLogger(EnumTest.class);
+ private static Log logger = LogFactory.getLog(EnumTest.class);
private List<EnumTable> databaseStateBeforeTest;
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
