From 30e33bc6427cb99cf5ce41cb090f1b644e2ac18b Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 24 Oct 2010 13:12:18 +0000
Subject: [PATCH] Allow Checkstyle's unused imports test to be used with the
 o.a.catalina.loader package

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1026789 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/loader/VirtualWebappLoader.java | 3 +--
 java/org/apache/catalina/loader/WebappClassLoader.java   | 4 ++--
 java/org/apache/catalina/loader/WebappLoader.java        | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/loader/VirtualWebappLoader.java b/java/org/apache/catalina/loader/VirtualWebappLoader.java
index 3f79a7beb..2d8a6e78d 100644
--- a/java/org/apache/catalina/loader/VirtualWebappLoader.java
+++ b/java/org/apache/catalina/loader/VirtualWebappLoader.java
@@ -24,7 +24,6 @@ import java.util.Set;
 import java.util.StringTokenizer;
 
 import org.apache.catalina.LifecycleException;
-import org.apache.catalina.util.LifecycleBase;
 
 /**
  * A WebappLoader that allows a customized classpath to be added
@@ -103,7 +102,7 @@ public class VirtualWebappLoader extends WebappLoader {
 
     /**
      * Implement the requirements
-     * of {@link LifecycleBase#startInternal()}.
+     * of {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
      *
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 78b5e204f..8fd663855 100644
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -69,7 +69,6 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.LifecycleState;
-import org.apache.jasper.servlet.JasperLoader;
 import org.apache.naming.JndiPermission;
 import org.apache.naming.resources.ProxyDirContext;
 import org.apache.naming.resources.Resource;
@@ -2591,7 +2590,8 @@ public class WebappClassLoader
      * Clear the {@link ResourceBundle} cache of any bundles loaded by this
      * class loader or any class loader where this loader is a parent class
      * loader. Whilst {@link ResourceBundle#clearCache()} could be used there
-     * are complications around the {@link JasperLoader} that mean a reflection
+     * are complications around the
+     * {@link org.apache.jasper.servlet.JasperLoader} that mean a reflection
      * based approach is more likely to be complete.
      * 
      * The ResourceBundle is using WeakReferences so it shouldn't be pinning the
diff --git a/java/org/apache/catalina/loader/WebappLoader.java b/java/org/apache/catalina/loader/WebappLoader.java
index 8037cb4a1..a8aed1716 100644
--- a/java/org/apache/catalina/loader/WebappLoader.java
+++ b/java/org/apache/catalina/loader/WebappLoader.java
@@ -53,7 +53,6 @@ import org.apache.catalina.LifecycleState;
 import org.apache.catalina.Loader;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.mbeans.MBeanUtils;
-import org.apache.catalina.util.LifecycleBase;
 import org.apache.catalina.util.LifecycleMBeanBase;
 import org.apache.naming.resources.DirContextURLStreamHandler;
 import org.apache.naming.resources.DirContextURLStreamHandlerFactory;
@@ -541,7 +540,7 @@ public class WebappLoader extends LifecycleMBeanBase
 
     /**
      * Start associated {@link ClassLoader} and implement the requirements
-     * of {@link LifecycleBase#startInternal()}.
+     * of {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
      *
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
@@ -635,7 +634,7 @@ public class WebappLoader extends LifecycleMBeanBase
 
     /**
      * Stop associated {@link ClassLoader} and implement the requirements
-     * of {@link LifecycleBase#stopInternal()}.
+     * of {@link org.apache.catalina.util.LifecycleBase#stopInternal()}.
      *
      * @exception LifecycleException if this component detects a fatal error
      *  that prevents this component from being used
-- 
2.11.0