Author: markt
Date: Wed Feb 27 16:50:20 2013
New Revision: 1450839
URL: http://svn.apache.org/r1450839
Log:
Align to proposed method signatures
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java
Wed Feb 27 16:50:20 2013
@@ -115,10 +115,10 @@ public class ServerContainerImpl extends
* instances
* @throws DeploymentException
*/
- public void publishServer(ServerEndpointConfiguration sec)
+ public void deploy(ServerEndpointConfiguration sec)
throws DeploymentException {
if (servletContext == null) {
- throw new IllegalArgumentException(
+ throw new DeploymentException(
sm.getString("serverContainer.servletContextMissing"));
}
String path = sec.getPath();
@@ -149,11 +149,11 @@ public class ServerContainerImpl extends
*
* @param pojo The annotated POJO
*/
- public void publishServer(Class<?> pojo) {
+ public void deploy(Class<?> pojo) throws DeploymentException {
ServerEndpoint annotation = pojo.getAnnotation(ServerEndpoint.class);
if (annotation == null) {
- throw new IllegalArgumentException(
+ throw new DeploymentException(
sm.getString("serverContainer.missingAnnotation",
pojo.getName()));
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Wed Feb 27
16:50:20 2013
@@ -22,6 +22,7 @@ import javax.servlet.ServletContainerIni
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.annotation.HandlesTypes;
+import javax.websocket.DeploymentException;
import javax.websocket.server.ServerEndpoint;
/**
@@ -45,7 +46,11 @@ public class WsSci implements ServletCon
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
sc.setServletContext(ctx);
for (Class<?> clazz : clazzes) {
- sc.publishServer(clazz);
+ try {
+ sc.deploy(clazz);
+ } catch (DeploymentException e) {
+ throw new ServletException(e);
+ }
}
}
}
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=1450839&r1=1450838&r2=1450839&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Wed Feb 27 16:50:20 2013
@@ -414,7 +414,11 @@ public class TestWsWebSocketContainer ex
super.contextInitialized(sce);
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
sc.setServletContext(sce.getServletContext());
- sc.publishServer(BlockingPojo.class);
+ try {
+ sc.deploy(BlockingPojo.class);
+ } catch (DeploymentException e) {
+ throw new IllegalStateException(e);
+ }
}
}
@@ -520,7 +524,7 @@ public class TestWsWebSocketContainer ex
super.contextInitialized(sce);
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
try {
- sc.publishServer(ServerEndpointConfigurationBuilder.create(
+ sc.deploy(ServerEndpointConfigurationBuilder.create(
ConstantTxEndpoint.class, PATH).build());
if (TestWsWebSocketContainer.timoutOnContainer) {
sc.setAsyncSendTimeout(TIMEOUT_MS);
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterEchoServer.java Wed Feb
27 16:50:20 2013
@@ -20,6 +20,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import javax.servlet.ServletContextEvent;
+import javax.websocket.DeploymentException;
import javax.websocket.OnMessage;
import javax.websocket.Session;
import javax.websocket.server.ServerEndpoint;
@@ -39,8 +40,12 @@ public class TesterEchoServer {
super.contextInitialized(sce);
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
sc.setServletContext(sce.getServletContext());
- sc.publishServer(Async.class);
- sc.publishServer(Basic.class);
+ try {
+ sc.deploy(Async.class);
+ sc.deploy(Basic.class);
+ } catch (DeploymentException e) {
+ throw new IllegalStateException(e);
+ }
}
}
Modified:
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java?rev=1450839&r1=1450838&r2=1450839&view=diff
==============================================================================
---
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
(original)
+++
tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java
Wed Feb 27 16:50:20 2013
@@ -32,7 +32,7 @@ public class WsConfigListener extends Ws
super.contextInitialized(sce);
ServerContainerImpl sc = ServerContainerImpl.getServerContainer();
try {
- sc.publishServer(ServerEndpointConfigurationBuilder.create(
+ sc.deploy(ServerEndpointConfigurationBuilder.create(
EchoEndpoint.class,
"/websocket/echoProgrammatic").build());
} catch (DeploymentException e) {
throw new IllegalStateException(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
