Author: markt
Date: Mon Jan 30 20:41:59 2012
New Revision: 1237986
URL: http://svn.apache.org/viewvc?rev=1237986&view=rev
Log:
Removed unused code
Modified:
tomcat/trunk/java/org/apache/catalina/Container.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
Modified: tomcat/trunk/java/org/apache/catalina/Container.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Container.java?rev=1237986&r1=1237985&r2=1237986&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/Container.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Container.java Mon Jan 30 20:41:59
2012
@@ -14,17 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina;
import java.beans.PropertyChangeListener;
-import java.io.IOException;
import javax.management.ObjectName;
import javax.naming.directory.DirContext;
-import javax.servlet.ServletException;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
@@ -82,7 +78,6 @@ import org.apache.juli.logging.Log;
* @author Remy Maucherat
* @version $Id$
*/
-
public interface Container extends Lifecycle {
@@ -97,15 +92,6 @@ public interface Container extends Lifec
/**
- * The ContainerEvent event type sent when a Mapper is added
- * by <code>addMapper()</code>.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
- @Deprecated
- public static final String ADD_MAPPER_EVENT = "addMapper";
-
-
- /**
* The ContainerEvent event type sent when a valve is added
* by <code>addValve()</code>, if this Container supports pipelines.
*/
@@ -120,15 +106,6 @@ public interface Container extends Lifec
/**
- * The ContainerEvent event type sent when a Mapper is removed
- * by <code>removeMapper()</code>.
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
- @Deprecated
- public static final String REMOVE_MAPPER_EVENT = "removeMapper";
-
-
- /**
* The ContainerEvent event type sent when a valve is removed
* by <code>removeValve()</code>, if this Container supports pipelines.
*/
@@ -393,25 +370,6 @@ public interface Container extends Lifec
/**
- * Process the specified Request, and generate the corresponding Response,
- * according to the design of this particular Container.
- *
- * @param request Request to be processed
- * @param response Response to be produced
- *
- * @exception IOException if an input/output error occurred while
- * processing
- * @exception ServletException if a ServletException was thrown
- * while processing this request
- *
- * @deprecated Unused. Will be removed in Tomcat 8.0.x.
- */
- @Deprecated
- public void invoke(Request request, Response response)
- throws IOException, ServletException;
-
-
- /**
* Remove an existing child Container from association with this parent
* Container.
*
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1237986&r1=1237985&r2=1237986&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Mon Jan 30
20:41:59 2012
@@ -19,7 +19,6 @@ package org.apache.catalina.core;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.IOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
@@ -39,7 +38,6 @@ import java.util.concurrent.locks.Reentr
import javax.management.ObjectName;
import javax.naming.directory.DirContext;
-import javax.servlet.ServletException;
import org.apache.catalina.AccessLog;
import org.apache.catalina.CatalinaFactory;
@@ -963,30 +961,6 @@ public abstract class ContainerBase exte
/**
- * Process the specified Request, to produce the corresponding Response,
- * by invoking the first Valve in our pipeline (if any), or the basic
- * Valve otherwise.
- *
- * @param request Request to be processed
- * @param response Response to be produced
- *
- * @exception IllegalStateException if neither a pipeline or a basic
- * Valve have been configured for this Container
- * @exception IOException if an input/output error occurred while
- * processing
- * @exception ServletException if a ServletException was thrown
- * while processing this request
- */
- @Override
- public void invoke(Request request, Response response)
- throws IOException, ServletException {
-
- pipeline.getFirst().invoke(request, response);
-
- }
-
-
- /**
* Remove an existing child Container from association with this parent
* Container.
*
Modified: tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java?rev=1237986&r1=1237985&r2=1237986&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Mon Jan 30
20:41:59 2012
@@ -17,14 +17,12 @@
package org.apache.catalina.startup;
import java.beans.PropertyChangeListener;
-import java.io.IOException;
import java.net.URL;
import java.util.Set;
import javax.naming.directory.DirContext;
import javax.servlet.ServletContainerInitializer;
import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletSecurityElement;
import javax.servlet.descriptor.JspConfigDescriptor;
@@ -239,10 +237,6 @@ public class FailedContext extends Lifec
public void removePropertyChangeListener(PropertyChangeListener listener)
{ /* NO-OP */ }
@Override
- public void invoke(Request request, Response response) throws IOException,
- ServletException { /* NO-OP */ }
-
- @Override
public void fireContainerEvent(String type, Object data) { /* NO-OP */ }
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
