Author: markt
Date: Fri Mar 27 12:56:40 2009
New Revision: 759123
URL: http://svn.apache.org/viewvc?rev=759123&view=rev
Log:
Move classes from org.apache to org.apache.tomcat
Added:
tomcat/trunk/java/org/apache/tomcat/InstanceManager.java (contents, props
changed)
- copied, changed from r758929,
tomcat/trunk/java/org/apache/InstanceManager.java
tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java (contents,
props changed)
- copied, changed from r758929,
tomcat/trunk/java/org/apache/PeriodicEventListener.java
Removed:
tomcat/trunk/java/org/apache/InstanceManager.java
tomcat/trunk/java/org/apache/PeriodicEventListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java
tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Fri
Mar 27 12:56:40 2009
@@ -32,13 +32,13 @@
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;
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Fri
Mar 27 12:56:40 2009
@@ -44,12 +44,12 @@
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:$
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Fri Mar 27
12:56:40 2009
@@ -57,7 +57,6 @@
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.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;
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Fri Mar 27
12:56:40 2009
@@ -44,7 +44,6 @@
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.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;
Modified:
tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/InstanceManagerFactory.java Fri
Mar 27 12:56:40 2009
@@ -22,7 +22,7 @@
import javax.servlet.ServletConfig;
-import org.apache.InstanceManager;
+import org.apache.tomcat.InstanceManager;
/**
* @version $Rev:$ $Date:$
Modified: tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Fri Mar 27
12:56:40 2009
@@ -21,10 +21,10 @@
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.
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServlet.java Fri Mar 27
12:56:40 2009
@@ -29,7 +29,6 @@
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.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).
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=759123&r1=759122&r2=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Fri Mar
27 12:56:40 2009
@@ -31,7 +31,6 @@
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.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).
Copied: tomcat/trunk/java/org/apache/tomcat/InstanceManager.java (from r758929,
tomcat/trunk/java/org/apache/InstanceManager.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/InstanceManager.java?p2=tomcat/trunk/java/org/apache/tomcat/InstanceManager.java&p1=tomcat/trunk/java/org/apache/InstanceManager.java&r1=758929&r2=759123&rev=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/InstanceManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/InstanceManager.java Fri Mar 27
12:56:40 2009
@@ -18,7 +18,7 @@
*/
-package org.apache;
+package org.apache.tomcat;
import java.lang.reflect.InvocationTargetException;
Propchange: tomcat/trunk/java/org/apache/tomcat/InstanceManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/trunk/java/org/apache/tomcat/InstanceManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 27 12:56:40 2009
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/InstanceManager.java:742915
Copied: tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java (from
r758929, tomcat/trunk/java/org/apache/PeriodicEventListener.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java?p2=tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java&p1=tomcat/trunk/java/org/apache/PeriodicEventListener.java&r1=758929&r2=759123&rev=759123&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/PeriodicEventListener.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java Fri Mar 27
12:56:40 2009
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache;
+package org.apache.tomcat;
public interface PeriodicEventListener {
/**
Propchange: tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: tomcat/trunk/java/org/apache/tomcat/PeriodicEventListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Mar 27 12:56:40 2009
@@ -0,0 +1 @@
+/tomcat/tc6.0.x/trunk/java/org/apache/PeriodicEventListener.java:742915
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
