Author: tv
Date: Mon Jul 27 12:49:53 2026
New Revision: 1936634
Log:
Use log4j2 throughout all modules. Remove obsolete code
Deleted:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/configuration/controller/Log4jLoggingAdapter.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/BaseTest.java
Modified:
db/torque/trunk/pom.xml
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml
db/torque/trunk/torque-generator/pom.xml
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.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/control/TokenReplacerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java
db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml
db/torque/trunk/torque-maven-plugin/pom.xml
db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
db/torque/trunk/torque-runtime/pom.xml
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
Modified: db/torque/trunk/pom.xml
==============================================================================
--- db/torque/trunk/pom.xml Mon Jul 27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/pom.xml Mon Jul 27 12:49:53 2026 (r1936634)
@@ -343,11 +343,6 @@
<artifactId>log4j-core</artifactId>
<version>${log4j2.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -865,7 +860,7 @@
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<junit.launcher.version>1.11.0</junit.launcher.version>
- <log4j2.version>2.23.1</log4j2.version>
+ <log4j2.version>2.26.1</log4j2.version>
<torque.compiler.fork>false</torque.compiler.fork>
<!--suppress UnresolvedMavenProperty -->
Modified:
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
==============================================================================
---
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-ant-tasks/src/test/java/org/apache/torque/ant/task/TorqueGeneratorTaskTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -1,11 +1,5 @@
package org.apache.torque.ant.task;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
-import java.io.BufferedReader;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -25,6 +19,11 @@ import java.io.BufferedReader;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -36,7 +35,6 @@ import java.sql.Statement;
import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.BasicConfigurator;
import org.junit.jupiter.api.Test;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.DefaultNodeMatcher;
@@ -80,7 +78,6 @@ public class TorqueGeneratorTaskTest
//
try {
Class.forName("org.apache.derby.jdbc.EmbeddedDriver").getDeclaredConstructor().newInstance();
- BasicConfigurator.configure();
Connection connection =
DriverManager.getConnection("jdbc:derby:memory:myDb;create=true");
InputStream inputStream = getClass().getResourceAsStream(
"jdbc2schemaTest.sql");
Modified: db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml
==============================================================================
--- db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml Mon Jul
27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/torque-ant-tasks/src/test/resources/log4j2-test.xml Mon Jul
27 12:49:53 2026 (r1936634)
@@ -18,21 +18,29 @@
under the License.
-->
<Configuration status="warn" name="Torque">
- <Appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
- </Console>
- <File name="torque" fileName="./target/torque-gen/log/torque-gen.log">
- <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- </File>
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
+ </Console>
+ <File name="torque" fileName="./target/torque-gen/log/torque-gen.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
</Appenders>
<Loggers>
- <Logger name="org.apache.torque" additivity="false" level="DEBUG">
- <AppenderRef ref="torque" level="DEBUG"/>
- <AppenderRef ref="console" level="INFO"/>
- </Logger>
- <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
- <AppenderRef ref="console"/>
- </Root>
+ <Logger name="org.apache.torque" additivity="false" level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Logger name="org.apache.commons.beanutils" additivity="false"
level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Logger name="org.apache.velocity" additivity="false" level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
+ <AppenderRef ref="console"/>
+ </Root>
</Loggers>
</Configuration>
\ No newline at end of file
Modified: db/torque/trunk/torque-generator/pom.xml
==============================================================================
--- db/torque/trunk/torque-generator/pom.xml Mon Jul 27 12:45:04 2026
(r1936633)
+++ db/torque/trunk/torque-generator/pom.xml Mon Jul 27 12:49:53 2026
(r1936634)
@@ -45,20 +45,20 @@
<version>6.10.0.202406032230-r</version>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
</dependency>
+ <!-- this is needed for velocity 2.0, it contains slf4j-api -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -111,13 +111,6 @@
<artifactId>xmlunit-core</artifactId>
<scope>test</scope>
</dependency>
- <!-- this is needed for velocity 2.0, it contains slf4j-api -->
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/outlet/java/ModifySourcenameOutlet.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -23,7 +23,8 @@ package org.apache.torque.generator.outl
import java.io.File;
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.outlet.OutletImpl;
@@ -58,8 +59,7 @@ public class ModifySourcenameOutlet exte
private String discardTo = null;
/** The logger of the class. */
- private static Logger logger
- = Logger.getLogger(ModifySourcenameOutlet.class);
+ private static Logger logger =
LogManager.getLogger(ModifySourcenameOutlet.class);
/**
* Constructor.
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/BeanPropertyMethodNameTransformer.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -20,7 +20,8 @@ package org.apache.torque.generator.sour
*/
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.processor.string.Camelbacker;
import org.apache.torque.generator.source.SourceElement;
@@ -38,8 +39,7 @@ public class BeanPropertyMethodNameTrans
extends SourceTargetAttributeTransformer
{
/** The logger of the class. */
- private static Logger log
- = Logger.getLogger(BeanPropertyMethodNameTransformer.class);
+ private static Logger log =
LogManager.getLogger(BeanPropertyMethodNameTransformer.class);
/** The camelbacker used to convert the input string. */
private final Camelbacker camelbacker = new Camelbacker();
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/CopyAttributeTransformer.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -19,7 +19,8 @@ package org.apache.torque.generator.sour
* under the License.
*/
-import org.apache.log4j.Logger;
+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;
@@ -33,8 +34,7 @@ import org.apache.torque.generator.sourc
public class CopyAttributeTransformer extends SourceTargetAttributeTransformer
{
/** The logger of the class. */
- private static Logger log
- = Logger.getLogger(CopyAttributeTransformer.class);
+ private static Logger log =
LogManager.getLogger(CopyAttributeTransformer.class);
/**
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/GetterSetterNameTransformer.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -20,7 +20,8 @@ package org.apache.torque.generator.sour
*/
import org.apache.commons.lang3.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.processor.string.Camelbacker;
import org.apache.torque.generator.source.SourceElement;
@@ -34,8 +35,7 @@ import org.apache.torque.generator.sourc
public class GetterSetterNameTransformer implements SourceTransformer
{
/** The logger of the class. */
- private static Logger log
- = Logger.getLogger(GetterSetterNameTransformer.class);
+ private static Logger log =
LogManager.getLogger(GetterSetterNameTransformer.class);
/** The camelbacker to convert the property name. */
private static Camelbacker camelbacker = new Camelbacker();
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformer.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,7 +25,8 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.configuration.ClassHelper;
import org.apache.torque.generator.configuration.UnitConfiguration;
import org.apache.torque.generator.control.ControllerState;
@@ -49,7 +50,7 @@ public class SourceElementToModelTransfo
public static final String NULL_ATTRIBUTE_FIELD_NAME = "value";
/** The class logger. */
- private static final Logger log =
Logger.getLogger(SourceTransformer.class);
+ private static final Logger log =
LogManager.getLogger(SourceTransformer.class);
/** The processor which does the camelback processing. */
private final Camelbacker camelbacker = new Camelbacker();
Modified:
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java
==============================================================================
---
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/main/java/org/apache/torque/generator/source/transform/SourceTargetAttributeTransformer.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -19,7 +19,8 @@ package org.apache.torque.generator.sour
* under the License.
*/
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.control.ControllerState;
/**
@@ -31,8 +32,7 @@ public abstract class SourceTargetAttrib
implements SourceTransformer
{
/** The logger of the class. */
- private static final Logger log
- = Logger.getLogger(SourceTargetAttributeTransformer.class);
+ private static final Logger log =
LogManager.getLogger(SourceTargetAttributeTransformer.class);
/** The name of the attribute which is read as Input. */
private String sourceAttributeName;
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/configuration/ReadConfigurationTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -39,9 +39,7 @@ import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.apache.torque.generator.BaseTest;
import
org.apache.torque.generator.configuration.controller.Log4j2LoggingAdapter;
-import
org.apache.torque.generator.configuration.controller.Log4jLoggingAdapter;
import org.apache.torque.generator.configuration.controller.Loglevel;
import org.apache.torque.generator.configuration.controller.OutletReference;
import org.apache.torque.generator.configuration.controller.Output;
@@ -85,7 +83,7 @@ import org.junit.jupiter.api.TestInfo;
/**
* Tests whether the configuration is read correctly.
*/
-public class ReadConfigurationTest extends BaseTest
+public class ReadConfigurationTest
{
private ControllerState controllerState;
@@ -98,12 +96,7 @@ public class ReadConfigurationTest exten
controllerState = new ControllerState();
int currentRepetition = repetitionInfo.getCurrentRepetition();
- if (currentRepetition % 2 == 0) {
- Loglevel.setLoggingAdapter(new Log4j2LoggingAdapter());
- } else {
- // no implicit Loglevel.setLoggingAdapter(null);
- Loglevel.setLoggingAdapter(new Log4jLoggingAdapter());
- }
+ Loglevel.setLoggingAdapter(new Log4j2LoggingAdapter());
UnitConfiguration unitConfiguration = new UnitConfiguration();
// unit configuration
logger.info(currentRepetition + " loglevel type:" +
Loglevel.getLoggingAdapter().getClass());
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ChecksumsTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -29,7 +29,6 @@ import java.text.SimpleDateFormat;
import java.util.Date;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -39,7 +38,7 @@ import org.junit.jupiter.api.Test;
*
* @version $Id: $
*/
-public class ChecksumsTest extends BaseTest
+public class ChecksumsTest
{
private static final File CHECKSUM_DIR
= new File("target/test/lastChangesContent");
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/DeeplyNestedMergepointsTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -39,7 +38,7 @@ import org.junit.jupiter.api.Test;
* Tests nested mergepoints in a depth of 10 calls, and checks that the
* outcome is correct.
*/
-public class DeeplyNestedMergepointsTest extends BaseTest
+public class DeeplyNestedMergepointsTest
{
@Test
public void testDeeplyNestedMergepointsGeneration() throws Exception
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/ExistingTargetStrategyTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -29,7 +29,6 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.GeneratorException;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
@@ -39,7 +38,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class ExistingTargetStrategyTest extends BaseTest
+public class ExistingTargetStrategyTest
{
private final File confRootDir = new
File("src/test/existingTargetStrategy");
private final File targetDir1 = new
File("target/test/existingTargetStrategy/target1");
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/OutputEncodingTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -29,7 +29,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -41,7 +40,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests whether the output encoding handling is correct.
*/
-public class OutputEncodingTest extends BaseTest
+public class OutputEncodingTest
{
@Test
public void testOutputEncoding() throws Exception
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PostprocessorTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -38,7 +37,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests whether postprocessing works as expected.
*/
-public class PostprocessorTest extends BaseTest
+public class PostprocessorTest
{
@Test
public void testPostprocessors() throws Exception
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaGenerationTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -32,7 +32,6 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -47,7 +46,7 @@ import org.junit.jupiter.api.Test;
*
* @version $Id$
*/
-public class PropertyToJavaGenerationTest extends BaseTest
+public class PropertyToJavaGenerationTest
{
/**
* Tests that the property to java generation works.
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/PropertyToJavaJarGenerationTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
import org.apache.torque.generator.configuration.paths.Maven2JarProjectPaths;
@@ -35,7 +34,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests generation where the templates are read from a jar file.
*/
-public class PropertyToJavaJarGenerationTest extends BaseTest
+public class PropertyToJavaJarGenerationTest
{
@Test
public void testPropertyToJavaJarGeneration() throws Exception
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 Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/RunOnlyOnSourceChangeTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -33,7 +33,6 @@ 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.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -44,7 +43,7 @@ import org.junit.jupiter.api.Test;
* Tests nested mergepoints in a depth of 10 calls, and checks that the
* outcome is correct.
*/
-public class RunOnlyOnSourceChangeTest extends BaseTest
+public class RunOnlyOnSourceChangeTest
{
/** The logger. */
private static Log log = LogFactory.getLog(Controller.class);
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/control/TokenReplacerTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -20,7 +20,6 @@ package org.apache.torque.generator.cont
*/
import static org.junit.jupiter.api.Assertions.assertEquals;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitConfiguration;
import org.apache.torque.generator.option.Option;
import org.apache.torque.generator.option.OptionImpl;
@@ -30,7 +29,7 @@ import org.junit.jupiter.api.Test;
-public class TokenReplacerTest extends BaseTest
+public class TokenReplacerTest
{
private TokenReplacer tokenReplacer;
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/example/gettingstarted/GettingStartedTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -33,7 +32,7 @@ import org.apache.torque.generator.confi
import org.apache.torque.generator.control.Controller;
import org.junit.jupiter.api.Test;
-public class GettingStartedTest extends BaseTest
+public class GettingStartedTest
{
@Test
public void testGettingStarted() throws Exception
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/processor/string/RemoveUnusedImportsProcessorTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -24,7 +24,6 @@ import static org.junit.Assert.assertEqu
import java.nio.charset.StandardCharsets;
import org.apache.commons.io.IOUtils;
-import org.apache.torque.generator.BaseTest;
import org.junit.Test;
/**
@@ -32,7 +31,7 @@ import org.junit.Test;
*
* @version $Id: $
*/
-public class RemoveUnusedImportsProcessorTest extends BaseTest
+public class RemoveUnusedImportsProcessorTest
{
/** System under test. */
private final RemoveUnusedImportsProcessor organizeImportsProcessor
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/jdbc/JdbcMetadataSourceTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -34,8 +34,8 @@ import java.sql.Statement;
import java.util.List;
import java.util.StringTokenizer;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.source.SourceElement;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -43,8 +43,7 @@ import org.junit.Test;
public class JdbcMetadataSourceTest
{
- private static Logger logger
- = Logger.getLogger(JdbcMetadataSourceTest.class);
+ private static Logger logger =
LogManager.getLogger(JdbcMetadataSourceTest.class);
private static String SQL_FILENAME = "jdbcMetadataSourceTest.sql";
@@ -61,7 +60,6 @@ public class JdbcMetadataSourceTest
@Before
public void setUp() throws Exception
{
- BasicConfigurator.configure();
Connection connection = DriverManager.getConnection(URL);
InputStream inputStream = getClass().getResourceAsStream(SQL_FILENAME);
BufferedReader bufferedReader = new BufferedReader(
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAdditionalSourceTransformerTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -39,7 +38,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests whether the loadAdditionalSourceTransformer works correctly.
*/
-public class LoadAdditionalSourceTransformerTest extends BaseTest
+public class LoadAdditionalSourceTransformerTest
{
private static final String EXPECTED = "<root>\n"
+ " <element>\n"
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/LoadAllSourceFilesTransformerTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -27,7 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.FileUtils;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitDescriptor;
import org.apache.torque.generator.configuration.paths.CustomProjectPaths;
import
org.apache.torque.generator.configuration.paths.DefaultTorqueGeneratorPaths;
@@ -42,7 +41,7 @@ import org.xmlunit.diff.ElementSelectors
/**
* Tests whether the loadAllSourceTransformer works correctly.
*/
-public class LoadAllSourceFilesTransformerTest extends BaseTest
+public class LoadAllSourceFilesTransformerTest
{
private static final String TEST_RESOURCES_ROOT
= "src/test/loadAllSourceFilesTransformer";
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/source/transform/SourceElementToModelTransformerTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -23,7 +23,6 @@ import static org.junit.jupiter.api.Asse
import java.util.List;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.configuration.UnitConfiguration;
import org.apache.torque.generator.control.ControllerState;
import org.apache.torque.generator.source.SourceElement;
@@ -34,7 +33,7 @@ import org.junit.jupiter.api.Test;
/**
* Tests whether the loadAllSourceTransformer works correctly.
*/
-public class SourceElementToModelTransformerTest extends BaseTest
+public class SourceElementToModelTransformerTest
{
/**
* The root of the source tree to transform.
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableStoreTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -22,12 +22,11 @@ package org.apache.torque.generator.vari
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.qname.QualifiedName;
import org.apache.torque.generator.qname.QualifiedNameMap;
import org.junit.Test;
-public class VariableStoreTest extends BaseTest
+public class VariableStoreTest
{
@Test
public void testVariableScopePrecedence()
Modified:
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java
==============================================================================
---
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-generator/src/test/java/org/apache/torque/generator/variable/VariableTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
-import org.apache.torque.generator.BaseTest;
import org.apache.torque.generator.qname.Namespace;
import org.apache.torque.generator.qname.QualifiedName;
import org.junit.Test;
@@ -31,7 +30,7 @@ import org.junit.Test;
/**
* Unit test for the Variable Class.
*/
-public class VariableTest extends BaseTest
+public class VariableTest
{
/**
* Tests the constructor.
Modified: db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml
==============================================================================
--- db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml Mon Jul
27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/torque-generator/src/test/resources/log4j2-test.xml Mon Jul
27 12:49:53 2026 (r1936634)
@@ -32,8 +32,12 @@
<Loggers>
<Logger name="org.apache.torque" additivity="false" level="DEBUG">
<AppenderRef ref="torque" level="DEBUG"/>
- <AppenderRef ref="console" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
</Logger>
+ <Logger name="org.apache.commons.beanutils" additivity="false"
level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
<Logger name="org.apache.torque.generator.template.velocity"
additivity="false" level="DEBUG">
<AppenderRef ref="torque" level="DEBUG"/>
<AppenderRef ref="console" level="INFO"/>
Modified: db/torque/trunk/torque-maven-plugin/pom.xml
==============================================================================
--- db/torque/trunk/torque-maven-plugin/pom.xml Mon Jul 27 12:45:04 2026
(r1936633)
+++ db/torque/trunk/torque-maven-plugin/pom.xml Mon Jul 27 12:49:53 2026
(r1936634)
@@ -80,12 +80,6 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
-
-
- <dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
Modified: db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
==============================================================================
--- db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
Mon Jul 27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/torque-maven-plugin/src/test/resources/log4j2-test.xml
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -18,21 +18,29 @@
under the License.
-->
<Configuration status="warn" name="Torque">
- <Appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
- </Console>
- <File name="torque" fileName="./target/log/torque-maven-plugin.log">
- <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- </File>
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
+ </Console>
+ <File name="torque" fileName="./target/log/torque-maven-plugin.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
</Appenders>
<Loggers>
- <Logger name="org.apache.torque" additivity="false" level="DEBUG">
- <AppenderRef ref="torque" level="DEBUG"/>
- <AppenderRef ref="console" level="INFO"/>
- </Logger>
- <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
- <AppenderRef ref="console"/>
- </Root>
+ <Logger name="org.apache.torque" additivity="false" level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Logger name="org.apache.commons.beanutils" additivity="false"
level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Logger name="org.apache.velocity" additivity="false" level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
+ <AppenderRef ref="console"/>
+ </Root>
</Loggers>
</Configuration>
\ No newline at end of file
Modified: db/torque/trunk/torque-runtime/pom.xml
==============================================================================
--- db/torque/trunk/torque-runtime/pom.xml Mon Jul 27 12:45:04 2026
(r1936633)
+++ db/torque/trunk/torque-runtime/pom.xml Mon Jul 27 12:49:53 2026
(r1936634)
@@ -81,11 +81,6 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
</dependency>
@@ -149,6 +144,7 @@
<!-- to get a not-initialized TorqueInstance singleton
-->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
+ <argLine>@{argLine} -Xshare:off</argLine>
<excludes>
<exclude>**/BaseTestCase.java</exclude>
</excludes>
Modified:
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
==============================================================================
---
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-templates/src/test/java/org/apache/torque/templates/jdbc2schema/Jdbc2SchemaTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -1,9 +1,5 @@
package org.apache.torque.templates.jdbc2schema;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,6 +19,9 @@ import static org.junit.jupiter.api.Asse
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.BufferedReader;
import java.io.File;
@@ -41,7 +40,6 @@ import java.util.Map;
import java.util.StringTokenizer;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.BasicConfigurator;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.torque.generator.GeneratorException;
@@ -82,7 +80,6 @@ public class Jdbc2SchemaTest /* implemen
public void setUp()
{
try {
- BasicConfigurator.configure();
Connection connection = DriverManager.getConnection(URL);
InputStream inputStream =
getClass().getResourceAsStream(SQL_FILENAME);
BufferedReader bufferedReader = new BufferedReader(
Modified: db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml
==============================================================================
--- db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml Mon Jul
27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/torque-templates/src/test/resources/log4j2-test.xml Mon Jul
27 12:49:53 2026 (r1936634)
@@ -18,33 +18,37 @@
under the License.
-->
<Configuration status="warn" name="Torque">
- <Appenders>
- <Console name="console" target="SYSTEM_OUT">
- <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
- </Console>
- <RollingFile name="torque" fileName="./target/log/torque-templates.log"
- filePattern="./target/log/torque-templates.log%i" >
- <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- <Policies>
- <SizeBasedTriggeringPolicy size="40 MB"/>
- </Policies>
- <DefaultRolloverStrategy max="1"/>
- </RollingFile>
- <File name="velocity" fileName="./target/log/velocity.log">
- <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
- </File>
+ <Appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p | %c - %m%n"/>
+ </Console>
+ <RollingFile name="torque" fileName="./target/log/torque-templates.log"
+ filePattern="./target/log/torque-templates.log%i" >
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="40 MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="1"/>
+ </RollingFile>
+ <File name="velocity" fileName="./target/log/velocity.log">
+ <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/>
+ </File>
</Appenders>
<Loggers>
- <Logger name="org.apache.torque" additivity="false" level="DEBUG">
- <AppenderRef ref="torque" level="DEBUG"/>
- <AppenderRef ref="console" level="INFO"/>
- </Logger>
- <Logger name="org.apache.velocity" additivity="false" level="DEBUG">
- <AppenderRef ref="velocity" level="DEBUG"/>
- <AppenderRef ref="console" level="INFO"/>
- </Logger>
- <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
- <AppenderRef ref="console"/>
- </Root>
+ <Logger name="org.apache.torque" additivity="false" level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Logger name="org.apache.commons.beanutils" additivity="false"
level="DEBUG">
+ <AppenderRef ref="torque" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Logger name="org.apache.velocity" additivity="false" level="DEBUG">
+ <AppenderRef ref="velocity" level="DEBUG"/>
+ <AppenderRef ref="console" level="INFO"/>
+ </Logger>
+ <Root level="INFO"><!-- log4j 1.2 has DEBUG -->
+ <AppenderRef ref="console"/>
+ </Root>
</Loggers>
</Configuration>
\ No newline at end of file
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/DataTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -19,6 +19,11 @@ package org.apache.torque;
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.sql.Connection;
import java.sql.ResultSet;
import java.util.HashSet;
@@ -27,10 +32,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import static org.junit.jupiter.api.Assertions.*;
-
-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.adapter.Adapter;
import org.apache.torque.adapter.DerbyAdapter;
import org.apache.torque.adapter.HsqldbAdapter;
@@ -97,7 +100,7 @@ import org.opentest4j.AssertionFailedErr
*/
public class DataTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(DataTest.class);
+ private static Logger log = LogManager.getLogger(DataTest.class);
/**
* test whether we can connect to the database at all
@@ -226,7 +229,7 @@ public class DataTest extends BaseDataba
criteria.setLimit(1);
criteria.setOffset(5);
List<Book> books = BookPeer.doSelect(criteria);
- assertTrue(books.size() == 1,
+ assertTrue(books.size() == 1,
"List should have 1 books, not " + books.size());
criteria = new Criteria();
@@ -1261,7 +1264,7 @@ public class DataTest extends BaseDataba
assertEquals(1, authors.size());
}
-
+
@Test
@ArgumentsSource(AdapterProvider.class)
public void testLikeClauseEscaping(Adapter adapter) throws Exception
@@ -1282,28 +1285,28 @@ public class DataTest extends BaseDataba
likeResults.put("a\\\\c", "a\\c"); // escaped \ three times
likeResults.put("a\\\\%", "a\\c");
-
+
// mysql: like '%\\c' ESCAPE '|' succeeds, but
- // %\\\\c fails, see
https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html,
+ // %\\\\c fails, see
https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html,
// MySQL uses C escape syntax in strings.. you must double any \ that
you use in LIKE strings.
// That is platform specific mysql:
-
+
// succeeded only in mysql 5.x:
- if (adapter instanceof MysqlAdapter &&
- ( getMysqlMajorVersion() < 8 ||
getMysqlVersion().matches("10\\.[12]\\..*\\-MariaDB") )) {
+ if (adapter instanceof MysqlAdapter &&
+ ( getMysqlMajorVersion() < 8 ||
getMysqlVersion().matches("10\\.[12]\\..*\\-MariaDB") )) {
// likeResults.put("%\\\\\\\\c", "a\\c");
log.warn("If using MySQL < 8 this test may fail, skipping special
escape, "
+ "see
https://dev.mysql.com/doc/refman/8.0/en/string-comparison-functions.html and
issue TORQUE-353");
} else {
- likeResults.put("%\\\\c", "a\\c");
+ likeResults.put("%\\\\c", "a\\c");
}
-
+
likeResults.put("a\\*c", "a*c");
likeResults.put("a\\*%", "a*c");
//likeResults.put("%\\*c", "a*c"); // mysql: %\\*c fails, only
underscore (_) is wild card
// this matches multiple users
- //likeResults.put("%*c", "a%c");
- likeResults.put("_\\*c", "a*c");
+ //likeResults.put("%*c", "a%c");
+ likeResults.put("_\\*c", "a*c");
likeResults.put("a\\?c", "a?c");
likeResults.put("a\\?%", "a?c");
@@ -1444,7 +1447,7 @@ public class DataTest extends BaseDataba
* @param fullyQualifiedColumnName the fully qualified column name, not
null
* @return the column name stripped from the table (and schema) prefixes
*/
-
+
public static String getRawColumnName(final String
fullyQualifiedColumnName)
{
int dotPosition = fullyQualifiedColumnName.lastIndexOf(".");
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
==============================================================================
--- db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++ db/torque/trunk/torque-test/src/test/java/org/apache/torque/DocsTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,8 +25,8 @@ import static org.junit.Assert.fail;
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.adapter.Adapter;
import org.apache.torque.adapter.MysqlAdapter;
import org.apache.torque.criteria.Criteria;
@@ -66,7 +66,7 @@ public class DocsTest extends BaseDataba
public static final String BOOK_3_ISBN = "0-201-63354-X";
- private static Log log = LogFactory.getLog(DocsTest.class);
+ private static Logger log = LogManager.getLogger(DocsTest.class);
@BeforeEach
public void setUp() throws Exception
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/BitTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTru
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.TorqueException;
import org.apache.torque.adapter.Adapter;
@@ -48,7 +48,7 @@ import org.junit.jupiter.params.provider
*/
public class BitTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(BitTest.class);
+ private static Logger log = LogManager.getLogger(BitTest.class);
/**
* Test whether we can insert into Tables with BIT PKs and BIT values.
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/ByteTypeTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -26,8 +26,8 @@ import static org.junit.Assert.fail;
import java.util.Arrays;
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.TorqueException;
import org.apache.torque.adapter.Adapter;
@@ -45,7 +45,7 @@ import org.junit.jupiter.params.provider
*/
public abstract class ByteTypeTest<T extends Persistent> extends
BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(ByteTypeTest.class);
+ private static Logger log = LogManager.getLogger(ByteTypeTest.class);
private BasePeerImpl<T> peer;
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/datatypes/DateTimeTimestampTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -29,8 +29,8 @@ import java.util.Date;
import java.util.GregorianCalendar;
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.TorqueException;
import org.apache.torque.adapter.Adapter;
@@ -55,7 +55,7 @@ import org.junit.jupiter.params.provider
*/
public class DateTimeTimestampTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(DateTimeTimestampTest.class);
+ private static Logger log =
LogManager.getLogger(DateTimeTimestampTest.class);
/**
* Tests the date behaviour. Date fields should be truncated to the start
@@ -71,7 +71,7 @@ public class DateTimeTimestampTest exten
// insert new DateTest object to db
DateTimeTimestampType dateTimeTimestamp = new DateTimeTimestampType();
-
+
dateTimeTimestamp.setDateValue(LocalDate.EPOCH);
dateTimeTimestamp.setTimeValue(LocalTime.NOON);
dateTimeTimestamp.setTimestampValue(LocalDateTime.ofInstant(java.time.Instant.EPOCH,
ZoneOffset.UTC));
@@ -141,7 +141,7 @@ public class DateTimeTimestampTest exten
// calculate expected value
LocalDateTime expected =
LocalDateTime.ofInstant(java.time.Instant.EPOCH, ZoneOffset.UTC);
-
+
// verify
assertEquals(expected, loaded.getTimestampValue());
}
@@ -196,7 +196,7 @@ public class DateTimeTimestampTest exten
List<DateTimeTimestampType> result
= DateTimeTimestampTypePeer.doSelect(criteria);
assertEquals(0, result.size());
-
+
criteria = new Criteria().where(
DateTimeTimestampTypePeer.TIME_VALUE,
Criteria.CURRENT_TIME,
@@ -288,15 +288,15 @@ public class DateTimeTimestampTest exten
// execute select
Criteria criteria = new Criteria();
-
+
// java.util.Date cannot be cast to java.sql.Time
Date queryTimeValue = new java.sql.Time(new Date(1234000).getTime());
//new Date(1234000);
-
+
criteria.where(DateTimeTimestampTypePeer.TIME_VALUE, queryTimeValue);
-
+
List<DateTimeTimestampType> result
= DateTimeTimestampTypePeer.doSelect(criteria);
-
+
// verify
assertEquals(1, result.size());
assertEquals(dateTimeTimestamp, result.get(0));
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/dataobject/SaveTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,8 +25,8 @@ import static org.junit.Assert.fail;
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.ForeignKeySchemaData;
import org.apache.torque.TorqueException;
@@ -52,7 +52,7 @@ import org.junit.jupiter.params.provider
*/
public class SaveTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(SaveTest.class);
+ private static Logger log = LogManager.getLogger(SaveTest.class);
/**
* Tests the save method for a simple object.
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValuesFromJavaTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -7,8 +7,8 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-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.adapter.Adapter;
import org.apache.torque.adapter.MssqlAdapter;
@@ -44,7 +44,7 @@ import org.junit.jupiter.params.provider
*/
public class DefaultValuesFromJavaTest extends BaseDatabaseTestCase
{
- private static Log log =
LogFactory.getLog(DefaultValuesFromJavaTest.class);
+ private static Logger log =
LogManager.getLogger(DefaultValuesFromJavaTest.class);
/**
* Checks that if CURRENT_DATE is used as non database default value
(useDatabaseDefaultValue is not set)
@@ -64,7 +64,7 @@ public class DefaultValuesFromJavaTest e
}
LocalDate currentDateBefore = LocalDate.now();
JavaDefaultValues javaDefaultValues = new JavaDefaultValues();
-
+
if (javaDefaultValues.getCurrentDateValue() == null) {
// if the schema has useDatabaseDefaultValue current time is set
null.
log.error("testCurrentDateAsJavaDefault(): "
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DeleteTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -28,8 +28,8 @@ import java.math.BigDecimal;
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.ForeignKeySchemaData;
import org.apache.torque.PkSchemaData;
@@ -51,7 +51,7 @@ import org.apache.torque.test.peer.OInte
*/
public class DeleteTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(DeleteTest.class);
+ private static Logger log = LogManager.getLogger(DeleteTest.class);
/**
* Tests that the delete(DatabaseObject) method deletes the correct
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/JoinTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -25,8 +25,8 @@ import static org.junit.Assert.fail;
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.ColumnImpl;
import org.apache.torque.ForeignKeySchemaData;
@@ -56,7 +56,7 @@ import org.junit.jupiter.params.provider
*/
public class JoinTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(JoinTest.class);
+ private static Logger log = LogManager.getLogger(JoinTest.class);
/**
* Test left joins.
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/SelectSetOperationTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -28,8 +28,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.BaseDatabaseTestCase;
import org.apache.torque.ColumnImpl;
import org.apache.torque.TorqueException;
@@ -55,7 +55,7 @@ import org.junit.jupiter.params.provider
*/
public class SelectSetOperationTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(SelectSetOperationTest.class);
+ private static Logger log =
LogManager.getLogger(SelectSetOperationTest.class);
private List<Author> authorList;
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/WhereClauseSubselectTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertEqu
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.ColumnImpl;
import org.apache.torque.TorqueException;
@@ -49,7 +49,7 @@ import org.junit.jupiter.params.provider
*/
public class WhereClauseSubselectTest extends BaseDatabaseTestCase
{
- private static Log log = LogFactory.getLog(WhereClauseSubselectTest.class);
+ private static Logger log =
LogManager.getLogger(WhereClauseSubselectTest.class);
Author author1;
Author author2;
Modified:
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
==============================================================================
---
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
Mon Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/oid/IDBrokerTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -27,8 +27,8 @@ import java.sql.Connection;
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.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.torque.BaseDatabaseTestCase;
import org.apache.torque.Torque;
import org.apache.torque.test.peer.AuthorPeer;
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test;
public class IDBrokerTest extends BaseDatabaseTestCase
{
/** Class logger. */
- private static Log log = LogFactory.getLog(IDBrokerTest.class);
+ private static Logger log = LogManager.getLogger(IDBrokerTest.class);
/** System under test. */
private IDBroker idBroker;
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 Jul 27 12:45:04 2026 (r1936633)
+++
db/torque/trunk/torque-test/src/test/java/org/apache/torque/util/ExceptionMapperTest.java
Mon Jul 27 12:49:53 2026 (r1936634)
@@ -1,8 +1,5 @@
package org.apache.torque.util;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,12 +19,15 @@ import static org.junit.jupiter.api.Asse
* under the License.
*/
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
import java.sql.Connection;
import java.sql.SQLException;
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.ConstraintViolationException;
import org.apache.torque.DeadlockException;
@@ -50,7 +50,7 @@ public class ExceptionMapperTest extends
/** Timeout for waiting for started threads and saves, in milliseconds. */
private static int TIMEOUT = 50000;
- private static Log log = LogFactory.getLog(ExceptionMapperTest.class);
+ private static Logger log =
LogManager.getLogger(ExceptionMapperTest.class);
/**
* Check that a ConstraintViolationException is thrown if a record
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
