Author: markt
Date: Wed Mar 6 15:04:38 2013
New Revision: 1453371
URL: http://svn.apache.org/r1453371
Log:
Refactoring towards v014 API (not yet complete)
Modified:
tomcat/trunk/java/javax/websocket/server/ServerApplicationConfig.java
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
Modified: tomcat/trunk/java/javax/websocket/server/ServerApplicationConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/server/ServerApplicationConfig.java?rev=1453371&r1=1453370&r2=1453371&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/server/ServerApplicationConfig.java
(original)
+++ tomcat/trunk/java/javax/websocket/server/ServerApplicationConfig.java Wed
Mar 6 15:04:38 2013
@@ -22,7 +22,7 @@ import javax.websocket.Endpoint;
public interface ServerApplicationConfig {
- Set<Class<? extends ServerEndpointConfig>> getEndpointConfiguration(
+ Set<ServerEndpointConfig> getEndpointConfigs(
Set<Class<? extends Endpoint>> scanned);
Set<Class<?>> getAnnotatedEndpointClasses(Set<Class<?>> scanned);
Modified: tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java?rev=1453371&r1=1453370&r2=1453371&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
(original)
+++ tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java Wed Mar
6 15:04:38 2013
@@ -209,5 +209,11 @@ public interface ServerEndpointConfig ex
HandshakeRequest request, HandshakeResponse response) {
fetchContainerDefaultConfigurator().modifyHandshake(sec, request,
response);
}
+
+ public <T extends Object> T getEndpointInstance(Class<T> clazz)
+ throws InstantiationException {
+ return fetchContainerDefaultConfigurator().getEndpointInstance(
+ clazz);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
