Skip to content

Commit

Permalink
SAK-29960 Upgrade log4j impl 1 to 2 (sakaiproject#9302)
Browse files Browse the repository at this point in the history
  • Loading branch information
ern committed Sep 1, 2021
1 parent 5fafc0b commit c02c298
Show file tree
Hide file tree
Showing 118 changed files with 3,370 additions and 1,152 deletions.
8 changes: 0 additions & 8 deletions assignment/impl/src/test/resources/log4j.properties

This file was deleted.

70 changes: 70 additions & 0 deletions assignment/impl/src/test/resources/log4j2.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### direct log messages to stdout ###
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %highlight{[%p]} %r [%t] %c:%L %m%n

### set log levels - for more verbose logging change 'info' to 'debug' ###
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = STDOUT

### Hibernate debug
#logger.hibernate.name = org.hibernate
#logger.hibernate.level = DEBUG
#logger.hibernate.additivity=false
#logger.hibernate.appenderRef.console.ref = STDOUT

### log HQL query parser activity
#logger.hibernateAST.name = org.hibernate.hql.ast.AST
#logger.hibernateAST.level = DEBUG
#logger.hibernateAST.additivity=false
#logger.hibernateAST.appenderRef.console.ref = STDOUT

### log just the SQL
logger.hibernateSQL.name = org.hibernate.SQL
logger.hibernateSQL.level = INFO
logger.hibernateSQL.additivity=false
logger.hibernateSQL.appenderRef.console.ref = STDOUT

### log JDBC bind parameters ###
logger.hibernateType.name = org.hibernate.type
logger.hibernateType.level = INFO
logger.hibernateType.additivity=false
logger.hibernateType.appenderRef.console.ref = STDOUT

### log schema export/update ###
logger.hibernateDDL.name = org.hibernate.tool.hbm2ddl
logger.hibernateDDL.level = INFO
logger.hibernateDDL.additivity=false
logger.hibernateDDL.appenderRef.console.ref = STDOUT

### log HQL parse trees
#logger.hibernateHQL.name = org.hibernate.hql
#logger.hibernateHQL.level = DEBUG
#logger.hibernateHQL.additivity=false
#logger.hibernateHQL.appenderRef.console.ref = STDOUT

### log cache activity ###
#logger.hibernateCache.name = org.hibernate.cache
#logger.hibernateCache.level = INFO
#logger.hibernateCache.additivity=false
#logger.hibernateCache.appenderRef.console.ref = STDOUT

### log transaction activity
#logger.hibernateTx.name = org.hibernate.transaction
#logger.hibernateTx.level = DEBUG
#logger.hibernateTx.additivity=false
#logger.hibernateTx.appenderRef.console.ref = STDOUT

### log JDBC resource acquisition
#logger.hibernateJDBC.name = org.hibernate.jdbc
#logger.hibernateJDBC.level = DEBUG
#logger.hibernateJDBC.additivity=false
#logger.hibernateJDBC.appenderRef.console.ref = STDOUT

### enable the following line if you want to track down connection ###
### leakages when using DriverManagerConnectionProvider ###
#logger.hibernateConnection.name = org.hibernate.connection.DriverManagerConnectionProvider
#logger.hibernateConnection.level = TRACE
#logger.hibernateConnection.additivity=false
#logger.hibernateConnection.appenderRef.console.ref = STDOUT
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.Locale;
import java.util.Map;

import org.apache.log4j.BasicConfigurator;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down Expand Up @@ -60,7 +59,6 @@ public class AssignmentActionTestTools {

@Before
public void setUp() {
BasicConfigurator.configure();
PowerMockito.mockStatic(ComponentManager.class);
// A mock component manager.
when(ComponentManager.get(any(Class.class))).then(new Answer<Object>() {
Expand Down

This file was deleted.

70 changes: 70 additions & 0 deletions calendar/calendar-impl/impl/src/test/resources/log4j2.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### direct log messages to stdout ###
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %highlight{[%p]} %r [%t] %c:%L %m%n

### set log levels - for more verbose logging change 'info' to 'debug' ###
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = STDOUT

### Hibernate debug
#logger.hibernate.name = org.hibernate
#logger.hibernate.level = DEBUG
#logger.hibernate.additivity=false
#logger.hibernate.appenderRef.console.ref = STDOUT

### log HQL query parser activity
#logger.hibernateAST.name = org.hibernate.hql.ast.AST
#logger.hibernateAST.level = DEBUG
#logger.hibernateAST.additivity=false
#logger.hibernateAST.appenderRef.console.ref = STDOUT

### log just the SQL
logger.hibernateSQL.name = org.hibernate.SQL
logger.hibernateSQL.level = INFO
logger.hibernateSQL.additivity=false
logger.hibernateSQL.appenderRef.console.ref = STDOUT

### log JDBC bind parameters ###
logger.hibernateType.name = org.hibernate.type
logger.hibernateType.level = INFO
logger.hibernateType.additivity=false
logger.hibernateType.appenderRef.console.ref = STDOUT

### log schema export/update ###
logger.hibernateDDL.name = org.hibernate.tool.hbm2ddl
logger.hibernateDDL.level = INFO
logger.hibernateDDL.additivity=false
logger.hibernateDDL.appenderRef.console.ref = STDOUT

### log HQL parse trees
#logger.hibernateHQL.name = org.hibernate.hql
#logger.hibernateHQL.level = DEBUG
#logger.hibernateHQL.additivity=false
#logger.hibernateHQL.appenderRef.console.ref = STDOUT

### log cache activity ###
#logger.hibernateCache.name = org.hibernate.cache
#logger.hibernateCache.level = INFO
#logger.hibernateCache.additivity=false
#logger.hibernateCache.appenderRef.console.ref = STDOUT

### log transaction activity
#logger.hibernateTx.name = org.hibernate.transaction
#logger.hibernateTx.level = DEBUG
#logger.hibernateTx.additivity=false
#logger.hibernateTx.appenderRef.console.ref = STDOUT

### log JDBC resource acquisition
#logger.hibernateJDBC.name = org.hibernate.jdbc
#logger.hibernateJDBC.level = DEBUG
#logger.hibernateJDBC.additivity=false
#logger.hibernateJDBC.appenderRef.console.ref = STDOUT

### enable the following line if you want to track down connection ###
### leakages when using DriverManagerConnectionProvider ###
#logger.hibernateConnection.name = org.hibernate.connection.DriverManagerConnectionProvider
#logger.hibernateConnection.level = TRACE
#logger.hibernateConnection.additivity=false
#logger.hibernateConnection.appenderRef.console.ref = STDOUT

This file was deleted.

70 changes: 70 additions & 0 deletions calendar/calendar-util/util/src/test/resources/log4j2.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### direct log messages to stdout ###
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %highlight{[%p]} %r [%t] %c:%L %m%n

### set log levels - for more verbose logging change 'info' to 'debug' ###
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = STDOUT

### Hibernate debug
#logger.hibernate.name = org.hibernate
#logger.hibernate.level = DEBUG
#logger.hibernate.additivity=false
#logger.hibernate.appenderRef.console.ref = STDOUT

### log HQL query parser activity
#logger.hibernateAST.name = org.hibernate.hql.ast.AST
#logger.hibernateAST.level = DEBUG
#logger.hibernateAST.additivity=false
#logger.hibernateAST.appenderRef.console.ref = STDOUT

### log just the SQL
logger.hibernateSQL.name = org.hibernate.SQL
logger.hibernateSQL.level = INFO
logger.hibernateSQL.additivity=false
logger.hibernateSQL.appenderRef.console.ref = STDOUT

### log JDBC bind parameters ###
logger.hibernateType.name = org.hibernate.type
logger.hibernateType.level = INFO
logger.hibernateType.additivity=false
logger.hibernateType.appenderRef.console.ref = STDOUT

### log schema export/update ###
logger.hibernateDDL.name = org.hibernate.tool.hbm2ddl
logger.hibernateDDL.level = INFO
logger.hibernateDDL.additivity=false
logger.hibernateDDL.appenderRef.console.ref = STDOUT

### log HQL parse trees
#logger.hibernateHQL.name = org.hibernate.hql
#logger.hibernateHQL.level = DEBUG
#logger.hibernateHQL.additivity=false
#logger.hibernateHQL.appenderRef.console.ref = STDOUT

### log cache activity ###
#logger.hibernateCache.name = org.hibernate.cache
#logger.hibernateCache.level = INFO
#logger.hibernateCache.additivity=false
#logger.hibernateCache.appenderRef.console.ref = STDOUT

### log transaction activity
#logger.hibernateTx.name = org.hibernate.transaction
#logger.hibernateTx.level = DEBUG
#logger.hibernateTx.additivity=false
#logger.hibernateTx.appenderRef.console.ref = STDOUT

### log JDBC resource acquisition
#logger.hibernateJDBC.name = org.hibernate.jdbc
#logger.hibernateJDBC.level = DEBUG
#logger.hibernateJDBC.additivity=false
#logger.hibernateJDBC.appenderRef.console.ref = STDOUT

### enable the following line if you want to track down connection ###
### leakages when using DriverManagerConnectionProvider ###
#logger.hibernateConnection.name = org.hibernate.connection.DriverManagerConnectionProvider
#logger.hibernateConnection.level = TRACE
#logger.hibernateConnection.additivity=false
#logger.hibernateConnection.appenderRef.console.ref = STDOUT
2 changes: 1 addition & 1 deletion citations/citations-impl/impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
<directory>${basedir}/src/test</directory>
<includes>
<include>**/*.xml</include>
<include>**/log4j.properties</include>
<include>**/log4j2.properties</include>
</includes>
</testResource>
</testResources>
Expand Down
6 changes: 0 additions & 6 deletions citations/citations-impl/impl/src/test/log4j.properties

This file was deleted.

70 changes: 70 additions & 0 deletions citations/citations-impl/impl/src/test/log4j2.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
### direct log messages to stdout ###
appender.console.type = Console
appender.console.name = STDOUT
appender.console.layout.type = PatternLayout
appender.console.layout.pattern = %highlight{[%p]} %r [%t] %c:%L %m%n

### set log levels - for more verbose logging change 'info' to 'debug' ###
rootLogger.level = INFO
rootLogger.appenderRef.stdout.ref = STDOUT

### Hibernate debug
#logger.hibernate.name = org.hibernate
#logger.hibernate.level = DEBUG
#logger.hibernate.additivity=false
#logger.hibernate.appenderRef.console.ref = STDOUT

### log HQL query parser activity
#logger.hibernateAST.name = org.hibernate.hql.ast.AST
#logger.hibernateAST.level = DEBUG
#logger.hibernateAST.additivity=false
#logger.hibernateAST.appenderRef.console.ref = STDOUT

### log just the SQL
logger.hibernateSQL.name = org.hibernate.SQL
logger.hibernateSQL.level = INFO
logger.hibernateSQL.additivity=false
logger.hibernateSQL.appenderRef.console.ref = STDOUT

### log JDBC bind parameters ###
logger.hibernateType.name = org.hibernate.type
logger.hibernateType.level = INFO
logger.hibernateType.additivity=false
logger.hibernateType.appenderRef.console.ref = STDOUT

### log schema export/update ###
logger.hibernateDDL.name = org.hibernate.tool.hbm2ddl
logger.hibernateDDL.level = INFO
logger.hibernateDDL.additivity=false
logger.hibernateDDL.appenderRef.console.ref = STDOUT

### log HQL parse trees
#logger.hibernateHQL.name = org.hibernate.hql
#logger.hibernateHQL.level = DEBUG
#logger.hibernateHQL.additivity=false
#logger.hibernateHQL.appenderRef.console.ref = STDOUT

### log cache activity ###
#logger.hibernateCache.name = org.hibernate.cache
#logger.hibernateCache.level = INFO
#logger.hibernateCache.additivity=false
#logger.hibernateCache.appenderRef.console.ref = STDOUT

### log transaction activity
#logger.hibernateTx.name = org.hibernate.transaction
#logger.hibernateTx.level = DEBUG
#logger.hibernateTx.additivity=false
#logger.hibernateTx.appenderRef.console.ref = STDOUT

### log JDBC resource acquisition
#logger.hibernateJDBC.name = org.hibernate.jdbc
#logger.hibernateJDBC.level = DEBUG
#logger.hibernateJDBC.additivity=false
#logger.hibernateJDBC.appenderRef.console.ref = STDOUT

### enable the following line if you want to track down connection ###
### leakages when using DriverManagerConnectionProvider ###
#logger.hibernateConnection.name = org.hibernate.connection.DriverManagerConnectionProvider
#logger.hibernateConnection.level = TRACE
#logger.hibernateConnection.additivity=false
#logger.hibernateConnection.appenderRef.console.ref = STDOUT
26 changes: 0 additions & 26 deletions common/common-composite-component/src/test/log4j.properties

This file was deleted.

Loading

0 comments on commit c02c298

Please sign in to comment.