diff --git a/build.third_step1.gradle b/build.third_step1.gradle index 852b4591b..8d3cc999f 100644 --- a/build.third_step1.gradle +++ b/build.third_step1.gradle @@ -86,8 +86,12 @@ def buildDir=files[0].path.substring(0,files[0].path.lastIndexOf (java.io.File.s def branchName=buildDir.substring(buildDir.lastIndexOf (java.io.File.separator)+1) def MVN_BRANCH = branchVariable.toUpperCase() +// 主体代码与essential的对应关系配置在TeamCity +String essentialVersion = findProperty("essentialVersion") + //指定依赖 dependencies{ + compileOnly "com.fr.essential:fine-essential:${essentialVersion}" compile fileTree(dir:"${srcDir}/fine-aspectj/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-cssparser/lib",include:'**/*.jar') compile fileTree(dir:"${srcDir}/fine-freehep/lib",include:'**/*.jar') diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/MySqlUtils.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/MySqlUtils.java index b20f82192..ba1104129 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/MySqlUtils.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/MySqlUtils.java @@ -357,16 +357,14 @@ public class MySqlUtils { } Class clazz = conn.getClass(); - if (class_ConnectionImpl == null) { - if (clazz.getName().equals("com.mysql.jdbc.ConnectionImpl")) { - class_ConnectionImpl = clazz; - } else if (clazz.getName().equals("com.mysql.jdbc.Connection")) { // mysql 5.0.x - class_ConnectionImpl = clazz; - } else if (clazz.getName().equals("com.mysql.cj.jdbc.ConnectionImpl")) { // mysql 5.0.x - class_ConnectionImpl = clazz; - } else if (clazz.getSuperclass().getName().equals("com.mysql.jdbc.ConnectionImpl")) { - class_ConnectionImpl = clazz.getSuperclass(); - } + if (clazz.getName().equals("com.mysql.jdbc.ConnectionImpl")) { + class_ConnectionImpl = clazz; + } else if (clazz.getName().equals("com.mysql.jdbc.Connection")) { // mysql 5.0.x + class_ConnectionImpl = clazz; + } else if (clazz.getName().equals("com.mysql.cj.jdbc.ConnectionImpl")) { // mysql 5.0.x + class_ConnectionImpl = clazz; + } else if (clazz.getSuperclass().getName().equals("com.mysql.jdbc.ConnectionImpl")) { + class_ConnectionImpl = clazz.getSuperclass(); } if (class_ConnectionImpl == clazz || class_ConnectionImpl == clazz.getSuperclass()) { @@ -387,7 +385,7 @@ public class MySqlUtils { } public static long getLastPacketReceivedTimeMs(Connection conn) throws SQLException { - if (class_connectionImpl == null && !class_connectionImpl_Error) { + if (!class_connectionImpl_Error) { try { class_connectionImpl = Utils.loadClass("com.mysql.jdbc.MySQLConnection"); if (class_connectionImpl == null) { @@ -406,9 +404,7 @@ public class MySqlUtils { } if(mysqlJdbcVersion6){ - if (classJdbc == null) { - classJdbc = Utils.loadClass("com.mysql.cj.jdbc.JdbcConnection"); - } + classJdbc = Utils.loadClass("com.mysql.cj.jdbc.JdbcConnection"); if (classJdbc == null) { return -1; @@ -441,7 +437,7 @@ public class MySqlUtils { throw new SQLException("getIdleFor error", e); } } else { - if (method_getIO == null && !method_getIO_error) { + if (!method_getIO_error) { try { method_getIO = class_connectionImpl.getMethod("getIO"); } catch (Throwable error) { @@ -453,7 +449,7 @@ public class MySqlUtils { return -1; } - if (class_MysqlIO == null && !class_MysqlIO_Error) { + if (!class_MysqlIO_Error) { try { class_MysqlIO = Utils.loadClass("com.mysql.jdbc.MysqlIO"); } catch (Throwable error) { @@ -465,7 +461,7 @@ public class MySqlUtils { return -1; } - if (method_getLastPacketReceivedTimeMs == null && !method_getLastPacketReceivedTimeMs_error) { + if (!method_getLastPacketReceivedTimeMs_error) { try { Method method = class_MysqlIO.getDeclaredMethod("getLastPacketReceivedTimeMs"); method.setAccessible(true); @@ -1988,4 +1984,4 @@ public class MySqlUtils { byte[] bytes = HexBin.decode(hex); return new String(bytes, BIG5); } -} +} \ No newline at end of file diff --git a/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/Utils.java b/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/Utils.java index 24457a9bf..c8ca0b0f5 100644 --- a/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/Utils.java +++ b/fine-druid/src/main/java/com/fr/third/alibaba/druid/util/Utils.java @@ -239,21 +239,21 @@ public class Utils { return null; } - try { - return Class.forName(className); - } catch (ClassNotFoundException e) { - // skip - } - ClassLoader ctxClassLoader = Thread.currentThread().getContextClassLoader(); if (ctxClassLoader != null) { try { - clazz = ctxClassLoader.loadClass(className); + return clazz = ctxClassLoader.loadClass(className); } catch (ClassNotFoundException e) { // skip } } + try { + clazz = Class.forName(className); + } catch (ClassNotFoundException e) { + // skip + } + return clazz; } diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Cache.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Cache.java index ddb995368..7a89a1d25 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Cache.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Cache.java @@ -99,8 +99,8 @@ import com.fr.third.net.sf.ehcache.writer.CacheWriterManagerException; import com.fr.third.net.sf.ehcache.constructs.nonstop.concurrency.LockOperationTimedOutNonstopException; import com.fr.third.net.sf.ehcache.store.TxCopyingCacheStore; import com.fr.third.net.sf.ehcache.util.PropertyUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.context.annotations.ContextAttribute; import org.terracotta.statistics.StatisticsManager; import org.terracotta.statistics.observer.OperationObserver; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/CacheManager.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/CacheManager.java index 1e6f1030b..e233a7813 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/CacheManager.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/CacheManager.java @@ -65,8 +65,8 @@ import com.fr.third.net.sf.ehcache.util.FailSafeTimer; import com.fr.third.net.sf.ehcache.util.PropertyUtil; import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehind; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.StatisticsManager; import java.io.File; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/DiskStorePathManager.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/DiskStorePathManager.java index af58ca54f..5bf7d8c9a 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/DiskStorePathManager.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/DiskStorePathManager.java @@ -27,8 +27,8 @@ import java.util.Set; import com.fr.third.net.sf.ehcache.config.DiskStoreConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Manager class to handle disk store path. CacheManager has a reference to this manager. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Element.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Element.java index 2ce30dd47..c4609891a 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Element.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/Element.java @@ -22,8 +22,8 @@ import com.fr.third.net.sf.ehcache.config.CacheConfiguration; import com.fr.third.net.sf.ehcache.pool.sizeof.annotations.IgnoreSizeOf; import com.fr.third.net.sf.ehcache.util.TimeUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/TransactionController.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/TransactionController.java index e5ea0db8e..af8dfef75 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/TransactionController.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/TransactionController.java @@ -22,9 +22,9 @@ import com.fr.third.net.sf.ehcache.transaction.local.LocalTransactionContext; import com.fr.third.net.sf.ehcache.util.lang.VicariousThreadLocal; import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException; import com.fr.third.net.sf.ehcache.transaction.local.LocalRecoveryManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.slf4j.MDC; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; +import com.fr.third.slf4j.MDC; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/BeanHandler.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/BeanHandler.java index b18afdc49..67c22bc42 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/BeanHandler.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/BeanHandler.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/CacheConfiguration.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/CacheConfiguration.java index b4a80d9ad..ab6224bd7 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/CacheConfiguration.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/CacheConfiguration.java @@ -33,8 +33,8 @@ import com.fr.third.net.sf.ehcache.event.NotificationScope; import com.fr.third.net.sf.ehcache.store.MemoryStoreEvictionPolicy; import com.fr.third.net.sf.ehcache.store.compound.ReadWriteCopyStrategy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/Configuration.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/Configuration.java index 20405af5b..5b0deb81d 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/Configuration.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/Configuration.java @@ -29,8 +29,8 @@ import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.ObjectExistsException; import com.fr.third.net.sf.ehcache.util.PropertyUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationFactory.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationFactory.java index 9ce60945d..d794ff95a 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationFactory.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationFactory.java @@ -33,8 +33,8 @@ import java.net.URL; import java.util.HashSet; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.xml.sax.InputSource; import java.util.regex.Matcher; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationHelper.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationHelper.java index fd5f7c94f..920322474 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationHelper.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/ConfigurationHelper.java @@ -43,8 +43,8 @@ import com.fr.third.net.sf.ehcache.exceptionhandler.CacheExceptionHandler; import com.fr.third.net.sf.ehcache.exceptionhandler.CacheExceptionHandlerFactory; import com.fr.third.net.sf.ehcache.util.PropertyUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * The configuration for ehcache. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/DiskStoreConfiguration.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/DiskStoreConfiguration.java index 4665671ce..9bbc3953e 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/DiskStoreConfiguration.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/DiskStoreConfiguration.java @@ -20,8 +20,8 @@ import java.io.File; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A class to represent DiskStore configuration diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/TerracottaConfiguration.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/TerracottaConfiguration.java index 175bcac0f..88272a52b 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/TerracottaConfiguration.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/config/TerracottaConfiguration.java @@ -16,8 +16,8 @@ package com.fr.third.net.sf.ehcache.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Class to hold the Terracotta configuration - either a pointer to the real config or a diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java index 54f743ca6..a87db2e92 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/SelfPopulatingCache.java @@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.constructs.blocking; import com.fr.third.net.sf.ehcache.Ehcache; import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.Element; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Collection; import java.util.Iterator; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java index 4ec54f3ee..c9c59fdfd 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/blocking/UpdatingSelfPopulatingCache.java @@ -25,8 +25,8 @@ import com.fr.third.net.sf.ehcache.concurrent.Sync; import com.fr.third.net.sf.ehcache.CacheException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/OverseerJob.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/OverseerJob.java index f514cb19f..185216700 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/OverseerJob.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/OverseerJob.java @@ -38,8 +38,8 @@ import com.fr.third.v2.org.quartz.SchedulerException; import com.fr.third.v2.org.quartz.Trigger; import com.fr.third.v2.org.quartz.TriggerBuilder; import com.fr.third.v2.org.quartz.impl.matchers.GroupMatcher; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * This is the seed job for a scheduled execution of a scheduled refresh job. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java index 0645fc539..9c8b1eb55 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/RefreshBatchJob.java @@ -24,8 +24,8 @@ import com.fr.third.v2.org.quartz.Job; import com.fr.third.v2.org.quartz.JobDataMap; import com.fr.third.v2.org.quartz.JobExecutionContext; import com.fr.third.v2.org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Collection; import java.util.HashMap; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/ScheduledRefreshCacheExtension.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/ScheduledRefreshCacheExtension.java index ab51f3c53..d8e1f0796 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/ScheduledRefreshCacheExtension.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/scheduledrefresh/ScheduledRefreshCacheExtension.java @@ -29,8 +29,8 @@ import com.fr.third.v2.org.quartz.Scheduler; import com.fr.third.v2.org.quartz.SchedulerException; import com.fr.third.v2.org.quartz.TriggerBuilder; import com.fr.third.v2.org.quartz.impl.StdSchedulerFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.StatisticsManager; import java.util.Collection; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/web/ShutdownListener.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/web/ShutdownListener.java index 5366cd34b..186634ac5 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/web/ShutdownListener.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/constructs/web/ShutdownListener.java @@ -17,8 +17,8 @@ package com.fr.third.net.sf.ehcache.constructs.web; import com.fr.third.net.sf.ehcache.CacheManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java index 6f496b021..6d70f76d9 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/ManualRMICacheManagerPeerProvider.java @@ -25,8 +25,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A provider of Peer RMI addresses based off manual configuration. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java index 53124a667..330cd1991 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatReceiver.java @@ -32,8 +32,8 @@ import java.util.concurrent.Executors; import com.fr.third.net.sf.ehcache.CacheManager; import com.fr.third.net.sf.ehcache.util.NamedThreadFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Receives heartbeats from any {@link MulticastKeepaliveHeartbeatSender}s out there. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java index b166df415..a1eeeab9e 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastKeepaliveHeartbeatSender.java @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Sends heartbeats to a multicast group containing a compressed list of URLs. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java index 0e58a65d4..dc0c749be 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/MulticastRMICacheManagerPeerProvider.java @@ -28,8 +28,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A peer provider which discovers peers using Multicast. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/PayloadUtil.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/PayloadUtil.java index 15aebc877..d2617c05f 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/PayloadUtil.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/PayloadUtil.java @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java index 5b2a23653..4306889ce 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIAsynchronousCacheReplicator.java @@ -31,8 +31,8 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import com.fr.third.net.sf.ehcache.distribution.RmiEventMessage.RmiEventType; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; /** * Listens to {@link CacheManager} and {@link Cache} events and propagates those to diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java index 29b4f4533..7bcf52077 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoader.java @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Loads Elements from a random Cache Peer diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java index 30d746ed7..05b898fdd 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMIBootstrapCacheLoaderFactory.java @@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.distribution; import com.fr.third.net.sf.ehcache.bootstrap.BootstrapCacheLoaderFactory; import com.fr.third.net.sf.ehcache.util.PropertyUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Properties; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java index cc009f898..437c59e58 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerListener.java @@ -41,8 +41,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A cache server which exposes available cache operations remotely through RMI. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java index 3d9d9097a..b7148f5c4 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProvider.java @@ -29,8 +29,8 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProviderFactory.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProviderFactory.java index 2c75e8fe9..3fcaf0460 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProviderFactory.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheManagerPeerProviderFactory.java @@ -25,8 +25,8 @@ import java.net.InetAddress; import java.util.Properties; import java.util.StringTokenizer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Builds a factory based on RMI diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICachePeer.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICachePeer.java index 655114ee6..6d2e064c3 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICachePeer.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICachePeer.java @@ -27,8 +27,8 @@ import java.rmi.server.UnicastRemoteObject; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * An RMI based implementation of CachePeer. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java index 68576af83..747131bd3 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMICacheReplicatorFactory.java @@ -22,8 +22,8 @@ import com.fr.third.net.sf.ehcache.util.PropertyUtil; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java index 7ff6e258f..aed114b82 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/distribution/RMISynchronousCacheReplicator.java @@ -26,8 +26,8 @@ import com.fr.third.net.sf.ehcache.CacheException; import java.io.Serializable; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Listens to {@link CacheManager} and {@link Cache} events and propagates those to diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java index c3f22c1e3..cabb743dc 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/exceptionhandler/ExceptionHandlingDynamicCacheProxy.java @@ -22,8 +22,8 @@ import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/DevModeClassLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/DevModeClassLoader.java index 406c8a9dc..8ab6ac052 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/DevModeClassLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/DevModeClassLoader.java @@ -32,8 +32,8 @@ import java.util.regex.Pattern; import com.fr.third.net.sf.ehcache.util.MergedEnumeration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Classloader used for devmode to load management classes diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementServerLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementServerLoader.java index 7fa32e6df..1ebf658da 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementServerLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementServerLoader.java @@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.management; import com.fr.third.net.sf.ehcache.CacheManager; import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.config.ManagementRESTServiceConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementService.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementService.java index 8b8cb5cdd..eedeaa2a7 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementService.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ManagementService.java @@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.event.CacheEventListener; import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.Status; import com.fr.third.net.sf.ehcache.event.CacheManagerEventListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ResourceClassLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ResourceClassLoader.java index 116811748..e02c482c6 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ResourceClassLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/ResourceClassLoader.java @@ -33,8 +33,8 @@ import java.util.jar.Attributes.Name; import com.fr.third.net.sf.ehcache.util.MergedEnumeration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * ResourceClassLoader can load classes nested in a subdirectory of a jar diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java index 98dd3c0fa..5488280aa 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImpl.java @@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory; import com.fr.third.net.sf.ehcache.management.resource.CacheConfigEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImplV2.java index 885a11cb2..4035646c0 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheConfigsResourceServiceImplV2.java @@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.resource.CacheConfigEntityV2; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.ResponseEntityV2; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java index d0d2082fb..ff87e4fe6 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImpl.java @@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.resource.CacheManagerConfigEntity; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImplV2.java index 4aeb1ca36..7c6484535 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagerConfigsResourceServiceImplV2.java @@ -3,8 +3,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.resource.CacheManagerConfigEntityV2; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.ResponseEntityV2; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImpl.java index 20070ee24..9eadaf236 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImpl.java @@ -4,8 +4,8 @@ import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntity; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory; import com.fr.third.net.sf.ehcache.management.service.CacheManagerService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceLocator; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImplV2.java index 80ee63f2f..3ad9de0e6 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheManagersResourceServiceImplV2.java @@ -4,8 +4,8 @@ import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntityV2; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2; import com.fr.third.net.sf.ehcache.management.service.CacheManagerServiceV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceLocator; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.resource.ResponseEntityV2; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImpl.java index cd64fa8ee..3a0973d59 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImpl.java @@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.resource.CacheStatisticSampleEntity; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImplV2.java index 7d1807fc6..6da51c9fa 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CacheStatisticSamplesResourceServiceImplV2.java @@ -18,8 +18,8 @@ import javax.ws.rs.core.UriInfo; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.ResponseEntityV2; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java index 349919aae..507fa3b77 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImpl.java @@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.management.service.CacheService; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactory; import com.fr.third.net.sf.ehcache.management.resource.CacheEntity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImplV2.java index 8e0380b63..3f03a9c07 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/CachesResourceServiceImplV2.java @@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.management.service.CacheServiceV2; import com.fr.third.net.sf.ehcache.management.service.EntityResourceFactoryV2; import com.fr.third.net.sf.ehcache.management.resource.CacheEntityV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.ResponseEntityV2; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImpl.java index 207fa1ba7..2b45415c3 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImpl.java @@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.service.CacheService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImplV2.java index 7f6b5cd0c..408c9b8b7 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/ElementsResourceServiceImplV2.java @@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.resource.services; import com.fr.third.net.sf.ehcache.management.service.CacheServiceV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImpl.java index 0162cbff6..44257faae 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImpl.java @@ -15,8 +15,8 @@ import javax.ws.rs.core.UriInfo; import com.fr.third.net.sf.ehcache.management.resource.QueryResultsEntity; import com.fr.third.net.sf.ehcache.management.service.CacheManagerService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.exceptions.ExceptionUtils; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImplV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImplV2.java index 389f82e97..a461a9423 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/resource/services/QueryResourceServiceImplV2.java @@ -13,8 +13,8 @@ import javax.ws.rs.core.UriInfo; import com.fr.third.net.sf.ehcache.management.service.CacheManagerServiceV2; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.ResponseEntityV2; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/CacheSamplerImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/CacheSamplerImpl.java index d5d865e52..744303566 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/CacheSamplerImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/CacheSamplerImpl.java @@ -36,8 +36,8 @@ import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter; import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledRateCounter; import com.fr.third.net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue; import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehindManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.archive.Timestamped; import java.util.ArrayList; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java index 4438b3e48..06b7b9fd3 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/sampled/SampledMBeanRegistrationProvider.java @@ -25,8 +25,8 @@ import com.fr.third.net.sf.ehcache.event.CacheManagerEventListener; import com.fr.third.net.sf.ehcache.management.provider.MBeanRegistrationProvider; import com.fr.third.net.sf.ehcache.management.provider.MBeanRegistrationProviderException; import com.fr.third.net.sf.ehcache.terracotta.ClusteredInstanceFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilder.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilder.java index 12e9f4a84..9e33b5541 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilder.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilder.java @@ -16,8 +16,8 @@ import com.fr.third.net.sf.ehcache.management.sampled.CacheSampler; import com.fr.third.net.sf.ehcache.management.resource.CacheEntity; import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.AgentEntity; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilderV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilderV2.java index 6b095e1f5..7e23ca453 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilderV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheEntityBuilderV2.java @@ -16,8 +16,8 @@ import com.fr.third.net.sf.ehcache.management.sampled.CacheSampler; import com.fr.third.net.sf.ehcache.management.resource.CacheEntityV2; import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.AgentEntityV2; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilder.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilder.java index 8301f9de2..e52e9fa26 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilder.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilder.java @@ -7,8 +7,8 @@ package com.fr.third.net.sf.ehcache.management.service.impl; import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntity; import com.fr.third.net.sf.ehcache.management.sampled.CacheManagerSampler; import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.AgentEntity; import java.util.ArrayList; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilderV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilderV2.java index c031e3b6b..efa13fb3b 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilderV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheManagerEntityBuilderV2.java @@ -8,8 +8,8 @@ import com.fr.third.net.sf.ehcache.management.resource.CacheManagerEntityV2; import com.fr.third.net.sf.ehcache.management.sampled.CacheManagerSampler; import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.AgentEntityV2; import java.util.ArrayList; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilder.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilder.java index 1fd4818ba..bf09e59e4 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilder.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilder.java @@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter; import com.fr.third.net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.AgentEntity; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java index aef7ad692..4f1d07e15 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/CacheStatisticSampleEntityBuilderV2.java @@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter; import com.fr.third.net.sf.ehcache.util.counter.sampled.TimeStampedCounterValue; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.AgentEntityV2; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupport.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupport.java index 1a1a63e41..5665b3afe 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupport.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupport.java @@ -7,7 +7,7 @@ package com.fr.third.net.sf.ehcache.management.service.impl; import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; import com.fr.third.net.sf.ehcache.util.counter.Counter; import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter; -import org.slf4j.Logger; +import com.fr.third.slf4j.Logger; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupportV2.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupportV2.java index 535440a4e..762e5cb33 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupportV2.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/ConstrainableEntityBuilderSupportV2.java @@ -17,7 +17,7 @@ import com.fr.third.net.sf.ehcache.util.counter.sampled.SampledCounter; import com.fr.third.net.sf.ehcache.management.service.AccessorPrefix; import com.fr.third.net.sf.ehcache.util.ManagementAttribute; -import org.slf4j.Logger; +import com.fr.third.slf4j.Logger; /** * @author brandony diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/RemoteAgentEndpointImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/RemoteAgentEndpointImpl.java index c1f8037b4..ffdac667c 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/RemoteAgentEndpointImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/management/service/impl/RemoteAgentEndpointImpl.java @@ -5,8 +5,8 @@ package com.fr.third.net.sf.ehcache.management.service.impl; import com.fr.third.net.sf.ehcache.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.l1bridge.AbstractRemoteAgentEndpointImpl; import javax.management.MBeanException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/impl/DefaultSizeOfEngine.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/impl/DefaultSizeOfEngine.java index 95e517cce..9d9d503e6 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/impl/DefaultSizeOfEngine.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/impl/DefaultSizeOfEngine.java @@ -36,8 +36,8 @@ import com.fr.third.net.sf.ehcache.pool.sizeof.ReflectionSizeOf; import com.fr.third.net.sf.ehcache.pool.sizeof.UnsafeSizeOf; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.CombinationSizeOfFilter; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.ResourceSizeOfFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * @author Alex Snaps diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/AgentLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/AgentLoader.java index 3dc42a6e1..9b39c8045 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/AgentLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/AgentLoader.java @@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.pool.sizeof; import com.fr.third.net.sf.ehcache.config.MemoryUnit; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.io.File; import java.io.FileOutputStream; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/JvmInformation.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/JvmInformation.java index bfaa7247e..9c24d1893 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/JvmInformation.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/JvmInformation.java @@ -23,8 +23,8 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.openmbean.CompositeData; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Detects and represents JVM-specific properties that relate to the memory diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ObjectGraphWalker.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ObjectGraphWalker.java index 1d1d9d622..8a053b5dd 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ObjectGraphWalker.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ObjectGraphWalker.java @@ -29,8 +29,8 @@ import java.util.Stack; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter; import com.fr.third.net.sf.ehcache.util.WeakIdentityConcurrentMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * This will walk an object graph and let you execute some "function" along the way diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ReflectionSizeOf.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ReflectionSizeOf.java index 9e260bdeb..3bc36f4fe 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ReflectionSizeOf.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/ReflectionSizeOf.java @@ -23,8 +23,8 @@ import java.util.Stack; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.PassThroughFilter; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * SizeOf that uses reflection to measure on heap size of object graphs diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/SizeOf.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/SizeOf.java index 692c45de9..d178ac251 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/SizeOf.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/SizeOf.java @@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.pool.Size; import com.fr.third.net.sf.ehcache.pool.sizeof.ObjectGraphWalker.Visitor; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter; import com.fr.third.net.sf.ehcache.util.WeakIdentityConcurrentMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/UnsafeSizeOf.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/UnsafeSizeOf.java index c9128d27a..417f0b50b 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/UnsafeSizeOf.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/UnsafeSizeOf.java @@ -22,8 +22,8 @@ import java.lang.reflect.Modifier; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.PassThroughFilter; import com.fr.third.net.sf.ehcache.pool.sizeof.filter.SizeOfFilter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import sun.misc.Unsafe; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/filter/AnnotationSizeOfFilter.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/filter/AnnotationSizeOfFilter.java index 70be15285..8a406fcff 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/filter/AnnotationSizeOfFilter.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/pool/sizeof/filter/AnnotationSizeOfFilter.java @@ -25,8 +25,8 @@ import java.lang.annotation.Annotation; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A Filter that will filter fields, based on the {@link IgnoreSizeOf} annotation diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/beans/ExtendedStatisticsMBean.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/beans/ExtendedStatisticsMBean.java index 428a86528..e39128d7b 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/beans/ExtendedStatisticsMBean.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/beans/ExtendedStatisticsMBean.java @@ -28,8 +28,8 @@ import java.util.concurrent.TimeUnit; import com.fr.third.net.sf.ehcache.Ehcache; import com.fr.third.net.sf.ehcache.statistics.extended.ExtendedStatistics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.ValueStatistic; import org.terracotta.statistics.archive.Timestamped; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/extended/ExtendedStatisticsImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/extended/ExtendedStatisticsImpl.java index e168d0cd4..01c62f0b3 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/extended/ExtendedStatisticsImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/statistics/extended/ExtendedStatisticsImpl.java @@ -31,8 +31,8 @@ import com.fr.third.net.sf.ehcache.store.StoreOperationOutcomes; import com.fr.third.net.sf.ehcache.transaction.xa.XaCommitOutcome; import com.fr.third.net.sf.ehcache.transaction.xa.XaRecoveryOutcome; import com.fr.third.net.sf.ehcache.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.context.TreeNode; import org.terracotta.context.query.Matcher; import org.terracotta.context.query.Matchers; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/CacheStore.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/CacheStore.java index ae81a9b59..163ba2c1d 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/CacheStore.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/CacheStore.java @@ -40,8 +40,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.context.annotations.ContextChild; /** diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoader.java index 370dc087f..f06d85a99 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoader.java @@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.store; import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.Ehcache; import com.fr.third.net.sf.ehcache.distribution.RemoteCacheException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Iterator; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoaderFactory.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoaderFactory.java index a68f2fe29..3f14aea9f 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoaderFactory.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/DiskStoreBootstrapCacheLoaderFactory.java @@ -17,8 +17,8 @@ package com.fr.third.net.sf.ehcache.store; import com.fr.third.net.sf.ehcache.bootstrap.BootstrapCacheLoaderFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Properties; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/LruMemoryStore.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/LruMemoryStore.java index fd9010d76..2534670c7 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/LruMemoryStore.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/LruMemoryStore.java @@ -28,8 +28,8 @@ import com.fr.third.net.sf.ehcache.pool.Size; import com.fr.third.net.sf.ehcache.pool.SizeOfEngine; import com.fr.third.net.sf.ehcache.pool.SizeOfEngineLoader; import com.fr.third.net.sf.ehcache.writer.CacheWriterManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Iterator; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStore.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStore.java index 91961ce6b..593bbc9b4 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStore.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStore.java @@ -44,8 +44,8 @@ import com.fr.third.net.sf.ehcache.search.impl.SearchManager; import com.fr.third.net.sf.ehcache.store.chm.SelectableConcurrentHashMap; import com.fr.third.net.sf.ehcache.writer.CacheWriterManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.OperationStatistic; import org.terracotta.statistics.Statistic; import org.terracotta.statistics.StatisticsManager; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java index 173661eff..0d14fbdf6 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/MemoryStoreEvictionPolicy.java @@ -19,8 +19,8 @@ package com.fr.third.net.sf.ehcache.store; import java.io.Serializable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A typesafe enumeration of eviction policies. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/CountBasedBackEnd.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/CountBasedBackEnd.java index 45d5264e7..deb46a11e 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/CountBasedBackEnd.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/CountBasedBackEnd.java @@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.store.LruPolicy; import com.fr.third.net.sf.ehcache.store.Policy; import com.fr.third.net.sf.ehcache.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.List; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/PooledBasedBackEnd.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/PooledBasedBackEnd.java index 9a244564b..2edcea835 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/PooledBasedBackEnd.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/cachingtier/PooledBasedBackEnd.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.observer.OperationObserver; import org.terracotta.statistics.OperationStatistic; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/DiskStorageFactory.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/DiskStorageFactory.java index d45c456ae..5d72ebdde 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/DiskStorageFactory.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/DiskStorageFactory.java @@ -53,8 +53,8 @@ import com.fr.third.net.sf.ehcache.util.MemoryEfficientByteArrayOutputStream; import com.fr.third.net.sf.ehcache.util.PreferredLoaderObjectInputStream; import com.fr.third.net.sf.ehcache.util.TimeUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A mock-up of a on-disk element proxy factory. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/Segment.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/Segment.java index 69fe08c02..fd74f80e5 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/Segment.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/Segment.java @@ -31,8 +31,8 @@ import com.fr.third.net.sf.ehcache.store.disk.DiskStorageFactory.DiskSubstitute; import com.fr.third.net.sf.ehcache.store.disk.DiskStorageFactory.Placeholder; import com.fr.third.net.sf.ehcache.util.FindBugsSuppressWarnings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.observer.OperationObserver; import java.io.Serializable; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/ods/FileAllocationTree.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/ods/FileAllocationTree.java index 883dba0ba..431357f83 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/ods/FileAllocationTree.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/store/disk/ods/FileAllocationTree.java @@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.store.disk.ods; import java.io.IOException; import java.io.RandomAccessFile; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * File allocation tree allows C-like alloc/free operations on a random access file. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/KeySnapshotter.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/KeySnapshotter.java index cfd0e2028..91be13c08 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/KeySnapshotter.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/KeySnapshotter.java @@ -23,8 +23,8 @@ import com.fr.third.net.sf.ehcache.Ehcache; import com.fr.third.net.sf.ehcache.store.Store; import com.fr.third.net.sf.ehcache.store.TerracottaStore; import com.fr.third.net.sf.ehcache.util.WeakIdentityConcurrentMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.io.IOException; import java.util.Collection; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/RotatingSnapshotFile.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/RotatingSnapshotFile.java index f2c54dc4e..4e4475632 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/RotatingSnapshotFile.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/RotatingSnapshotFile.java @@ -33,8 +33,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import com.fr.third.net.sf.ehcache.DiskStorePathManager; import com.fr.third.net.sf.ehcache.util.PreferredLoaderObjectInputStream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A file will rotate on every write, so to never loose older values in case of a JVM crash diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaBootstrapCacheLoader.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaBootstrapCacheLoader.java index eb2d440fc..4214570d1 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaBootstrapCacheLoader.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaBootstrapCacheLoader.java @@ -29,8 +29,8 @@ import com.fr.third.net.sf.ehcache.Status; import com.fr.third.net.sf.ehcache.distribution.RemoteCacheException; import com.fr.third.net.sf.ehcache.store.MemoryLimitedCacheLoader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A {@link BootstrapCacheLoader} that will load Elements into a Terracotta clustered cache, based on a previously diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaCacheCluster.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaCacheCluster.java index 522159b9f..734ec161b 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaCacheCluster.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaCacheCluster.java @@ -28,8 +28,8 @@ import com.fr.third.net.sf.ehcache.cluster.ClusterNode; import com.fr.third.net.sf.ehcache.cluster.ClusterScheme; import com.fr.third.net.sf.ehcache.cluster.ClusterTopologyListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * {@link CacheCluster} implementation that delegates to an underlying cache cluster. The underlying {@link CacheCluster} can be changed diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClient.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClient.java index 94bef3631..3f147a880 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClient.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClient.java @@ -21,8 +21,8 @@ import com.fr.third.net.sf.ehcache.cluster.CacheCluster; import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.config.TerracottaClientConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.lang.reflect.Method; import java.util.concurrent.ExecutorService; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClusteredInstanceHelper.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClusteredInstanceHelper.java index 30551d21c..a50d487eb 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClusteredInstanceHelper.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/terracotta/TerracottaClusteredInstanceHelper.java @@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.util.ClassLoaderUtil; import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.config.TerracottaClientConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * A small helper class that knows how to create terracotta store factories diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/JtaLocalTransactionStore.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/JtaLocalTransactionStore.java index bd704e3ec..e5f86260a 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/JtaLocalTransactionStore.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/JtaLocalTransactionStore.java @@ -31,8 +31,8 @@ import com.fr.third.net.sf.ehcache.transaction.xa.XATransactionContext; import com.fr.third.net.sf.ehcache.util.lang.VicariousThreadLocal; import com.fr.third.net.sf.ehcache.writer.CacheWriterManager; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Collection; import java.util.List; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionContext.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionContext.java index a06367023..5ee495c18 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionContext.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionContext.java @@ -20,8 +20,8 @@ import com.fr.third.net.sf.ehcache.transaction.TransactionException; import com.fr.third.net.sf.ehcache.transaction.TransactionID; import com.fr.third.net.sf.ehcache.transaction.TransactionIDFactory; import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collections; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionStore.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionStore.java index d26924347..9a2718316 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionStore.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/local/LocalTransactionStore.java @@ -36,8 +36,8 @@ import com.fr.third.net.sf.ehcache.transaction.SoftLockManager; import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException; import com.fr.third.net.sf.ehcache.util.LargeSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.HashSet; import java.util.Iterator; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/DefaultTransactionManagerLookup.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/DefaultTransactionManagerLookup.java index edb56db27..7cd5a3b81 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/DefaultTransactionManagerLookup.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/DefaultTransactionManagerLookup.java @@ -38,8 +38,8 @@ import com.fr.third.net.sf.ehcache.transaction.manager.selector.GlassfishSelecto import com.fr.third.net.sf.ehcache.transaction.manager.selector.WeblogicSelector; import com.fr.third.net.sf.ehcache.transaction.xa.EhcacheXAResource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Default {@link TransactionManagerLookup} implementation, that will be used by an {@link Cache#initialise() initializing} diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/BitronixSelector.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/BitronixSelector.java index 7483f5fda..0b3169856 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/BitronixSelector.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/BitronixSelector.java @@ -16,8 +16,8 @@ package com.fr.third.net.sf.ehcache.transaction.manager.selector; import com.fr.third.net.sf.ehcache.transaction.xa.EhcacheXAResource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.lang.reflect.Method; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/ClassSelector.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/ClassSelector.java index cf4664f02..3e1318565 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/ClassSelector.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/ClassSelector.java @@ -15,8 +15,8 @@ */ package com.fr.third.net.sf.ehcache.transaction.manager.selector; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import javax.transaction.TransactionManager; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/FactorySelector.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/FactorySelector.java index e4e554e73..1e69905eb 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/FactorySelector.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/FactorySelector.java @@ -15,8 +15,8 @@ */ package com.fr.third.net.sf.ehcache.transaction.manager.selector; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/JndiSelector.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/JndiSelector.java index 04bf15d52..423af4206 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/JndiSelector.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/JndiSelector.java @@ -15,8 +15,8 @@ */ package com.fr.third.net.sf.ehcache.transaction.manager.selector; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/WeblogicSelector.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/WeblogicSelector.java index 7c30d4941..1ff599c06 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/WeblogicSelector.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/manager/selector/WeblogicSelector.java @@ -16,8 +16,8 @@ package com.fr.third.net.sf.ehcache.transaction.manager.selector; import com.fr.third.net.sf.ehcache.transaction.xa.EhcacheXAResource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.lang.reflect.Method; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/EhcacheXAResourceImpl.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/EhcacheXAResourceImpl.java index 8143243ad..45181c01c 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/EhcacheXAResourceImpl.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/EhcacheXAResourceImpl.java @@ -30,8 +30,8 @@ import com.fr.third.net.sf.ehcache.transaction.manager.TransactionManagerLookup; import com.fr.third.net.sf.ehcache.transaction.xa.commands.Command; import com.fr.third.net.sf.ehcache.transaction.xa.processor.XARequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.observer.OperationObserver; import java.util.ArrayList; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionContext.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionContext.java index 7f1a4eea7..55fd4c9bc 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionContext.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionContext.java @@ -18,8 +18,8 @@ package com.fr.third.net.sf.ehcache.transaction.xa; import com.fr.third.net.sf.ehcache.store.Store; import com.fr.third.net.sf.ehcache.Element; import com.fr.third.net.sf.ehcache.transaction.xa.commands.Command; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.ArrayList; import java.util.Collection; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionStore.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionStore.java index c63a89e33..488a46c00 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionStore.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/transaction/xa/XATransactionStore.java @@ -37,8 +37,8 @@ import com.fr.third.net.sf.ehcache.transaction.TransactionTimeoutException; import com.fr.third.net.sf.ehcache.transaction.xa.commands.StoreRemoveCommand; import com.fr.third.net.sf.ehcache.util.LargeSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.observer.OperationObserver; import java.util.Iterator; diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/PropertyUtil.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/PropertyUtil.java index 409af0795..f58539d92 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/PropertyUtil.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/PropertyUtil.java @@ -22,8 +22,8 @@ import java.io.StringReader; import java.util.Map; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * Property utilities. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/SlewClock.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/SlewClock.java index a8e4c9a39..83361e8cf 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/SlewClock.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/SlewClock.java @@ -19,8 +19,8 @@ import com.fr.third.net.sf.ehcache.util.lang.VicariousThreadLocal; import java.util.concurrent.atomic.AtomicLong; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; /** * SlewClock will return the current time in millis, but will never go back in time. diff --git a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/Timestamper.java b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/Timestamper.java index 6fec2b100..dd8b0b624 100644 --- a/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/Timestamper.java +++ b/fine-ehcache/src/main/java/com/fr/third/net/sf/ehcache/util/Timestamper.java @@ -15,8 +15,8 @@ */ package com.fr.third.net.sf.ehcache.util; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.concurrent.atomic.AtomicLong; diff --git a/fine-ehcache/src/main/java/org/terracotta/context/ContextManager.java b/fine-ehcache/src/main/java/org/terracotta/context/ContextManager.java index b2ff33a08..57fa9869e 100644 --- a/fine-ehcache/src/main/java/org/terracotta/context/ContextManager.java +++ b/fine-ehcache/src/main/java/org/terracotta/context/ContextManager.java @@ -22,8 +22,8 @@ import java.util.Collections; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.context.annotations.ContextChild; import org.terracotta.context.annotations.ContextParent; import org.terracotta.context.extractor.ObjectContextExtractor; diff --git a/fine-ehcache/src/main/java/org/terracotta/context/WeakIdentityHashMap.java b/fine-ehcache/src/main/java/org/terracotta/context/WeakIdentityHashMap.java index 4aea989ad..2171cd6fa 100644 --- a/fine-ehcache/src/main/java/org/terracotta/context/WeakIdentityHashMap.java +++ b/fine-ehcache/src/main/java/org/terracotta/context/WeakIdentityHashMap.java @@ -20,8 +20,8 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; import java.util.concurrent.ConcurrentHashMap; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; public class WeakIdentityHashMap { diff --git a/fine-ehcache/src/main/java/org/terracotta/management/application/DefaultExceptionMapper.java b/fine-ehcache/src/main/java/org/terracotta/management/application/DefaultExceptionMapper.java index 6f64aae37..0bb0e1ecc 100644 --- a/fine-ehcache/src/main/java/org/terracotta/management/application/DefaultExceptionMapper.java +++ b/fine-ehcache/src/main/java/org/terracotta/management/application/DefaultExceptionMapper.java @@ -4,8 +4,8 @@ */ package org.terracotta.management.application; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.exceptions.ExceptionUtils; import javax.ws.rs.core.MediaType; diff --git a/fine-ehcache/src/main/java/org/terracotta/management/application/ResourceRuntimeExceptionMapper.java b/fine-ehcache/src/main/java/org/terracotta/management/application/ResourceRuntimeExceptionMapper.java index d37811ce4..44771f68b 100644 --- a/fine-ehcache/src/main/java/org/terracotta/management/application/ResourceRuntimeExceptionMapper.java +++ b/fine-ehcache/src/main/java/org/terracotta/management/application/ResourceRuntimeExceptionMapper.java @@ -4,8 +4,8 @@ */ package org.terracotta.management.application; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.resource.exceptions.ExceptionUtils; import org.terracotta.management.resource.exceptions.ResourceRuntimeException; diff --git a/fine-ehcache/src/main/java/org/terracotta/management/application/WebApplicationExceptionMapper.java b/fine-ehcache/src/main/java/org/terracotta/management/application/WebApplicationExceptionMapper.java index 29d856e73..a7f36abb5 100644 --- a/fine-ehcache/src/main/java/org/terracotta/management/application/WebApplicationExceptionMapper.java +++ b/fine-ehcache/src/main/java/org/terracotta/management/application/WebApplicationExceptionMapper.java @@ -4,8 +4,8 @@ */ package org.terracotta.management.application; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; diff --git a/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImpl.java b/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImpl.java index 90a1661e1..8e5c18558 100644 --- a/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImpl.java +++ b/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImpl.java @@ -2,8 +2,8 @@ package org.terracotta.management.resource.services; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.AgentEntity; diff --git a/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImplV2.java b/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImplV2.java index 2e9466c76..22870ee83 100644 --- a/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/org/terracotta/management/resource/services/AgentsResourceServiceImplV2.java @@ -2,8 +2,8 @@ package org.terracotta.management.resource.services; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceExecutionException; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.AgentEntityV2; diff --git a/fine-ehcache/src/main/java/org/terracotta/management/resource/services/events/AllEventsResourceServiceImplV2.java b/fine-ehcache/src/main/java/org/terracotta/management/resource/services/events/AllEventsResourceServiceImplV2.java index d6628a46b..0b3ac3b3d 100644 --- a/fine-ehcache/src/main/java/org/terracotta/management/resource/services/events/AllEventsResourceServiceImplV2.java +++ b/fine-ehcache/src/main/java/org/terracotta/management/resource/services/events/AllEventsResourceServiceImplV2.java @@ -8,8 +8,8 @@ import org.glassfish.jersey.media.sse.OutboundEvent; import org.glassfish.jersey.media.sse.SseBroadcaster; import org.glassfish.jersey.media.sse.SseFeature; import org.glassfish.jersey.server.ChunkedOutput; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.management.ServiceLocator; import org.terracotta.management.resource.events.EventEntityV2; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImpl.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImpl.java index 6a95bc40f..b69da5ce7 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImpl.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/ToolkitInstanceFactoryImpl.java @@ -14,8 +14,8 @@ import com.fr.third.net.sf.ehcache.config.generator.ConfigurationUtil; import com.fr.third.net.sf.ehcache.search.attribute.AttributeExtractor; import com.fr.third.net.sf.ehcache.transaction.Decision; import com.fr.third.net.sf.ehcache.transaction.TransactionID; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.async.AsyncConfig; import org.terracotta.modules.ehcache.collections.SerializationHelper; import org.terracotta.modules.ehcache.collections.SerializedToolkitCache; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java index 86f9e6b73..bd72a6018 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/WanAwareToolkitCache.java @@ -2,8 +2,8 @@ package org.terracotta.modules.ehcache; import com.fr.third.net.sf.ehcache.config.CacheConfiguration; import com.fr.third.net.sf.ehcache.config.NonstopConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.wan.Watchable; import org.terracotta.toolkit.cache.ToolkitCacheListener; import org.terracotta.toolkit.cluster.ClusterNode; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorImpl.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorImpl.java index 7214fd244..95a5ece05 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorImpl.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/AsyncCoordinatorImpl.java @@ -3,8 +3,8 @@ */ package org.terracotta.modules.ehcache.async; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactoryImpl; import org.terracotta.modules.ehcache.async.scatterpolicies.HashCodeScatterPolicy; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/ProcessingBucket.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/ProcessingBucket.java index 64f95027c..c8d451b72 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/ProcessingBucket.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/async/ProcessingBucket.java @@ -3,8 +3,8 @@ */ package org.terracotta.modules.ehcache.async; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.async.AsyncCoordinatorImpl.Callback; import org.terracotta.modules.ehcache.async.exceptions.ProcessingException; import org.terracotta.toolkit.cluster.ClusterInfo; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/ClusteredEventReplicator.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/ClusteredEventReplicator.java index 19f95e6c8..1dd1b6f69 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/ClusteredEventReplicator.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/ClusteredEventReplicator.java @@ -9,8 +9,8 @@ import com.fr.third.net.sf.ehcache.Element; import com.fr.third.net.sf.ehcache.event.CacheEventListener; import com.fr.third.net.sf.ehcache.event.RegisteredEventListeners; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.event.CacheEventNotificationMsg.EventType; import org.terracotta.toolkit.events.ToolkitNotificationEvent; import org.terracotta.toolkit.events.ToolkitNotificationListener; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/NonStopEventReplicator.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/NonStopEventReplicator.java index 8750b3d1e..acd0c2e45 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/NonStopEventReplicator.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/event/NonStopEventReplicator.java @@ -10,8 +10,8 @@ import com.fr.third.net.sf.ehcache.config.NonstopConfiguration; import com.fr.third.net.sf.ehcache.constructs.nonstop.NonStopCacheException; import com.fr.third.net.sf.ehcache.event.CacheEventListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.modules.ehcache.store.ToolkitNonStopExceptionOnTimeoutConfiguration; import org.terracotta.toolkit.ToolkitFeatureType; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridge.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridge.java index 28545dcc2..cf188c966 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridge.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/CacheConfigChangeBridge.java @@ -5,8 +5,8 @@ package org.terracotta.modules.ehcache.store; import com.fr.third.net.sf.ehcache.config.CacheConfiguration; import com.fr.third.net.sf.ehcache.config.CacheConfigurationListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.toolkit.cache.ToolkitCache; import org.terracotta.toolkit.config.Configuration; import org.terracotta.toolkit.events.ToolkitNotificationEvent; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/ClusteredStore.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/ClusteredStore.java index db01965b4..5754bae86 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/ClusteredStore.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/ClusteredStore.java @@ -38,8 +38,8 @@ import com.fr.third.net.sf.ehcache.util.SetAsList; import com.fr.third.net.sf.ehcache.writer.CacheWriterManager; import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehind; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ClusteredCacheInternalContext; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.modules.ehcache.concurrency.TCCacheLockProvider; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaClusteredInstanceFactory.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaClusteredInstanceFactory.java index afcc1c62e..9ee8de963 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaClusteredInstanceFactory.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaClusteredInstanceFactory.java @@ -18,8 +18,8 @@ import com.fr.third.net.sf.ehcache.transaction.TransactionIDFactory; import com.fr.third.net.sf.ehcache.util.ProductInfo; import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehind; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactoryImpl; import org.terracotta.modules.ehcache.async.AsyncConfig; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaStoreInitializationService.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaStoreInitializationService.java index aa2f7569b..456bfb91c 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaStoreInitializationService.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/TerracottaStoreInitializationService.java @@ -5,8 +5,8 @@ package org.terracotta.modules.ehcache.store; import com.fr.third.net.sf.ehcache.config.NonstopConfiguration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.toolkit.cluster.ClusterInfo; import java.util.concurrent.ExecutionException; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/nonstop/NonStopStoreWrapper.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/nonstop/NonStopStoreWrapper.java index 4bf54dc2c..3fa62feed 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/nonstop/NonStopStoreWrapper.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/store/nonstop/NonStopStoreWrapper.java @@ -30,8 +30,8 @@ import com.fr.third.net.sf.ehcache.writer.CacheWriterManager; import com.fr.third.net.sf.ehcache.writer.writebehind.NonStopWriteBehind; import com.fr.third.net.sf.ehcache.writer.writebehind.WriteBehind; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ClusteredCacheInternalContext; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.modules.ehcache.concurrency.NonStopCacheLockProvider; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/transaction/ClusteredTransactionIDFactory.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/transaction/ClusteredTransactionIDFactory.java index 3cdf8f5a9..6674c2eae 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/transaction/ClusteredTransactionIDFactory.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/transaction/ClusteredTransactionIDFactory.java @@ -13,8 +13,8 @@ import com.fr.third.net.sf.ehcache.transaction.TransactionIDSerializedForm; import com.fr.third.net.sf.ehcache.transaction.XidTransactionIDSerializedForm; import com.fr.third.net.sf.ehcache.transaction.xa.XidTransactionID; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.modules.ehcache.collections.SerializedToolkitCache; import org.terracotta.modules.ehcache.transaction.xa.ClusteredXidTransactionID; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/WANUtil.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/WANUtil.java index 590e095ca..bcc3a22f6 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/WANUtil.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/WANUtil.java @@ -3,8 +3,8 @@ */ package org.terracotta.modules.ehcache.wan; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.ToolkitInstanceFactory; import org.terracotta.toolkit.concurrent.locks.ToolkitLock; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/Watchdog.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/Watchdog.java index a9323cbc8..77e2ce8e1 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/Watchdog.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/wan/Watchdog.java @@ -1,7 +1,7 @@ package org.terracotta.modules.ehcache.wan; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; diff --git a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/writebehind/CacheWriterProcessor.java b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/writebehind/CacheWriterProcessor.java index 716c28725..ec0b10490 100644 --- a/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/writebehind/CacheWriterProcessor.java +++ b/fine-ehcache/src/main/java/org/terracotta/modules/ehcache/writebehind/CacheWriterProcessor.java @@ -8,8 +8,8 @@ import com.fr.third.net.sf.ehcache.CacheException; import com.fr.third.net.sf.ehcache.Element; import com.fr.third.net.sf.ehcache.writer.CacheWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.modules.ehcache.async.ItemProcessor; import org.terracotta.modules.ehcache.writebehind.operations.BatchAsyncOperation; import org.terracotta.modules.ehcache.writebehind.operations.DeleteAllAsyncOperation; diff --git a/fine-ehcache/src/main/java/org/terracotta/statistics/derived/LatencySampling.java b/fine-ehcache/src/main/java/org/terracotta/statistics/derived/LatencySampling.java index bedc7e9e5..e64c5f633 100644 --- a/fine-ehcache/src/main/java/org/terracotta/statistics/derived/LatencySampling.java +++ b/fine-ehcache/src/main/java/org/terracotta/statistics/derived/LatencySampling.java @@ -18,8 +18,8 @@ package org.terracotta.statistics.derived; import java.util.EnumSet; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import org.terracotta.statistics.AbstractSourceStatistic; import org.terracotta.statistics.jsr166e.ThreadLocalRandom; import org.terracotta.statistics.observer.ChainedEventObserver; diff --git a/fine-jboss-logging/pom.xml b/fine-jboss-logging/pom.xml index 702197f28..99db8427d 100644 --- a/fine-jboss-logging/pom.xml +++ b/fine-jboss-logging/pom.xml @@ -15,6 +15,11 @@ ${revision} + + com.fr.essential + fine-slf4j-api + ${essentialVersion} + com.fr.essential fine-log4j2 diff --git a/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLocationAwareLogger.java b/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLocationAwareLogger.java index 30263b9fd..023475745 100644 --- a/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLocationAwareLogger.java +++ b/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLocationAwareLogger.java @@ -22,7 +22,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.UndeclaredThrowableException; import java.text.MessageFormat; -import org.slf4j.spi.LocationAwareLogger; +import com.fr.third.slf4j.spi.LocationAwareLogger; final class Slf4jLocationAwareLogger extends Logger { diff --git a/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLogger.java b/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLogger.java index 0810c5dbf..c1d4a0bc0 100644 --- a/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLogger.java +++ b/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLogger.java @@ -24,9 +24,9 @@ final class Slf4jLogger extends Logger { private static final long serialVersionUID = 8685757928087758380L; - private final org.slf4j.Logger logger; + private final com.fr.third.slf4j.Logger logger; - Slf4jLogger(final String name, final org.slf4j.Logger logger) { + Slf4jLogger(final String name, final com.fr.third.slf4j.Logger logger) { super(name); this.logger = logger; } diff --git a/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLoggerProvider.java b/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLoggerProvider.java index 6337181f9..41cffa7f0 100644 --- a/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLoggerProvider.java +++ b/fine-jboss-logging/src/main/java/com/fr/third/org/jboss/logging/Slf4jLoggerProvider.java @@ -22,14 +22,14 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.slf4j.LoggerFactory; -import org.slf4j.MDC; -import org.slf4j.spi.LocationAwareLogger; +import com.fr.third.slf4j.LoggerFactory; +import com.fr.third.slf4j.MDC; +import com.fr.third.slf4j.spi.LocationAwareLogger; final class Slf4jLoggerProvider extends AbstractLoggerProvider implements LoggerProvider { public Logger getLogger(final String name) { - org.slf4j.Logger l = LoggerFactory.getLogger(name); + com.fr.third.slf4j.Logger l = LoggerFactory.getLogger(name); try { return new Slf4jLocationAwareLogger(name, (LocationAwareLogger) l); } catch (Throwable ignored) { diff --git a/fine-jgit/pom.xml b/fine-jgit/pom.xml index e43ef5c41..c1b077d1a 100644 --- a/fine-jgit/pom.xml +++ b/fine-jgit/pom.xml @@ -15,6 +15,11 @@ ${revision} + + com.fr.essential + fine-slf4j-api + ${essentialVersion} + com.fr.third httpclient diff --git a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java index b3fe82960..459861bf3 100644 --- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java +++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/internal/storage/file/ObjectDirectory.java @@ -62,8 +62,8 @@ import com.fr.third.eclipse.jgit.lib.RepositoryCache; import com.fr.third.eclipse.jgit.util.FS; import com.fr.third.eclipse.jgit.util.FileUtils; import com.fr.third.eclipse.jgit.lib.RepositoryCache.FileKey; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.File; diff --git a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS.java b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS.java index a43df504e..9f9568da0 100644 --- a/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS.java +++ b/fine-jgit/src/main/java/com/fr/third/eclipse/jgit/util/FS.java @@ -49,8 +49,8 @@ import com.fr.third.eclipse.jgit.internal.JGitText; import com.fr.third.eclipse.jgit.lib.Constants; import com.fr.third.eclipse.jgit.lib.Repository; import com.fr.third.eclipse.jgit.util.ProcessResult.Status; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import com.fr.third.slf4j.Logger; +import com.fr.third.slf4j.LoggerFactory; import java.io.BufferedReader; import java.io.BufferedWriter;