Author: markt Date: Wed Jun 4 21:18:55 2014 New Revision: 1600505 URL: http://svn.apache.org/r1600505 Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56588 Remove unnecessary code - essentially revert r1492307 - that is no longer required now that Jasper is initialized via an SCI.
Removed: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ApplicationListener.java Modified: tomcat/trunk/java/org/apache/catalina/Context.java tomcat/trunk/java/org/apache/catalina/core/StandardContext.java tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java tomcat/trunk/test/org/apache/catalina/core/TesterContext.java tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java tomcat/trunk/test/org/apache/catalina/startup/TestListener.java tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/Context.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Context.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/Context.java (original) +++ tomcat/trunk/java/org/apache/catalina/Context.java Wed Jun 4 21:18:55 2014 @@ -31,7 +31,6 @@ import javax.servlet.descriptor.JspConfi import org.apache.catalina.deploy.NamingResourcesImpl; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.JarScanner; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ApplicationParameter; import org.apache.tomcat.util.descriptor.web.ErrorPage; import org.apache.tomcat.util.descriptor.web.FilterDef; @@ -727,7 +726,7 @@ public interface Context extends Contain * * @param listener Java class name of a listener class */ - public void addApplicationListener(ApplicationListener listener); + public void addApplicationListener(String listener); /** @@ -905,7 +904,7 @@ public interface Context extends Contain * Return the set of application listener class names configured * for this application. */ - public ApplicationListener[] findApplicationListeners(); + public String[] findApplicationListeners(); /** 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=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Jun 4 21:18:55 2014 @@ -116,7 +116,6 @@ import org.apache.tomcat.util.ExceptionU import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.buf.UDecoder; import org.apache.tomcat.util.descriptor.XmlIdentifiers; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ApplicationParameter; import org.apache.tomcat.util.descriptor.web.ErrorPage; import org.apache.tomcat.util.descriptor.web.FilterDef; @@ -228,8 +227,7 @@ public class StandardContext extends Con * application, in the order they were encountered in the resulting merged * web.xml file. */ - private ApplicationListener applicationListeners[] = - new ApplicationListener[0]; + private String applicationListeners[] = new String[0]; private final Object applicationListenersLock = new Object(); @@ -2663,15 +2661,13 @@ public class StandardContext extends Con * @param listener Java class name of a listener class */ @Override - public void addApplicationListener(ApplicationListener listener) { + public void addApplicationListener(String listener) { synchronized (applicationListenersLock) { - ApplicationListener results[] = - new ApplicationListener[applicationListeners.length + 1]; + String results[] = new String[applicationListeners.length + 1]; for (int i = 0; i < applicationListeners.length; i++) { if (listener.equals(applicationListeners[i])) { - log.info(sm.getString( - "standardContext.duplicateListener",listener)); + log.info(sm.getString("standardContext.duplicateListener",listener)); return; } results[i] = applicationListeners[i]; @@ -2682,7 +2678,6 @@ public class StandardContext extends Con fireContainerEvent("addApplicationListener", listener); // FIXME - add instance if already started? - } @@ -3289,10 +3284,8 @@ public class StandardContext extends Con * for this application. */ @Override - public ApplicationListener[] findApplicationListeners() { - - return (applicationListeners); - + public String[] findApplicationListeners() { + return applicationListeners; } @@ -3813,7 +3806,7 @@ public class StandardContext extends Con // Make sure this welcome file is currently present int n = -1; for (int i = 0; i < applicationListeners.length; i++) { - if (applicationListeners[i].getClassName().equals(listener)) { + if (applicationListeners.equals(listener)) { n = i; break; } @@ -3823,8 +3816,7 @@ public class StandardContext extends Con // Remove the specified constraint int j = 0; - ApplicationListener results[] = - new ApplicationListener[applicationListeners.length - 1]; + String results[] = new String[applicationListeners.length - 1]; for (int i = 0; i < applicationListeners.length; i++) { if (i != n) results[j++] = applicationListeners[i]; @@ -3837,7 +3829,6 @@ public class StandardContext extends Con fireContainerEvent("removeApplicationListener", listener); // FIXME - behavior if already started? - } @@ -4677,7 +4668,7 @@ public class StandardContext extends Con log.debug("Configuring application event listeners"); // Instantiate the required listeners - ApplicationListener listeners[] = findApplicationListeners(); + String listeners[] = findApplicationListeners(); Object results[] = new Object[listeners.length]; boolean ok = true; Set<Object> noPluggabilityListeners = new HashSet<>(); @@ -4686,18 +4677,13 @@ public class StandardContext extends Con getLogger().debug(" Configuring event listener class '" + listeners[i] + "'"); try { - ApplicationListener listener = listeners[i]; - results[i] = instanceManager.newInstance( - listener.getClassName()); - if (listener.isPluggabilityBlocked()) { - noPluggabilityListeners.add(results[i]); - } + String listener = listeners[i]; + results[i] = instanceManager.newInstance(listener); } catch (Throwable t) { t = ExceptionUtils.unwrapInvocationTargetException(t); ExceptionUtils.handleThrowable(t); - getLogger().error - (sm.getString("standardContext.applicationListener", - listeners[i].getClassName()), t); + getLogger().error(sm.getString( + "standardContext.applicationListener", listeners[i]), t); ok = false; } } @@ -5599,7 +5585,7 @@ public class StandardContext extends Con // Bugzilla 32867 distributable = false; - applicationListeners = new ApplicationListener[0]; + applicationListeners = new String[0]; applicationEventListenersObjects = new Object[0]; applicationLifecycleListenersObjects = new Object[0]; jspConfigDescriptor = null; Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed Jun 4 21:18:55 2014 @@ -79,7 +79,6 @@ import org.apache.tomcat.util.bcel.class import org.apache.tomcat.util.bcel.classfile.ElementValuePair; import org.apache.tomcat.util.bcel.classfile.JavaClass; import org.apache.tomcat.util.descriptor.XmlErrorHandler; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ContextEjb; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; import org.apache.tomcat.util.descriptor.web.ContextLocalEjb; @@ -1269,8 +1268,7 @@ public class ContextConfig implements Li } context.setJspConfigDescriptor(webxml.getJspConfigDescriptor()); for (String listener : webxml.getListeners()) { - context.addApplicationListener( - new ApplicationListener(listener, false)); + context.addApplicationListener(listener); } for (Entry<String, String> entry : webxml.getLocaleEncodingMappings().entrySet()) { 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=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/FailedContext.java Wed Jun 4 21:18:55 2014 @@ -55,7 +55,6 @@ import org.apache.catalina.util.Lifecycl import org.apache.juli.logging.Log; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.JarScanner; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ApplicationParameter; import org.apache.tomcat.util.descriptor.web.ErrorPage; import org.apache.tomcat.util.descriptor.web.FilterDef; @@ -480,9 +479,9 @@ public class FailedContext extends Lifec public boolean getLogEffectiveWebXml() { return false; } @Override - public void addApplicationListener(ApplicationListener listener) { /* NO-OP */ } + public void addApplicationListener(String listener) { /* NO-OP */ } @Override - public ApplicationListener[] findApplicationListeners() { return null; } + public String[] findApplicationListeners() { return null; } @Override public void removeApplicationListener(String listener) { /* NO-OP */ } Modified: tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java Wed Jun 4 21:18:55 2014 @@ -28,7 +28,6 @@ import org.apache.catalina.Container; import org.apache.catalina.Context; import org.apache.catalina.Wrapper; import org.apache.catalina.util.Introspection; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; import org.apache.tomcat.util.descriptor.web.ContextResource; import org.apache.tomcat.util.descriptor.web.ContextResourceEnvRef; @@ -77,11 +76,9 @@ public class WebAnnotationSet { */ protected static void loadApplicationListenerAnnotations(Context context) { Class<?> classClass = null; - ApplicationListener[] applicationListeners = - context.findApplicationListeners(); + String[] applicationListeners = context.findApplicationListeners(); for (int i = 0; i < applicationListeners.length; i++) { - classClass = Introspection.loadClass(context, - applicationListeners[i].getClassName()); + classClass = Introspection.loadClass(context, applicationListeners[i]); if (classClass == null) { continue; } Modified: tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java (original) +++ tomcat/trunk/test/org/apache/catalina/authenticator/TestFormAuthenticator.java Wed Jun 4 21:18:55 2014 @@ -39,7 +39,6 @@ import org.apache.catalina.startup.Teste import org.apache.catalina.startup.TesterServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.LoginConfig; import org.apache.tomcat.util.descriptor.web.SecurityCollection; import org.apache.tomcat.util.descriptor.web.SecurityConstraint; @@ -648,8 +647,7 @@ public class TestFormAuthenticator exten appDir.getAbsolutePath()); setUseCookies(clientShouldUseCookies); ctx.setCookies(serverShouldUseCookies); - ctx.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctx.addApplicationListener(WsContextListener.class.getName()); TesterMapRealm realm = new TesterMapRealm(); realm.addUser("tomcat", "tomcat"); Modified: tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestAsyncContextImpl.java Wed Jun 4 21:18:55 2014 @@ -56,7 +56,6 @@ import org.apache.catalina.startup.Tomca import org.apache.catalina.startup.TomcatBaseTest; import org.apache.catalina.valves.TesterAccessLogValve; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ErrorPage; public class TestAsyncContextImpl extends TomcatBaseTest { @@ -493,8 +492,7 @@ public class TestAsyncContextImpl extend } } - ctx.addApplicationListener(new ApplicationListener( - TrackingRequestListener.class.getName(), false)); + ctx.addApplicationListener(TrackingRequestListener.class.getName()); TesterAccessLogValve alv = new TesterAccessLogValve(); ctx.getPipeline().addValve(alv); @@ -641,8 +639,7 @@ public class TestAsyncContextImpl extend wrapper2.setAsyncSupported(true); ctx.addServletMapping("/stage2", "nonasync"); - ctx.addApplicationListener(new ApplicationListener( - TrackingRequestListener.class.getName(), false)); + ctx.addApplicationListener(TrackingRequestListener.class.getName()); TesterAccessLogValve alv = new TesterAccessLogValve(); ctx.getPipeline().addValve(alv); @@ -972,8 +969,7 @@ public class TestAsyncContextImpl extend Tomcat.addServlet(ctx, "error", error); ctx.addServletMapping("/stage2", "error"); - ctx.addApplicationListener(new ApplicationListener( - TrackingRequestListener.class.getName(), false)); + ctx.addApplicationListener(TrackingRequestListener.class.getName()); TesterAccessLogValve alv = new TesterAccessLogValve(); ctx.getPipeline().addValve(alv); @@ -1598,8 +1594,7 @@ public class TestAsyncContextImpl extend ctx.addErrorPage(ep); } - ctx.addApplicationListener(new ApplicationListener( - TrackingRequestListener.class.getName(), false)); + ctx.addApplicationListener(TrackingRequestListener.class.getName()); TesterAccessLogValve alv = new TesterAccessLogValve(); ctx.getPipeline().addValve(alv); Modified: tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TestNamingContextListener.java Wed Jun 4 21:18:55 2014 @@ -29,7 +29,6 @@ import org.junit.Test; import org.apache.catalina.LifecycleState; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; public class TestNamingContextListener extends TomcatBaseTest { @@ -62,8 +61,7 @@ public class TestNamingContextListener e environment.setValue(BUG49132_VALUE); ctx.getNamingResources().addEnvironment(environment); - ctx.addApplicationListener(new ApplicationListener( - Bug49132Listener.class.getName(), false)); + ctx.addApplicationListener(Bug49132Listener.class.getName()); tomcat.start(); @@ -117,8 +115,7 @@ public class TestNamingContextListener e environmentB.setValue(BUG54096_ValueB); ctx.getNamingResources().addEnvironment(environmentB); - ctx.addApplicationListener(new ApplicationListener( - Bug54096Listener.class.getName(), false)); + ctx.addApplicationListener(Bug54096Listener.class.getName()); tomcat.start(); Modified: tomcat/trunk/test/org/apache/catalina/core/TesterContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TesterContext.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/core/TesterContext.java (original) +++ tomcat/trunk/test/org/apache/catalina/core/TesterContext.java Wed Jun 4 21:18:55 2014 @@ -56,7 +56,6 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.InstanceManager; import org.apache.tomcat.JarScanner; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ApplicationParameter; import org.apache.tomcat.util.descriptor.web.ErrorPage; import org.apache.tomcat.util.descriptor.web.FilterDef; @@ -699,7 +698,7 @@ public class TesterContext implements Co } @Override - public void addApplicationListener(ApplicationListener listener) { + public void addApplicationListener(String listener) { // NO-OP } @@ -790,7 +789,7 @@ public class TesterContext implements Co } @Override - public ApplicationListener[] findApplicationListeners() { + public String[] findApplicationListeners() { return null; } Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java (original) +++ tomcat/trunk/test/org/apache/catalina/servlets/TestDefaultServlet.java Wed Jun 4 21:18:55 2014 @@ -45,7 +45,6 @@ import org.apache.catalina.startup.Simpl import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.server.WsContextListener; public class TestDefaultServlet extends TomcatBaseTest { @@ -159,8 +158,7 @@ public class TestDefaultServlet extends // app dir is relative to server home org.apache.catalina.Context ctx = tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); - ctx.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctx.addApplicationListener(WsContextListener.class.getName()); // Override the default servlet with our own mappings Tomcat.addServlet(ctx, "default2", new DefaultServlet()); Modified: tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java (original) +++ tomcat/trunk/test/org/apache/catalina/servlets/TestWebdavServlet.java Wed Jun 4 21:18:55 2014 @@ -30,7 +30,6 @@ import org.junit.Test; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.server.WsContextListener; public class TestWebdavServlet extends TomcatBaseTest { @@ -95,8 +94,7 @@ public class TestWebdavServlet extends T Tomcat.addServlet(ctx, "webdav", new WebdavServlet()); ctx.addServletMapping("/webdav/*", "webdav"); - ctx.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctx.addApplicationListener(WsContextListener.class.getName()); tomcat.start(); Modified: tomcat/trunk/test/org/apache/catalina/startup/TestListener.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestListener.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestListener.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestListener.java Wed Jun 4 21:18:55 2014 @@ -30,7 +30,6 @@ import static org.junit.Assert.assertTru import org.junit.Test; import org.apache.catalina.Context; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; public class TestListener extends TomcatBaseTest { @@ -65,8 +64,7 @@ public class TestListener extends Tomcat // SCL2 pretends to be in web.xml, and tries to install a // ServletContextInitializer. - context.addApplicationListener(new ApplicationListener( - SCL2.class.getName(), false)); + context.addApplicationListener(SCL2.class.getName()); tomcat.start(); //check that the ServletContextInitializer wasn't initialized. Modified: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (original) +++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Wed Jun 4 21:18:55 2014 @@ -43,7 +43,6 @@ import org.junit.Test; import org.apache.catalina.core.StandardContext; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; import org.apache.tomcat.util.descriptor.web.ContextResourceLink; import org.apache.tomcat.websocket.server.WsContextListener; @@ -205,8 +204,7 @@ public class TestTomcat extends TomcatBa // app dir is relative to server home org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); - ctxt.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctxt.addApplicationListener(WsContextListener.class.getName()); tomcat.start(); ByteChunk res = getUrl("http://localhost:" + getPort() + @@ -222,8 +220,7 @@ public class TestTomcat extends TomcatBa // app dir is relative to server home org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); - ctxt.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctxt.addApplicationListener(WsContextListener.class.getName()); tomcat.start(); @@ -343,8 +340,7 @@ public class TestTomcat extends TomcatBa // app dir is relative to server home org.apache.catalina.Context ctx = tomcat.addWebapp(null, "/examples", appDir.getAbsolutePath()); - ctx.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctx.addApplicationListener(WsContextListener.class.getName()); Tomcat.addServlet(ctx, "testGetResource", new GetResource()); ctx.addServletMapping("/testGetResource", "testGetResource"); Modified: tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java (original) +++ tomcat/trunk/test/org/apache/jasper/compiler/TestELInterpreterFactory.java Wed Jun 4 21:18:55 2014 @@ -30,7 +30,6 @@ import org.apache.catalina.startup.Tomca import org.apache.catalina.startup.TomcatBaseTest; import org.apache.jasper.JspCompilationContext; import org.apache.jasper.compiler.ELInterpreterFactory.DefaultELInterpreter; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; public class TestELInterpreterFactory extends TomcatBaseTest { @@ -79,8 +78,7 @@ public class TestELInterpreterFactory ex context.removeAttribute(ELInterpreter.class.getName()); ctx.stop(); - ctx.addApplicationListener((new ApplicationListener( - Bug54239Listener.class.getName(), false))); + ctx.addApplicationListener(Bug54239Listener.class.getName()); ctx.start(); interpreter = ELInterpreterFactory.getELInterpreter(ctx.getServletContext()); Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Wed Jun 4 21:18:55 2014 @@ -35,7 +35,6 @@ import org.apache.catalina.startup.Tomca import org.apache.coyote.ProtocolHandler; import org.apache.coyote.http11.AbstractHttp11JsseProtocol; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl; import org.apache.tomcat.websocket.server.WsContextListener; @@ -75,8 +74,7 @@ public class TestCustomSsl extends Tomca File appDir = new File(getBuildDirectory(), "webapps/examples"); Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); - ctxt.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctxt.addApplicationListener(WsContextListener.class.getName()); tomcat.start(); ByteChunk res = getUrl("https://localhost:" + getPort() + Modified: tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original) +++ tomcat/trunk/test/org/apache/tomcat/util/net/TestSsl.java Wed Jun 4 21:18:55 2014 @@ -41,7 +41,6 @@ import org.apache.catalina.startup.Teste import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.tomcat.util.buf.ByteChunk; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.server.WsContextListener; /** @@ -60,8 +59,7 @@ public class TestSsl extends TomcatBaseT File appDir = new File(getBuildDirectory(), "webapps/examples"); org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); - ctxt.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctxt.addApplicationListener(WsContextListener.class.getName()); TesterSupport.initSsl(tomcat); @@ -80,8 +78,7 @@ public class TestSsl extends TomcatBaseT File appDir = new File(getBuildDirectory(), "webapps/examples"); org.apache.catalina.Context ctxt = tomcat.addWebapp( null, "/examples", appDir.getAbsolutePath()); - ctxt.addApplicationListener(new ApplicationListener( - WsContextListener.class.getName(), false)); + ctxt.addApplicationListener(WsContextListener.class.getName()); TesterSupport.initSsl(tomcat, "localhost-copy1.jks", "changeit", "tomcatpass"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Wed Jun 4 21:18:55 2014 @@ -33,7 +33,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; @@ -46,8 +45,7 @@ public class TestWebSocketFrameClient ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterFirehoseServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterFirehoseServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java Wed Jun 4 21:18:55 2014 @@ -35,7 +35,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.net.TesterSupport; import org.apache.tomcat.websocket.TesterMessageCountClient.BasicText; import org.apache.tomcat.websocket.TesterMessageCountClient.SleepingText; @@ -50,8 +49,7 @@ public class TestWebSocketFrameClientSSL // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterFirehoseServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterFirehoseServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -106,8 +104,7 @@ public class TestWebSocketFrameClientSSL // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterFirehoseServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterFirehoseServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java Wed Jun 4 21:18:55 2014 @@ -34,7 +34,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterEndpoint; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; @@ -50,8 +49,7 @@ public class TestWsPingPongMessages exte // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Wed Jun 4 21:18:55 2014 @@ -39,7 +39,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncBinary; import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncHandler; import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncText; @@ -86,8 +85,7 @@ public class TestWsRemoteEndpoint extend // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Wed Jun 4 21:18:55 2014 @@ -40,7 +40,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; import org.apache.tomcat.websocket.server.Constants; import org.apache.tomcat.websocket.server.WsContextListener; @@ -53,8 +52,7 @@ public class TestWsSubprotocols extends // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener(Config.class - .getName(), false)); + ctx.addApplicationListener(Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Wed Jun 4 21:18:55 2014 @@ -50,7 +50,6 @@ import org.apache.catalina.servlets.Defa import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; import org.apache.coyote.http11.Http11Protocol; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.util.net.TesterSupport; import org.apache.tomcat.websocket.TesterMessageCountClient.BasicBinary; import org.apache.tomcat.websocket.TesterMessageCountClient.BasicHandler; @@ -84,8 +83,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -121,8 +119,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); tomcat.start(); @@ -141,8 +138,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); tomcat.start(); @@ -209,8 +205,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -319,8 +314,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - BlockingConfig.class.getName(), false)); + ctx.addApplicationListener(BlockingConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -411,8 +405,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ConstantTxConfig.class.getName(), false)); + ctx.addApplicationListener(ConstantTxConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -624,8 +617,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -674,8 +666,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -733,8 +724,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -820,8 +810,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -905,8 +894,7 @@ public class TestWsWebSocketContainer ex // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterConnectionLimit.java Wed Jun 4 21:18:55 2014 @@ -31,7 +31,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterProgrammaticEndpoint; @@ -47,8 +46,7 @@ public class TesterConnectionLimit exten // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - TesterEchoServer.Config.class.getName(), false)); + ctx.addApplicationListener(TesterEchoServer.Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Wed Jun 4 21:18:55 2014 @@ -53,7 +53,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.pojo.TesterUtil.ServerConfigListener; import org.apache.tomcat.websocket.pojo.TesterUtil.SingletonConfigurator; import org.apache.tomcat.websocket.server.WsContextListener; @@ -72,8 +71,7 @@ public class TestEncodingDecoding extend // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ProgramaticServerEndpointConfig.class.getName(), false)); + ctx.addApplicationListener(ProgramaticServerEndpointConfig.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -124,8 +122,7 @@ public class TestEncodingDecoding extend // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ServerConfigListener.class.getName(), false)); + ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -185,8 +182,7 @@ public class TestEncodingDecoding extend // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ServerConfigListener.class.getName(), false)); + ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Wed Jun 4 21:18:55 2014 @@ -37,7 +37,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TestUtil; import org.apache.tomcat.websocket.pojo.TesterUtil.ServerConfigListener; import org.apache.tomcat.websocket.pojo.TesterUtil.SingletonConfigurator; @@ -56,8 +55,7 @@ public class TestPojoEndpointBase extend // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ServerConfigListener.class.getName(), false)); + ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); @@ -89,8 +87,7 @@ public class TestPojoEndpointBase extend // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ServerConfigListener.class.getName(), false)); + ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java Wed Jun 4 21:18:55 2014 @@ -36,7 +36,6 @@ import org.apache.catalina.Context; import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.pojo.TesterUtil.ServerConfigListener; import org.apache.tomcat.websocket.pojo.TesterUtil.SimpleClient; import org.apache.tomcat.websocket.pojo.TesterUtil.SingletonConfigurator; @@ -59,8 +58,7 @@ public class TestPojoMethodMapping exten // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - ServerConfigListener.class.getName(), false)); + ctx.addApplicationListener(ServerConfigListener.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Wed Jun 4 21:18:55 2014 @@ -30,7 +30,6 @@ import org.apache.catalina.filters.Teste import org.apache.catalina.servlets.DefaultServlet; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.tomcat.util.descriptor.web.ApplicationListener; import org.apache.tomcat.websocket.TesterEchoServer; @@ -42,8 +41,7 @@ public class TestWsServerContainer exten // Must have a real docBase - just use temp Context ctx = tomcat.addContext("", System.getProperty("java.io.tmpdir")); - ctx.addApplicationListener(new ApplicationListener( - Bug54807Config.class.getName(), false)); + ctx.addApplicationListener(Bug54807Config.class.getName()); Tomcat.addServlet(ctx, "default", new DefaultServlet()); ctx.addServletMapping("/", "default"); Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1600505&r1=1600504&r2=1600505&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Wed Jun 4 21:18:55 2014 @@ -115,6 +115,13 @@ components that depend on JULI (such as Jasper) independently from Tomcat. Patch provided by Greg Wilkins. (markt) </add> + <fix> + <bug>56588</bug>: Remove code previously added to enforce the + requirements of section 4.4 of the Servlet 3.1 specification. The code + is no longer required now that Jasper initialization has been refactored + and TLD defined listeners are added via a different code path that + already enforces the specification requirements. (markt) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org