svn commit: r1936840 - in db/torque/trunk: torque-generator/src/main/java/org/apache/torque/generator/configuration torque-generator/src/main/java/org/apache/torque/generator/configuration/controller torque-generator/src/main/java/org/apache/torque/gen...
[email protected] Mon, 03 Aug 2026 15:40:08 -0000
| Newsgroups | gmane.comp.jakarta.turbine.torque.devel |
|---|---|
| Message-ID | <178577160855.1897322.14565094563932723719@svn03-he-fi> |
Author: tv
Date: Mon Aug 3 15:40:07 2026
New Revision: 1936840
Log:
Finally move all logging to log4j2, also in generated code
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/copy/CopyOutlet.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/CombinedFileSource.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java
db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java
db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java
db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
db/torque/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ClasspathConfigurationProvider.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -24,8 +24,8 @@ import java.io.InputStream;
import java.util.Collection;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
/**
@@ -36,8 +36,8 @@ public class ClasspathConfigurationProvi
extends AbstractConfigurationProvider
{
/** The logger. */
- private static Log log
- = LogFactory.getLog(ClasspathConfigurationProvider.class);
+ private static Logger log
+ = LogManager.getLogger(ClasspathConfigurationProvider.class);
/** The description of the generation unit, not null. */
private final UnitDescriptor unitDescriptor;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/ConfigurationEntityResolver.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -41,8 +41,8 @@ package org.apache.torque.generator.conf
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -63,8 +63,8 @@ public class ConfigurationEntityResolver
= "http://db.apache.org/torque/4.0/generator/outlet.xsd";
/** Logging class from commons.logging */
- private static Log log
- = LogFactory.getLog(ConfigurationEntityResolver.class);
+ private static Logger log
+ = LogManager.getLogger(ConfigurationEntityResolver.class);
/** The class object of this class. */
private static final Class<ConfigurationEntityResolver> CLAZZ
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/DirectoryConfigurationProvider.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -31,8 +31,8 @@ import java.util.Collection;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.paths.ProjectPaths;
import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
@@ -43,8 +43,8 @@ public class DirectoryConfigurationProvi
extends AbstractConfigurationProvider
{
/** The logger. */
- private static Log log
- = LogFactory.getLog(DirectoryConfigurationProvider.class);
+ private static Logger log
+ = LogManager.getLogger(DirectoryConfigurationProvider.class);
/**
* The paths needed to interact with the enclosing project, not null.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/JarConfigurationProvider.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -27,8 +27,8 @@ import java.util.Objects;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.paths.ProjectPaths;
import org.apache.torque.generator.configuration.paths.TorqueGeneratorPaths;
@@ -40,8 +40,8 @@ public class JarConfigurationProvider
extends AbstractConfigurationProvider
{
/** The logger. */
- private static Log log
- = LogFactory.getLog(JarConfigurationProvider.class);
+ private static Logger log
+ = LogManager.getLogger(JarConfigurationProvider.class);
/**
* The paths needed to interact with the enclosing project, not null.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/PackageResources.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -30,8 +30,8 @@ import java.util.Objects;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* A Container of resources which contain a specific package.
@@ -44,8 +44,8 @@ public class PackageResources
private static final String FILE_URL_PREFIX = "file:";
/** The logger. */
- private static Log log
- = LogFactory.getLog(PackageResources.class);
+ private static Logger log
+ = LogManager.getLogger(PackageResources.class);
/** The jar files containing the package. */
private final List<JarFile> jarFiles = new ArrayList<>();
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/UnitConfigurationReader.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -27,8 +27,8 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.UnitDescriptor.Packaging;
import org.apache.torque.generator.configuration.controller.ControlConfiguration;
import org.apache.torque.generator.configuration.controller.ControlConfigurationXmlParser;
@@ -50,7 +50,7 @@ class UnitConfigurationReader
/**
* The logger.
*/
- private static Log log = LogFactory.getLog(UnitConfigurationReader.class);
+ private static Logger log = LogManager.getLogger(UnitConfigurationReader.class);
/**
* Reads the configuration for a unit of generation.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/ControlConfigurationXmlParser.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -26,8 +26,8 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
@@ -49,8 +49,8 @@ public class ControlConfigurationXmlPars
private static SAXParserFactory saxFactory;
/** The logger. */
- private static Log log
- = LogFactory.getLog(ControlConfigurationXmlParser.class);
+ private static Logger log
+ = LogManager.getLogger(ControlConfigurationXmlParser.class);
static
{
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/DummyLoggingAdapter.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -19,8 +19,8 @@ package org.apache.torque.generator.conf
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Dummy implementation of the LoggingAdapter interface.
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
public class DummyLoggingAdapter implements LoggingAdapter
{
/** The logger. */
- private static Log log = LogFactory.getLog(DummyLoggingAdapter.class);
+ private static Logger log = LogManager.getLogger(DummyLoggingAdapter.class);
/**
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandler.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -19,8 +19,8 @@ package org.apache.torque.generator.conf
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationProvider;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.control.action.MergepointAction;
@@ -35,7 +35,7 @@ import org.xml.sax.helpers.DefaultHandle
public abstract class ActionSaxHandler extends DefaultHandler
{
/** The logger of the class. */
- private static Log log = LogFactory.getLog(ActionSaxHandler.class);
+ private static Logger log = LogManager.getLogger(ActionSaxHandler.class);
/** The action which configured by this handler, not null. */
private final MergepointAction action;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/ActionSaxHandlerFactories.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -22,8 +22,8 @@ package org.apache.torque.generator.conf
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
/**
@@ -34,7 +34,7 @@ import org.apache.torque.generator.confi
public class ActionSaxHandlerFactories
{
/** The class log. */
- private static Log log = LogFactory.getLog(ActionSaxHandlerFactories.class);
+ private static Logger log = LogManager.getLogger(ActionSaxHandlerFactories.class);
/**
* A map containing all known ActionSaxHandlerFactories,
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/mergepoint/OptionsSaxHandlerFactories.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -22,8 +22,8 @@ package org.apache.torque.generator.conf
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.option.OptionsSaxHandlerFactory;
import org.apache.torque.generator.configuration.option.PropertiesOptionsSaxHandlerFactory;
@@ -37,8 +37,8 @@ import org.apache.torque.generator.confi
public class OptionsSaxHandlerFactories
{
/** The class log. */
- private static Log log
- = LogFactory.getLog(OptionsSaxHandlerFactories.class);
+ private static Logger log
+ = LogManager.getLogger(OptionsSaxHandlerFactories.class);
/**
* A map containing all known ActionSaxHandlerFactories,
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/option/OptionsConfigurationBase.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -25,8 +25,8 @@ import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.option.Option;
import org.apache.torque.generator.option.OptionImpl;
@@ -38,7 +38,7 @@ import org.apache.torque.generator.optio
abstract class OptionsConfigurationBase implements OptionsConfiguration
{
/** The class log. */
- private static Log log = LogFactory.getLog(OptionsConfigurationBase.class);
+ private static Logger log = LogManager.getLogger(OptionsConfigurationBase.class);
/**
* Creates options from a Map and returns them.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/JavaOutletSaxHandler.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -29,8 +29,8 @@ import java.lang.reflect.InvocationTarge
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
import org.apache.torque.generator.configuration.UnitDescriptor;
@@ -46,7 +46,7 @@ import org.xml.sax.SAXException;
class JavaOutletSaxHandler extends OutletSaxHandler
{
/** The logger of the class. */
- private static Log log = LogFactory.getLog(JavaOutletSaxHandler.class);
+ private static Logger log = LogManager.getLogger(JavaOutletSaxHandler.class);
/** the name of the property which is currently processed. */
private String propertyName;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationSaxHandler.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -27,8 +27,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationEntityResolver;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
@@ -85,7 +85,7 @@ public class OutletConfigurationSaxHandl
private MergepointSaxHandler mergepointHandler;
/** The log. */
- private static Log log = LogFactory.getLog(OutletSaxHandler.class);
+ private static Logger log = LogManager.getLogger(OutletSaxHandler.class);
/**
* Constructor.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletConfigurationXmlParser.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -31,8 +31,8 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
@@ -58,8 +58,8 @@ public class OutletConfigurationXmlParse
private static SAXParserFactory saxFactory;
/** The logger. */
- private static Log log
- = LogFactory.getLog(OutletConfigurationXmlParser.class);
+ private static Logger log
+ = LogManager.getLogger(OutletConfigurationXmlParser.class);
static
{
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/OutletSaxHandler.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -24,8 +24,8 @@ import static org.apache.torque.generato
import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.INPUT_ELEMENT_NAME_ATTRIBUTE;
import static org.apache.torque.generator.configuration.outlet.OutletConfigurationTags.INPUT_TAG;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
@@ -44,7 +44,7 @@ import org.xml.sax.helpers.DefaultHandle
public abstract class OutletSaxHandler extends DefaultHandler
{
/** the logger for the class. */
- private static Log log = LogFactory.getLog(OutletSaxHandler.class);
+ private static Logger log = LogManager.getLogger(OutletSaxHandler.class);
/**
* the name for the outlet which configuration will be read in
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/outlet/ReflectionOutletSaxHandlerFactory.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -23,8 +23,8 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.ConfigurationProvider;
import org.apache.torque.generator.configuration.UnitDescriptor;
@@ -50,7 +50,7 @@ implements UntypedOutletSaxHandlerFactor
= "org.apache.torque.generator.configuration.outlet";
/** The class log. */
- private static Log log = LogFactory.getLog(
+ private static Logger log = LogManager.getLogger(
ReflectionOutletSaxHandlerFactory.class);
/**
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/paths/Maven2ProjectPaths.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -24,8 +24,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Contains information of the default integration of the Torque generator
@@ -34,8 +34,8 @@ import org.apache.commons.logging.LogFac
public abstract class Maven2ProjectPaths implements ProjectPaths
{
/** The log for the class. */
- private static Log log
- = LogFactory.getLog(Maven2ProjectPaths.class);
+ private static Logger log
+ = LogManager.getLogger(Maven2ProjectPaths.class);
/**
* Default configuration root directory,
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/ConfigurableClassSaxHandler.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -29,8 +29,8 @@ import java.util.Objects;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationProvider;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.source.transform.SourceTransformer;
@@ -46,7 +46,7 @@ import org.xml.sax.helpers.DefaultHandle
public class ConfigurableClassSaxHandler<T> extends DefaultHandler
{
/** The logger for this class. */
- private static Log log = LogFactory.getLog(DefaultHandler.class);
+ private static Logger log = LogManager.getLogger(DefaultHandler.class);
/** The description of the generation unit, not null. */
private final UnitDescriptor unitDescriptor;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/source/SourceSaxHandlerFactories.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
/**
@@ -35,8 +35,8 @@ import org.apache.torque.generator.confi
public class SourceSaxHandlerFactories
{
/** The class log. */
- private static Log log
- = LogFactory.getLog(SourceSaxHandlerFactories.class);
+ private static Logger log
+ = LogManager.getLogger(SourceSaxHandlerFactories.class);
/**
* A map containing all known SourceSaxHandlerFactories,
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -29,8 +29,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.configuration.Configuration;
import org.apache.torque.generator.configuration.ConfigurationException;
@@ -66,7 +66,7 @@ import org.apache.torque.generator.sourc
public class Controller
{
/** The logger. */
- private static Log log = LogFactory.getLog(Controller.class);
+ private static Logger log = LogManager.getLogger(Controller.class);
/**
* The file in the work directory where last source changes
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/existingtargetstrategy/MergeTargetFileStrategy.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -25,8 +25,8 @@ import java.nio.charset.Charset;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.configuration.UnitConfiguration;
import org.apache.torque.generator.control.ControllerException;
@@ -51,7 +51,7 @@ public class MergeTargetFileStrategy imp
public static final String WORK_SUBDIR = "raw-generated";
/** The classlogger. */
- private static Log log = LogFactory.getLog(MergeTargetFileStrategy.class);
+ private static Logger log = LogManager.getLogger(MergeTargetFileStrategy.class);
/** The merger. */
private final ThreeWayMerger merger = new ThreeWayMerger();
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/file/Fileset.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -31,8 +31,8 @@ import java.util.List;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOCase;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* Selects Files in a directory and the subdirectories of the directory.
@@ -44,7 +44,7 @@ import org.apache.commons.logging.LogFac
public class Fileset
{
/** The class logger. */
- private static Log log = LogFactory.getLog(Fileset.class);
+ private static Logger log = LogManager.getLogger(Fileset.class);
/** The base directory of the fileset. */
private File basedir;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/OutletImpl.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.mergepoint.MergepointMapping;
@@ -46,7 +46,7 @@ public abstract class OutletImpl impleme
/**
* The log.
*/
- private static Log log = LogFactory.getLog(OutletImpl.class);
+ private static Logger log = LogManager.getLogger(OutletImpl.class);
/**
* The merge point mappings configured for this outlet.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/copy/CopyOutlet.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/copy/CopyOutlet.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/copy/CopyOutlet.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -24,8 +24,8 @@ import java.io.InputStream;
import java.util.Objects;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationProvider;
@@ -40,7 +40,7 @@ import org.apache.torque.generator.qname
public class CopyOutlet extends OutletImpl
{
/** The log. */
- private static Log log = LogFactory.getLog(CopyOutlet.class);
+ private static Logger log = LogManager.getLogger(CopyOutlet.class);
/**
* The path to the resource to copy.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/OutletUtils.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -19,8 +19,8 @@ package org.apache.torque.generator.outl
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.qname.Namespace;
@@ -43,7 +43,7 @@ public final class OutletUtils
}
/** The logger for the class. */
- private static Log log = LogFactory.getLog(OutletUtils.class);
+ private static Logger log = LogManager.getLogger(OutletUtils.class);
/**
* Retrieves the value of a source element attribute. The source element
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProvider.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProvider.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/SourceProvider.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -21,8 +21,8 @@ package org.apache.torque.generator.sour
import java.util.Iterator;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.control.ControllerState;
@@ -35,7 +35,7 @@ import org.apache.torque.generator.contr
public abstract class SourceProvider implements Iterator<Source>
{
/** The class log. */
- private static Log log = LogFactory.getLog(SourceProvider.class);
+ private static Logger log = LogManager.getLogger(SourceProvider.class);
/**
* Whether the init method was already called.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSource.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -37,8 +37,8 @@ import java.util.Set;
import java.util.stream.IntStream;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.jdbc.SchemaType;
import org.apache.torque.generator.source.SourceElement;
import org.apache.torque.generator.source.SourceException;
@@ -117,7 +117,7 @@ public class JdbcMetadataSource extends
/** The class log. */
- private static Log log = LogFactory.getLog(JdbcMetadataSource.class);
+ private static Logger log = LogManager.getLogger(JdbcMetadataSource.class);
/** The fully qualified class name of the database driver. */
private final String driver;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/CombinedFileSource.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/CombinedFileSource.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/CombinedFileSource.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -27,8 +27,8 @@ import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.source.SourceElement;
import org.apache.torque.generator.source.SourceException;
import org.apache.torque.generator.source.SourceImpl;
@@ -64,7 +64,7 @@ public class CombinedFileSource extends
/**
* The log of the class.
*/
- private static final Log log = LogFactory.getLog(CombinedFileSource.class);
+ private static final Logger log = LogManager.getLogger(CombinedFileSource.class);
/**
* The list of contained file sources, not null..
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSource.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -31,8 +31,8 @@ import java.util.Arrays;
import java.util.Date;
import java.util.Objects;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
import org.apache.torque.generator.source.SourceException;
@@ -46,7 +46,7 @@ public class FileSource extends SourceIm
/**
* The log of the class.
*/
- private static Log log = LogFactory.getLog(FileSource.class);
+ private static Logger log = LogManager.getLogger(FileSource.class);
/**
* The format of the file, e.g. properties or XML, not null.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/FileSourceProvider.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -28,8 +28,8 @@ import java.util.List;
import java.util.Objects;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.control.ControllerState;
@@ -45,7 +45,7 @@ import org.apache.torque.generator.sourc
public class FileSourceProvider extends SourceProvider
{
/** The class log. */
- private static Log log = LogFactory.getLog(FileSourceProvider.class);
+ private static Logger log = LogManager.getLogger(FileSourceProvider.class);
/**
* The type of the file(s), or null if the type should be determined
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/stream/SourceToXml.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -1,5 +1,24 @@
package org.apache.torque.generator.source.stream;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/AttributeTransformer.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -26,8 +26,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
@@ -97,7 +97,7 @@ public class AttributeTransformer implem
private static final char DEFINITION_TYPE_SEPARATION_CHAR = ':';
/** The logger of the class. */
- private static Log log = LogFactory.getLog(AttributeTransformer.class);
+ private static Logger log = LogManager.getLogger(AttributeTransformer.class);
/**
* The list of transform rules which is created from the definition file.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformer.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformer.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformer.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -22,8 +22,8 @@ package org.apache.torque.generator.sour
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.control.ControllerState;
@@ -43,8 +43,8 @@ import org.apache.torque.generator.sourc
public class LoadAdditionalSourceTransformer implements SourceTransformer
{
/** The class log. */
- private static Log log
- = LogFactory.getLog(LoadAdditionalSourceTransformer.class);
+ private static Logger log
+ = LogManager.getLogger(LoadAdditionalSourceTransformer.class);
/**
* The element where the newly loaded source should be added.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformer.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -25,8 +25,8 @@ import java.util.List;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationHandlers;
import org.apache.torque.generator.configuration.UnitConfiguration;
@@ -53,8 +53,8 @@ import org.apache.torque.generator.sourc
public class LoadAllSourceFilesTransformer implements SourceTransformer
{
/** The class log. */
- private static Log log
- = LogFactory.getLog(LoadAllSourceFilesTransformer.class);
+ private static Logger log
+ = LogManager.getLogger(LoadAllSourceFilesTransformer.class);
/**
* The element to where the new elements are added.
Modified: db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java
==============================================================================
--- db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/template/groovy/GroovyOutlet.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.configuration.ConfigurationException;
import org.apache.torque.generator.configuration.ConfigurationProvider;
@@ -59,7 +59,7 @@ public abstract class GroovyOutlet exten
public static final String NULL_KEY_BINDING_NAME = "value";
/** The log. */
- private static Log log = LogFactory.getLog(GroovyOutlet.class);
+ private static Logger log = LogManager.getLogger(GroovyOutlet.class);
/**
* Whether the options should be put into the binding.
Modified: db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
==============================================================================
--- db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -31,8 +31,8 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -46,7 +46,7 @@ import org.junit.jupiter.api.Test;
public class RunOnlyOnSourceChangeTest
{
/** The logger. */
- private static Log log = LogFactory.getLog(Controller.class);
+ private static Logger log = LogManager.getLogger(Controller.class);
@Test
public void testRunOnlyOnSourceChange() throws Exception
Modified: db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java
==============================================================================
--- db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/java/JavaOutlet.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -21,8 +21,8 @@ import java.util.Objects;
* under the License.
*/
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.outlet.OutletImpl;
@@ -34,7 +34,7 @@ import org.apache.torque.generator.qname
public class JavaOutlet extends OutletImpl
{
/** The class log. */
- private static Log log = LogFactory.getLog(JavaOutlet.class);
+ private static Logger log = LogManager.getLogger(JavaOutlet.class);
/** A generator configuration option. */
private String foo;
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java
==============================================================================
--- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -24,6 +24,7 @@ import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
import java.util.AbstractMap.SimpleEntry;
+import java.util.HashMap;
import java.util.Map;
import org.apache.logging.log4j.LogManager;
@@ -49,7 +50,7 @@ public final class AdapterFactory
/**
* JDBC driver to Torque Adapter map.
*/
- private static final Map<String, Class<? extends Adapter>> adapters = Map.ofEntries(
+ private static final Map<String, Class<? extends Adapter>> adapters = new HashMap<>(Map.ofEntries(
new SimpleEntry<>("org.hsql.jdbcDriver", HsqldbAdapter.class),
new SimpleEntry<>("org.hsqldb.jdbcDriver", HsqldbAdapter.class),
new SimpleEntry<>("com.microsoft.jdbc.sqlserver.SQLServerDriver", MssqlAdapter.class),
@@ -80,7 +81,7 @@ public final class AdapterFactory
new SimpleEntry<>("Apache Derby", DerbyAdapter.class),
new SimpleEntry<>("MariaDB", MysqlAdapter.class),
- new SimpleEntry<>("", NoneAdapter.class));
+ new SimpleEntry<>("", NoneAdapter.class)));
/**
* Private constructor to prevent instantiation.
Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java
==============================================================================
--- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/platform/PlatformFactory.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -21,8 +21,8 @@ package org.apache.torque.templates.plat
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
/**
* Factory class responsible to create Platform objects that
@@ -39,7 +39,7 @@ public final class PlatformFactory
= new HashMap<>();
/** The class log. */
- private static Log log = LogFactory.getLog(PlatformFactory.class);
+ private static Logger log = LogManager.getLogger(PlatformFactory.class);
/**
* private constructor for utility class.
Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java
==============================================================================
--- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/IncludeSchemaTransformer.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -27,8 +27,8 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
import org.apache.torque.generator.source.SourceException;
@@ -50,8 +50,8 @@ import org.apache.torque.templates.model
public class IncludeSchemaTransformer implements SourceTransformer
{
/** The class log. */
- private static Log log
- = LogFactory.getLog(IncludeSchemaTransformer.class);
+ private static Logger log
+ = LogManager.getLogger(IncludeSchemaTransformer.class);
/**
* The base dir for the external schema,
Modified: db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java
==============================================================================
--- db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/LoadExternalSchemaTransformer.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -25,8 +25,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
import org.apache.torque.generator.source.SourceException;
@@ -52,8 +52,8 @@ import org.apache.torque.templates.trans
public class LoadExternalSchemaTransformer implements SourceTransformer
{
/** The class log. */
- private static Log log
- = LogFactory.getLog(LoadExternalSchemaTransformer.class);
+ private static Logger log
+ = LogManager.getLogger(LoadExternalSchemaTransformer.class);
/**
* The base dir for the external schema,
Modified: db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm
==============================================================================
--- db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/recordmapper/base/recordMapperBase.vm Mon Aug 3 15:40:07 2026 (r1936840)
@@ -38,8 +38,8 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.Column;
import org.apache.torque.TorqueException;
import org.apache.torque.criteria.Criteria;
@@ -96,12 +96,12 @@ public class ${baseRecordMapperClassName
private static final long serialVersionUID = ${torqueGen.now().Time}L;
#else
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
#end
/** The class log. */
- private static final Log log
- = LogFactory.getLog(${baseRecordMapperClassName}.class);
+ private static final Logger log
+ = LogManager.getLogger(${baseRecordMapperClassName}.class);
## TORQUE-364: Cached SQL expressions to speed up looking for columns selected by a given Criteria
#foreach ($columnElement in $torqueGen.getChildren("column"))
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/JndiConfigurationTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -40,8 +40,8 @@ import org.apache.commons.configuration2
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.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.dsfactory.AbstractDataSourceFactory;
import org.apache.torque.dsfactory.DataSourceFactory;
@@ -65,7 +65,7 @@ import junit.framework.TestCase;
*/
public class JndiConfigurationTest extends TestCase
{
- private static Log logger = LogFactory.getLog(JndiConfigurationTest.class);
+ private static Logger log = LogManager.getLogger(JndiConfigurationTest.class);
/**
* The subcontext where the data source is bound.
*/
@@ -351,7 +351,7 @@ public class JndiConfigurationTest exten
}
catch (NameNotFoundException e)
{
- logger.warn("Name " + JNDI_PATH + " not found, could not unbind DataSource");
+ log.warn("Name " + JNDI_PATH + " not found, could not unbind DataSource");
return;
}
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/EnumTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -26,8 +26,8 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.TestEnum;
import org.apache.torque.TorqueException;
@@ -57,7 +57,7 @@ import org.junit.jupiter.params.provider
*/
public class EnumTest extends BaseDatabaseTestCase
{
- private static Log logger = LogFactory.getLog(EnumTest.class);
+ private static Logger log = LogManager.getLogger(EnumTest.class);
private List<EnumTable> databaseStateBeforeTest;
@@ -225,7 +225,7 @@ public class EnumTest extends BaseDataba
}
else
{
- logger.warn("error code and SQL code not checked for unknown adapter " + adapter.getClass());
+ log.warn("error code and SQL code not checked for unknown adapter " + adapter.getClass());
}
}
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromDatabaseTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -18,8 +18,8 @@ import java.time.format.DateTimeFormatte
import java.time.temporal.TemporalAccessor;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.Torque;
import org.apache.torque.TorqueException;
@@ -71,8 +71,8 @@ import org.junit.jupiter.params.provider
*/
public class DefaultValuesFromDatabaseTest extends BaseDatabaseTestCase
{
- private static Log log
- = LogFactory.getLog(DefaultValuesFromDatabaseTest.class);
+ private static Logger log
+ = LogManager.getLogger(DefaultValuesFromDatabaseTest.class);
/**
* Checks the java default values.
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DoInsertTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -27,8 +27,8 @@ import java.math.BigDecimal;
import java.sql.Types;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.Column;
import org.apache.torque.ColumnImpl;
@@ -59,7 +59,7 @@ public class DoInsertTest extends BaseDa
{
private List<Author> authorList;
- private static Log log =LogFactory.getLog(DoInsertTest.class);
+ private static Logger log =LogManager.getLogger(DoInsertTest.class);
@BeforeEach
public void setUp() throws Exception
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -1,5 +1,24 @@
package org.apache.torque.util;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.fail;
Modified: db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java Mon Aug 3 14:50:47 2026 (r1936839)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/SummaryHelperTest.java Mon Aug 3 15:40:07 2026 (r1936840)
@@ -26,8 +26,8 @@ import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.criteria.Criteria;
import org.apache.torque.test.dbobject.Summarize1;
@@ -47,7 +47,7 @@ import org.junit.jupiter.api.BeforeEach;
*/
public class SummaryHelperTest extends BaseDatabaseTestCase
{
- static Log logger = LogFactory.getLog( SummaryHelperTest.class );
+ static Logger log = LogManager.getLogger( SummaryHelperTest.class );
private static final String[] TEST_GROUPBY1 = {
"A1","B1","C1","D1"
@@ -132,7 +132,7 @@ public class SummaryHelperTest extends B
StringWriter out = new StringWriter();
summary.dumpResults(out, results, true);
out.close();
- logger.debug("\n" + out.toString());
+ log.debug("\n" + out.toString());
assertTrue("No results returned", results.size() > 0 );
assertEquals("Invalid number of records returned", 4, results.size());
@@ -198,7 +198,7 @@ public class SummaryHelperTest extends B
StringWriter out = new StringWriter();
summary.dumpResults(out, results, true);
out.close();
- logger.debug("\n"+out.toString());
+ log.debug("\n"+out.toString());
assertTrue("No results returned", results.size() > 0 );
assertEquals("Invalid number of records returned", 1, results.size());
@@ -262,7 +262,7 @@ public class SummaryHelperTest extends B
StringWriter out = new StringWriter();
summary.dumpResults(out, results, true);
out.close();
- logger.debug("\n"+out.toString());
+ log.debug("\n"+out.toString());
assertTrue("No results returned", results.size() > 0 );
assertEquals("Invalid number of records returned", 1, results.size());