You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by tv...@apache.org on 2025/03/21 14:58:02 UTC
(commons-jcs) branch master updated (b1117bf0 -> ff03e182)
This is an automated email from the ASF dual-hosted git repository.
tv pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
from b1117bf0 Merge pull request #341 from apache/dependabot/github_actions/actions/cache-4.2.3
new bc3167c6 JCS-241 Use System.Logger from Java9, Remove own logging abstraction
new ff03e182 Document changes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
commons-jcs-jcache-openjpa/.gitignore | 1 -
commons-jcs3-core/pom.xml | 43 +-
.../src/main/java/org/apache/commons/jcs3/JCS.java | 13 -
.../auxiliary/AbstractAuxiliaryCacheMonitor.java | 3 +-
.../jcs3/auxiliary/AuxiliaryCacheConfigurator.java | 3 +-
.../jcs3/auxiliary/disk/AbstractDiskCache.java | 3 +-
.../disk/AbstractDiskCacheAttributes.java | 3 +-
.../jcs3/auxiliary/disk/block/BlockDisk.java | 3 +-
.../jcs3/auxiliary/disk/block/BlockDiskCache.java | 3 +-
.../disk/block/BlockDiskCacheFactory.java | 3 +-
.../auxiliary/disk/block/BlockDiskKeyStore.java | 3 +-
.../jcs3/auxiliary/disk/indexed/IndexedDisk.java | 3 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 3 +-
.../disk/indexed/IndexedDiskCacheFactory.java | 3 +-
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java | 3 +-
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 3 +-
.../jcs3/auxiliary/disk/jdbc/ShrinkerThread.java | 3 +-
.../disk/jdbc/dsfactory/JndiDataSourceFactory.java | 3 +-
.../dsfactory/SharedPoolDataSourceFactory.java | 3 +-
.../disk/jdbc/hsql/HSQLDiskCacheFactory.java | 3 +-
.../auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 3 +-
.../disk/jdbc/mysql/MySQLDiskCacheFactory.java | 3 +-
.../disk/jdbc/mysql/MySQLTableOptimizer.java | 3 +-
.../jcs3/auxiliary/lateral/LateralCache.java | 3 +-
.../jcs3/auxiliary/lateral/LateralCacheNoWait.java | 3 +-
.../lateral/LateralCacheNoWaitFacade.java | 3 +-
.../lateral/socket/tcp/LateralTCPCacheFactory.java | 3 +-
.../socket/tcp/LateralTCPDiscoveryListener.java | 3 +-
.../lateral/socket/tcp/LateralTCPListener.java | 3 +-
.../lateral/socket/tcp/LateralTCPSender.java | 3 +-
.../lateral/socket/tcp/LateralTCPService.java | 3 +-
.../remote/AbstractRemoteAuxiliaryCache.java | 3 +-
.../remote/AbstractRemoteCacheListener.java | 3 +-
.../remote/AbstractRemoteCacheNoWaitFacade.java | 3 +-
.../commons/jcs3/auxiliary/remote/RemoteCache.java | 3 +-
.../jcs3/auxiliary/remote/RemoteCacheListener.java | 3 +-
.../jcs3/auxiliary/remote/RemoteCacheManager.java | 3 +-
.../jcs3/auxiliary/remote/RemoteCacheNoWait.java | 3 +-
.../auxiliary/remote/RemoteCacheNoWaitFacade.java | 3 +-
.../jcs3/auxiliary/remote/RemoteLocation.java | 3 +-
.../commons/jcs3/auxiliary/remote/RemoteUtils.java | 3 +-
.../remote/http/client/AbstractHttpClient.java | 3 +-
.../remote/http/client/RemoteHttpCache.java | 3 +-
.../remote/http/client/RemoteHttpCacheClient.java | 3 +-
.../http/client/RemoteHttpCacheDispatcher.java | 3 +-
.../remote/http/client/RemoteHttpCacheFactory.java | 3 +-
.../http/server/AbstractRemoteCacheService.java | 3 +-
.../remote/http/server/RemoteHttpCacheServlet.java | 3 +-
.../auxiliary/remote/server/RemoteCacheServer.java | 3 +-
.../remote/server/RemoteCacheServerFactory.java | 3 +-
.../remote/server/RemoteCacheStartupServlet.java | 3 +-
.../remote/util/RemoteCacheRequestFactory.java | 3 +-
.../jcs3/engine/AbstractCacheEventQueue.java | 3 +-
.../jcs3/engine/CacheEventQueueFactory.java | 3 +-
.../commons/jcs3/engine/CacheWatchRepairable.java | 3 +-
.../commons/jcs3/engine/PooledCacheEventQueue.java | 3 +-
.../commons/jcs3/engine/ZombieCacheService.java | 3 +-
.../jcs3/engine/ZombieCacheServiceNonLocal.java | 3 +-
.../jcs3/engine/control/CompositeCache.java | 3 +-
.../engine/control/CompositeCacheConfigurator.java | 3 +-
.../jcs3/engine/control/CompositeCacheManager.java | 3 +-
.../engine/control/event/ElementEventQueue.java | 3 +-
.../logging/CacheEventLoggerDebugLogger.java | 5 +-
.../AbstractDoubleLinkedListMemoryCache.java | 3 +-
.../jcs3/engine/memory/AbstractMemoryCache.java | 3 +-
.../jcs3/engine/memory/lru/LHMLRUMemoryCache.java | 3 +-
.../engine/memory/shrinking/ShrinkerThread.java | 3 +-
.../memory/soft/SoftReferenceMemoryCache.java | 3 +-
.../org/apache/commons/jcs3/log/JulLogFactory.java | 76 ---
.../main/java/org/apache/commons/jcs3/log/Log.java | 49 +-
.../org/apache/commons/jcs3/log/Log4j2Factory.java | 88 ----
.../apache/commons/jcs3/log/Log4j2LogAdapter.java | 530 ---------------------
.../org/apache/commons/jcs3/log/LogFactory.java | 64 ---
.../org/apache/commons/jcs3/log/LogManager.java | 173 -------
.../{JulLogAdapter.java => SystemLogAdapter.java} | 97 ++--
.../commons/jcs3/utils/access/JCSWorker.java | 3 +-
.../commons/jcs3/utils/config/OptionConverter.java | 3 +-
.../commons/jcs3/utils/config/PropertySetter.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoveryManager.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoveryReceiver.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoverySender.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoveryService.java | 3 +-
.../commons/jcs3/utils/net/HostNameUtil.java | 3 +-
.../serialization/SerializationConversionUtil.java | 3 +-
.../utils/servlet/JCSServletContextListener.java | 3 +-
.../commons/jcs3/utils/struct/AbstractLRUMap.java | 3 +-
.../jcs3/utils/struct/DoubleLinkedList.java | 3 +-
.../jcs3/utils/threadpool/ThreadPoolManager.java | 3 +-
.../commons/jcs3/utils/zip/CompressionUtil.java | 3 +-
.../org.apache.commons.jcs3.log.LogFactory | 16 -
commons-jcs3-core/src/test/conf/log4j.properties | 69 ---
.../org/apache/commons/jcs3/JCSThrashTest.java | 3 +-
.../jcs3/JCSvsHashtablePerformanceTest.java | 5 +-
.../commons/jcs3/TestLogConfigurationUtil.java | 3 -
.../commons/jcs3/access/TestCacheAccess.java | 3 +-
.../auxiliary/disk/AbstractDiskCacheUnitTest.java | 1 +
.../auxiliary/remote/MockRemoteCacheClient.java | 3 +-
.../jcs3/auxiliary/remote/TestRemoteCache.java | 3 +-
.../server/RemoteCacheServerStartupUtil.java | 3 +-
.../control/event/ElementEventHandlerMockImpl.java | 3 +-
.../engine/memory/mru/LRUvsMRUPerformanceTest.java | 5 +-
.../jcs3/log/LogManagerNoLogSystemUnitTest.java | 38 --
.../commons/jcs3/log/LogManagerUnitTest.java | 5 +-
.../struct/JCSvsCommonsLRUMapPerformanceTest.java | 3 +-
.../src/test/test-conf/log4j2-test.xml | 34 --
pom.xml | 1 -
src/changes/changes.xml | 11 +-
107 files changed, 192 insertions(+), 1390 deletions(-)
delete mode 100644 commons-jcs-jcache-openjpa/.gitignore
delete mode 100644 commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogFactory.java
delete mode 100644 commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2Factory.java
delete mode 100644 commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2LogAdapter.java
delete mode 100644 commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogFactory.java
delete mode 100644 commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java
rename commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/{JulLogAdapter.java => SystemLogAdapter.java} (85%)
delete mode 100644 commons-jcs3-core/src/main/resources/META-INF/services/org.apache.commons.jcs3.log.LogFactory
delete mode 100644 commons-jcs3-core/src/test/conf/log4j.properties
delete mode 100644 commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java
delete mode 100644 commons-jcs3-core/src/test/test-conf/log4j2-test.xml
(commons-jcs) 01/02: JCS-241 Use System.Logger from Java9, Remove own logging abstraction
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit bc3167c608678ad3dfbccbe780c5cecbc94130f2
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Fri Mar 21 15:53:10 2025 +0100
JCS-241 Use System.Logger from Java9, Remove own logging abstraction
---
commons-jcs-jcache-openjpa/.gitignore | 1 -
commons-jcs3-core/pom.xml | 43 +-
.../src/main/java/org/apache/commons/jcs3/JCS.java | 13 -
.../auxiliary/AbstractAuxiliaryCacheMonitor.java | 3 +-
.../jcs3/auxiliary/AuxiliaryCacheConfigurator.java | 3 +-
.../jcs3/auxiliary/disk/AbstractDiskCache.java | 3 +-
.../disk/AbstractDiskCacheAttributes.java | 3 +-
.../jcs3/auxiliary/disk/block/BlockDisk.java | 3 +-
.../jcs3/auxiliary/disk/block/BlockDiskCache.java | 3 +-
.../disk/block/BlockDiskCacheFactory.java | 3 +-
.../auxiliary/disk/block/BlockDiskKeyStore.java | 3 +-
.../jcs3/auxiliary/disk/indexed/IndexedDisk.java | 3 +-
.../auxiliary/disk/indexed/IndexedDiskCache.java | 3 +-
.../disk/indexed/IndexedDiskCacheFactory.java | 3 +-
.../jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java | 3 +-
.../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java | 3 +-
.../jcs3/auxiliary/disk/jdbc/ShrinkerThread.java | 3 +-
.../disk/jdbc/dsfactory/JndiDataSourceFactory.java | 3 +-
.../dsfactory/SharedPoolDataSourceFactory.java | 3 +-
.../disk/jdbc/hsql/HSQLDiskCacheFactory.java | 3 +-
.../auxiliary/disk/jdbc/mysql/MySQLDiskCache.java | 3 +-
.../disk/jdbc/mysql/MySQLDiskCacheFactory.java | 3 +-
.../disk/jdbc/mysql/MySQLTableOptimizer.java | 3 +-
.../jcs3/auxiliary/lateral/LateralCache.java | 3 +-
.../jcs3/auxiliary/lateral/LateralCacheNoWait.java | 3 +-
.../lateral/LateralCacheNoWaitFacade.java | 3 +-
.../lateral/socket/tcp/LateralTCPCacheFactory.java | 3 +-
.../socket/tcp/LateralTCPDiscoveryListener.java | 3 +-
.../lateral/socket/tcp/LateralTCPListener.java | 3 +-
.../lateral/socket/tcp/LateralTCPSender.java | 3 +-
.../lateral/socket/tcp/LateralTCPService.java | 3 +-
.../remote/AbstractRemoteAuxiliaryCache.java | 3 +-
.../remote/AbstractRemoteCacheListener.java | 3 +-
.../remote/AbstractRemoteCacheNoWaitFacade.java | 3 +-
.../commons/jcs3/auxiliary/remote/RemoteCache.java | 3 +-
.../jcs3/auxiliary/remote/RemoteCacheListener.java | 3 +-
.../jcs3/auxiliary/remote/RemoteCacheManager.java | 3 +-
.../jcs3/auxiliary/remote/RemoteCacheNoWait.java | 3 +-
.../auxiliary/remote/RemoteCacheNoWaitFacade.java | 3 +-
.../jcs3/auxiliary/remote/RemoteLocation.java | 3 +-
.../commons/jcs3/auxiliary/remote/RemoteUtils.java | 3 +-
.../remote/http/client/AbstractHttpClient.java | 3 +-
.../remote/http/client/RemoteHttpCache.java | 3 +-
.../remote/http/client/RemoteHttpCacheClient.java | 3 +-
.../http/client/RemoteHttpCacheDispatcher.java | 3 +-
.../remote/http/client/RemoteHttpCacheFactory.java | 3 +-
.../http/server/AbstractRemoteCacheService.java | 3 +-
.../remote/http/server/RemoteHttpCacheServlet.java | 3 +-
.../auxiliary/remote/server/RemoteCacheServer.java | 3 +-
.../remote/server/RemoteCacheServerFactory.java | 3 +-
.../remote/server/RemoteCacheStartupServlet.java | 3 +-
.../remote/util/RemoteCacheRequestFactory.java | 3 +-
.../jcs3/engine/AbstractCacheEventQueue.java | 3 +-
.../jcs3/engine/CacheEventQueueFactory.java | 3 +-
.../commons/jcs3/engine/CacheWatchRepairable.java | 3 +-
.../commons/jcs3/engine/PooledCacheEventQueue.java | 3 +-
.../commons/jcs3/engine/ZombieCacheService.java | 3 +-
.../jcs3/engine/ZombieCacheServiceNonLocal.java | 3 +-
.../jcs3/engine/control/CompositeCache.java | 3 +-
.../engine/control/CompositeCacheConfigurator.java | 3 +-
.../jcs3/engine/control/CompositeCacheManager.java | 3 +-
.../engine/control/event/ElementEventQueue.java | 3 +-
.../logging/CacheEventLoggerDebugLogger.java | 5 +-
.../AbstractDoubleLinkedListMemoryCache.java | 3 +-
.../jcs3/engine/memory/AbstractMemoryCache.java | 3 +-
.../jcs3/engine/memory/lru/LHMLRUMemoryCache.java | 3 +-
.../engine/memory/shrinking/ShrinkerThread.java | 3 +-
.../memory/soft/SoftReferenceMemoryCache.java | 3 +-
.../org/apache/commons/jcs3/log/JulLogFactory.java | 76 ---
.../main/java/org/apache/commons/jcs3/log/Log.java | 49 +-
.../org/apache/commons/jcs3/log/Log4j2Factory.java | 88 ----
.../apache/commons/jcs3/log/Log4j2LogAdapter.java | 530 ---------------------
.../org/apache/commons/jcs3/log/LogFactory.java | 64 ---
.../org/apache/commons/jcs3/log/LogManager.java | 173 -------
.../{JulLogAdapter.java => SystemLogAdapter.java} | 97 ++--
.../commons/jcs3/utils/access/JCSWorker.java | 3 +-
.../commons/jcs3/utils/config/OptionConverter.java | 3 +-
.../commons/jcs3/utils/config/PropertySetter.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoveryManager.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoveryReceiver.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoverySender.java | 3 +-
.../jcs3/utils/discovery/UDPDiscoveryService.java | 3 +-
.../commons/jcs3/utils/net/HostNameUtil.java | 3 +-
.../serialization/SerializationConversionUtil.java | 3 +-
.../utils/servlet/JCSServletContextListener.java | 3 +-
.../commons/jcs3/utils/struct/AbstractLRUMap.java | 3 +-
.../jcs3/utils/struct/DoubleLinkedList.java | 3 +-
.../jcs3/utils/threadpool/ThreadPoolManager.java | 3 +-
.../commons/jcs3/utils/zip/CompressionUtil.java | 3 +-
.../org.apache.commons.jcs3.log.LogFactory | 16 -
commons-jcs3-core/src/test/conf/log4j.properties | 69 ---
.../org/apache/commons/jcs3/JCSThrashTest.java | 3 +-
.../jcs3/JCSvsHashtablePerformanceTest.java | 5 +-
.../commons/jcs3/TestLogConfigurationUtil.java | 3 -
.../commons/jcs3/access/TestCacheAccess.java | 3 +-
.../auxiliary/disk/AbstractDiskCacheUnitTest.java | 1 +
.../auxiliary/remote/MockRemoteCacheClient.java | 3 +-
.../jcs3/auxiliary/remote/TestRemoteCache.java | 3 +-
.../server/RemoteCacheServerStartupUtil.java | 3 +-
.../control/event/ElementEventHandlerMockImpl.java | 3 +-
.../engine/memory/mru/LRUvsMRUPerformanceTest.java | 5 +-
.../jcs3/log/LogManagerNoLogSystemUnitTest.java | 38 --
.../commons/jcs3/log/LogManagerUnitTest.java | 5 +-
.../struct/JCSvsCommonsLRUMapPerformanceTest.java | 3 +-
.../src/test/test-conf/log4j2-test.xml | 34 --
pom.xml | 1 -
106 files changed, 183 insertions(+), 1388 deletions(-)
diff --git a/commons-jcs-jcache-openjpa/.gitignore b/commons-jcs-jcache-openjpa/.gitignore
deleted file mode 100644
index 13753951..00000000
--- a/commons-jcs-jcache-openjpa/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/derby.log
diff --git a/commons-jcs3-core/pom.xml b/commons-jcs3-core/pom.xml
index c470167b..42d23832 100644
--- a/commons-jcs3-core/pom.xml
+++ b/commons-jcs3-core/pom.xml
@@ -48,8 +48,7 @@
<commons.osgi.import>
javax.servlet.*;resolution:=optional,
org.apache.commons.dbcp2.*;resolution:=optional,
- org.apache.http.*;resolution:=optional,
- org.apache.logging.log4j.*;resolution:=optional
+ org.apache.http.*;resolution:=optional
</commons.osgi.import>
<!-- project.build.outputTimestamp is managed by Maven plugins, see https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<project.build.outputTimestamp>2022-01-01T00:00:00Z</project.build.outputTimestamp>
@@ -57,13 +56,6 @@
<dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${commons.log4j.version}</version>
- <optional>true</optional>
- </dependency>
-
<!-- JDBC DISK CACHE -->
<dependency>
<groupId>org.apache.commons</groupId>
@@ -182,39 +174,6 @@
</build>
<profiles>
- <profile>
- <id>testWithLog4j2</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${commons.log4j.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>default-test</id>
- <configuration>
- <systemPropertyVariables>
- <jcs.logSystem>log4j2</jcs.logSystem>
- <log4j.configurationFile>src/test/test-conf/log4j2-test.xml</log4j.configurationFile>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
<profile>
<id>testWithMulticast</id>
<activation>
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/JCS.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/JCS.java
index 532c3530..4d22ca15 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/JCS.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/JCS.java
@@ -29,7 +29,6 @@ import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
import org.apache.commons.jcs3.engine.control.CompositeCache;
import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
import org.apache.commons.jcs3.engine.control.group.GroupAttrName;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Simple class for using JCS. To use JCS in your application, you can use the static methods of
@@ -193,18 +192,6 @@ public abstract class JCS
JCS.configProps = configProps;
}
- /**
- * Sets the log system. Must be called before getInstance is called
- * Predefined Log systems are {@link LogManager#LOGSYSTEM_JAVA_UTIL_LOGGING}
- * and {@link LogManager#LOGSYSTEM_LOG4J2}
- *
- * @param logSystem the logSystem to set
- */
- public static void setLogSystem(final String logSystem)
- {
- LogManager.setLogSystem(logSystem);
- }
-
/**
* Shut down the cache manager and set the instance to null
*/
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java
index 629da014..22d66d98 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AbstractAuxiliaryCacheMonitor.java
@@ -25,7 +25,6 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Used to monitor and repair any failed connection for the lateral cache service. By default the
@@ -53,7 +52,7 @@ public abstract class AbstractAuxiliaryCacheMonitor extends Thread
}
/** The logger */
- protected final Log log = LogManager.getLog( this.getClass() );
+ protected final Log log = Log.getLog( this.getClass() );
/**
* Must make sure AbstractAuxiliaryCacheMonitor is started before any error can be detected!
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfigurator.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfigurator.java
index 2610087a..7cee3a69 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfigurator.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/AuxiliaryCacheConfigurator.java
@@ -24,7 +24,6 @@ import java.util.Properties;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.OptionConverter;
import org.apache.commons.jcs3.utils.config.PropertySetter;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
@@ -36,7 +35,7 @@ import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
public class AuxiliaryCacheConfigurator
{
/** The logger. */
- private static final Log log = LogManager.getLog( AuxiliaryCacheConfigurator.class );
+ private static final Log log = Log.getLog( AuxiliaryCacheConfigurator.class );
/** .attributes */
public static final String ATTRIBUTE_PREFIX = ".attributes";
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java
index dcdc7dc7..7a7f4226 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCache.java
@@ -44,7 +44,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.struct.LRUMap;
/**
@@ -217,7 +216,7 @@ public abstract class AbstractDiskCache<K, V>
}
/** The logger */
- private static final Log log = LogManager.getLog( AbstractDiskCache.class );
+ private static final Log log = Log.getLog( AbstractDiskCache.class );
/** Generic disk cache attributes */
private final IDiskCacheAttributes diskCacheAttributes;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheAttributes.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheAttributes.java
index 9a0c1871..ac0497c5 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheAttributes.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheAttributes.java
@@ -24,7 +24,6 @@ import java.io.File;
import org.apache.commons.jcs3.auxiliary.AbstractAuxiliaryCacheAttributes;
import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This has common attributes that any conceivable disk cache would need.
@@ -35,7 +34,7 @@ public abstract class AbstractDiskCacheAttributes extends AbstractAuxiliaryCache
private static final long serialVersionUID = 8306631920391711229L;
/** The logger */
- private static final Log log = LogManager.getLog(AbstractDiskCacheAttributes.class);
+ private static final Log log = Log.getLog(AbstractDiskCacheAttributes.class);
/** Default amount of time to allow for key persistence on shutdown */
private static final int DEFAULT_shutdownSpoolTimeLimit = 60;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
index 00143e85..62df98fe 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDisk.java
@@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
/**
@@ -40,7 +39,7 @@ import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
public class BlockDisk implements AutoCloseable
{
/** The logger */
- private static final Log log = LogManager.getLog(BlockDisk.class);
+ private static final Log log = Log.getLog(BlockDisk.class);
/** The size of the header that indicates the amount of data stored in an occupied block. */
public static final byte HEADER_SIZE_BYTES = 4;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java
index ee1e876c..2aeb7993 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCache.java
@@ -46,7 +46,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
/**
@@ -57,7 +56,7 @@ public class BlockDiskCache<K, V>
implements IRequireScheduler
{
/** The logger. */
- private static final Log log = LogManager.getLog( BlockDiskCache.class );
+ private static final Log log = Log.getLog( BlockDiskCache.class );
/** The name to prefix all log messages with. */
private final String logCacheName;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheFactory.java
index 9bf4e0e0..7f14fb50 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskCacheFactory.java
@@ -25,7 +25,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Creates disk cache instances.
@@ -34,7 +33,7 @@ public class BlockDiskCacheFactory
extends AbstractAuxiliaryCacheFactory
{
/** The logger */
- private static final Log log = LogManager.getLog( BlockDiskCacheFactory.class );
+ private static final Log log = Log.getLog( BlockDiskCacheFactory.class );
/**
* Create an instance of the BlockDiskCache.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
index e40b0026..754c1768 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/block/BlockDiskKeyStore.java
@@ -41,7 +41,6 @@ import org.apache.commons.jcs3.auxiliary.disk.behavior.IDiskCacheAttributes.Disk
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.io.ObjectInputStreamClassLoaderAware;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
import org.apache.commons.jcs3.utils.struct.AbstractLRUMap;
import org.apache.commons.jcs3.utils.struct.LRUMap;
@@ -210,7 +209,7 @@ public class BlockDiskKeyStore<K>
}
/** The logger */
- private static final Log log = LogManager.getLog(BlockDiskKeyStore.class);
+ private static final Log log = Log.getLog(BlockDiskKeyStore.class);
/** The key file signature for new-style key files */
private final static int KEY_FILE_SIGNATURE = 0x6A63734B; // "jcsK"
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDisk.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDisk.java
index f9cd291f..95d2b73f 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDisk.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDisk.java
@@ -27,7 +27,6 @@ import java.nio.file.StandardOpenOption;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/** Provides thread safe access to the underlying random access file. */
public class IndexedDisk implements AutoCloseable
@@ -36,7 +35,7 @@ public class IndexedDisk implements AutoCloseable
public static final byte HEADER_SIZE_BYTES = 4;
/** The logger */
- private static final Log log = LogManager.getLog(IndexedDisk.class);
+ private static final Log log = Log.getLog(IndexedDisk.class);
/** The serializer. */
private final IElementSerializer elementSerializer;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
index 848e7cfa..89b21209 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCache.java
@@ -50,7 +50,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.struct.AbstractLRUMap;
import org.apache.commons.jcs3.utils.struct.LRUMap;
import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
@@ -214,7 +213,7 @@ public class IndexedDiskCache<K, V> extends AbstractDiskCache<K, V>
}
/** The logger */
- private static final Log log = LogManager.getLog(IndexedDiskCache.class);
+ private static final Log log = Log.getLog(IndexedDiskCache.class);
/** Cache name used in log messages */
protected final String logCacheName;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
index 5079d83d..32718748 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/indexed/IndexedDiskCacheFactory.java
@@ -25,7 +25,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Creates disk cache instances.
@@ -34,7 +33,7 @@ public class IndexedDiskCacheFactory
extends AbstractAuxiliaryCacheFactory
{
/** The logger. */
- private static final Log log = LogManager.getLog( IndexedDiskCacheFactory.class );
+ private static final Log log = Log.getLog( IndexedDiskCacheFactory.class );
/**
* Create an instance of an IndexedDiskCache.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
index 06dbc65b..07ca3a70 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCache.java
@@ -44,7 +44,6 @@ import org.apache.commons.jcs3.engine.stats.StatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This is the jdbc disk cache plugin.
@@ -79,7 +78,7 @@ public class JDBCDiskCache<K, V>
extends AbstractDiskCache<K, V>
{
/** The local logger. */
- private static final Log log = LogManager.getLog( JDBCDiskCache.class );
+ private static final Log log = Log.getLog( JDBCDiskCache.class );
/** Configuration */
private JDBCDiskCacheAttributes jdbcDiskCacheAttributes;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
index 3512b645..3d22c420 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/JDBCDiskCacheFactory.java
@@ -36,7 +36,6 @@ import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.behavior.IRequireScheduler;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.PropertySetter;
/**
@@ -47,7 +46,7 @@ public class JDBCDiskCacheFactory
implements IRequireScheduler
{
/** The logger */
- private static final Log log = LogManager.getLog( JDBCDiskCacheFactory.class );
+ private static final Log log = Log.getLog( JDBCDiskCacheFactory.class );
/** Props prefix */
protected static final String POOL_CONFIGURATION_PREFIX = "jcs.jdbcconnectionpool.";
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/ShrinkerThread.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/ShrinkerThread.java
index f770d180..dbd7fa87 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/ShrinkerThread.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/ShrinkerThread.java
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
/**
@@ -34,7 +33,7 @@ public class ShrinkerThread
implements Runnable
{
/** The logger. */
- private static final Log log = LogManager.getLog( ShrinkerThread.class );
+ private static final Log log = Log.getLog( ShrinkerThread.class );
/** Default time period to use. */
private static final long DEFAULT_PAUSE_BETWEEN_REGION_CALLS_MILLIS = 5000;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
index 51b035d4..d7bd8b31 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/JndiDataSourceFactory.java
@@ -30,7 +30,6 @@ import javax.sql.DataSource;
import org.apache.commons.jcs3.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* A factory that looks up the DataSource from JNDI. It is also able
@@ -45,7 +44,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class JndiDataSourceFactory implements DataSourceFactory
{
/** The log. */
- private static final Log log = LogManager.getLog(JndiDataSourceFactory.class);
+ private static final Log log = Log.getLog(JndiDataSourceFactory.class);
/**
*
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
index 8bf6e4f6..48fc42f7 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/dsfactory/SharedPoolDataSourceFactory.java
@@ -29,7 +29,6 @@ import org.apache.commons.dbcp2.datasources.InstanceKeyDataSource;
import org.apache.commons.dbcp2.datasources.SharedPoolDataSource;
import org.apache.commons.jcs3.auxiliary.disk.jdbc.JDBCDiskCacheAttributes;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* A factory that looks up the DataSource using the JDBC2 pool methods.
@@ -39,7 +38,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class SharedPoolDataSourceFactory implements DataSourceFactory
{
/** The log. */
- private static final Log log = LogManager.getLog(SharedPoolDataSourceFactory.class);
+ private static final Log log = Log.getLog(SharedPoolDataSourceFactory.class);
/**
* Initializes the ConnectionPoolDataSource.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
index 4233a582..74888465 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/hsql/HSQLDiskCacheFactory.java
@@ -35,7 +35,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This factory should create hsql disk caches.
@@ -44,7 +43,7 @@ public class HSQLDiskCacheFactory
extends JDBCDiskCacheFactory
{
/** The logger */
- private static final Log log = LogManager.getLog( HSQLDiskCacheFactory.class );
+ private static final Log log = Log.getLog( HSQLDiskCacheFactory.class );
/**
* This factory method should create an instance of the hsqlcache.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
index 838a0cb0..f1265db2 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCache.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.auxiliary.disk.jdbc.TableState;
import org.apache.commons.jcs3.auxiliary.disk.jdbc.dsfactory.DataSourceFactory;
import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* The MySQLDiskCache extends the core JDBCDiskCache.
@@ -40,7 +39,7 @@ public class MySQLDiskCache<K, V>
extends JDBCDiskCache<K, V>
{
/** Local logger */
- private static final Log log = LogManager.getLog( MySQLDiskCache.class );
+ private static final Log log = Log.getLog( MySQLDiskCache.class );
/** Config attributes */
private final MySQLDiskCacheAttributes mySQLDiskCacheAttributes;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
index 3ec201fe..291d78d2 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLDiskCacheFactory.java
@@ -35,7 +35,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This factory should create mysql disk caches.
@@ -44,7 +43,7 @@ public class MySQLDiskCacheFactory
extends JDBCDiskCacheFactory
{
/** The logger */
- private static final Log log = LogManager.getLog( MySQLDiskCacheFactory.class );
+ private static final Log log = Log.getLog( MySQLDiskCacheFactory.class );
/**
* This calls the optimizers' optimize table method. This is used by the timer.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
index 84602a8b..370ee6e8 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/disk/jdbc/mysql/MySQLTableOptimizer.java
@@ -28,7 +28,6 @@ import javax.sql.DataSource;
import org.apache.commons.jcs3.auxiliary.disk.jdbc.TableState;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
/**
@@ -42,7 +41,7 @@ import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
public class MySQLTableOptimizer
{
/** The logger */
- private static final Log log = LogManager.getLog( MySQLTableOptimizer.class );
+ private static final Log log = Log.getLog( MySQLTableOptimizer.class );
/** The data source */
private final DataSource dataSource;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
index 2035c64c..9a464cf4 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCache.java
@@ -35,7 +35,6 @@ import org.apache.commons.jcs3.engine.behavior.IZombie;
import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Lateral distributor. Returns null on get by default. Net search not implemented.
@@ -44,7 +43,7 @@ public class LateralCache<K, V>
extends AbstractAuxiliaryCacheEventLogging<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( LateralCache.class );
+ private static final Log log = Log.getLog( LateralCache.class );
/** Generalize this, use another interface */
private final ILateralCacheAttributes lateralCacheAttributes;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java
index 78152786..a174857f 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWait.java
@@ -43,7 +43,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Used to queue up update requests to the underlying cache. These requests will be processed in
@@ -53,7 +52,7 @@ public class LateralCacheNoWait<K, V>
extends AbstractAuxiliaryCache<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( LateralCacheNoWait.class );
+ private static final Log log = Log.getLog( LateralCacheNoWait.class );
/** The cache */
private final LateralCache<K, V> cache;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java
index aa605beb..034b3ce6 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/LateralCacheNoWaitFacade.java
@@ -42,7 +42,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Used to provide access to multiple services under nowait protection. Composite factory should
@@ -54,7 +53,7 @@ public class LateralCacheNoWaitFacade<K, V>
extends AbstractAuxiliaryCache<K, V>
{
/** The logger */
- private static final Log log = LogManager.getLog( LateralCacheNoWaitFacade.class );
+ private static final Log log = Log.getLog( LateralCacheNoWaitFacade.class );
/**
* The queuing facade to the client.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
index 2ba90b65..8834e9f0 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPCacheFactory.java
@@ -41,7 +41,6 @@ import org.apache.commons.jcs3.engine.behavior.IShutdownObserver;
import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.discovery.UDPDiscoveryManager;
import org.apache.commons.jcs3.utils.discovery.UDPDiscoveryService;
@@ -56,7 +55,7 @@ public class LateralTCPCacheFactory
extends AbstractAuxiliaryCacheFactory
{
/** The logger */
- private static final Log log = LogManager.getLog( LateralTCPCacheFactory.class );
+ private static final Log log = Log.getLog( LateralTCPCacheFactory.class );
/**
* Makes sure a listener gets created. It will get monitored as soon as it
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
index c926fc05..a8ce570d 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPDiscoveryListener.java
@@ -31,7 +31,6 @@ import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.discovery.DiscoveredService;
import org.apache.commons.jcs3.utils.discovery.behavior.IDiscoveryListener;
@@ -44,7 +43,7 @@ public class LateralTCPDiscoveryListener
implements IDiscoveryListener
{
/** The log factory */
- private static final Log log = LogManager.getLog( LateralTCPDiscoveryListener.class );
+ private static final Log log = Log.getLog( LateralTCPDiscoveryListener.class );
/**
* Map of no wait facades. these are used to determine which regions are locally configured to
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPListener.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPListener.java
index 30608639..539d443a 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPListener.java
@@ -42,7 +42,6 @@ import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.behavior.IShutdownObserver;
import org.apache.commons.jcs3.engine.control.CompositeCache;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Listens for connections from other TCP lateral caches and handles them. The initialization method
@@ -53,7 +52,7 @@ public class LateralTCPListener<K, V>
implements ILateralCacheListener<K, V>, IShutdownObserver
{
/** The logger */
- private static final Log log = LogManager.getLog( LateralTCPListener.class );
+ private static final Log log = Log.getLog( LateralTCPListener.class );
/** How long the server will block on an accept(). 0 is infinite. */
private static final int acceptTimeOut = 1000;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
index 263db182..83907431 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPSender.java
@@ -33,7 +33,6 @@ import org.apache.commons.jcs3.auxiliary.lateral.LateralElementDescriptor;
import org.apache.commons.jcs3.auxiliary.lateral.socket.tcp.behavior.ITCPLateralCacheAttributes;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This class is based on the log4j SocketAppender class. I'm using a different repair structure, so
@@ -42,7 +41,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class LateralTCPSender
{
/** The logger */
- private static final Log log = LogManager.getLog( LateralTCPSender.class );
+ private static final Log log = Log.getLog( LateralTCPSender.class );
/** Config */
private final int socketOpenTimeOut;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPService.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPService.java
index 1e33f970..20d86dbe 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPService.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/lateral/socket/tcp/LateralTCPService.java
@@ -34,7 +34,6 @@ import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.engine.behavior.ICacheServiceNonLocal;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* A lateral cache service implementation. Does not implement getGroupKey
@@ -44,7 +43,7 @@ public class LateralTCPService<K, V>
implements ICacheServiceNonLocal<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( LateralTCPService.class );
+ private static final Log log = Log.getLog( LateralTCPService.class );
/** Special configuration */
private final boolean allowPut;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
index dcea01ef..e56985f3 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteAuxiliaryCache.java
@@ -49,7 +49,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.serialization.SerializationConversionUtil;
import org.apache.commons.jcs3.utils.threadpool.ThreadPoolManager;
@@ -59,7 +58,7 @@ public abstract class AbstractRemoteAuxiliaryCache<K, V>
implements IRemoteCacheClient<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( AbstractRemoteAuxiliaryCache.class );
+ private static final Log log = Log.getLog( AbstractRemoteAuxiliaryCache.class );
/**
* This does the work. In an RMI instances, it will be a remote reference. In an http remote
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheListener.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheListener.java
index 057892b8..2b274558 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheListener.java
@@ -30,7 +30,6 @@ import org.apache.commons.jcs3.engine.behavior.ICacheElementSerialized;
import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
import org.apache.commons.jcs3.utils.serialization.SerializationConversionUtil;
@@ -39,7 +38,7 @@ public abstract class AbstractRemoteCacheListener<K, V>
implements IRemoteCacheListener<K, V>
{
/** The logger */
- private static final Log log = LogManager.getLog( AbstractRemoteCacheListener.class );
+ private static final Log log = Log.getLog( AbstractRemoteCacheListener.class );
/** The cached name of the local host. The remote server gets this for logging purposes. */
private static String localHostName;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
index 4cc3a0f2..660bc65f 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java
@@ -39,14 +39,13 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/** An abstract base for the No Wait Facade. Different implementations will failover differently. */
public abstract class AbstractRemoteCacheNoWaitFacade<K, V>
extends AbstractAuxiliaryCache<K, V>
{
/** Log instance */
- private static final Log log = LogManager.getLog( AbstractRemoteCacheNoWaitFacade.class );
+ private static final Log log = Log.getLog( AbstractRemoteCacheNoWaitFacade.class );
/** The connection to a remote server, or a zombie. */
protected List<RemoteCacheNoWait<K, V>> noWaits;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java
index 3c9ed8c9..d695cc85 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCache.java
@@ -32,7 +32,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Client proxy for an RMI remote cache.
@@ -44,7 +43,7 @@ public class RemoteCache<K, V>
extends AbstractRemoteAuxiliaryCache<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( RemoteCache.class );
+ private static final Log log = Log.getLog( RemoteCache.class );
/** For error notifications */
private final RemoteCacheMonitor monitor;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java
index a5bc9571..d55d3cb8 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheListener.java
@@ -29,7 +29,6 @@ import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheConstants;
import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Registered with RemoteCache server. The server updates the local caches via this listener. Each
@@ -43,7 +42,7 @@ public class RemoteCacheListener<K, V>
implements IRemoteCacheConstants
{
/** The logger */
- private static final Log log = LogManager.getLog( RemoteCacheListener.class );
+ private static final Log log = Log.getLog( RemoteCacheListener.class );
/** Has this client been shutdown. */
private final AtomicBoolean disposed;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java
index 5e2eeb13..e0bdb278 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheManager.java
@@ -37,7 +37,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* An instance of RemoteCacheManager corresponds to one remote connection of a specific host and
@@ -50,7 +49,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class RemoteCacheManager
{
/** The logger */
- private static final Log log = LogManager.getLog( RemoteCacheManager.class );
+ private static final Log log = Log.getLog( RemoteCacheManager.class );
/** Contains instances of RemoteCacheNoWait managed by a RemoteCacheManager instance. */
private final ConcurrentMap<String, RemoteCacheNoWait<?, ?>> caches =
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java
index a5934370..a5ccb6b1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWait.java
@@ -41,7 +41,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* The RemoteCacheNoWait wraps the RemoteCacheClient. The client holds a handle on the
@@ -67,7 +66,7 @@ public class RemoteCacheNoWait<K, V>
extends AbstractAuxiliaryCache<K, V>
{
/** Log instance */
- private static final Log log = LogManager.getLog( RemoteCacheNoWait.class );
+ private static final Log log = Log.getLog( RemoteCacheNoWait.class );
/** The remote cache client */
private final IRemoteCacheClient<K, V> remoteCacheClient;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java
index a27eec48..9e4b658c 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteCacheNoWaitFacade.java
@@ -32,7 +32,6 @@ import org.apache.commons.jcs3.engine.behavior.ICache;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Used to provide access to multiple services under nowait protection. Factory should construct
@@ -46,7 +45,7 @@ public class RemoteCacheNoWaitFacade<K, V>
extends AbstractRemoteCacheNoWaitFacade<K, V>
{
/** Log instance */
- private static final Log log = LogManager.getLog( RemoteCacheNoWaitFacade.class );
+ private static final Log log = Log.getLog( RemoteCacheNoWaitFacade.class );
/** Time in ms to sleep between failover attempts */
private static final long idlePeriod = 20000L;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
index 4c2a68ad..30387d7a 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteLocation.java
@@ -4,7 +4,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,7 +30,7 @@ import org.apache.commons.jcs3.log.LogManager;
public final class RemoteLocation
{
/** The logger. */
- private static final Log log = LogManager.getLog( RemoteLocation.class );
+ private static final Log log = Log.getLog( RemoteLocation.class );
/** Pattern for parsing server:port */
private static final Pattern SERVER_COLON_PORT = Pattern.compile("(\\S+)\\s*:\\s*(\\d+)");
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java
index c56cc058..74cad17d 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/RemoteUtils.java
@@ -35,7 +35,6 @@ import java.rmi.server.RMISocketFactory;
import java.util.Properties;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This class provides some basic utilities for doing things such as starting
@@ -44,7 +43,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class RemoteUtils
{
/** The logger. */
- private static final Log log = LogManager.getLog(RemoteUtils.class);
+ private static final Log log = Log.getLog(RemoteUtils.class);
/**
* Configure a custom socket factory to set the timeout value. This sets the
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java
index 4ba565c6..bbedac22 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/AbstractHttpClient.java
@@ -22,7 +22,6 @@ package org.apache.commons.jcs3.auxiliary.remote.http.client;
import java.io.IOException;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.http.HttpResponse;
import org.apache.http.HttpVersion;
import org.apache.http.client.HttpClient;
@@ -40,7 +39,7 @@ import org.apache.http.impl.client.HttpClientBuilder;
public abstract class AbstractHttpClient
{
/** The Logger. */
- private static final Log log = LogManager.getLog( AbstractHttpClient.class );
+ private static final Log log = Log.getLog( AbstractHttpClient.class );
/** The client */
private final HttpClient httpClient;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCache.java
index abc18cda..b8c8bdb6 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCache.java
@@ -26,7 +26,6 @@ import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheListener;
import org.apache.commons.jcs3.engine.ZombieCacheServiceNonLocal;
import org.apache.commons.jcs3.engine.behavior.ICacheServiceNonLocal;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This uses an http client as the service.
@@ -35,7 +34,7 @@ public class RemoteHttpCache<K, V>
extends AbstractRemoteAuxiliaryCache<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( RemoteHttpCache.class );
+ private static final Log log = Log.getLog( RemoteHttpCache.class );
/** For error notifications */
private final RemoteHttpCacheMonitor monitor;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClient.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClient.java
index 8e8d7098..60e7282b 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClient.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheClient.java
@@ -32,14 +32,13 @@ import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheRequest;
import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheResponse;
import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/** This is the service used by the remote http auxiliary cache. */
public class RemoteHttpCacheClient<K, V>
implements IRemoteHttpCacheClient<K, V>
{
/** The Logger. */
- private static final Log log = LogManager.getLog( RemoteHttpCacheClient.class );
+ private static final Log log = Log.getLog( RemoteHttpCacheClient.class );
/** The internal client. */
private IRemoteCacheDispatcher remoteDispatcher;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
index 8f2a73c5..ea866718 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheDispatcher.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheDispatcher;
import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheRequest;
import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheResponse;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
import org.apache.http.HttpException;
import org.apache.http.HttpResponse;
@@ -54,7 +53,7 @@ public class RemoteHttpCacheDispatcher
private static final String PARAMETER_CACHE_NAME = "CacheName";
/** The Logger. */
- private static final Log log = LogManager.getLog( RemoteHttpCacheDispatcher.class );
+ private static final Log log = Log.getLog( RemoteHttpCacheDispatcher.class );
/** This needs to be standard, since the other side is standard */
private final StandardSerializer serializer = new StandardSerializer();
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
index ba499f2b..e82a086a 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/client/RemoteHttpCacheFactory.java
@@ -30,7 +30,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.OptionConverter;
/**
@@ -43,7 +42,7 @@ public class RemoteHttpCacheFactory
extends AbstractAuxiliaryCacheFactory
{
/** The logger */
- private static final Log log = LogManager.getLog( RemoteHttpCacheFactory.class );
+ private static final Log log = Log.getLog( RemoteHttpCacheFactory.class );
/** Monitor thread instance */
private RemoteHttpCacheMonitor monitor;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/AbstractRemoteCacheService.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/AbstractRemoteCacheService.java
index 39ca496d..a48c09e1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/AbstractRemoteCacheService.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/AbstractRemoteCacheService.java
@@ -32,7 +32,6 @@ import org.apache.commons.jcs3.engine.logging.CacheEvent;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEvent;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This class contains common methods for remote cache services. Eventually I hope to extract out
@@ -45,7 +44,7 @@ public abstract class AbstractRemoteCacheService<K, V>
private final static int logInterval = 100;
/** Log instance */
- private static final Log log = LogManager.getLog( AbstractRemoteCacheService.class );
+ private static final Log log = Log.getLog( AbstractRemoteCacheService.class );
/** An optional event logger */
private transient ICacheEventLogger cacheEventLogger;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
index 61339e04..8e2d62cc 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/http/server/RemoteHttpCacheServlet.java
@@ -45,7 +45,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.PropertySetter;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
@@ -60,7 +59,7 @@ public class RemoteHttpCacheServlet
private static final long serialVersionUID = 8752849397531933346L;
/** The Logger. */
- private static final Log log = LogManager.getLog( RemoteHttpCacheServlet.class );
+ private static final Log log = Log.getLog( RemoteHttpCacheServlet.class );
/** The cache manager */
private static CompositeCacheManager cacheMgr;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
index bd8daf53..985032c1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServer.java
@@ -51,7 +51,6 @@ import org.apache.commons.jcs3.engine.logging.CacheEvent;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEvent;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
/**
@@ -79,7 +78,7 @@ public class RemoteCacheServer<K, V>
private static final long serialVersionUID = -8072345435941473116L;
/** Log instance */
- private static final Log log = LogManager.getLog( RemoteCacheServer.class );
+ private static final Log log = Log.getLog( RemoteCacheServer.class );
/** The interval at which we will log updates. */
private static final int logInterval = 100;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java
index 542d7f7c..0c21921e 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerFactory.java
@@ -41,7 +41,6 @@ import org.apache.commons.jcs3.auxiliary.remote.behavior.IRemoteCacheConstants;
import org.apache.commons.jcs3.engine.behavior.ICacheServiceAdmin;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.OptionConverter;
import org.apache.commons.jcs3.utils.config.PropertySetter;
import org.apache.commons.jcs3.utils.threadpool.DaemonThreadFactory;
@@ -54,7 +53,7 @@ public class RemoteCacheServerFactory
implements IRemoteCacheConstants
{
/** The logger */
- private static final Log log = LogManager.getLog( RemoteCacheServerFactory.class );
+ private static final Log log = Log.getLog( RemoteCacheServerFactory.class );
/** The single instance of the RemoteCacheServer object. */
private static RemoteCacheServer<?, ?> remoteCacheServer;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java
index 01ea5eeb..f523c06e 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheStartupServlet.java
@@ -37,7 +37,6 @@ import org.apache.commons.jcs3.access.exception.CacheException;
import org.apache.commons.jcs3.auxiliary.remote.RemoteUtils;
import org.apache.commons.jcs3.engine.control.CompositeCacheManager;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
/**
@@ -67,7 +66,7 @@ public class RemoteCacheStartupServlet
private static final long serialVersionUID = 1L;
/** The logger */
- private static final Log log = LogManager.getLog(RemoteCacheStartupServlet.class);
+ private static final Log log = Log.getLog(RemoteCacheStartupServlet.class);
/** The default port to start the registry on. */
private static final int DEFAULT_REGISTRY_PORT = 1101;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactory.java
index 738c0b73..84989368 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/auxiliary/remote/util/RemoteCacheRequestFactory.java
@@ -25,7 +25,6 @@ import org.apache.commons.jcs3.auxiliary.remote.value.RemoteCacheRequest;
import org.apache.commons.jcs3.auxiliary.remote.value.RemoteRequestType;
import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This creates request objects. You could write your own client and use the objects from this
@@ -34,7 +33,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class RemoteCacheRequestFactory
{
/** The Logger. */
- private static final Log log = LogManager.getLog( RemoteCacheRequestFactory.class );
+ private static final Log log = Log.getLog( RemoteCacheRequestFactory.class );
/**
* Creates an alive check Request.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/AbstractCacheEventQueue.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/AbstractCacheEventQueue.java
index 120ca436..4e3f5ed9 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/AbstractCacheEventQueue.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/AbstractCacheEventQueue.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.engine.behavior.ICacheEventQueue;
import org.apache.commons.jcs3.engine.behavior.ICacheListener;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* An abstract base class to the different implementations
@@ -217,7 +216,7 @@ public abstract class AbstractCacheEventQueue<K, V>
}
/** The logger. */
- private static final Log log = LogManager.getLog( AbstractCacheEventQueue.class );
+ private static final Log log = Log.getLog( AbstractCacheEventQueue.class );
/** Default */
protected static final int DEFAULT_WAIT_TO_DIE_MILLIS = 10000;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheEventQueueFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheEventQueueFactory.java
index e894e373..92f2d6fd 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheEventQueueFactory.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheEventQueueFactory.java
@@ -22,7 +22,6 @@ package org.apache.commons.jcs3.engine;
import org.apache.commons.jcs3.engine.behavior.ICacheEventQueue;
import org.apache.commons.jcs3.engine.behavior.ICacheListener;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This class hands out event Queues. This allows us to change the implementation more easily. You
@@ -31,7 +30,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class CacheEventQueueFactory<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( CacheEventQueueFactory.class );
+ private static final Log log = Log.getLog( CacheEventQueueFactory.class );
/**
* Fully configured event queue.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
index 121963b4..0ebf481c 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/CacheWatchRepairable.java
@@ -29,7 +29,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
import org.apache.commons.jcs3.engine.behavior.ICacheListener;
import org.apache.commons.jcs3.engine.behavior.ICacheObserver;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Intercepts the requests to the underlying ICacheObserver object so that the listeners can be
@@ -40,7 +39,7 @@ public class CacheWatchRepairable
implements ICacheObserver
{
/** The logger */
- private static final Log log = LogManager.getLog( CacheWatchRepairable.class );
+ private static final Log log = Log.getLog( CacheWatchRepairable.class );
/** The underlying ICacheObserver. */
private ICacheObserver cacheWatch;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/PooledCacheEventQueue.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/PooledCacheEventQueue.java
index e258dbf2..0fa8c17f 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/PooledCacheEventQueue.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/PooledCacheEventQueue.java
@@ -31,7 +31,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.threadpool.ThreadPoolManager;
/**
@@ -48,7 +47,7 @@ public class PooledCacheEventQueue<K, V>
extends AbstractCacheEventQueue<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog( PooledCacheEventQueue.class );
+ private static final Log log = Log.getLog( PooledCacheEventQueue.class );
/** The Thread Pool to execute events with. */
protected ExecutorService pool;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheService.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheService.java
index 00146022..3daa51c8 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheService.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheService.java
@@ -28,7 +28,6 @@ import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.engine.behavior.ICacheService;
import org.apache.commons.jcs3.engine.behavior.IZombie;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Zombie adapter for any cache service. Balks at every call.
@@ -37,7 +36,7 @@ public class ZombieCacheService<K, V>
implements ICacheService<K, V>, IZombie
{
/** The logger. */
- private static final Log log = LogManager.getLog( ZombieCacheService.class );
+ private static final Log log = Log.getLog( ZombieCacheService.class );
/**
* @param cacheName
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
index d5689c16..3b22ab8a 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/ZombieCacheServiceNonLocal.java
@@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.engine.behavior.ICacheServiceNonLocal;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.timing.ElapsedTimer;
/**
@@ -119,7 +118,7 @@ public class ZombieCacheServiceNonLocal<K, V>
}
/** The logger */
- private static final Log log = LogManager.getLog( ZombieCacheServiceNonLocal.class );
+ private static final Log log = Log.getLog( ZombieCacheServiceNonLocal.class );
/** How big can the queue grow. */
private int maxQueueSize;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
index e4d3f076..8984dec1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCache.java
@@ -65,7 +65,6 @@ import org.apache.commons.jcs3.engine.stats.StatElement;
import org.apache.commons.jcs3.engine.stats.behavior.ICacheStats;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This is the primary hub for a single cache/region. It controls the flow of items through the
@@ -77,7 +76,7 @@ public class CompositeCache<K, V>
implements ICache<K, V>, IRequireScheduler
{
/** Log instance */
- private static final Log log = LogManager.getLog(CompositeCache.class);
+ private static final Log log = Log.getLog(CompositeCache.class);
/**
* EventQueue for handling element events. Lazy initialized. One for each region. To be more efficient, the manager
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java
index 71fc94aa..bf9908f8 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheConfigurator.java
@@ -36,7 +36,6 @@ import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.engine.match.KeyMatcherPatternImpl;
import org.apache.commons.jcs3.engine.match.behavior.IKeyMatcher;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.OptionConverter;
import org.apache.commons.jcs3.utils.config.PropertySetter;
@@ -50,7 +49,7 @@ import org.apache.commons.jcs3.utils.config.PropertySetter;
public class CompositeCacheConfigurator
{
/** The logger */
- private static final Log log = LogManager.getLog( CompositeCacheConfigurator.class );
+ private static final Log log = Log.getLog( CompositeCacheConfigurator.class );
/** The prefix of relevant system properties */
protected static final String SYSTEM_PROPERTY_KEY_PREFIX = "jcs";
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
index a788a015..e147c405 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/CompositeCacheManager.java
@@ -58,7 +58,6 @@ import org.apache.commons.jcs3.engine.control.event.behavior.IElementEventQueue;
import org.apache.commons.jcs3.engine.stats.CacheStats;
import org.apache.commons.jcs3.engine.stats.behavior.ICacheStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.OptionConverter;
import org.apache.commons.jcs3.utils.threadpool.DaemonThreadFactory;
import org.apache.commons.jcs3.utils.threadpool.ThreadPoolManager;
@@ -77,7 +76,7 @@ public class CompositeCacheManager
implements IRemoteCacheConstants, ICompositeCacheManager, IProvideScheduler
{
/** The logger */
- private static final Log log = LogManager.getLog( CompositeCacheManager.class );
+ private static final Log log = Log.getLog( CompositeCacheManager.class );
/** JMX object name */
public static final String JMX_OBJECT_NAME = "org.apache.commons.jcs3:type=JCSAdminBean";
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
index cdd06a22..2a345fc9 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/control/event/ElementEventQueue.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.engine.control.event.behavior.IElementEvent;
import org.apache.commons.jcs3.engine.control.event.behavior.IElementEventHandler;
import org.apache.commons.jcs3.engine.control.event.behavior.IElementEventQueue;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.threadpool.PoolConfiguration;
import org.apache.commons.jcs3.utils.threadpool.PoolConfiguration.WhenBlockedPolicy;
import org.apache.commons.jcs3.utils.threadpool.ThreadPoolManager;
@@ -41,7 +40,7 @@ public class ElementEventQueue
private static final String THREAD_PREFIX = "JCS-ElementEventQueue-";
/** The logger */
- private static final Log log = LogManager.getLog( ElementEventQueue.class );
+ private static final Log log = Log.getLog( ElementEventQueue.class );
/** Shutdown or not */
private final AtomicBoolean destroyed = new AtomicBoolean();
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java
index 5dcffa2b..66f8e271 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/logging/CacheEventLoggerDebugLogger.java
@@ -22,7 +22,6 @@ package org.apache.commons.jcs3.engine.logging;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEvent;
import org.apache.commons.jcs3.engine.logging.behavior.ICacheEventLogger;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This implementation simple logs to a logger at debug level, for all events. It's mainly
@@ -35,7 +34,7 @@ public class CacheEventLoggerDebugLogger
private String logCategoryName = CacheEventLoggerDebugLogger.class.getName();
/** The logger. This is recreated on set logCategoryName */
- private Log log = LogManager.getLog( logCategoryName );
+ private Log log = Log.getLog( logCategoryName );
/**
* @param source
@@ -98,7 +97,7 @@ public class CacheEventLoggerDebugLogger
if ( logCategoryName != null && !logCategoryName.equals( this.logCategoryName ) )
{
this.logCategoryName = logCategoryName;
- log = LogManager.getLog( logCategoryName );
+ log = Log.getLog( logCategoryName );
}
}
}
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
index 56c6e695..f2fc8999 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractDoubleLinkedListMemoryCache.java
@@ -32,7 +32,6 @@ import org.apache.commons.jcs3.engine.stats.StatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.struct.DoubleLinkedList;
/**
@@ -46,7 +45,7 @@ import org.apache.commons.jcs3.utils.struct.DoubleLinkedList;
public abstract class AbstractDoubleLinkedListMemoryCache<K, V> extends AbstractMemoryCache<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog(AbstractDoubleLinkedListMemoryCache.class);
+ private static final Log log = Log.getLog(AbstractDoubleLinkedListMemoryCache.class);
/** Thread-safe double linked list for lru */
protected DoubleLinkedList<MemoryElementDescriptor<K, V>> list; // TODO privatise
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
index 9cfff48d..181b5930 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/AbstractMemoryCache.java
@@ -44,7 +44,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This base includes some common code for memory caches.
@@ -53,7 +52,7 @@ public abstract class AbstractMemoryCache<K, V>
implements IMemoryCache<K, V>
{
/** Log instance */
- private static final Log log = LogManager.getLog( AbstractMemoryCache.class );
+ private static final Log log = Log.getLog( AbstractMemoryCache.class );
/** Cache Attributes. Regions settings. */
private ICompositeCacheAttributes cacheAttributes;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
index 4bd8f8ff..ec76d680 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/lru/LHMLRUMemoryCache.java
@@ -30,7 +30,6 @@ import org.apache.commons.jcs3.engine.memory.AbstractMemoryCache;
import org.apache.commons.jcs3.engine.memory.util.MemoryElementDescriptor;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This is a test memory manager using the stock {@link LinkedHashMap}.
@@ -83,7 +82,7 @@ public class LHMLRUMemoryCache<K, V>
}
/** The Logger. */
- private static final Log log = LogManager.getLog( LRUMemoryCache.class );
+ private static final Log log = Log.getLog( LRUMemoryCache.class );
/**
* Returns a synchronized LHMSpooler
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThread.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThread.java
index 93d36848..59f0853a 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThread.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/shrinking/ShrinkerThread.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.engine.control.CompositeCache;
import org.apache.commons.jcs3.engine.control.event.behavior.ElementEventType;
import org.apache.commons.jcs3.engine.memory.behavior.IMemoryCache;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* A background memory shrinker. Memory problems and concurrent modification exception caused by
@@ -37,7 +36,7 @@ public class ShrinkerThread<K, V>
implements Runnable
{
/** The logger */
- private static final Log log = LogManager.getLog( ShrinkerThread.class );
+ private static final Log log = Log.getLog( ShrinkerThread.class );
/** The CompositeCache instance which this shrinker is watching */
private final CompositeCache<K, V> cache;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java
index 7206e2f2..f04f68b9 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/engine/memory/soft/SoftReferenceMemoryCache.java
@@ -39,7 +39,6 @@ import org.apache.commons.jcs3.engine.stats.StatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* A JCS IMemoryCache that has {@link SoftReference} to all its values.
@@ -53,7 +52,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class SoftReferenceMemoryCache<K, V> extends AbstractMemoryCache<K, V>
{
/** The logger. */
- private static final Log log = LogManager.getLog(SoftReferenceMemoryCache.class);
+ private static final Log log = Log.getLog(SoftReferenceMemoryCache.class);
/**
* Strong references to the maxObjects number of newest objects.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogFactory.java
deleted file mode 100644
index 757650a7..00000000
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogFactory.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.apache.commons.jcs3.log;
-
-import java.util.logging.Logger;
-
-/*
- * 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.
- */
-
-/**
- * This is a SPI factory implementation for java.util.logging
- */
-public class JulLogFactory implements LogFactory
-{
- /**
- * Returns a Log using the fully qualified name of the Class as the Log
- * name.
- *
- * @param clazz
- * The Class whose name should be used as the Log name.
- *
- * @return The Log.
- */
- @Override
- public Log getLog(final Class<?> clazz)
- {
- final Logger logger = Logger.getLogger(clazz.getName());
- return new JulLogAdapter(logger);
- }
-
- /**
- * Returns a Log with the specified name.
- *
- * @param name
- * The logger name.
- * @return The Log.
- */
- @Override
- public Log getLog(final String name)
- {
- final Logger logger = Logger.getLogger(name);
- return new JulLogAdapter(logger);
- }
-
- /**
- * Return the name of the Log subsystem managed by this factory
- *
- * @return the name of the log subsystem
- */
- @Override
- public String getName()
- {
- return "jul";
- }
-
- /**
- * Shutdown the logging system if the logging system supports it.
- */
- @Override
- public void shutdown()
- {
- // do nothing
- }
-}
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log.java
index 4633c149..460b5741 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log.java
@@ -1,5 +1,7 @@
package org.apache.commons.jcs3.log;
+import java.lang.System.Logger;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -24,7 +26,7 @@ import java.util.function.Supplier;
* All logging operations, except configuration, are done through this interface.
*
* <p>
- * The canonical way to obtain a Logger for a class is through {@link LogManager#getLog(String)}}.
+ * The canonical way to obtain a Logger for a class is through {@link Log#getLog(String)}}.
* Typically, each class should get its own Log named after its fully qualified class name
* </p>
*
@@ -37,6 +39,11 @@ import java.util.function.Supplier;
*/
public interface Log
{
+ /**
+ * The name of the root Log.
+ */
+ String ROOT_LOGGER_NAME = "";
+
/**
* Logs a message object with the DEBUG level.
*
@@ -338,4 +345,44 @@ public interface Log
* @param t the exception to log, including its stack trace.
*/
void warn(String message, Throwable t);
+
+ /**
+ * Returns the root logger.
+ *
+ * @return the root logger, named {@link ROOT_LOGGER_NAME}.
+ */
+ static Log getRootLogger()
+ {
+ return getLog(ROOT_LOGGER_NAME);
+ }
+
+ /**
+ * Returns a Log with the specified name.
+ *
+ * @param name
+ * The logger name.
+ * @return The Log.
+ * @throws UnsupportedOperationException
+ * if {@code name} is {@code null}
+ */
+ static Log getLog(final String name)
+ {
+ final Logger logger = System.getLogger(name);
+ return new SystemLogAdapter(logger);
+ }
+
+ /**
+ * Returns a Log using the fully qualified name of the Class as the Log
+ * name.
+ *
+ * @param clazz
+ * The Class whose name should be used as the Log name.
+ * @return The Log.
+ * @throws UnsupportedOperationException
+ * if {@code clazz} is {@code null}
+ */
+ static Log getLog(final Class<?> clazz)
+ {
+ return Log.getLog(clazz.getName());
+ }
}
\ No newline at end of file
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2Factory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2Factory.java
deleted file mode 100644
index 88d91fe8..00000000
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2Factory.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.apache.commons.jcs3.log;
-
-import org.apache.logging.log4j.Logger;
-import org.apache.logging.log4j.message.MessageFactory;
-import org.apache.logging.log4j.message.MessageFormatMessageFactory;
-
-/*
- * 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.
- */
-
-/**
- * This is a SPI factory implementation for log4j2
- */
-public class Log4j2Factory implements LogFactory
-{
- /** Use java.text.MessageFormat for log messages */
- private final MessageFactory messageFactory = new MessageFormatMessageFactory();
-
- /**
- * Returns a Log using the fully qualified name of the Class as the Log
- * name.
- *
- * @param clazz
- * The Class whose name should be used as the Log name. If null
- * it will default to the calling class.
- * @return The Log.
- * @throws UnsupportedOperationException
- * if {@code clazz} is {@code null} and the calling class cannot
- * be determined.
- */
- @Override
- public Log getLog(final Class<?> clazz)
- {
- final Logger logger = org.apache.logging.log4j.LogManager.getLogger(clazz, messageFactory);
- return new Log4j2LogAdapter(logger);
- }
-
- /**
- * Returns a Log with the specified name.
- *
- * @param name
- * The logger name. If null the name of the calling class will be
- * used.
- * @return The Log.
- * @throws UnsupportedOperationException
- * if {@code name} is {@code null} and the calling class cannot
- * be determined.
- */
- @Override
- public Log getLog(final String name)
- {
- final Logger logger = org.apache.logging.log4j.LogManager.getLogger(name, messageFactory);
- return new Log4j2LogAdapter(logger);
- }
-
- /**
- * Return the name of the Log subsystem managed by this factory
- *
- * @return the name of the log subsystem
- */
- @Override
- public String getName()
- {
- return "log4j2";
- }
-
- /**
- * Shutdown the logging system if the logging system supports it.
- */
- @Override
- public void shutdown()
- {
- org.apache.logging.log4j.LogManager.shutdown();
- }
-}
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2LogAdapter.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2LogAdapter.java
deleted file mode 100644
index f282f547..00000000
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/Log4j2LogAdapter.java
+++ /dev/null
@@ -1,530 +0,0 @@
-package org.apache.commons.jcs3.log;
-
-/*
- * 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.function.Supplier;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-
-/**
- * This is a wrapper around the <code>org.apache.logging.log4j.Logger</code> implementing our own
- * <code>Log</code> interface.
- */
-public class Log4j2LogAdapter implements Log
-{
- private final Logger logger;
-
- /**
- * Constructs a Log4j Logger wrapper
- *
- * @param logger the log4j Logger
- */
- public Log4j2LogAdapter(final Logger logger)
- {
- this.logger = logger;
- }
-
- /**
- * Logs a message object with the DEBUG level.
- *
- * @param message the message object to log.
- */
- @Override
- public void debug(final Object message)
- {
- logger.debug(message);
- }
-
- /**
- * Logs a message object with the DEBUG level.
- *
- * @param message the message string to log.
- */
- @Override
- public void debug(final String message)
- {
- logger.debug(message);
- }
-
- /**
- * Logs a message with parameters at the DEBUG level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param params parameters to the message.
- */
- @Override
- public void debug(final String message, final Object... params)
- {
- logger.debug(message, params);
- }
-
- /**
- * Logs a message with parameters which are only to be constructed if the
- * logging level is the DEBUG level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param paramSuppliers An array of functions, which when called, produce
- * the desired log message parameters.
- */
- @Override
- public void debug(final String message, final Supplier<?>... paramSuppliers)
- {
- log(Level.DEBUG, message, paramSuppliers);
- }
-
- /**
- * Logs a message at the DEBUG level including the stack trace of the {@link Throwable}
- * <code>t</code> passed as parameter.
- *
- * @param message the message to log.
- * @param t the exception to log, including its stack trace.
- */
- @Override
- public void debug(final String message, final Throwable t)
- {
- logger.debug(message, t);
- }
-
- /**
- * Logs a message object with the ERROR level.
- *
- * @param message the message object to log.
- */
- @Override
- public void error(final Object message)
- {
- logger.error(message);
- }
-
- /**
- * Logs a message object with the ERROR level.
- *
- * @param message the message string to log.
- */
- @Override
- public void error(final String message)
- {
- logger.error(message);
- }
-
- /**
- * Logs a message with parameters at the ERROR level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param params parameters to the message.
- */
- @Override
- public void error(final String message, final Object... params)
- {
- logger.error(message, params);
- }
-
- /**
- * Logs a message with parameters which are only to be constructed if the
- * logging level is the ERROR level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param paramSuppliers An array of functions, which when called, produce
- * the desired log message parameters.
- */
- @Override
- public void error(final String message, final Supplier<?>... paramSuppliers)
- {
- log(Level.ERROR, message, paramSuppliers);
- }
-
- /**
- * Logs a message at the ERROR level including the stack trace of the {@link Throwable}
- * <code>t</code> passed as parameter.
- *
- * @param message the message object to log.
- * @param t the exception to log, including its stack trace.
- */
- @Override
- public void error(final String message, final Throwable t)
- {
- logger.error(message, t);
- }
-
- /**
- * Logs a message object with the FATAL level.
- *
- * @param message the message object to log.
- */
- @Override
- public void fatal(final Object message)
- {
- logger.fatal(message);
- }
-
- /**
- * Logs a message object with the FATAL level.
- *
- * @param message the message string to log.
- */
- @Override
- public void fatal(final String message)
- {
- logger.fatal(message);
- }
-
- /**
- * Logs a message with parameters at the FATAL level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param params parameters to the message.
- */
- @Override
- public void fatal(final String message, final Object... params)
- {
- logger.fatal(message, params);
- }
-
- /**
- * Logs a message with parameters which are only to be constructed if the
- * logging level is the FATAL level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param paramSuppliers An array of functions, which when called, produce
- * the desired log message parameters.
- */
- @Override
- public void fatal(final String message, final Supplier<?>... paramSuppliers)
- {
- log(Level.FATAL, message, paramSuppliers);
- }
-
- /**
- * Logs a message at the FATAL level including the stack trace of the {@link Throwable}
- * <code>t</code> passed as parameter.
- *
- * @param message the message object to log.
- * @param t the exception to log, including its stack trace.
- */
- @Override
- public void fatal(final String message, final Throwable t)
- {
- logger.fatal(message, t);
- }
-
- /**
- * Gets the logger name.
- *
- * @return the logger name.
- */
- @Override
- public String getName()
- {
- return logger.getName();
- }
-
- /**
- * Logs a message object with the INFO level.
- *
- * @param message the message object to log.
- */
- @Override
- public void info(final Object message)
- {
- logger.info(message);
- }
-
- /**
- * Logs a message object with the INFO level.
- *
- * @param message the message string to log.
- */
- @Override
- public void info(final String message)
- {
- logger.info(message);
- }
-
- /**
- * Logs a message with parameters at the INFO level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param params parameters to the message.
- */
- @Override
- public void info(final String message, final Object... params)
- {
- logger.info(message, params);
- }
-
- /**
- * Logs a message with parameters which are only to be constructed if the
- * logging level is the INFO level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param paramSuppliers An array of functions, which when called, produce
- * the desired log message parameters.
- */
- @Override
- public void info(final String message, final Supplier<?>... paramSuppliers)
- {
- log(Level.INFO, message, paramSuppliers);
- }
-
- /**
- * Logs a message at the INFO level including the stack trace of the {@link Throwable}
- * <code>t</code> passed as parameter.
- *
- * @param message the message object to log.
- * @param t the exception to log, including its stack trace.
- */
- @Override
- public void info(final String message, final Throwable t)
- {
- logger.info(message, t);
- }
-
- /**
- * Checks whether this Logger is enabled for the DEBUG Level.
- *
- * @return boolean - {@code true} if this Logger is enabled for level DEBUG, {@code false}
- * otherwise.
- */
- @Override
- public boolean isDebugEnabled()
- {
- return logger.isDebugEnabled();
- }
-
- /**
- * Checks whether this Logger is enabled for the ERROR Level.
- *
- * @return boolean - {@code true} if this Logger is enabled for level ERROR, {@code false}
- * otherwise.
- */
- @Override
- public boolean isErrorEnabled()
- {
- return logger.isErrorEnabled();
- }
-
- /**
- * Checks whether this Logger is enabled for the FATAL Level.
- *
- * @return boolean - {@code true} if this Logger is enabled for level FATAL, {@code false}
- * otherwise.
- */
- @Override
- public boolean isFatalEnabled()
- {
- return logger.isFatalEnabled();
- }
-
- /**
- * Checks whether this Logger is enabled for the INFO Level.
- *
- * @return boolean - {@code true} if this Logger is enabled for level INFO, {@code false}
- * otherwise.
- */
- @Override
- public boolean isInfoEnabled()
- {
- return logger.isInfoEnabled();
- }
-
- /**
- * Checks whether this Logger is enabled for the TRACE level.
- *
- * @return boolean - {@code true} if this Logger is enabled for level TRACE, {@code false}
- * otherwise.
- */
- @Override
- public boolean isTraceEnabled()
- {
- return logger.isTraceEnabled();
- }
-
- /**
- * Checks whether this Logger is enabled for the WARN Level.
- *
- * @return boolean - {@code true} if this Logger is enabled for level WARN, {@code false}
- * otherwise.
- */
- @Override
- public boolean isWarnEnabled()
- {
- return logger.isWarnEnabled();
- }
-
- private void log(final Level level, final String message, final Supplier<?>... paramSuppliers)
- {
- if (logger.isEnabled(level))
- {
- if (paramSuppliers == null)
- {
- logger.log(level, message);
- }
- else
- {
- switch (paramSuppliers.length)
- {
- case 1: logger.log(level, message, paramSuppliers[0].get());
- break;
- case 2: logger.log(level, message, paramSuppliers[0].get(),
- paramSuppliers[1].get());
- break;
- case 3: logger.log(level, message, paramSuppliers[0].get(),
- paramSuppliers[1].get(), paramSuppliers[2].get());
- break;
- case 4: logger.log(level, message, paramSuppliers[0].get(),
- paramSuppliers[1].get(), paramSuppliers[2].get(),
- paramSuppliers[3].get());
- break;
- case 5: logger.log(level, message, paramSuppliers[0].get(),
- paramSuppliers[1].get(), paramSuppliers[2].get(),
- paramSuppliers[3].get(), paramSuppliers[4].get());
- break;
- default: logger.log(level, message, paramSuppliers[0].get(),
- paramSuppliers[1].get(), paramSuppliers[2].get(),
- paramSuppliers[3].get(), paramSuppliers[4].get(),
- paramSuppliers[5].get());
- break;
- }
- }
- }
- }
-
- /**
- * Logs a message object with the TRACE level.
- *
- * @param message the message object to log.
- */
- @Override
- public void trace(final Object message)
- {
- logger.trace(message);
- }
-
- /**
- * Logs a message object with the TRACE level.
- *
- * @param message the message string to log.
- */
- @Override
- public void trace(final String message)
- {
- logger.trace(message);
- }
-
- /**
- * Logs a message with parameters at the TRACE level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param params parameters to the message.
- */
- @Override
- public void trace(final String message, final Object... params)
- {
- logger.trace(message, params);
- }
-
- /**
- * Logs a message with parameters which are only to be constructed if the
- * logging level is the TRACE level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param paramSuppliers An array of functions, which when called, produce
- * the desired log message parameters.
- */
- @Override
- public void trace(final String message, final Supplier<?>... paramSuppliers)
- {
- log(Level.TRACE, message, paramSuppliers);
- }
-
- /**
- * Logs a message at the TRACE level including the stack trace of the {@link Throwable}
- * <code>t</code> passed as parameter.
- *
- * @param message the message object to log.
- * @param t the exception to log, including its stack trace.
- * @see #debug(String)
- */
- @Override
- public void trace(final String message, final Throwable t)
- {
- logger.trace(message, t);
- }
-
- /**
- * Logs a message object with the WARN level.
- *
- * @param message the message object to log.
- */
- @Override
- public void warn(final Object message)
- {
- logger.warn(message);
- }
-
- /**
- * Logs a message object with the WARN level.
- *
- * @param message the message string to log.
- */
- @Override
- public void warn(final String message)
- {
- logger.warn(message);
- }
-
- /**
- * Logs a message with parameters at the WARN level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param params parameters to the message.
- */
- @Override
- public void warn(final String message, final Object... params)
- {
- logger.warn(message, params);
- }
-
- /**
- * Logs a message with parameters which are only to be constructed if the
- * logging level is the WARN level.
- *
- * @param message the message to log; the format depends on the message factory.
- * @param paramSuppliers An array of functions, which when called, produce
- * the desired log message parameters.
- */
- @Override
- public void warn(final String message, final Supplier<?>... paramSuppliers)
- {
- log(Level.WARN, message, paramSuppliers);
- }
-
- /**
- * Logs a message at the WARN level including the stack trace of the {@link Throwable}
- * <code>t</code> passed as parameter.
- *
- * @param message the message object to log.
- * @param t the exception to log, including its stack trace.
- */
- @Override
- public void warn(final String message, final Throwable t)
- {
- logger.warn(message, t);
- }
-}
\ No newline at end of file
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogFactory.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogFactory.java
deleted file mode 100644
index e5de09ee..00000000
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.apache.commons.jcs3.log;
-
-/*
- * 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.
- */
-
-/**
- * This is a SPI factory interface for specialized Log objects
- */
-public interface LogFactory
-{
- /**
- * The name of the root Log.
- */
- String ROOT_LOGGER_NAME = "";
-
- /**
- * Returns a Log using the fully qualified name of the Class as the Log
- * name.
- *
- * @param clazz
- * The Class whose name should be used as the Log name.
- * @return The Log.
- * @throws UnsupportedOperationException
- * if {@code clazz} is {@code null}
- */
- Log getLog(final Class<?> clazz);
-
- /**
- * Returns a Log with the specified name.
- *
- * @param name
- * The logger name.
- * @return The Log.
- * @throws UnsupportedOperationException
- * if {@code name} is {@code null}
- */
- Log getLog(final String name);
-
- /**
- * Return the name of the Log subsystem managed by this factory
- *
- * @return the name of the log subsystem
- */
- String getName();
-
- /**
- * Shutdown the logging system if the logging system supports it.
- */
- void shutdown();
-}
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java
deleted file mode 100644
index 30abe81e..00000000
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/LogManager.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.apache.commons.jcs3.log;
-
-/*
- * 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.ArrayList;
-import java.util.List;
-import java.util.ServiceConfigurationError;
-import java.util.ServiceLoader;
-
-/**
- * This is a borrowed and stripped-down version of the log4j2 LogManager class.
- *
- * The anchor point for the JCS logging system. The most common usage of this
- * class is to obtain a named {@link Log}.
- */
-public class LogManager
-{
- /**
- * The SPI LogFactory
- */
- private static final class LogFactoryHolder
- {
- static final LogFactory INSTANCE = createLogFactory();
-
- /**
- * Scans the classpath to find a logging implementation.
- *
- * @return the LogFactory
- * @throws RuntimeException, if no factory implementation could be found
- */
- private static LogFactory createLogFactory()
- {
- final ServiceLoader<LogFactory> factories = ServiceLoader.load(LogFactory.class);
- if (LogManager.logSystem == null)
- {
- LogManager.logSystem = System.getProperty("jcs.logSystem",
- LOGSYSTEM_JAVA_UTIL_LOGGING);
- }
-
- // Store errors that may occur until log system is available
- final List<ServiceConfigurationError> errors = new ArrayList<>();
- LogFactory factory = null;
- for (final LogFactory instance : factories) {
- try
- {
- if (logSystem.equalsIgnoreCase(instance.getName()))
- {
- factory = instance;
- break;
- }
- }
- catch (final ServiceConfigurationError e)
- {
- errors.add(e);
- }
- }
- if (factory != null)
- {
- if (!errors.isEmpty())
- {
- final Log log = factory.getLog(LogFactoryHolder.class);
-
- for (final ServiceConfigurationError error : errors)
- {
- log.debug("Error loading LogFactory", error);
- }
- log.debug("Found LogFactory for " + logSystem);
- }
- return factory;
- }
-
- // No log system could be found --> report errors to stderr
- errors.forEach(e -> System.err.println(e.getMessage()));
- throw new IllegalStateException("Could not find factory implementation for log subsystem " + logSystem);
- }
- }
-
- /**
- * The name of log subsystem
- */
- private static String logSystem;
- /** Log systems currently known */
- public static final String LOGSYSTEM_JAVA_UTIL_LOGGING = "jul";
-
- public static final String LOGSYSTEM_LOG4J2 = "log4j2";
-
- /**
- * Returns a Log using the fully qualified name of the Class as the Log
- * name.
- *
- * @param clazz
- * The Class whose name should be used as the Log name.
- * @return The Log.
- * @throws UnsupportedOperationException
- * if {@code clazz} is {@code null}
- */
- public static Log getLog(final Class<?> clazz)
- {
- return getLogFactory().getLog(clazz);
- }
-
- /**
- * Returns a Log with the specified name.
- *
- * @param name
- * The logger name.
- * @return The Log.
- * @throws UnsupportedOperationException
- * if {@code name} is {@code null}
- */
- public static Log getLog(final String name)
- {
- return getLogFactory().getLog(name);
- }
-
- /**
- * Return the LogFactory
- */
- private static LogFactory getLogFactory()
- {
- return LogFactoryHolder.INSTANCE;
- }
-
- /**
- * Returns the root logger.
- *
- * @return the root logger, named {@link LogFactory#ROOT_LOGGER_NAME}.
- */
- public static Log getRootLogger()
- {
- return getLog(LogFactory.ROOT_LOGGER_NAME);
- }
-
- /**
- * Sets the log system. Must be called before getLog is called
- *
- * @param logSystem the logSystem to set
- */
- public static void setLogSystem(final String logSystem)
- {
- LogManager.logSystem = logSystem;
- }
-
- /**
- * Shutdown the logging system if the logging system supports it.
- */
- public static void shutdown()
- {
- getLogFactory().shutdown();
- }
-
- /**
- * Prevents instantiation
- */
- protected LogManager()
- {
- }
-}
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogAdapter.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/SystemLogAdapter.java
similarity index 85%
rename from commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogAdapter.java
rename to commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/SystemLogAdapter.java
index ccc4e5d3..82829699 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/JulLogAdapter.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/log/SystemLogAdapter.java
@@ -1,9 +1,9 @@
package org.apache.commons.jcs3.log;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
import java.util.Objects;
import java.util.function.Supplier;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,31 +23,19 @@ import java.util.logging.Logger;
*/
/**
- * This is a wrapper around the <code>java.util.logging.Logger</code> implementing our own
+ * This is a wrapper around the <code>java.lang.System.Logger</code> implementing our own
* <code>Log</code> interface.
- * <p>
- * This is the mapping of the log levels
- * </p>
- * <pre>
- * Java Level Log Level
- * SEVERE FATAL
- * SEVERE ERROR
- * WARNING WARN
- * INFO INFO
- * FINE DEBUG
- * FINER TRACE
- * </pre>
*/
-public class JulLogAdapter implements Log
+public class SystemLogAdapter implements Log
{
private final Logger logger;
/**
- * Constructs a JUL Logger wrapper
+ * Constructs a System Logger wrapper
*
- * @param logger the JUL Logger
+ * @param logger the System Logger
*/
- public JulLogAdapter(final Logger logger)
+ public SystemLogAdapter(final Logger logger)
{
this.logger = logger;
}
@@ -60,7 +48,7 @@ public class JulLogAdapter implements Log
@Override
public void debug(final Object message)
{
- log(Level.FINE, message);
+ log(Level.DEBUG, message);
}
/**
@@ -71,7 +59,7 @@ public class JulLogAdapter implements Log
@Override
public void debug(final String message)
{
- log(Level.FINE, message);
+ log(Level.DEBUG, message);
}
/**
@@ -83,7 +71,7 @@ public class JulLogAdapter implements Log
@Override
public void debug(final String message, final Object... params)
{
- log(Level.FINE, message, params);
+ log(Level.DEBUG, message, params);
}
/**
@@ -97,7 +85,7 @@ public class JulLogAdapter implements Log
@Override
public void debug(final String message, final Supplier<?>... paramSuppliers)
{
- log(Level.FINE, message, paramSuppliers);
+ log(Level.DEBUG, message, paramSuppliers);
}
/**
@@ -110,7 +98,7 @@ public class JulLogAdapter implements Log
@Override
public void debug(final String message, final Throwable t)
{
- log(Level.FINE, message, t);
+ log(Level.DEBUG, message, t);
}
/**
@@ -121,7 +109,7 @@ public class JulLogAdapter implements Log
@Override
public void error(final Object message)
{
- log(Level.SEVERE, message);
+ log(Level.ERROR, message);
}
/**
@@ -132,7 +120,7 @@ public class JulLogAdapter implements Log
@Override
public void error(final String message)
{
- log(Level.SEVERE, message);
+ log(Level.ERROR, message);
}
/**
@@ -144,7 +132,7 @@ public class JulLogAdapter implements Log
@Override
public void error(final String message, final Object... params)
{
- log(Level.SEVERE, message, params);
+ log(Level.ERROR, message, params);
}
/**
@@ -159,7 +147,7 @@ public class JulLogAdapter implements Log
@Override
public void error(final String message, final Supplier<?>... paramSuppliers)
{
- log(Level.SEVERE, message, paramSuppliers);
+ log(Level.ERROR, message, paramSuppliers);
}
/**
@@ -172,7 +160,7 @@ public class JulLogAdapter implements Log
@Override
public void error(final String message, final Throwable t)
{
- log(Level.SEVERE, message, t);
+ log(Level.ERROR, message, t);
}
/**
@@ -183,7 +171,7 @@ public class JulLogAdapter implements Log
@Override
public void fatal(final Object message)
{
- log(Level.SEVERE, message);
+ log(Level.ERROR, message);
}
/**
@@ -194,7 +182,7 @@ public class JulLogAdapter implements Log
@Override
public void fatal(final String message)
{
- log(Level.SEVERE, message);
+ log(Level.ERROR, message);
}
/**
@@ -206,7 +194,7 @@ public class JulLogAdapter implements Log
@Override
public void fatal(final String message, final Object... params)
{
- log(Level.SEVERE, message, params);
+ log(Level.ERROR, message, params);
}
/**
@@ -220,7 +208,7 @@ public class JulLogAdapter implements Log
@Override
public void fatal(final String message, final Supplier<?>... paramSuppliers)
{
- log(Level.SEVERE, message, paramSuppliers);
+ log(Level.ERROR, message, paramSuppliers);
}
/**
@@ -233,7 +221,7 @@ public class JulLogAdapter implements Log
@Override
public void fatal(final String message, final Throwable t)
{
- log(Level.SEVERE, message, t);
+ log(Level.ERROR, message, t);
}
/**
@@ -317,7 +305,7 @@ public class JulLogAdapter implements Log
@Override
public boolean isDebugEnabled()
{
- return logger.isLoggable(Level.FINE);
+ return logger.isLoggable(Level.DEBUG);
}
/**
@@ -329,7 +317,7 @@ public class JulLogAdapter implements Log
@Override
public boolean isErrorEnabled()
{
- return logger.isLoggable(Level.SEVERE);
+ return logger.isLoggable(Level.ERROR);
}
/**
@@ -341,7 +329,7 @@ public class JulLogAdapter implements Log
@Override
public boolean isFatalEnabled()
{
- return logger.isLoggable(Level.SEVERE);
+ return logger.isLoggable(Level.ERROR);
}
/**
@@ -365,7 +353,7 @@ public class JulLogAdapter implements Log
@Override
public boolean isTraceEnabled()
{
- return logger.isLoggable(Level.FINER);
+ return logger.isLoggable(Level.TRACE);
}
/**
@@ -386,12 +374,11 @@ public class JulLogAdapter implements Log
{
if (message instanceof Throwable)
{
- logger.logp(level, logger.getName(), "", "Exception:", (Throwable) message);
+ logger.log(level, "Exception:", message);
}
else
{
- logger.logp(level, logger.getName(), "",
- Objects.toString(message, null));
+ logger.log(level, Objects.toString(message, null));
}
}
}
@@ -400,7 +387,7 @@ public class JulLogAdapter implements Log
{
if (logger.isLoggable(level))
{
- logger.logp(level, logger.getName(), "", message);
+ logger.log(level, message);
}
}
@@ -411,13 +398,12 @@ public class JulLogAdapter implements Log
final MessageFormatter formatter = new MessageFormatter(message, params);
if (formatter.hasThrowable())
{
- logger.logp(level, logger.getName(), "",
- formatter.getFormattedMessage(), formatter.getThrowable());
+ logger.log(level, formatter.getFormattedMessage(),
+ formatter.getThrowable());
}
else
{
- logger.logp(level, logger.getName(), "",
- formatter.getFormattedMessage());
+ logger.log(level, formatter.getFormattedMessage());
}
}
}
@@ -429,13 +415,12 @@ public class JulLogAdapter implements Log
final MessageFormatter formatter = new MessageFormatter(message, paramSuppliers);
if (formatter.hasThrowable())
{
- logger.logp(level, logger.getName(), "",
- formatter.getFormattedMessage(), formatter.getThrowable());
+ logger.log(level, formatter.getFormattedMessage(),
+ formatter.getThrowable());
}
else
{
- logger.logp(level, logger.getName(), "",
- formatter.getFormattedMessage());
+ logger.log(level, formatter.getFormattedMessage());
}
}
}
@@ -444,7 +429,7 @@ public class JulLogAdapter implements Log
{
if (logger.isLoggable(level))
{
- logger.logp(level, logger.getName(), "", message, t);
+ logger.log(level, message, t);
}
}
@@ -456,7 +441,7 @@ public class JulLogAdapter implements Log
@Override
public void trace(final Object message)
{
- log(Level.FINER, message);
+ log(Level.TRACE, message);
}
/**
@@ -467,7 +452,7 @@ public class JulLogAdapter implements Log
@Override
public void trace(final String message)
{
- log(Level.FINER, message);
+ log(Level.TRACE, message);
}
/**
@@ -479,7 +464,7 @@ public class JulLogAdapter implements Log
@Override
public void trace(final String message, final Object... params)
{
- log(Level.FINER, message, params);
+ log(Level.TRACE, message, params);
}
/**
@@ -493,7 +478,7 @@ public class JulLogAdapter implements Log
@Override
public void trace(final String message, final Supplier<?>... paramSuppliers)
{
- log(Level.FINER, message, paramSuppliers);
+ log(Level.TRACE, message, paramSuppliers);
}
/**
@@ -507,7 +492,7 @@ public class JulLogAdapter implements Log
@Override
public void trace(final String message, final Throwable t)
{
- log(Level.FINER, message, t);
+ log(Level.TRACE, message, t);
}
/**
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/access/JCSWorker.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/access/JCSWorker.java
index 7344cc68..6bbdca63 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/access/JCSWorker.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/access/JCSWorker.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.access.CacheAccess;
import org.apache.commons.jcs3.access.GroupCacheAccess;
import org.apache.commons.jcs3.access.exception.CacheException;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Utility class to encapsulate doing a piece of work, and caching the results
@@ -93,7 +92,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class JCSWorker<K, V>
{
/** The logger */
- private static final Log logger = LogManager.getLog( JCSWorker.class );
+ private static final Log logger = Log.getLog( JCSWorker.class );
/** The cache we are working with */
private final CacheAccess<K, V> cache;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/OptionConverter.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/OptionConverter.java
index 5cc1c27c..45134d0c 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/OptionConverter.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/OptionConverter.java
@@ -22,7 +22,6 @@ package org.apache.commons.jcs3.utils.config;
import java.util.Properties;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This class is based on the log4j class org.apache.log4j.helpers.OptionConverter that was made by
@@ -32,7 +31,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class OptionConverter
{
/** The logger */
- private static final Log log = LogManager.getLog( OptionConverter.class );
+ private static final Log log = Log.getLog( OptionConverter.class );
/** System property delimter */
private static final String DELIM_START = "${";
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
index dddf7b03..febc1e56 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/config/PropertySetter.java
@@ -28,7 +28,6 @@ import java.lang.reflect.Method;
import java.util.Properties;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This class is based on the log4j class org.apache.log4j.config.PropertySetter that was made by
@@ -54,7 +53,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class PropertySetter
{
/** Logger */
- private static final Log log = LogManager.getLog( PropertySetter.class );
+ private static final Log log = Log.getLog( PropertySetter.class );
/**
* Sets the properties of an object passed as a parameter in one go. The <code>properties</code>
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java
index 90ad53c6..e59f86eb 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryManager.java
@@ -26,7 +26,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.behavior.IProvideScheduler;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This manages UDPDiscovery Services. We should end up with one service per Lateral Cache Manager
@@ -35,7 +34,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class UDPDiscoveryManager
{
/** The logger */
- private static final Log log = LogManager.getLog( UDPDiscoveryManager.class );
+ private static final Log log = Log.getLog( UDPDiscoveryManager.class );
/** Singleton instance */
private static final UDPDiscoveryManager INSTANCE = new UDPDiscoveryManager();
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
index 8ce3c384..b2b707ca 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryReceiver.java
@@ -41,7 +41,6 @@ import org.apache.commons.jcs3.engine.CacheInfo;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.behavior.IShutdownObserver;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.discovery.UDPDiscoveryMessage.BroadcastType;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
import org.apache.commons.jcs3.utils.serialization.StandardSerializer;
@@ -54,7 +53,7 @@ public class UDPDiscoveryReceiver
implements Runnable, IShutdownObserver
{
/** The log factory */
- private static final Log log = LogManager.getLog( UDPDiscoveryReceiver.class );
+ private static final Log log = Log.getLog( UDPDiscoveryReceiver.class );
/**
* TODO: Consider using the threadpool manager to get this thread pool. For now place a tight
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySender.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySender.java
index 28889c6a..70d77aa1 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySender.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoverySender.java
@@ -29,7 +29,6 @@ import java.util.ArrayList;
import org.apache.commons.jcs3.engine.CacheInfo;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.discovery.UDPDiscoveryMessage.BroadcastType;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
@@ -39,7 +38,7 @@ import org.apache.commons.jcs3.utils.net.HostNameUtil;
public class UDPDiscoverySender implements AutoCloseable
{
/** The logger. */
- private static final Log log = LogManager.getLog( UDPDiscoverySender.class );
+ private static final Log log = Log.getLog( UDPDiscoverySender.class );
/** The socket */
private final MulticastSocket localSocket;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryService.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryService.java
index 1556d459..e5f68ebe 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryService.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/discovery/UDPDiscoveryService.java
@@ -41,7 +41,6 @@ import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.engine.behavior.IRequireScheduler;
import org.apache.commons.jcs3.engine.behavior.IShutdownObserver;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.discovery.behavior.IDiscoveryListener;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
@@ -58,7 +57,7 @@ public class UDPDiscoveryService
implements IShutdownObserver, IRequireScheduler
{
/** The logger */
- private static final Log log = LogManager.getLog( UDPDiscoveryService.class );
+ private static final Log log = Log.getLog( UDPDiscoveryService.class );
/** Thread that listens for messages */
private Thread udpReceiverThread;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java
index 17eac8bc..c026b2a2 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/net/HostNameUtil.java
@@ -45,7 +45,6 @@ import java.util.Enumeration;
import java.util.List;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Simple utility for getting the local host name.
@@ -53,7 +52,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class HostNameUtil
{
/** The logger. */
- private static final Log log = LogManager.getLog( HostNameUtil.class );
+ private static final Log log = Log.getLog( HostNameUtil.class );
/**
* Gets the address for the local machine.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtil.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtil.java
index a1a4da76..019de88c 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtil.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/serialization/SerializationConversionUtil.java
@@ -27,7 +27,6 @@ import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.engine.behavior.ICacheElementSerialized;
import org.apache.commons.jcs3.engine.behavior.IElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This uses a supplied Serializer to convert to and from cache elements.
@@ -35,7 +34,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class SerializationConversionUtil
{
/** The logger */
- private static final Log log = LogManager.getLog( SerializationConversionUtil.class );
+ private static final Log log = Log.getLog( SerializationConversionUtil.class );
/**
* This returns a wrapper that has a de-serialized version of the value
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java
index 3846b28b..6268eba6 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/servlet/JCSServletContextListener.java
@@ -24,7 +24,6 @@ import javax.servlet.ServletContextListener;
import org.apache.commons.jcs3.JCS;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* If you add this to the context listeners section of your web.xml file, this will shutdown JCS
@@ -44,7 +43,7 @@ public class JCSServletContextListener
implements ServletContextListener
{
/** The logger */
- private static final Log log = LogManager.getLog( JCSServletContextListener.class );
+ private static final Log log = Log.getLog( JCSServletContextListener.class );
/**
* Shutdown JCS.
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
index a27183e2..f85d46a8 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/AbstractLRUMap.java
@@ -35,7 +35,6 @@ import org.apache.commons.jcs3.engine.stats.Stats;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This is a simple LRUMap. It implements most of the map methods. It is not recommended that you
@@ -56,7 +55,7 @@ public abstract class AbstractLRUMap<K, V>
implements Map<K, V>
{
/** The logger */
- private static final Log log = LogManager.getLog( AbstractLRUMap.class );
+ private static final Log log = Log.getLog( AbstractLRUMap.class );
/** Double linked list for lru */
private final DoubleLinkedList<LRUElementDescriptor<K, V>> list;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedList.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedList.java
index 72aca1dd..e10a41db 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedList.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/struct/DoubleLinkedList.java
@@ -20,7 +20,6 @@ package org.apache.commons.jcs3.utils.struct;
*/
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* This is a generic thread safe double linked list. It's very simple and all the operations are so
@@ -30,7 +29,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class DoubleLinkedList<T extends DoubleLinkedListNode>
{
/** The logger */
- private static final Log log = LogManager.getLog( DoubleLinkedList.class );
+ private static final Log log = Log.getLog( DoubleLinkedList.class );
/** Record size to avoid having to iterate */
private int size;
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java
index 8bb97c23..03403f47 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/threadpool/ThreadPoolManager.java
@@ -33,7 +33,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.config.PropertySetter;
/**
@@ -67,7 +66,7 @@ public class ThreadPoolManager
}
/** The logger */
- private static final Log log = LogManager.getLog( ThreadPoolManager.class );
+ private static final Log log = Log.getLog( ThreadPoolManager.class );
/** The root property name */
private static final String PROP_NAME_ROOT = "thread_pool";
diff --git a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/zip/CompressionUtil.java b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/zip/CompressionUtil.java
index 95e5f27e..12d3c765 100644
--- a/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/zip/CompressionUtil.java
+++ b/commons-jcs3-core/src/main/java/org/apache/commons/jcs3/utils/zip/CompressionUtil.java
@@ -28,13 +28,12 @@ import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/** Compress / Decompress. */
public final class CompressionUtil
{
/** The logger */
- private static final Log log = LogManager.getLog( CompressionUtil.class );
+ private static final Log log = Log.getLog( CompressionUtil.class );
/**
* Compress the byte array passed
diff --git a/commons-jcs3-core/src/main/resources/META-INF/services/org.apache.commons.jcs3.log.LogFactory b/commons-jcs3-core/src/main/resources/META-INF/services/org.apache.commons.jcs3.log.LogFactory
deleted file mode 100644
index 2a8bea74..00000000
--- a/commons-jcs3-core/src/main/resources/META-INF/services/org.apache.commons.jcs3.log.LogFactory
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.
-org.apache.commons.jcs3.log.JulLogFactory
-org.apache.commons.jcs3.log.Log4j2Factory
diff --git a/commons-jcs3-core/src/test/conf/log4j.properties b/commons-jcs3-core/src/test/conf/log4j.properties
deleted file mode 100644
index 87047c62..00000000
--- a/commons-jcs3-core/src/test/conf/log4j.properties
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.
-log4j.rootCategory=INFO, A1
-
-# A1 -- console
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-log4j.appender.A1.layout=org.apache.log4j.PatternLayout
-# Print the date in ISO 8601 format
-log4j.appender.A1.layout.ConversionPattern=%d %-5p [%c{1}] [%t] [%x] %m%n
-
-# RF --file appender
-log4j.appender.RF=org.apache.log4j.RollingFileAppender
-log4j.appender.RF.File=server.log
-log4j.appender.RF.layout=org.apache.log4j.PatternLayout
-log4j.appender.RF.layout.ConversionPattern=%d %-5p [%c{1}] [%t] [%x] %m%n
-
-# WF -- special file for warnings
-# log4j.appender.WF=org.apache.log4j.RollingFileAppender
-# log4j.appender.WF.File=I:/dev/jakarta-turbine-jcs/src/scripts/warnings.log
-# log4j.appender.WF.layout=org.apache.log4j.PatternLayout
-# log4j.appender.WF.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-
-# ################################################################################
-
-log4j.category.test= DEBUG
-
-log4j.category.org.jgroups=WARN
-
-log4j.category.org.apache.commons.jcs=INFO
-log4j.category.org.apache.commons.jcs3.engine=INFO
-# log4j.category.org.apache.commons.jcs3.acess=WARN,WF
-# log4j.category.org.apache.commons.jcs3.engine.control=WARN,WF
-
-# log4j.logger.org.apache.commons.jcs3.engine.memory.shrinking=INFO
-# log4j.logger.org.apache.commons.jcs3.auxiliary.disk=INFO
-log4j.logger.org.apache.commons.jcs3.auxiliary.disk.indexed=INFO
-
-# log4j.category.org.apache.commons.jcs3.config=WARN,A1
-
-# log4j.category.org.apache.commons.jcs3.auxiliary=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.disk=WARN,WF
-# log4j.category.org.apache.commons.jcs3.auxiliary.lateral=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.lateral.javagroups=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.lateral.xmlrpc=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.remote=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.remote.RemoteCacheFailoverRunner=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.remote.RemoteCacheListener=DEBUG
-# log4j.category.org.apache.commons.jcs3.auxiliary.remote.RemoteCacheManager=INFO
-# log4j.category.org.apache.commons.jcs3.auxiliary.remote.server.RemoteCacheServer=DEBUG
-# log4j.category.org.apache.commons.jcs3.auxiliary.remote.server=INFO
-# log4j.category.org.apache.commons.jcs3.utils=WARN,WF
-# log4j.category.org.apache.commons.jcs3.utils.discovery=DEBUG
-
-log4j.category.org.apache.commons.jcs3.utils=INFO
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
index f4ed35b8..da6f0f26 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSThrashTest.java
@@ -32,7 +32,6 @@ import org.apache.commons.jcs3.access.CacheAccess;
import org.apache.commons.jcs3.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -58,7 +57,7 @@ class JCSThrashTest
}
/** The logger. */
- private static final Log LOG = LogManager.getLog( JCSThrashTest.class.getName() );
+ private static final Log LOG = Log.getLog( JCSThrashTest.class.getName() );
/**
* the cache instance
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java
index ec560a19..4fd2f369 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/JCSvsHashtablePerformanceTest.java
@@ -26,7 +26,6 @@ import java.util.Hashtable;
import org.apache.commons.jcs3.access.CacheAccess;
import org.apache.commons.jcs3.engine.memory.lru.LRUMemoryCache;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.junit.jupiter.api.Test;
/**
@@ -161,13 +160,13 @@ public class JCSvsHashtablePerformanceTest
void testSimpleLoad()
throws Exception
{
- final Log log1 = LogManager.getLog( LRUMemoryCache.class );
+ final Log log1 = Log.getLog( LRUMemoryCache.class );
if ( log1.isDebugEnabled() )
{
System.out.println( "The log level must be at info or above for the a performance test." );
return;
}
- final Log log2 = LogManager.getLog( JCS.class );
+ final Log log2 = Log.getLog( JCS.class );
if ( log2.isDebugEnabled() )
{
System.out.println( "The log level must be at info or above for the a performance test." );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java
index c6d45eab..4963c0f2 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/TestLogConfigurationUtil.java
@@ -6,8 +6,6 @@ import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
-import org.apache.commons.jcs3.log.LogManager;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -74,7 +72,6 @@ public class TestLogConfigurationUtil
*/
public static void configureLogger( final StringWriter stringWriter, final String loggerName )
{
- LogManager.setLogSystem("jul");
java.util.logging.LogManager.getLogManager().reset();
final Logger rootLogger = java.util.logging.LogManager.getLogManager().getLogger("");
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/TestCacheAccess.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/TestCacheAccess.java
index bb962f20..7e8d4761 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/TestCacheAccess.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/access/TestCacheAccess.java
@@ -33,7 +33,6 @@ import org.apache.commons.jcs3.engine.ElementAttributes;
import org.apache.commons.jcs3.engine.behavior.IElementAttributes;
import org.apache.commons.jcs3.engine.control.event.ElementEventHandlerMockImpl;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Allows the user to run common cache commands from the command line for a test cache. This also
@@ -42,7 +41,7 @@ import org.apache.commons.jcs3.log.LogManager;
public class TestCacheAccess
{
/** Log instance */
- private static final Log log = LogManager.getLog( TestCacheAccess.class );
+ private static final Log log = Log.getLog( TestCacheAccess.class );
/** Do we use system.out.println to print out debug data? */
private static boolean isSysOut;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java
index fc10ae39..49acc4a8 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/disk/AbstractDiskCacheUnitTest.java
@@ -270,6 +270,7 @@ class AbstractDiskCacheUnitTest
// DO WORK
diskCache.removeAll();
final String result = stringWriter.toString();
+ System.out.println(result);
// VERIFY
assertTrue( result.indexOf( "set to false" ) != -1, "Should say not allowed." );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/MockRemoteCacheClient.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/MockRemoteCacheClient.java
index 31443468..c8f34706 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/MockRemoteCacheClient.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/MockRemoteCacheClient.java
@@ -35,7 +35,6 @@ import org.apache.commons.jcs3.engine.behavior.ICacheElement;
import org.apache.commons.jcs3.engine.behavior.ICacheServiceNonLocal;
import org.apache.commons.jcs3.engine.stats.behavior.IStats;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
* Used for testing the no wait.
@@ -45,7 +44,7 @@ public class MockRemoteCacheClient<K, V>
implements IRemoteCacheClient<K, V>
{
/** Log instance */
- private static final Log log = LogManager.getLog( MockRemoteCacheClient.class );
+ private static final Log log = Log.getLog( MockRemoteCacheClient.class );
/** List of ICacheElement<K, V> objects passed into update. */
public List<ICacheElement<K, V>> updateList = new LinkedList<>();
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java
index eebccfb5..6a5c2b38 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/TestRemoteCache.java
@@ -31,7 +31,6 @@ import org.apache.commons.jcs3.engine.behavior.ICompositeCacheManager;
import org.apache.commons.jcs3.engine.control.MockCompositeCacheManager;
import org.apache.commons.jcs3.engine.control.MockElementSerializer;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@@ -41,7 +40,7 @@ import org.junit.jupiter.api.Test;
public class TestRemoteCache
{
/** The logger */
- private static final Log log = LogManager.getLog( TestRemoteCache.class );
+ private static final Log log = Log.getLog( TestRemoteCache.class );
/**
* Start the cache.
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerStartupUtil.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerStartupUtil.java
index 1027a750..17645cd0 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerStartupUtil.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/auxiliary/remote/server/RemoteCacheServerStartupUtil.java
@@ -25,7 +25,6 @@ import java.util.Properties;
import org.apache.commons.jcs3.auxiliary.remote.RemoteUtils;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.apache.commons.jcs3.utils.net.HostNameUtil;
/**
@@ -34,7 +33,7 @@ import org.apache.commons.jcs3.utils.net.HostNameUtil;
public class RemoteCacheServerStartupUtil
{
/** The logger */
- private static final Log log = LogManager.getLog( RemoteCacheServerStartupUtil.class );
+ private static final Log log = Log.getLog( RemoteCacheServerStartupUtil.class );
/** Registry to use in the test. */
private static final int DEFAULT_REGISTRY_PORT = 1101;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/ElementEventHandlerMockImpl.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/ElementEventHandlerMockImpl.java
index 2adfc937..b60c8c56 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/ElementEventHandlerMockImpl.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/control/event/ElementEventHandlerMockImpl.java
@@ -23,7 +23,6 @@ import org.apache.commons.jcs3.engine.control.event.behavior.ElementEventType;
import org.apache.commons.jcs3.engine.control.event.behavior.IElementEvent;
import org.apache.commons.jcs3.engine.control.event.behavior.IElementEventHandler;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
/**
*/
@@ -31,7 +30,7 @@ public class ElementEventHandlerMockImpl
implements IElementEventHandler
{
/** The logger */
- private static final Log log = LogManager.getLog( ElementEventHandlerMockImpl.class );
+ private static final Log log = Log.getLog( ElementEventHandlerMockImpl.class );
/** Times called. */
private int callCount;
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java
index 7a107db7..47d7a0a3 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/engine/memory/mru/LRUvsMRUPerformanceTest.java
@@ -23,7 +23,6 @@ import org.apache.commons.jcs3.JCS;
import org.apache.commons.jcs3.access.CacheAccess;
import org.apache.commons.jcs3.engine.memory.lru.LRUMemoryCache;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.junit.jupiter.api.Test;
/**
@@ -161,13 +160,13 @@ public class LRUvsMRUPerformanceTest
void testSimpleLoad()
throws Exception
{
- final Log log1 = LogManager.getLog( LRUMemoryCache.class );
+ final Log log1 = Log.getLog( LRUMemoryCache.class );
if ( log1.isDebugEnabled() )
{
System.out.println( "The log level must be at info or above for the a performance test." );
return;
}
- final Log log2 = LogManager.getLog( MRUMemoryCache.class );
+ final Log log2 = Log.getLog( MRUMemoryCache.class );
if ( log2.isDebugEnabled() )
{
System.out.println( "The log level must be at info or above for the a performance test." );
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java
deleted file mode 100644
index 9fc10ee8..00000000
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerNoLogSystemUnitTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.commons.jcs3.log;
-
-/*
- * 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.assertThrows;
-
-import org.junit.jupiter.api.Test;
-
-class LogManagerNoLogSystemUnitTest
-{
- @Test
- void testLogFactoryNonExistingLogSystem()
- {
- assertThrows( ExceptionInInitializerError.class, () -> {
- // Set non-existing log system
- LogManager.setLogSystem( "test-logging" );
-
- LogManager.getLog( getClass() );
- } );
- }
-}
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java
index cf62d69a..bf4f0853 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/log/LogManagerUnitTest.java
@@ -28,9 +28,6 @@ class LogManagerUnitTest
@Test
void testLogFactoryDefault()
{
- // Set default log system
- LogManager.setLogSystem(LogManager.LOGSYSTEM_JAVA_UTIL_LOGGING);
-
- assertNotNull(LogManager.getLog(getClass()));
+ assertNotNull(Log.getLog(getClass()));
}
}
diff --git a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
index d1de1ad0..eaf81c47 100644
--- a/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
+++ b/commons-jcs3-core/src/test/java/org/apache/commons/jcs3/utils/struct/JCSvsCommonsLRUMapPerformanceTest.java
@@ -24,7 +24,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Map;
import org.apache.commons.jcs3.log.Log;
-import org.apache.commons.jcs3.log.LogManager;
import org.junit.jupiter.api.Test;
/**
@@ -164,7 +163,7 @@ public class JCSvsCommonsLRUMapPerformanceTest
void testSimpleLoad()
throws Exception
{
- final Log log = LogManager.getLog( LRUMap.class );
+ final Log log = Log.getLog( LRUMap.class );
if ( log.isDebugEnabled() )
{
System.out.println( "The log level must be at info or above for the a performance test." );
diff --git a/commons-jcs3-core/src/test/test-conf/log4j2-test.xml b/commons-jcs3-core/src/test/test-conf/log4j2-test.xml
deleted file mode 100644
index 9bed1fdd..00000000
--- a/commons-jcs3-core/src/test/test-conf/log4j2-test.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<Configuration status="WARN">
- <Appenders>
- <File name="jcs" fileName="target/jcs-test.log">
- <PatternLayout pattern="%d [%t] %-5p %c - %m%n" />
- </File>
- </Appenders>
- <Loggers>
- <Logger name="org.apache.commons.jcs3" additivity="false" level="INFO">
- <AppenderRef ref="jcs"/>
- </Logger>
- <Root level="ERROR"><!-- log4j 1.2 has DEBUG -->
- <AppenderRef ref="jcs" />
- </Root>
- </Loggers>
-</Configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4e474e03..8f15c927 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,7 +550,6 @@
<commons.collections.version>4.5.0-M3</commons.collections.version>
<commons.text.version>1.13.0</commons.text.version>
<commons.lang.version>3.17.0</commons.lang.version>
- <commons.log4j.version>2.24.3</commons.log4j.version>
<test.type>Unit</test.type>
<doclint>none</doclint>
(commons-jcs) 02/02: Document changes
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tv pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jcs.git
commit ff03e182c25aecc9464da74127aa0bdf62bb07a6
Author: Thomas Vandahl <tv...@apache.org>
AuthorDate: Fri Mar 21 15:57:37 2025 +0100
Document changes
---
src/changes/changes.xml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 9fbd7e74..ff118ad3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -23,8 +23,12 @@
<body>
<release version="3.3.0" date="YYYY-MM-DD">
<!-- FIX -->
- <action type="fix" dev="ggregory" due-to="ammannmi">Fix put time in JCSCache.put(K, V) #276.</action>
- <action type="fix" dev="ggregory" due-to="Gary Gregory">Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).</action>
+ <action type="fix" dev="ggregory" due-to="ammannmi">
+ Fix put time in JCSCache.put(K, V) #276.
+ </action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">
+ Remove -nouses directive from maven-bundle-plugin. OSGi package imports now state 'uses' definitions for package imports, this doesn't affect JPMS (from org.apache.commons:commons-parent:80).
+ </action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary Gregory">
Add Maven property project.build.outputTimestamp for build reproducibility.
@@ -34,6 +38,9 @@
Remove all deprecated code.
</action>
<!-- UPDATE -->
+ <action dev="tv" type="update" issue="JCS-241">
+ Use System.Logger from Java9, remove own logging abstraction, remove dependency on log4j2
+ </action>
<action type="update" dev="ggregory" due-to="Gary Gregory, Dependabot">
Bump org.apache.commons:commons-parent from 59 to 81 #222, #258, #277, #280, #286, #292, #296, #302.
</action>