From 4403dd3f7a4277e2b50283e4e65659e2896b7b81 Mon Sep 17 00:00:00 2001 From: markt Date: Fri, 27 Mar 2009 12:56:40 +0000 Subject: [PATCH] Move classes from org.apache to org.apache.tomcat git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@759123 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/ApplicationFilterConfig.java | 2 +- java/org/apache/catalina/core/DefaultInstanceManager.java | 2 +- java/org/apache/catalina/core/StandardContext.java | 2 +- java/org/apache/catalina/core/StandardWrapper.java | 4 ++-- java/org/apache/jasper/runtime/InstanceManagerFactory.java | 2 +- java/org/apache/jasper/runtime/TagHandlerPool.java | 2 +- java/org/apache/jasper/servlet/JspServlet.java | 2 +- java/org/apache/jasper/servlet/JspServletWrapper.java | 2 +- java/org/apache/{ => tomcat}/InstanceManager.java | 2 +- java/org/apache/{ => tomcat}/PeriodicEventListener.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename java/org/apache/{ => tomcat}/InstanceManager.java (98%) rename java/org/apache/{ => tomcat}/PeriodicEventListener.java (97%) diff --git a/java/org/apache/catalina/core/ApplicationFilterConfig.java b/java/org/apache/catalina/core/ApplicationFilterConfig.java index f06cf2ed6..0b722e48a 100644 --- a/java/org/apache/catalina/core/ApplicationFilterConfig.java +++ b/java/org/apache/catalina/core/ApplicationFilterConfig.java @@ -32,13 +32,13 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import org.apache.InstanceManager; import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.deploy.FilterDef; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.StringManager; +import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.log.SystemLogHandler; diff --git a/java/org/apache/catalina/core/DefaultInstanceManager.java b/java/org/apache/catalina/core/DefaultInstanceManager.java index 254289f66..22251c8cb 100644 --- a/java/org/apache/catalina/core/DefaultInstanceManager.java +++ b/java/org/apache/catalina/core/DefaultInstanceManager.java @@ -44,12 +44,12 @@ import javax.xml.ws.WebServiceRef; import javax.servlet.Filter; import javax.servlet.Servlet; -import org.apache.InstanceManager; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.ContainerServlet; import org.apache.catalina.Globals; import org.apache.catalina.core.Constants; import org.apache.catalina.util.StringManager; +import org.apache.tomcat.InstanceManager; /** * @version $Rev:$ $Date:$ diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 6caedc3c4..8489e84e1 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -57,7 +57,6 @@ import javax.servlet.ServletRequestListener; import javax.servlet.http.HttpSessionAttributeListener; import javax.servlet.http.HttpSessionListener; -import org.apache.InstanceManager; import org.apache.catalina.Container; import org.apache.catalina.ContainerListener; import org.apache.catalina.Context; @@ -99,6 +98,7 @@ import org.apache.naming.resources.DirContextURLStreamHandler; import org.apache.naming.resources.FileDirContext; import org.apache.naming.resources.ProxyDirContext; import org.apache.naming.resources.WARDirContext; +import org.apache.tomcat.InstanceManager; import org.apache.tomcat.util.modeler.Registry; /** diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java index dfc9ad1c1..df7bd41ea 100644 --- a/java/org/apache/catalina/core/StandardWrapper.java +++ b/java/org/apache/catalina/core/StandardWrapper.java @@ -44,7 +44,6 @@ import javax.servlet.ServletResponse; import javax.servlet.SingleThreadModel; import javax.servlet.UnavailableException; -import org.apache.PeriodicEventListener; import org.apache.catalina.Container; import org.apache.catalina.ContainerServlet; import org.apache.catalina.Context; @@ -53,10 +52,11 @@ import org.apache.catalina.InstanceEvent; import org.apache.catalina.InstanceListener; import org.apache.catalina.LifecycleException; import org.apache.catalina.Wrapper; -import org.apache.InstanceManager; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.Enumerator; import org.apache.catalina.util.InstanceSupport; +import org.apache.tomcat.InstanceManager; +import org.apache.tomcat.PeriodicEventListener; import org.apache.tomcat.util.log.SystemLogHandler; import org.apache.tomcat.util.modeler.Registry; diff --git a/java/org/apache/jasper/runtime/InstanceManagerFactory.java b/java/org/apache/jasper/runtime/InstanceManagerFactory.java index d586fdb80..17c84ee5c 100644 --- a/java/org/apache/jasper/runtime/InstanceManagerFactory.java +++ b/java/org/apache/jasper/runtime/InstanceManagerFactory.java @@ -22,7 +22,7 @@ package org.apache.jasper.runtime; import javax.servlet.ServletConfig; -import org.apache.InstanceManager; +import org.apache.tomcat.InstanceManager; /** * @version $Rev:$ $Date:$ diff --git a/java/org/apache/jasper/runtime/TagHandlerPool.java b/java/org/apache/jasper/runtime/TagHandlerPool.java index 7974c4de9..bb770c8e4 100644 --- a/java/org/apache/jasper/runtime/TagHandlerPool.java +++ b/java/org/apache/jasper/runtime/TagHandlerPool.java @@ -21,10 +21,10 @@ import javax.servlet.ServletConfig; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.Tag; -import org.apache.InstanceManager; import org.apache.jasper.Constants; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.InstanceManager; /** * Pool of tag handlers that can be reused. diff --git a/java/org/apache/jasper/servlet/JspServlet.java b/java/org/apache/jasper/servlet/JspServlet.java index 9f24cea6e..b4a9e66f0 100644 --- a/java/org/apache/jasper/servlet/JspServlet.java +++ b/java/org/apache/jasper/servlet/JspServlet.java @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.PeriodicEventListener; import org.apache.jasper.Constants; import org.apache.jasper.EmbeddedServletOptions; @@ -39,6 +38,7 @@ import org.apache.jasper.compiler.Localizer; import org.apache.jasper.security.SecurityUtil; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.PeriodicEventListener; /** * The JSP engine (a.k.a Jasper). diff --git a/java/org/apache/jasper/servlet/JspServletWrapper.java b/java/org/apache/jasper/servlet/JspServletWrapper.java index 81a5f5088..45d52e5b1 100644 --- a/java/org/apache/jasper/servlet/JspServletWrapper.java +++ b/java/org/apache/jasper/servlet/JspServletWrapper.java @@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.jsp.tagext.TagInfo; -import org.apache.InstanceManager; import org.apache.jasper.JasperException; import org.apache.jasper.JspCompilationContext; import org.apache.jasper.Options; @@ -43,6 +42,7 @@ import org.apache.jasper.runtime.InstanceManagerFactory; import org.apache.jasper.runtime.JspSourceDependent; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; +import org.apache.tomcat.InstanceManager; /** * The JSP engine (a.k.a Jasper). diff --git a/java/org/apache/InstanceManager.java b/java/org/apache/tomcat/InstanceManager.java similarity index 98% rename from java/org/apache/InstanceManager.java rename to java/org/apache/tomcat/InstanceManager.java index 01ec95ce4..b6868f829 100644 --- a/java/org/apache/InstanceManager.java +++ b/java/org/apache/tomcat/InstanceManager.java @@ -18,7 +18,7 @@ */ -package org.apache; +package org.apache.tomcat; import java.lang.reflect.InvocationTargetException; diff --git a/java/org/apache/PeriodicEventListener.java b/java/org/apache/tomcat/PeriodicEventListener.java similarity index 97% rename from java/org/apache/PeriodicEventListener.java rename to java/org/apache/tomcat/PeriodicEventListener.java index 192308555..2d8c63ce4 100644 --- a/java/org/apache/PeriodicEventListener.java +++ b/java/org/apache/tomcat/PeriodicEventListener.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache; +package org.apache.tomcat; public interface PeriodicEventListener { /** -- 2.11.0