Author: markt Date: Thu Aug 15 23:09:06 2013 New Revision: 1514535 URL: http://svn.apache.org/r1514535 Log: Start with the easy compilation fixes. Tomcat 7 hasn't refactored web.xml parsing so change ApplicationListener import to pre-refactoring location.
Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsSubprotocols.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWebSocketFrameClient.java Thu Aug 15 23:09:06 2013 @@ -30,10 +30,10 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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.TesterProgrammaticEndpoint; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsPingPongMessages.java Thu Aug 15 23:09:06 2013 @@ -31,10 +31,10 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Thu Aug 15 23:09:06 2013 @@ -32,10 +32,10 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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.AsyncHandler; import org.apache.tomcat.websocket.TesterMessageCountClient.AsyncText; import org.apache.tomcat.websocket.TesterMessageCountClient.TesterAnnotatedEndpoint; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsSubprotocols.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsSubprotocols.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Thu Aug 15 23:09:06 2013 @@ -37,10 +37,10 @@ import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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.WsListener; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java Thu Aug 15 23:09:06 2013 @@ -44,11 +44,11 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; import org.apache.catalina.servlets.DefaultServlet; 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; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Thu Aug 15 23:09:06 2013 @@ -51,10 +51,10 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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.WsListener; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Thu Aug 15 23:09:06 2013 @@ -34,10 +34,10 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java Thu Aug 15 23:09:06 2013 @@ -33,10 +33,10 @@ import org.junit.Assert; import org.junit.Test; import org.apache.catalina.Context; +import org.apache.catalina.deploy.ApplicationListener; 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; Modified: tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java?rev=1514535&r1=1514534&r2=1514535&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java (original) +++ tomcat/tc7.0.x/trunk/modules/websocket/test/org/apache/tomcat/websocket/server/TestWsServerContainer.java Thu Aug 15 23:09:06 2013 @@ -26,11 +26,11 @@ import org.junit.Test; import org.apache.catalina.Context; import org.apache.catalina.LifecycleState; +import org.apache.catalina.deploy.ApplicationListener; import org.apache.catalina.filters.TesterServletContext; 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; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org