Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer 

+ removing etc/jetty-websockets.xml (now irrelevant)
This commit is contained in:
Joakim Erdfelt 2013-09-26 10:13:12 -07:00
parent 1fcede8b8b
commit b966545a95
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<!-- Should a Websocket container be initialized for each context? -->
<!-- Can be overridden by context attribute -->
<Call name="setAttribute">
<Arg>org.eclipse.jetty.websocket.jsr356</Arg>
<Arg type="Boolean"><Property name="org.eclipse.jetty.websocket.jsr356" default="true"/></Arg>
</Call>
</Configure>

4
jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
View File

@ -4,14 +4,10 @@
[depend]
# WebSocket needs Annotations feature
server
annotations
[lib]
# WebSocket needs websocket jars (as defined in start.config)
lib/websocket/*.jar
[xml]
# WebSocket needs websocket configuration
etc/jetty-websockets.xml