From b966545a9542e21269306cb6e974dc5d15730207 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Thu, 26 Sep 2013 10:13:12 -0700
Subject: [PATCH] 417152 - WebSocket / Do all setup in websocket specific
 ServletContainerInitializer

+ removing etc/jetty-websockets.xml (now irrelevant)
---
 .../src/main/config/etc/jetty-websockets.xml        | 13 -------------
 .../src/main/config/modules/websocket.mod           |  4 ----
 2 files changed, 17 deletions(-)
 delete mode 100644 jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml

diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml b/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml
deleted file mode 100644
index 7b7df6f24a9..00000000000
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/etc/jetty-websockets.xml
+++ /dev/null
@@ -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>
diff --git a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
index ecf5b3c0709..481bdfaaf11 100644
--- a/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
+++ b/jetty-websocket/javax-websocket-server-impl/src/main/config/modules/websocket.mod
@@ -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