From 898dcc8b2a5c750f061dbe0168bd2e0a2fba2a17 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Mon, 5 Sep 2011 11:24:37 +1000
Subject: [PATCH] 356693 reduce visibility to webapp of websocket
 implementations

---
 .../main/java/org/eclipse/jetty/webapp/WebAppContext.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
index 6b968e18df1..5743359b5be 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
@@ -99,7 +99,8 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
         "org.eclipse.jetty.continuation.",  // webapp cannot change continuation classes
         "org.eclipse.jetty.jndi.",          // webapp cannot change naming classes
         "org.eclipse.jetty.plus.jaas.",     // webapp cannot change jaas classes
-        "org.eclipse.jetty.websocket.",     // WebSocket is a jetty extension
+        "org.eclipse.jetty.websocket.WebSocket",// WebSocket is a jetty extension
+        "org.eclipse.jetty.websocket.WebSocketFactory",// WebSocket is a jetty extension
         "org.eclipse.jetty.servlet.DefaultServlet"  // webapp cannot change default servlets
     } ;
     
@@ -112,7 +113,9 @@ public class WebAppContext extends ServletContextHandler implements WebAppClassL
         "-org.eclipse.jetty.continuation.", // don't hide continuation classes
         "-org.eclipse.jetty.jndi.",         // don't hide naming classes
         "-org.eclipse.jetty.plus.jaas.",    // don't hide jaas classes
-        "-org.eclipse.jetty.websocket.",    // don't hide websocket extension
+        "-org.eclipse.jetty.websocket.WebSocket",// WebSocket is a jetty extension
+        "-org.eclipse.jetty.websocket.WebSocketFactory",// WebSocket is a jetty extension
+        "-org.eclipse.jetty.websocket.WebSocketServlet",// WebSocket is a jetty extension
         "-org.eclipse.jetty.servlet.DefaultServlet", // don't hide default servlet
         "-org.eclipse.jetty.servlet.listener.", //don't hide useful listeners
         "org.eclipse.jetty."                // hide other jetty classes