Author: markt Date: Tue Oct 15 11:01:08 2013 New Revision: 1532286 URL: http://svn.apache.org/r1532286 Log: Refactor WebSocket examples to only require the SCI
Added: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java (with props) Removed: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/WsConfigListener.java tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/WsConfigListener.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java tomcat/trunk/webapps/examples/WEB-INF/web.xml Added: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java?rev=1532286&view=auto ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java (added) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java Tue Oct 15 11:01:08 2013 @@ -0,0 +1,59 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package websocket; + +import java.util.HashSet; +import java.util.Set; + +import javax.websocket.Endpoint; +import javax.websocket.server.ServerApplicationConfig; +import javax.websocket.server.ServerEndpointConfig; + +import websocket.drawboard.DrawboardEndpoint; +import websocket.echo.EchoEndpoint; + +public class ExamplesConfig implements ServerApplicationConfig { + + @Override + public Set<ServerEndpointConfig> getEndpointConfigs( + Set<Class<? extends Endpoint>> scanned) { + + Set<ServerEndpointConfig> result = new HashSet<>(); + + if (scanned.contains(EchoEndpoint.class)) { + result.add(ServerEndpointConfig.Builder.create( + EchoEndpoint.class, + "/websocket/echoProgrammatic").build()); + } + + if (scanned.contains(DrawboardEndpoint.class)) { + result.add(ServerEndpointConfig.Builder.create( + DrawboardEndpoint.class, + "/websocket/drawboard").build()); + } + + return result; + } + + + @Override + public Set<Class<?>> getAnnotatedEndpointClasses(Set<Class<?>> scanned) { + // Deploy all WebSocket endpoints defined by annotations in the examples + // web application. + return scanned; + } +} Propchange: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java?rev=1532286&r1=1532285&r2=1532286&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java Tue Oct 15 11:01:08 2013 @@ -25,7 +25,7 @@ import javax.websocket.MessageHandler; import javax.websocket.RemoteEndpoint; import javax.websocket.Session; -public class EchoEndpoint extends Endpoint{ +public class EchoEndpoint extends Endpoint { @Override public void onOpen(Session session, EndpointConfig endpointConfig) { Modified: tomcat/trunk/webapps/examples/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/web.xml?rev=1532286&r1=1532285&r2=1532286&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/web.xml (original) +++ tomcat/trunk/webapps/examples/WEB-INF/web.xml Tue Oct 15 11:01:08 2013 @@ -20,7 +20,7 @@ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1" - metadata-complete="false"> + metadata-complete="true"> <description> Servlet and JSP Examples. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org