From ed243e29e8b4476deb1fb732af31cbbb0e2db768 Mon Sep 17 00:00:00 2001 From: loy Date: Fri, 14 Sep 2018 15:39:57 +0800 Subject: [PATCH] =?UTF-8?q?DEC-4430=20ehcache=E4=B8=ADimport=E7=9A=84jboss?= =?UTF-8?q?=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java | 2 +- .../third/org/hibernate/cache/ehcache/EhCacheMessageLogger.java | 2 +- .../third/org/hibernate/cache/ehcache/EhCacheRegionFactory.java | 2 +- .../hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java | 2 +- .../internal/nonstop/HibernateNonstopCacheExceptionHandler.java | 2 +- .../cache/ehcache/internal/regions/EhcacheDataRegion.java | 2 +- .../ehcache/internal/regions/EhcacheGeneralDataRegion.java | 2 +- .../strategy/AbstractReadWriteEhcacheAccessStrategy.java | 2 +- .../internal/strategy/EhcacheAccessStrategyFactoryImpl.java | 2 +- .../cache/ehcache/internal/util/HibernateEhcacheUtils.java | 2 +- .../management/impl/EhcacheHibernateMBeanRegistrationImpl.java | 2 +- .../management/impl/ProviderMBeanRegistrationHelper.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java index 49c8df1a0..cbd8e1f8f 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/AbstractEhcacheRegionFactory.java @@ -36,7 +36,7 @@ import com.fr.third.org.hibernate.cache.spi.TimestampsRegion; import com.fr.third.org.hibernate.cache.spi.access.AccessType; import com.fr.third.org.hibernate.service.spi.InjectService; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * Abstract implementation of an Ehcache specific RegionFactory. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheMessageLogger.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheMessageLogger.java index 931a41734..a2cc67ad0 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheMessageLogger.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheMessageLogger.java @@ -14,7 +14,7 @@ import org.jboss.logging.annotations.LogMessage; import org.jboss.logging.annotations.Message; import org.jboss.logging.annotations.MessageLogger; -import static org.jboss.logging.Logger.Level.WARN; +import static com.fr.third.org.jboss.logging.Logger.Level.WARN; /** * The jboss-logging {@link MessageLogger} for the hibernate-ehcache module. It reserves message ids ranging from diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheRegionFactory.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheRegionFactory.java index 30517dab4..c132c6262 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheRegionFactory.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/EhCacheRegionFactory.java @@ -17,7 +17,7 @@ import com.fr.third.org.hibernate.boot.spi.SessionFactoryOptions; import com.fr.third.org.hibernate.cache.CacheException; import com.fr.third.org.hibernate.cache.ehcache.internal.util.HibernateEhcacheUtils; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * A non-singleton EhCacheRegionFactory implementation. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java index fd606495b..c57a629db 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/SingletonEhCacheRegionFactory.java @@ -18,7 +18,7 @@ import com.fr.third.org.hibernate.boot.spi.SessionFactoryOptions; import com.fr.third.org.hibernate.cache.CacheException; import com.fr.third.org.hibernate.cache.ehcache.internal.util.HibernateEhcacheUtils; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * A singleton EhCacheRegionFactory implementation. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/nonstop/HibernateNonstopCacheExceptionHandler.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/nonstop/HibernateNonstopCacheExceptionHandler.java index 94f628f31..bbb3a1785 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/nonstop/HibernateNonstopCacheExceptionHandler.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/nonstop/HibernateNonstopCacheExceptionHandler.java @@ -10,7 +10,7 @@ import com.fr.third.net.sf.ehcache.constructs.nonstop.NonStopCacheException; import com.fr.third.org.hibernate.cache.ehcache.EhCacheMessageLogger; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * Class that takes care of {@link NonStopCacheException} that happens in hibernate module diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheDataRegion.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheDataRegion.java index ee654a003..48d17e88d 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheDataRegion.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheDataRegion.java @@ -22,7 +22,7 @@ import com.fr.third.net.sf.ehcache.util.Timestamper; import com.fr.third.org.hibernate.cache.CacheException; import com.fr.third.org.hibernate.cache.spi.Region; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * An Ehcache specific data region implementation. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheGeneralDataRegion.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheGeneralDataRegion.java index d0fb4183f..3d206e4a9 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheGeneralDataRegion.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/regions/EhcacheGeneralDataRegion.java @@ -19,7 +19,7 @@ import com.fr.third.org.hibernate.cache.CacheException; import com.fr.third.org.hibernate.cache.spi.GeneralDataRegion; import com.fr.third.org.hibernate.engine.spi.SessionImplementor; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * An Ehcache specific GeneralDataRegion. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java index 8277528d2..be66c6509 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/AbstractReadWriteEhcacheAccessStrategy.java @@ -19,7 +19,7 @@ import com.fr.third.org.hibernate.cache.spi.access.RegionAccessStrategy; import com.fr.third.org.hibernate.cache.spi.access.SoftLock; import com.fr.third.org.hibernate.engine.spi.SessionImplementor; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * Superclass for all Ehcache specific read/write AccessStrategy implementations. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java index 203aa1fae..0290a867c 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/strategy/EhcacheAccessStrategyFactoryImpl.java @@ -15,7 +15,7 @@ import com.fr.third.org.hibernate.cache.spi.access.CollectionRegionAccessStrateg import com.fr.third.org.hibernate.cache.spi.access.EntityRegionAccessStrategy; import com.fr.third.org.hibernate.cache.spi.access.NaturalIdRegionAccessStrategy; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * Class implementing {@link EhcacheAccessStrategyFactory} diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java index a95973319..9a9ab98f9 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/internal/util/HibernateEhcacheUtils.java @@ -13,7 +13,7 @@ import com.fr.third.net.sf.ehcache.config.Configuration; import com.fr.third.net.sf.ehcache.config.ConfigurationFactory; import com.fr.third.net.sf.ehcache.config.NonstopConfiguration; import com.fr.third.net.sf.ehcache.config.TimeoutBehaviorConfiguration.TimeoutBehaviorType; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; import com.fr.third.org.hibernate.cache.ehcache.EhCacheMessageLogger; diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java index 03bf1d779..423e939e2 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/EhcacheHibernateMBeanRegistrationImpl.java @@ -21,7 +21,7 @@ import com.fr.third.org.hibernate.SessionFactory; import com.fr.third.org.hibernate.cache.ehcache.EhCacheMessageLogger; import com.fr.third.org.hibernate.cfg.Environment; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * Implementation of {@link EhcacheHibernateMBeanRegistration}. diff --git a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java index 11d1284e1..87df26e51 100644 --- a/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java +++ b/fine-ehcache/src/com/fr/third/org/hibernate/cache/ehcache/management/impl/ProviderMBeanRegistrationHelper.java @@ -20,7 +20,7 @@ import com.fr.third.org.hibernate.cache.CacheException; import com.fr.third.org.hibernate.cfg.Environment; import com.fr.third.org.hibernate.internal.SessionFactoryRegistry; -import org.jboss.logging.Logger; +import com.fr.third.org.jboss.logging.Logger; /** * Helper class for registering mbeans for ehcache backed hibernate second level cache