svn commit: r1516183 - /tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java

[ma...@apache.org]

Author: markt
Date: Wed Aug 21 15:02:21 2013
New Revision: 1516183

URL: http://svn.apache.org/r1516183
Log:
Fix Gump errors with WebSocket and trunk

Added:
    tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java   (with props)

Added: tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java?rev=1516183&view=auto
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java (added)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java Wed Aug 21 15:02:21 2013
@@ -0,0 +1,46 @@
+/*
+ * 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 org.apache.tomcat.websocket;
+
+import java.util.Collections;
+import java.util.Set;
+
+import javax.websocket.Endpoint;
+import javax.websocket.server.ServerApplicationConfig;
+import javax.websocket.server.ServerEndpointConfig;
+
+/**
+ * This configuration blocks any endpoints discovered by the SCI from being
+ * deployed. It is intended to prevent testing errors generated when the
+ * WebSocket SCI scans the test classes for endpoints as it will discover
+ * multiple endpoints mapped to the same path ('/'). The tests all explicitly
+ * configure their required endpoints so have no need for SCI based
+ * configuration.
+ */
+public class TesterBlockWebSocketSCI implements ServerApplicationConfig {
+
+    @Override
+    public Set<ServerEndpointConfig> getEndpointConfigs(
+            Set<Class<? extends Endpoint>> scanned) {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Set<Class<?>> getAnnotatedEndpointClasses(Set<Class<?>> scanned) {
+        return Collections.emptySet();
+    }
+}

Propchange: tomcat/trunk/test/org/apache/tomcat/websocket/TesterBlockWebSocketSCI.java
------------------------------------------------------------------------------
    svn:eol-style = native



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