Author: markt
Date: Sun Oct 24 13:12:18 2010
New Revision: 1026789
URL: http://svn.apache.org/viewvc?rev=1026789&view=rev
Log:
Allow Checkstyle's unused imports test to be used with the o.a.catalina.loader
package
Modified:
tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?rev=1026789&r1=1026788&r2=1026789&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Sun
Oct 24 13:12:18 2010
@@ -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
/**
* 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
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1026789&r1=1026788&r2=1026789&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sun Oct
24 13:12:18 2010
@@ -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
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1026789&r1=1026788&r2=1026789&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Sun Oct 24
13:12:18 2010
@@ -53,7 +53,6 @@ import org.apache.catalina.LifecycleStat
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 Lifecy
/**
* 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 Lifecy
/**
* 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
