Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGreg Wilkins2013-09-09 02:27:15 +0000
committerGreg Wilkins2013-09-09 02:27:15 +0000
commita1cba900c5266ddba97a58f0e67e55b35418fc7e (patch)
treef063c66e262d25f9f2473410d812756b965f4854 /tests
parent400f0ce5a29d5d8e65ef8bb918026c1461a5111a (diff)
downloadorg.eclipse.jetty.project-a1cba900c5266ddba97a58f0e67e55b35418fc7e.tar.gz
org.eclipse.jetty.project-a1cba900c5266ddba97a58f0e67e55b35418fc7e.tar.xz
org.eclipse.jetty.project-a1cba900c5266ddba97a58f0e67e55b35418fc7e.zip
416812 Only start WebSocketContainer if enabled by attribute
Diffstat (limited to 'tests')
-rw-r--r--tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
index 09f59b7ce9..42e03cb333 100644
--- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
+++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml
@@ -28,8 +28,13 @@ detected.
<Set name="copyWebDir">false</Set>
<Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
<Set name="overrideDescriptor"><Property name="jetty.base" default="."/>/etc/override-web.xml</Set>
-
+ <!-- Enable/Disable JSR356 Container for this context -->
+ <Call name="setAttribute">
+ <Arg>org.eclipse.jetty.websocket.jsr356</Arg>
+ <Arg type="Boolean">true</Arg>
+ </Call>
+
<!-- virtual hosts
<Set name="virtualHosts">
<Array type="String">

Back to the top