Pull request #4644: KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j

Merge in CORE/base-third from ~DYLAN.LIU/base-third:feature/x to feature/x

* commit '6c73c85aa780ffbb02d9834551671a75980edc39':
  KERNEL-9984 feat: 【产品改进】slf4j冲突或缺少slf4j

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;

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;

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.

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;

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;

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;

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;

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;

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;

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.

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

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

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;

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;
 
 
 /**

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.

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;

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;

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;

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.

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.

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.

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.

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;
 

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

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

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;
 

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.

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;
 
 
 /**

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

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 <code>CachePeer</code>.

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;
 
 
 /**

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

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;
 
 
 /**

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

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;

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;

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

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;
 
 /**

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;

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;

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;
 
 /**

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;
 
 /**

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;

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

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;

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

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;

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

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

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

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;
 
 
 /**

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;
 

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

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;
 

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;

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;
 
 /**

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;
 

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;
 

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;

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;

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.

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;

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;

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.

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;

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.

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;

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

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

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

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;

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

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;

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;

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;

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}

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;
 

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;
 

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;

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;

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;
 

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;

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;