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/03/19 14:47:37 UTC
svn commit: r1458279 - in
/tomcat/trunk/test/org/apache/tomcat/websocket/pojo:
TestPojoMethodMapping.java Util.java
Author: markt
Date: Tue Mar 19 13:47:37 2013
New Revision: 1458279
URL: http://svn.apache.org/r1458279
Log:
Refactor
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/Util.java
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=1458279&r1=1458278&r2=1458279&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoMethodMapping.java Tue Mar 19 13:47:37 2013
@@ -20,7 +20,6 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.List;
-import javax.websocket.ClientEndpoint;
import javax.websocket.ContainerProvider;
import javax.websocket.OnClose;
import javax.websocket.OnMessage;
@@ -37,6 +36,7 @@ import org.apache.catalina.Context;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.websocket.pojo.Util.ServerConfigListener;
+import org.apache.tomcat.websocket.pojo.Util.SimpleClient;
import org.apache.tomcat.websocket.pojo.Util.SingletonConfigurator;
public class TestPojoMethodMapping extends TomcatBaseTest {
@@ -65,7 +65,7 @@ public class TestPojoMethodMapping exten
tomcat.start();
- Client client = new Client();
+ SimpleClient client = new SimpleClient();
URI uri = new URI("ws://localhost:" + getPort() + "/" + PARAM_ONE +
"/" + PARAM_TWO + "/" + PARAM_THREE);
@@ -96,11 +96,6 @@ public class TestPojoMethodMapping exten
}
- @ClientEndpoint
- public static final class Client {
- }
-
-
@ServerEndpoint(value="/{one}/{two}/{three}",
configurator=SingletonConfigurator.class)
public static final class Server {
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/pojo/Util.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/Util.java?rev=1458279&r1=1458278&r2=1458279&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/Util.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/Util.java Tue Mar 19 13:47:37 2013
@@ -17,6 +17,7 @@
package org.apache.tomcat.websocket.pojo;
import javax.servlet.ServletContextEvent;
+import javax.websocket.ClientEndpoint;
import javax.websocket.DeploymentException;
import javax.websocket.server.ServerEndpointConfig.Configurator;
@@ -63,4 +64,9 @@ public class Util {
return result;
}
}
+
+
+ @ClientEndpoint
+ public static final class SimpleClient {
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org