You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/06/13 10:41:39 UTC

svn commit: r1492568 - in /tomcat/trunk/test/org/apache/tomcat/websocket/pojo: TestEncodingDecoding.java TestPojoEndpointBase.java TestPojoMethodMapping.java

Author: markt
Date: Thu Jun 13 08:41:39 2013
New Revision: 1492568

URL: http://svn.apache.org/r1492568
Log:
Fix copy/paste error in r1492307

Modified:
    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

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=1492568&r1=1492567&r2=1492568&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java Thu Jun 13 08:41:39 2013
@@ -43,7 +43,6 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.websocket.pojo.Util.ServerConfigListener;
 import org.apache.tomcat.websocket.pojo.Util.SingletonConfigurator;
-import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestEncodingDecoding extends TomcatBaseTest {
 
@@ -62,7 +61,7 @@ public class TestEncodingDecoding extend
         Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
         ctx.addApplicationListener(new ApplicationListener(
-                WsListener.class.getName(), false));
+                ServerConfigListener.class.getName(), false));
         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=1492568&r1=1492567&r2=1492568&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoEndpointBase.java Thu Jun 13 08:41:39 2013
@@ -37,8 +37,6 @@ import org.apache.catalina.startup.Tomca
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.websocket.pojo.Util.ServerConfigListener;
 import org.apache.tomcat.websocket.pojo.Util.SingletonConfigurator;
-import org.apache.tomcat.websocket.server.WsListener;
-
 
 public class TestPojoEndpointBase extends TomcatBaseTest {
 
@@ -54,7 +52,7 @@ public class TestPojoEndpointBase extend
         Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
         ctx.addApplicationListener(new ApplicationListener(
-                WsListener.class.getName(), false));
+                ServerConfigListener.class.getName(), false));
         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=1492568&r1=1492567&r2=1492568&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java Thu Jun 13 08:41:39 2013
@@ -40,7 +40,6 @@ import org.apache.catalina.startup.Tomca
 import org.apache.tomcat.websocket.pojo.Util.ServerConfigListener;
 import org.apache.tomcat.websocket.pojo.Util.SimpleClient;
 import org.apache.tomcat.websocket.pojo.Util.SingletonConfigurator;
-import org.apache.tomcat.websocket.server.WsListener;
 
 public class TestPojoMethodMapping extends TomcatBaseTest {
 
@@ -61,7 +60,7 @@ public class TestPojoMethodMapping exten
         Context ctx =
             tomcat.addContext("", System.getProperty("java.io.tmpdir"));
         ctx.addApplicationListener(new ApplicationListener(
-                WsListener.class.getName(), false));
+                ServerConfigListener.class.getName(), false));
         Tomcat.addServlet(ctx, "default", new DefaultServlet());
         ctx.addServletMapping("/", "default");
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org