diff --git a/modules/portal/portal-cache-ehcache/src/com/liferay/portal/cache/ehcache/internal/MultiVMEhcachePortalCacheManager.java b/modules/portal/portal-cache-ehcache/src/com/liferay/portal/cache/ehcache/internal/MultiVMEhcachePortalCacheManager.java index 585f1c5517363d..b1be148d715a78 100644 --- a/modules/portal/portal-cache-ehcache/src/com/liferay/portal/cache/ehcache/internal/MultiVMEhcachePortalCacheManager.java +++ b/modules/portal/portal-cache-ehcache/src/com/liferay/portal/cache/ehcache/internal/MultiVMEhcachePortalCacheManager.java @@ -19,9 +19,9 @@ import com.liferay.portal.kernel.cache.PortalCacheManagerTypes; import com.liferay.portal.kernel.cache.configurator.PortalCacheConfiguratorSettings; import com.liferay.portal.kernel.util.AggregateClassLoader; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.Props; import com.liferay.portal.kernel.util.PropsKeys; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.Serializable; diff --git a/portal-impl/src/com/liferay/portal/action/JSONServiceAction.java b/portal-impl/src/com/liferay/portal/action/JSONServiceAction.java index 8d6ce22f8e8cab..af2d1385fad1f9 100644 --- a/portal-impl/src/com/liferay/portal/action/JSONServiceAction.java +++ b/portal-impl/src/com/liferay/portal/action/JSONServiceAction.java @@ -23,6 +23,7 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.LocaleUtil; @@ -37,7 +38,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.service.ServiceContextUtil; import com.liferay.portal.struts.JSONAction; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import java.lang.reflect.Method; diff --git a/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java b/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java index e57ae7aed36544..5cb4b104f6e4be 100644 --- a/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java +++ b/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java @@ -31,6 +31,7 @@ import com.liferay.portal.kernel.messaging.DestinationNames; import com.liferay.portal.kernel.messaging.Message; import com.liferay.portal.kernel.messaging.MessageBusUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.StackTraceUtil; import com.liferay.portal.kernel.util.StringUtil; @@ -38,7 +39,6 @@ import com.liferay.portal.model.BackgroundTask; import com.liferay.portal.service.BackgroundTaskLocalServiceUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.util.ClassLoaderUtil; /** * @author Michael C. Han diff --git a/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java b/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java index f117ce2afe2403..3e7a6c1bb5b1e0 100644 --- a/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java +++ b/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java @@ -18,9 +18,9 @@ import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil; import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil; import com.liferay.portal.kernel.util.ClassLoaderPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.MethodHandler; import com.liferay.portal.kernel.util.MethodKey; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import org.aopalliance.intercept.MethodInvocation; diff --git a/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java b/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java index 4a6e280ed85487..2af98817b7eaf6 100644 --- a/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java +++ b/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java @@ -14,7 +14,7 @@ package com.liferay.portal.bean; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; diff --git a/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java b/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java index 76a0eb4e4cfb62..2b29c22151a202 100644 --- a/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java +++ b/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java @@ -19,10 +19,10 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.security.pacl.DoPrivileged; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.PropsKeys; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/convert/ConvertDatabase.java b/portal-impl/src/com/liferay/portal/convert/ConvertDatabase.java index b1edf085f0c494..50f95e0c5b3a74 100644 --- a/portal-impl/src/com/liferay/portal/convert/ConvertDatabase.java +++ b/portal-impl/src/com/liferay/portal/convert/ConvertDatabase.java @@ -24,6 +24,7 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.servlet.ServletContextPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Tuple; @@ -32,7 +33,6 @@ import com.liferay.portal.service.ServiceComponentLocalServiceUtil; import com.liferay.portal.spring.hibernate.DialectDetector; import com.liferay.portal.upgrade.util.Table; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.MaintenanceUtil; import com.liferay.portal.util.ShutdownUtil; diff --git a/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java b/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java index f86c83b53d25fc..891ae2bac6af49 100644 --- a/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java @@ -23,6 +23,7 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.repository.model.FileEntry; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.ListUtil; @@ -33,7 +34,6 @@ import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Image; import com.liferay.portal.service.ImageLocalServiceUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.MaintenanceUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.documentlibrary.model.DLFileEntry; diff --git a/portal-impl/src/com/liferay/portal/dao/db/BaseDB.java b/portal-impl/src/com/liferay/portal/dao/db/BaseDB.java index b201cf1df7b56a..d2ab29fc48c9fb 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/BaseDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/BaseDB.java @@ -30,6 +30,7 @@ import com.liferay.portal.kernel.template.Template; import com.liferay.portal.kernel.template.TemplateConstants; import com.liferay.portal.kernel.template.TemplateManagerUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.StringBundler; @@ -37,7 +38,6 @@ import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.kernel.uuid.PortalUUIDUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.util.SimpleCounter; import java.io.File; diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java index 584096946c72d6..bf55ffcaa44804 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java @@ -22,13 +22,13 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.security.pacl.DoPrivileged; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.PropertiesUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.ServerDetector; import com.liferay.portal.kernel.util.SortedProperties; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.JarUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java index 92e86cb3a04f8b..f1ac525bce8700 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java @@ -21,8 +21,8 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.memory.FinalizeManager; import com.liferay.portal.kernel.security.pacl.permission.PortalRuntimePermission; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.security.lang.DoPrivilegedUtil; -import com.liferay.portal.util.ClassLoaderUtil; import java.security.PrivilegedAction; diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java index cae86bf774442e..3c3d69c7d9b1d9 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java @@ -21,8 +21,8 @@ import com.liferay.portal.kernel.dao.orm.SessionFactory; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.PreloadClassLoader; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import java.sql.Connection; diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/HotDeployImpl.java b/portal-impl/src/com/liferay/portal/deploy/hot/HotDeployImpl.java index c336bcbe6f48f8..b7738de5ec12e8 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/HotDeployImpl.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/HotDeployImpl.java @@ -26,6 +26,7 @@ import com.liferay.portal.kernel.servlet.ServletContextPool; import com.liferay.portal.kernel.template.TemplateManagerUtil; import com.liferay.portal.kernel.util.BasePortalLifecycle; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.HttpUtil; import com.liferay.portal.kernel.util.PortalLifecycle; import com.liferay.portal.kernel.util.PortalLifecycleUtil; @@ -33,7 +34,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.util.ClassLoaderUtil; import java.util.ArrayList; import java.util.Collections; diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java index ca5b2d7dad46ce..78dbe835e2f93d 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java @@ -17,8 +17,8 @@ import com.liferay.portal.kernel.deploy.hot.BaseHotDeployListener; import com.liferay.portal.kernel.deploy.hot.HotDeployEvent; import com.liferay.portal.kernel.deploy.hot.HotDeployException; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.spring.context.PortletContextLoaderListener; -import com.liferay.portal.util.ClassLoaderUtil; import java.util.HashMap; import java.util.Map; diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java index 78aeed0dfe85bf..e1c47604a9b5cb 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java @@ -22,10 +22,10 @@ import com.liferay.portal.kernel.servlet.FileTimestampUtil; import com.liferay.portal.kernel.template.TemplateConstants; import com.liferay.portal.kernel.template.TemplateResourceLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.HttpUtil; import com.liferay.portal.model.Theme; import com.liferay.portal.service.ThemeLocalServiceUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.WebKeys; import java.util.HashMap; diff --git a/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java b/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java index dcf8aaf3fee2ab..fa55c9d4159401 100644 --- a/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java +++ b/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java @@ -32,6 +32,7 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.servlet.ServletContextPool; import com.liferay.portal.kernel.util.BasePortalLifecycle; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.InfrastructureUtil; import com.liferay.portal.kernel.util.InstanceFactory; @@ -46,7 +47,6 @@ import com.liferay.portal.spring.context.PortalContextLoaderListener; import com.liferay.portal.struts.AuthPublicPathRegistry; import com.liferay.portal.util.BrowserLauncher; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/events/StartupHelper.java b/portal-impl/src/com/liferay/portal/events/StartupHelper.java index 78d3f81d0be371..1cc22cfbe86e59 100644 --- a/portal-impl/src/com/liferay/portal/events/StartupHelper.java +++ b/portal-impl/src/com/liferay/portal/events/StartupHelper.java @@ -22,12 +22,12 @@ import com.liferay.portal.kernel.upgrade.UpgradeException; import com.liferay.portal.kernel.upgrade.UpgradeProcess; import com.liferay.portal.kernel.upgrade.util.UpgradeProcessUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.ReleaseInfo; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.verify.VerifyException; import com.liferay.portal.verify.VerifyProcessUtil; diff --git a/portal-impl/src/com/liferay/portal/image/ImageMagickImpl.java b/portal-impl/src/com/liferay/portal/image/ImageMagickImpl.java index 9b0f0aa80c77f1..5038a4cf4ca0f0 100644 --- a/portal-impl/src/com/liferay/portal/image/ImageMagickImpl.java +++ b/portal-impl/src/com/liferay/portal/image/ImageMagickImpl.java @@ -19,12 +19,12 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.security.pacl.DoPrivileged; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.NamedThreadFactory; import com.liferay.portal.kernel.util.OSDetector; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsUtil; diff --git a/portal-impl/src/com/liferay/portal/increment/BufferedIncrementProcessor.java b/portal-impl/src/com/liferay/portal/increment/BufferedIncrementProcessor.java index 1b041132346f96..abc3349781396d 100644 --- a/portal-impl/src/com/liferay/portal/increment/BufferedIncrementProcessor.java +++ b/portal-impl/src/com/liferay/portal/increment/BufferedIncrementProcessor.java @@ -17,10 +17,10 @@ import com.liferay.portal.kernel.concurrent.BatchablePipe; import com.liferay.portal.kernel.increment.Increment; import com.liferay.portal.kernel.messaging.proxy.ProxyModeThreadLocal; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.NamedThreadFactory; import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.StringPool; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.Serializable; diff --git a/portal-impl/src/com/liferay/portal/javadoc/JavadocUtil.java b/portal-impl/src/com/liferay/portal/javadoc/JavadocUtil.java index 73befddfecbeb8..4d138dbfcc06e1 100644 --- a/portal-impl/src/com/liferay/portal/javadoc/JavadocUtil.java +++ b/portal-impl/src/com/liferay/portal/javadoc/JavadocUtil.java @@ -14,9 +14,9 @@ package com.liferay.portal.javadoc; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portal.util.ClassLoaderUtil; import java.util.Arrays; diff --git a/portal-impl/src/com/liferay/portal/jcr/JCRFactoryUtil.java b/portal-impl/src/com/liferay/portal/jcr/JCRFactoryUtil.java index 2cced2e3badde2..d971be68ace2be 100644 --- a/portal-impl/src/com/liferay/portal/jcr/JCRFactoryUtil.java +++ b/portal-impl/src/com/liferay/portal/jcr/JCRFactoryUtil.java @@ -17,8 +17,8 @@ import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil; import com.liferay.portal.kernel.memory.FinalizeManager; import com.liferay.portal.kernel.util.AutoResetThreadLocal; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ProxyUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import java.util.HashMap; diff --git a/portal-impl/src/com/liferay/portal/layoutconfiguration/util/JettyThreadLocalBinder.java b/portal-impl/src/com/liferay/portal/layoutconfiguration/util/JettyThreadLocalBinder.java index a402a62b20103c..8d5ab1b5c84575 100644 --- a/portal-impl/src/com/liferay/portal/layoutconfiguration/util/JettyThreadLocalBinder.java +++ b/portal-impl/src/com/liferay/portal/layoutconfiguration/util/JettyThreadLocalBinder.java @@ -14,9 +14,9 @@ package com.liferay.portal.layoutconfiguration.util; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.DefaultThreadLocalBinder; import com.liferay.portal.kernel.util.ServerDetector; -import com.liferay.portal.util.ClassLoaderUtil; /** * @author Shuyang Zhou diff --git a/portal-impl/src/com/liferay/portal/layoutconfiguration/util/RuntimePageImpl.java b/portal-impl/src/com/liferay/portal/layoutconfiguration/util/RuntimePageImpl.java index 3ddc3f8029c89a..09dd1c9fbf6f30 100644 --- a/portal-impl/src/com/liferay/portal/layoutconfiguration/util/RuntimePageImpl.java +++ b/portal-impl/src/com/liferay/portal/layoutconfiguration/util/RuntimePageImpl.java @@ -25,6 +25,7 @@ import com.liferay.portal.kernel.template.TemplateManager; import com.liferay.portal.kernel.template.TemplateManagerUtil; import com.liferay.portal.kernel.template.TemplateResource; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.JavaConstants; import com.liferay.portal.kernel.util.ObjectValuePair; @@ -43,7 +44,6 @@ import com.liferay.portal.model.Portlet; import com.liferay.portal.service.LayoutTemplateLocalServiceUtil; import com.liferay.portal.servlet.ThreadLocalFacadeServletRequestWrapperUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portal.util.WebKeys; import com.liferay.taglib.servlet.PipingServletResponse; diff --git a/portal-impl/src/com/liferay/portal/license/util/LicenseUtil.java b/portal-impl/src/com/liferay/portal/license/util/LicenseUtil.java index 14fb502f27591a..e6e7431214bc06 100644 --- a/portal-impl/src/com/liferay/portal/license/util/LicenseUtil.java +++ b/portal-impl/src/com/liferay/portal/license/util/LicenseUtil.java @@ -26,6 +26,7 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.util.Base64; import com.liferay.portal.kernel.util.CharPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.Constants; import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.FileUtil; @@ -38,7 +39,6 @@ import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/model/impl/BackgroundTaskImpl.java b/portal-impl/src/com/liferay/portal/model/impl/BackgroundTaskImpl.java index 1e21397e289efb..befbce3e6d02cd 100644 --- a/portal-impl/src/com/liferay/portal/model/impl/BackgroundTaskImpl.java +++ b/portal-impl/src/com/liferay/portal/model/impl/BackgroundTaskImpl.java @@ -20,6 +20,7 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.Folder; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; @@ -27,7 +28,6 @@ import com.liferay.portal.model.Repository; import com.liferay.portal.portletfilerepository.PortletFileRepositoryUtil; import com.liferay.portal.service.ServiceContext; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortletKeys; import com.liferay.portlet.documentlibrary.model.DLFolderConstants; diff --git a/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkAdapterHelper.java b/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkAdapterHelper.java index 52bbe9c7e693bc..05d254d183936d 100644 --- a/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkAdapterHelper.java +++ b/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkAdapterHelper.java @@ -16,13 +16,13 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.MethodKey; import com.liferay.portal.kernel.util.ReflectionUtil; import com.liferay.portal.kernel.util.ServiceLoader; import com.liferay.portal.security.lang.DoPrivilegedUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.FileImpl; import java.lang.reflect.Method; diff --git a/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkUtilAdapter.java b/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkUtilAdapter.java index 33e8a0fd090f74..ce1475aa9a6655 100644 --- a/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkUtilAdapter.java +++ b/portal-impl/src/com/liferay/portal/module/framework/ModuleFrameworkUtilAdapter.java @@ -15,7 +15,7 @@ package com.liferay.portal.module.framework; import com.liferay.portal.kernel.exception.PortalException; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import java.io.InputStream; diff --git a/portal-impl/src/com/liferay/portal/resiliency/spi/agent/SPIAgentSerializable.java b/portal-impl/src/com/liferay/portal/resiliency/spi/agent/SPIAgentSerializable.java index 13cce65830be9f..580d022c094869 100644 --- a/portal-impl/src/com/liferay/portal/resiliency/spi/agent/SPIAgentSerializable.java +++ b/portal-impl/src/com/liferay/portal/resiliency/spi/agent/SPIAgentSerializable.java @@ -26,11 +26,11 @@ import com.liferay.portal.kernel.resiliency.spi.agent.annotation.DistributedRegistry; import com.liferay.portal.kernel.servlet.HttpHeaders; import com.liferay.portal.kernel.util.ClassLoaderPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.ThreadLocalDistributor; import com.liferay.portal.kernel.util.ThreadLocalDistributorRegistry; import com.liferay.portal.model.Portlet; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.WebKeys; import java.io.EOFException; diff --git a/portal-impl/src/com/liferay/portal/scripting/ruby/RubyExecutor.java b/portal-impl/src/com/liferay/portal/scripting/ruby/RubyExecutor.java index 64db300808ebb0..209f37cf0c59d7 100644 --- a/portal-impl/src/com/liferay/portal/scripting/ruby/RubyExecutor.java +++ b/portal-impl/src/com/liferay/portal/scripting/ruby/RubyExecutor.java @@ -22,12 +22,12 @@ import com.liferay.portal.kernel.scripting.ScriptingException; import com.liferay.portal.kernel.scripting.ScriptingExecutor; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.NamedThreadFactory; import com.liferay.portal.kernel.util.ReflectionUtil; import com.liferay.portal.kernel.util.StringPool; import com.liferay.portal.kernel.util.SystemProperties; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import java.io.File; diff --git a/portal-impl/src/com/liferay/portal/security/lang/DoPrivilegedFactory.java b/portal-impl/src/com/liferay/portal/security/lang/DoPrivilegedFactory.java index 64ff635fc9bd4b..51fdfefedfbf80 100644 --- a/portal-impl/src/com/liferay/portal/security/lang/DoPrivilegedFactory.java +++ b/portal-impl/src/com/liferay/portal/security/lang/DoPrivilegedFactory.java @@ -18,9 +18,9 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.security.pacl.DoPrivileged; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.kernel.util.ReflectionUtil; -import com.liferay.portal.util.ClassLoaderUtil; import java.security.AccessController; import java.security.PrivilegedAction; diff --git a/portal-impl/src/com/liferay/portal/service/impl/LayoutLocalServiceStagingAdvice.java b/portal-impl/src/com/liferay/portal/service/impl/LayoutLocalServiceStagingAdvice.java index 08bb396608bde9..5d2eb0da1c3d23 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/LayoutLocalServiceStagingAdvice.java +++ b/portal-impl/src/com/liferay/portal/service/impl/LayoutLocalServiceStagingAdvice.java @@ -24,6 +24,7 @@ import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntry; import com.liferay.portal.kernel.systemevent.SystemEventHierarchyEntryThreadLocal; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.ParamUtil; @@ -48,7 +49,6 @@ import com.liferay.portal.service.persistence.LayoutUtil; import com.liferay.portal.staging.ProxiedLayoutsThreadLocal; import com.liferay.portal.staging.StagingAdvicesThreadLocal; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import java.lang.reflect.InvocationTargetException; diff --git a/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceStagingAdvice.java b/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceStagingAdvice.java index 3acffb2564e6f3..45e75004e69564 100644 --- a/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceStagingAdvice.java +++ b/portal-impl/src/com/liferay/portal/service/impl/LayoutSetLocalServiceStagingAdvice.java @@ -17,6 +17,7 @@ import com.liferay.portal.kernel.exception.PortalException; import com.liferay.portal.kernel.staging.LayoutStagingUtil; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ColorSchemeFactoryUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.kernel.util.ThemeFactoryUtil; @@ -27,7 +28,6 @@ import com.liferay.portal.model.LayoutSetStagingHandler; import com.liferay.portal.service.LayoutSetLocalService; import com.liferay.portal.staging.StagingAdvicesThreadLocal; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import java.lang.reflect.InvocationTargetException; diff --git a/portal-impl/src/com/liferay/portal/servlet/AxisServlet.java b/portal-impl/src/com/liferay/portal/servlet/AxisServlet.java index 51e981d19bcedd..02f15529fda16e 100644 --- a/portal-impl/src/com/liferay/portal/servlet/AxisServlet.java +++ b/portal-impl/src/com/liferay/portal/servlet/AxisServlet.java @@ -14,8 +14,8 @@ package com.liferay.portal.servlet; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.security.ac.AccessControlThreadLocal; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portal/servlet/ClassLoaderRequestDispatcherWrapper.java b/portal-impl/src/com/liferay/portal/servlet/ClassLoaderRequestDispatcherWrapper.java index fdf42551ad641e..5a6c41afa86dae 100644 --- a/portal-impl/src/com/liferay/portal/servlet/ClassLoaderRequestDispatcherWrapper.java +++ b/portal-impl/src/com/liferay/portal/servlet/ClassLoaderRequestDispatcherWrapper.java @@ -14,7 +14,7 @@ package com.liferay.portal.servlet; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portal/servlet/JSONServlet.java b/portal-impl/src/com/liferay/portal/servlet/JSONServlet.java index f086d9157dfea4..c783ed4a2f7354 100644 --- a/portal-impl/src/com/liferay/portal/servlet/JSONServlet.java +++ b/portal-impl/src/com/liferay/portal/servlet/JSONServlet.java @@ -18,9 +18,9 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.servlet.ServletResponseUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.security.ac.AccessControlThreadLocal; import com.liferay.portal.struts.JSONAction; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portal/servlet/MainServlet.java b/portal-impl/src/com/liferay/portal/servlet/MainServlet.java index 4e0209fbcb128f..d91dd053b67d8f 100644 --- a/portal-impl/src/com/liferay/portal/servlet/MainServlet.java +++ b/portal-impl/src/com/liferay/portal/servlet/MainServlet.java @@ -32,6 +32,7 @@ import com.liferay.portal.kernel.servlet.ProtectedServletRequest; import com.liferay.portal.kernel.template.TemplateConstants; import com.liferay.portal.kernel.template.TemplateManager; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.HttpUtil; @@ -81,7 +82,6 @@ import com.liferay.portal.setup.SetupWizardSampleDataUtil; import com.liferay.portal.struts.PortletRequestProcessor; import com.liferay.portal.struts.StrutsUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.ExtRegistry; import com.liferay.portal.util.MaintenanceUtil; import com.liferay.portal.util.PortalInstances; diff --git a/portal-impl/src/com/liferay/portal/servlet/filters/dynamiccss/DynamicCSSUtil.java b/portal-impl/src/com/liferay/portal/servlet/filters/dynamiccss/DynamicCSSUtil.java index b8fcf3367fdd9a..6e2d34ae50397a 100644 --- a/portal-impl/src/com/liferay/portal/servlet/filters/dynamiccss/DynamicCSSUtil.java +++ b/portal-impl/src/com/liferay/portal/servlet/filters/dynamiccss/DynamicCSSUtil.java @@ -18,6 +18,7 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.scripting.ScriptingContainer; import com.liferay.portal.kernel.util.CharPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ContextPathUtil; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.GetterUtil; @@ -37,7 +38,6 @@ import com.liferay.portal.service.ThemeLocalServiceUtil; import com.liferay.portal.theme.ThemeDisplay; import com.liferay.portal.tools.SassToCssBuilder; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.PropsValues; import com.liferay.sass.compiler.jni.JniSassCompiler; diff --git a/portal-impl/src/com/liferay/portal/spring/aop/DynamicProxyCreator.java b/portal-impl/src/com/liferay/portal/spring/aop/DynamicProxyCreator.java index fbdc0dbd7c301e..9c679036c8fdbf 100644 --- a/portal-impl/src/com/liferay/portal/spring/aop/DynamicProxyCreator.java +++ b/portal-impl/src/com/liferay/portal/spring/aop/DynamicProxyCreator.java @@ -14,9 +14,9 @@ package com.liferay.portal.spring.aop; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ObjectValuePair; import com.liferay.portal.kernel.util.ProxyUtil; -import com.liferay.portal.util.ClassLoaderUtil; import java.lang.reflect.InvocationHandler; diff --git a/portal-impl/src/com/liferay/portal/spring/context/PortalContextLoaderListener.java b/portal-impl/src/com/liferay/portal/spring/context/PortalContextLoaderListener.java index ecb91f2abeaa72..6c53a845b797ec 100644 --- a/portal-impl/src/com/liferay/portal/spring/context/PortalContextLoaderListener.java +++ b/portal-impl/src/com/liferay/portal/spring/context/PortalContextLoaderListener.java @@ -44,6 +44,7 @@ import com.liferay.portal.kernel.template.TemplateResourceLoaderUtil; import com.liferay.portal.kernel.util.CharPool; import com.liferay.portal.kernel.util.ClassLoaderPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClearThreadLocalUtil; import com.liferay.portal.kernel.util.ClearTimerThreadUtil; import com.liferay.portal.kernel.util.InstancePool; @@ -65,7 +66,6 @@ import com.liferay.portal.security.permission.PermissionCacheUtil; import com.liferay.portal.servlet.filters.cache.CacheUtil; import com.liferay.portal.spring.bean.BeanReferenceRefreshUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.InitUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portal.util.WebAppPool; diff --git a/portal-impl/src/com/liferay/portal/spring/context/PortletApplicationContext.java b/portal-impl/src/com/liferay/portal/spring/context/PortletApplicationContext.java index 9f6e36dbbdeeb4..fdbc7f0e548073 100644 --- a/portal-impl/src/com/liferay/portal/spring/context/PortletApplicationContext.java +++ b/portal-impl/src/com/liferay/portal/spring/context/PortletApplicationContext.java @@ -22,11 +22,11 @@ import com.liferay.portal.kernel.portlet.PortletClassLoaderUtil; import com.liferay.portal.kernel.util.AggregateClassLoader; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ListUtil; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.security.lang.DoPrivilegedFactory; import com.liferay.portal.spring.util.FilterClassLoader; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.FileNotFoundException; diff --git a/portal-impl/src/com/liferay/portal/spring/hibernate/PortalHibernateConfiguration.java b/portal-impl/src/com/liferay/portal/spring/hibernate/PortalHibernateConfiguration.java index 1ee4fe6c6301b2..e406e06e3d1116 100644 --- a/portal-impl/src/com/liferay/portal/spring/hibernate/PortalHibernateConfiguration.java +++ b/portal-impl/src/com/liferay/portal/spring/hibernate/PortalHibernateConfiguration.java @@ -21,12 +21,12 @@ import com.liferay.portal.kernel.io.unsync.UnsyncByteArrayInputStream; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.Converter; import com.liferay.portal.kernel.util.PreloadClassLoader; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/spring/transaction/TransactionManagerFactory.java b/portal-impl/src/com/liferay/portal/spring/transaction/TransactionManagerFactory.java index 8070a9755a51c7..7c096c09a2d5d9 100644 --- a/portal-impl/src/com/liferay/portal/spring/transaction/TransactionManagerFactory.java +++ b/portal-impl/src/com/liferay/portal/spring/transaction/TransactionManagerFactory.java @@ -18,9 +18,9 @@ import com.liferay.portal.kernel.dao.shard.ShardSessionFactoryTargetSource; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.SortedProperties; import com.liferay.portal.spring.hibernate.LastSessionRecorderHibernateTransactionManager; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/spring/util/FilterClassLoader.java b/portal-impl/src/com/liferay/portal/spring/util/FilterClassLoader.java index 960f8106bc7d15..63b31857b4ea87 100644 --- a/portal-impl/src/com/liferay/portal/spring/util/FilterClassLoader.java +++ b/portal-impl/src/com/liferay/portal/spring/util/FilterClassLoader.java @@ -14,7 +14,7 @@ package com.liferay.portal.spring.util; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; /** * @author Brian Wing Shun Chan diff --git a/portal-impl/src/com/liferay/portal/spring/util/SpringFactoryImpl.java b/portal-impl/src/com/liferay/portal/spring/util/SpringFactoryImpl.java index 9db8f56ca52599..860f862b032f22 100644 --- a/portal-impl/src/com/liferay/portal/spring/util/SpringFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/spring/util/SpringFactoryImpl.java @@ -19,10 +19,10 @@ import com.liferay.portal.kernel.spring.util.FactoryBean; import com.liferay.portal.kernel.spring.util.SpringFactory; import com.liferay.portal.kernel.spring.util.SpringFactoryException; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.SetUtil; import com.liferay.portal.kernel.util.StringUtil; -import com.liferay.portal.util.ClassLoaderUtil; import java.util.HashMap; import java.util.Map; diff --git a/portal-impl/src/com/liferay/portal/struts/StrutsActionAdapter.java b/portal-impl/src/com/liferay/portal/struts/StrutsActionAdapter.java index eea4dbe3beb0d5..e6c53d4896e9b1 100644 --- a/portal-impl/src/com/liferay/portal/struts/StrutsActionAdapter.java +++ b/portal-impl/src/com/liferay/portal/struts/StrutsActionAdapter.java @@ -15,7 +15,7 @@ package com.liferay.portal.struts; import com.liferay.portal.kernel.struts.BaseStrutsAction; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/portal-impl/src/com/liferay/portal/struts/StrutsPortletActionAdapter.java b/portal-impl/src/com/liferay/portal/struts/StrutsPortletActionAdapter.java index b8c4fbcb11b8da..e0e3badda958f9 100644 --- a/portal-impl/src/com/liferay/portal/struts/StrutsPortletActionAdapter.java +++ b/portal-impl/src/com/liferay/portal/struts/StrutsPortletActionAdapter.java @@ -15,7 +15,7 @@ package com.liferay.portal.struts; import com.liferay.portal.kernel.struts.BaseStrutsPortletAction; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; diff --git a/portal-impl/src/com/liferay/portal/template/TemplateContextHelper.java b/portal-impl/src/com/liferay/portal/template/TemplateContextHelper.java index abf86fa84cd677..2643f01d583ec1 100644 --- a/portal-impl/src/com/liferay/portal/template/TemplateContextHelper.java +++ b/portal-impl/src/com/liferay/portal/template/TemplateContextHelper.java @@ -33,6 +33,7 @@ import com.liferay.portal.kernel.template.TemplateVariableGroup; import com.liferay.portal.kernel.util.ArrayUtil_IW; import com.liferay.portal.kernel.util.CalendarFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.DateUtil_IW; import com.liferay.portal.kernel.util.FastDateFormatFactoryUtil; import com.liferay.portal.kernel.util.GetterUtil; @@ -75,7 +76,6 @@ import com.liferay.portal.service.permission.UserPermissionUtil; import com.liferay.portal.theme.NavItem; import com.liferay.portal.theme.ThemeDisplay; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.SessionClicks_IW; import com.liferay.portal.util.WebKeys; diff --git a/portal-impl/src/com/liferay/portal/tools/deploy/DeploymentHandler.java b/portal-impl/src/com/liferay/portal/tools/deploy/DeploymentHandler.java index 44603fbef824f1..0166ab3081aa7f 100644 --- a/portal-impl/src/com/liferay/portal/tools/deploy/DeploymentHandler.java +++ b/portal-impl/src/com/liferay/portal/tools/deploy/DeploymentHandler.java @@ -16,7 +16,7 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import java.io.File; diff --git a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java index 3f2cee3ae8739f..7119759d2eb535 100644 --- a/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java +++ b/portal-impl/src/com/liferay/portal/upgrade/v6_1_0/UpgradeImageGallery.java @@ -26,6 +26,7 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.upgrade.UpgradeProcess; import com.liferay.portal.kernel.util.Base64; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.MimeTypesUtil; import com.liferay.portal.kernel.util.StringBundler; @@ -35,7 +36,6 @@ import com.liferay.portal.model.Company; import com.liferay.portal.model.Image; import com.liferay.portal.service.ImageLocalServiceUtil; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortalUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.documentlibrary.model.DLFileEntry; diff --git a/portal-impl/src/com/liferay/portal/util/FileImpl.java b/portal-impl/src/com/liferay/portal/util/FileImpl.java index 521b408c20afd6..8eeab7a363a4cd 100644 --- a/portal-impl/src/com/liferay/portal/util/FileImpl.java +++ b/portal-impl/src/com/liferay/portal/util/FileImpl.java @@ -28,6 +28,7 @@ import com.liferay.portal.kernel.security.pacl.DoPrivileged; import com.liferay.portal.kernel.util.ArrayUtil; import com.liferay.portal.kernel.util.CharPool; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.Digester; import com.liferay.portal.kernel.util.DigesterUtil; import com.liferay.portal.kernel.util.FileComparator; diff --git a/portal-impl/src/com/liferay/portal/util/InitUtil.java b/portal-impl/src/com/liferay/portal/util/InitUtil.java index a8cc1d5258838d..c64d9bfc9b6906 100644 --- a/portal-impl/src/com/liferay/portal/util/InitUtil.java +++ b/portal-impl/src/com/liferay/portal/util/InitUtil.java @@ -27,6 +27,7 @@ import com.liferay.portal.kernel.dao.jdbc.DataSourceFactoryUtil; import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.log.SanitizerLogWrapper; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.ListUtil; import com.liferay.portal.kernel.util.LocaleUtil; diff --git a/portal-impl/src/com/liferay/portal/util/LayoutCloneFactory.java b/portal-impl/src/com/liferay/portal/util/LayoutCloneFactory.java index 8213ed6cb7bcc4..b398a99300de26 100644 --- a/portal-impl/src/com/liferay/portal/util/LayoutCloneFactory.java +++ b/portal-impl/src/com/liferay/portal/util/LayoutCloneFactory.java @@ -16,6 +16,7 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.Validator; /** diff --git a/portal-impl/src/com/liferay/portal/util/LocalizationImpl.java b/portal-impl/src/com/liferay/portal/util/LocalizationImpl.java index 6ff62738b4324e..5e922d5168c23c 100644 --- a/portal-impl/src/com/liferay/portal/util/LocalizationImpl.java +++ b/portal-impl/src/com/liferay/portal/util/LocalizationImpl.java @@ -24,6 +24,7 @@ import com.liferay.portal.kernel.settings.LocalizedValuesMap; import com.liferay.portal.kernel.settings.Settings; import com.liferay.portal.kernel.util.ArrayUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.LocaleUtil; import com.liferay.portal.kernel.util.Localization; import com.liferay.portal.kernel.util.ParamUtil; diff --git a/portal-impl/src/com/liferay/portal/util/PropsUtilTask.java b/portal-impl/src/com/liferay/portal/util/PropsUtilTask.java index 654e39460ebd05..8e02da2e7e58fc 100644 --- a/portal-impl/src/com/liferay/portal/util/PropsUtilTask.java +++ b/portal-impl/src/com/liferay/portal/util/PropsUtilTask.java @@ -14,6 +14,8 @@ package com.liferay.portal.util; +import com.liferay.portal.kernel.util.ClassLoaderUtil; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; diff --git a/portal-impl/src/com/liferay/portal/verify/VerifyProcess.java b/portal-impl/src/com/liferay/portal/verify/VerifyProcess.java index aaf484f61eddee..74c03bbcb5886c 100644 --- a/portal-impl/src/com/liferay/portal/verify/VerifyProcess.java +++ b/portal-impl/src/com/liferay/portal/verify/VerifyProcess.java @@ -20,10 +20,10 @@ import com.liferay.portal.kernel.exception.BulkException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.StringUtil; import com.liferay.portal.model.ReleaseConstants; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import java.sql.Connection; diff --git a/portal-impl/src/com/liferay/portal/xml/SAXReaderImpl.java b/portal-impl/src/com/liferay/portal/xml/SAXReaderImpl.java index 54659f9c96f0f3..af9ca12f1ef527 100644 --- a/portal-impl/src/com/liferay/portal/xml/SAXReaderImpl.java +++ b/portal-impl/src/com/liferay/portal/xml/SAXReaderImpl.java @@ -15,6 +15,7 @@ package com.liferay.portal.xml; import com.liferay.portal.kernel.security.pacl.DoPrivileged; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.xml.Attribute; import com.liferay.portal.kernel.xml.Document; import com.liferay.portal.kernel.xml.DocumentException; @@ -30,7 +31,6 @@ import com.liferay.portal.kernel.xml.XPath; import com.liferay.portal.security.xml.SecureXMLFactoryProvider; import com.liferay.portal.security.xml.SecureXMLFactoryProviderImpl; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import com.liferay.util.xml.XMLSafeReader; diff --git a/portal-impl/src/com/liferay/portal/xuggler/XugglerImpl.java b/portal-impl/src/com/liferay/portal/xuggler/XugglerImpl.java index a32e058c05f290..9fd20835217077 100644 --- a/portal-impl/src/com/liferay/portal/xuggler/XugglerImpl.java +++ b/portal-impl/src/com/liferay/portal/xuggler/XugglerImpl.java @@ -16,12 +16,12 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ProgressStatusConstants; import com.liferay.portal.kernel.util.ProgressTracker; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.xuggler.Xuggler; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.JarUtil; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portal/zip/ZipReaderFactoryImpl.java b/portal-impl/src/com/liferay/portal/zip/ZipReaderFactoryImpl.java index e8c368d2962f73..dc0113f86b72e0 100644 --- a/portal-impl/src/com/liferay/portal/zip/ZipReaderFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/zip/ZipReaderFactoryImpl.java @@ -14,9 +14,9 @@ package com.liferay.portal.zip; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.zip.ZipReader; import com.liferay.portal.kernel.zip.ZipReaderFactory; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.File; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portal/zip/ZipWriterFactoryImpl.java b/portal-impl/src/com/liferay/portal/zip/ZipWriterFactoryImpl.java index eb0e3b2d24e1ad..68e3a3ac5ebe69 100644 --- a/portal-impl/src/com/liferay/portal/zip/ZipWriterFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/zip/ZipWriterFactoryImpl.java @@ -14,9 +14,9 @@ package com.liferay.portal.zip; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.zip.ZipWriter; import com.liferay.portal.kernel.zip.ZipWriterFactory; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.File; diff --git a/portal-impl/src/com/liferay/portlet/InvokerFilterContainerImpl.java b/portal-impl/src/com/liferay/portlet/InvokerFilterContainerImpl.java index 85dfcff25604ee..0879ac4d30bc87 100644 --- a/portal-impl/src/com/liferay/portlet/InvokerFilterContainerImpl.java +++ b/portal-impl/src/com/liferay/portlet/InvokerFilterContainerImpl.java @@ -16,11 +16,11 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.model.Portlet; import com.liferay.portal.model.impl.PortletFilterImpl; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import com.liferay.registry.Filter; import com.liferay.registry.Registry; diff --git a/portal-impl/src/com/liferay/portlet/InvokerPortletImpl.java b/portal-impl/src/com/liferay/portlet/InvokerPortletImpl.java index 5648ef8c157f71..c86208db93f38a 100644 --- a/portal-impl/src/com/liferay/portlet/InvokerPortletImpl.java +++ b/portal-impl/src/com/liferay/portlet/InvokerPortletImpl.java @@ -24,6 +24,7 @@ import com.liferay.portal.kernel.portlet.PortletFilterUtil; import com.liferay.portal.kernel.servlet.BufferCacheServletResponse; import com.liferay.portal.kernel.servlet.PortletServlet; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.JavaConstants; @@ -37,7 +38,6 @@ import com.liferay.portal.model.PortletConstants; import com.liferay.portal.service.PortletLocalServiceUtil; import com.liferay.portal.tools.deploy.PortletDeployer; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.WebKeys; import java.io.Closeable; diff --git a/portal-impl/src/com/liferay/portlet/PortletInstanceFactoryImpl.java b/portal-impl/src/com/liferay/portlet/PortletInstanceFactoryImpl.java index 1a0610fa39b3bc..06dd0003d943c3 100644 --- a/portal-impl/src/com/liferay/portlet/PortletInstanceFactoryImpl.java +++ b/portal-impl/src/com/liferay/portlet/PortletInstanceFactoryImpl.java @@ -17,11 +17,11 @@ import com.liferay.portal.kernel.portlet.PortletBag; import com.liferay.portal.kernel.portlet.PortletBagPool; import com.liferay.portal.kernel.security.pacl.DoPrivileged; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.model.Portlet; import com.liferay.portal.model.PortletApp; import com.liferay.portal.model.PortletConstants; import com.liferay.portal.service.PortletLocalServiceUtil; -import com.liferay.portal.util.ClassLoaderUtil; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/portal-impl/src/com/liferay/portlet/PortletServletRequest.java b/portal-impl/src/com/liferay/portlet/PortletServletRequest.java index d0bf0ec38507c0..f2b45904ede156 100644 --- a/portal-impl/src/com/liferay/portlet/PortletServletRequest.java +++ b/portal-impl/src/com/liferay/portlet/PortletServletRequest.java @@ -18,11 +18,11 @@ import com.liferay.portal.kernel.log.LogFactoryUtil; import com.liferay.portal.kernel.servlet.HttpMethods; import com.liferay.portal.kernel.servlet.ServletInputStreamAdapter; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.GetterUtil; import com.liferay.portal.kernel.util.JavaConstants; import com.liferay.portal.kernel.util.ServerDetector; import com.liferay.portal.kernel.util.Validator; -import com.liferay.portal.util.ClassLoaderUtil; import java.io.BufferedReader; import java.io.IOException; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java b/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java index 7784039b2c5c60..634d67783e92bc 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/store/StoreFactory.java @@ -19,6 +19,7 @@ import com.liferay.portal.kernel.dao.db.DBFactoryUtil; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ClassUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.PropsKeys; @@ -26,7 +27,6 @@ import com.liferay.portal.kernel.util.StringBundler; import com.liferay.portal.kernel.util.Validator; import com.liferay.portal.spring.aop.MethodInterceptorInvocationHandler; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsUtil; import com.liferay.portal.util.PropsValues; diff --git a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java index e687481d405cf4..18540751c3bad1 100644 --- a/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java +++ b/portal-impl/src/com/liferay/portlet/documentlibrary/util/DLProcessorRegistryImpl.java @@ -20,11 +20,11 @@ import com.liferay.portal.kernel.repository.model.FileEntry; import com.liferay.portal.kernel.repository.model.FileVersion; import com.liferay.portal.kernel.security.pacl.DoPrivileged; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.InstanceFactory; import com.liferay.portal.kernel.util.PropsKeys; import com.liferay.portal.kernel.util.PropsUtil; import com.liferay.portal.kernel.xml.Element; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PrefsPropsUtil; import com.liferay.portal.util.PropsValues; import com.liferay.registry.Registry; diff --git a/portal-impl/src/com/liferay/portlet/journal/lar/JournalCreationStrategyFactory.java b/portal-impl/src/com/liferay/portlet/journal/lar/JournalCreationStrategyFactory.java index b499211bc54aa6..1d5b8c3f53efc6 100644 --- a/portal-impl/src/com/liferay/portlet/journal/lar/JournalCreationStrategyFactory.java +++ b/portal-impl/src/com/liferay/portlet/journal/lar/JournalCreationStrategyFactory.java @@ -16,7 +16,7 @@ import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; /** diff --git a/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBStatsUserLocalServiceImpl.java b/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBStatsUserLocalServiceImpl.java index df2f7ecf51e1bd..8abc7c4374eefb 100644 --- a/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBStatsUserLocalServiceImpl.java +++ b/portal-impl/src/com/liferay/portlet/messageboards/service/impl/MBStatsUserLocalServiceImpl.java @@ -27,9 +27,9 @@ import com.liferay.portal.kernel.exception.SystemException; import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.workflow.WorkflowConstants; import com.liferay.portal.model.Group; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portlet.messageboards.model.MBStatsUser; import com.liferay.portlet.messageboards.model.MBThread; import com.liferay.portlet.messageboards.model.impl.MBStatsUserImpl; diff --git a/portal-impl/test/integration/com/liferay/portal/convert/ConvertDocumentLibraryTest.java b/portal-impl/test/integration/com/liferay/portal/convert/ConvertDocumentLibraryTest.java index a20fa69345d3eb..6565900591bb31 100644 --- a/portal-impl/test/integration/com/liferay/portal/convert/ConvertDocumentLibraryTest.java +++ b/portal-impl/test/integration/com/liferay/portal/convert/ConvertDocumentLibraryTest.java @@ -23,6 +23,7 @@ import com.liferay.portal.kernel.test.util.RandomTestUtil; import com.liferay.portal.kernel.test.util.ServiceContextTestUtil; import com.liferay.portal.kernel.test.util.TestPropsValues; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ContentTypes; import com.liferay.portal.kernel.util.FileUtil; import com.liferay.portal.kernel.util.InstanceFactory; @@ -38,7 +39,6 @@ import com.liferay.portal.service.ServiceContext; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.MainServletTestRule; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.documentlibrary.model.DLFileEntry; import com.liferay.portlet.documentlibrary.model.DLFolderConstants; diff --git a/portal-impl/test/integration/com/liferay/portal/service/PortletPreferencesLocalServiceTest.java b/portal-impl/test/integration/com/liferay/portal/service/PortletPreferencesLocalServiceTest.java index d0039e9dc56fd1..83e5be94a4f60b 100644 --- a/portal-impl/test/integration/com/liferay/portal/service/PortletPreferencesLocalServiceTest.java +++ b/portal-impl/test/integration/com/liferay/portal/service/PortletPreferencesLocalServiceTest.java @@ -21,6 +21,7 @@ import com.liferay.portal.kernel.test.rule.AggregateTestRule; import com.liferay.portal.kernel.test.rule.DeleteAfterTestRun; import com.liferay.portal.kernel.test.util.GroupTestUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.ProxyUtil; import com.liferay.portal.model.Group; import com.liferay.portal.model.Layout; @@ -33,7 +34,6 @@ import com.liferay.portal.spring.aop.ServiceBeanAopProxy; import com.liferay.portal.test.rule.LiferayIntegrationTestRule; import com.liferay.portal.test.rule.MainServletTestRule; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PortletKeys; import com.liferay.portal.util.test.LayoutTestUtil; import com.liferay.portlet.PortletPreferencesFactoryUtil; diff --git a/portal-pacl/src/com/liferay/portal/security/pacl/PACLClassLoaderUtil.java b/portal-pacl/src/com/liferay/portal/security/pacl/PACLClassLoaderUtil.java index eeca0caf533896..63e3e4fd7cb8f5 100644 --- a/portal-pacl/src/com/liferay/portal/security/pacl/PACLClassLoaderUtil.java +++ b/portal-pacl/src/com/liferay/portal/security/pacl/PACLClassLoaderUtil.java @@ -14,12 +14,12 @@ package com.liferay.portal.security.pacl; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; /** * @author Raymond Augé * @deprecated As of 6.2.0, moved to {@link - * com.liferay.portal.util.ClassLoaderUtil} + * ClassLoaderUtil} */ @Deprecated public class PACLClassLoaderUtil extends ClassLoaderUtil { diff --git a/portal-pacl/src/com/liferay/portal/security/pacl/PortalSecurityManagerImpl.java b/portal-pacl/src/com/liferay/portal/security/pacl/PortalSecurityManagerImpl.java index 2b5aa36f918a9d..b1b6a7fa8aecd8 100644 --- a/portal-pacl/src/com/liferay/portal/security/pacl/PortalSecurityManagerImpl.java +++ b/portal-pacl/src/com/liferay/portal/security/pacl/PortalSecurityManagerImpl.java @@ -39,6 +39,7 @@ import com.liferay.portal.kernel.security.pacl.permission.PortalSocketPermission; import com.liferay.portal.kernel.util.AutoResetThreadLocal; import com.liferay.portal.kernel.util.CentralizedThreadLocal; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import com.liferay.portal.kernel.util.InfrastructureUtil; import com.liferay.portal.kernel.util.JavaDetector; import com.liferay.portal.kernel.util.PreloadClassLoader; @@ -74,7 +75,6 @@ import com.liferay.portal.template.BaseTemplateManager; import com.liferay.portal.template.TemplateContextHelper; import com.liferay.portal.template.TemplateControlContext; -import com.liferay.portal.util.ClassLoaderUtil; import com.liferay.portal.util.PropsValues; import com.liferay.portlet.PortletRequestImpl; import com.liferay.portlet.PortletResponseImpl; diff --git a/portal-pacl/src/com/liferay/portal/security/pacl/servlet/PACLRequestDispatcherWrapper.java b/portal-pacl/src/com/liferay/portal/security/pacl/servlet/PACLRequestDispatcherWrapper.java index 7473c80859592a..ca5c3535b00cdf 100644 --- a/portal-pacl/src/com/liferay/portal/security/pacl/servlet/PACLRequestDispatcherWrapper.java +++ b/portal-pacl/src/com/liferay/portal/security/pacl/servlet/PACLRequestDispatcherWrapper.java @@ -14,7 +14,7 @@ package com.liferay.portal.security.pacl.servlet; -import com.liferay.portal.util.ClassLoaderUtil; +import com.liferay.portal.kernel.util.ClassLoaderUtil; import java.io.IOException;