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

JSR-356 using Spec 6.4 properly for access to ServerContainer

This commit is contained in:
Joakim Erdfelt 2013-07-26 14:03:45 -07:00
parent 6076e05bf6
commit 6029826aa4
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
View File

@ -43,7 +43,7 @@ public class ServerContainer extends ClientContainer implements javax.websocket.
{
public static ServerContainer get(WebAppContext context)
{
return (ServerContainer)context.getAttribute(WebSocketConfiguration.JAVAX_WEBSOCKET_SERVER_CONTAINER);
return (ServerContainer)context.getAttribute(javax.websocket.server.ServerContainer.class.getName());
}
private final MappedWebSocketCreator mappedCreator;

26
jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/WebSocketConfiguration.java
View File

@ -24,6 +24,7 @@ import javax.servlet.DispatcherType;
import org.eclipse.jetty.annotations.AnnotationConfiguration;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
import org.eclipse.jetty.webapp.AbstractConfiguration;
@ -36,11 +37,9 @@ import org.eclipse.jetty.websocket.server.WebSocketUpgradeFilter;
*/
public class WebSocketConfiguration extends AbstractConfiguration
{
public static final String JAVAX_WEBSOCKET_SERVER_CONTAINER = "javax.websocket.server.ServerContainer";
private static final Logger LOG = Log.getLogger(WebSocketConfiguration.class);
@Override
public void configure(WebAppContext context) throws Exception
public void configureContext(ServletContextHandler context, boolean startContainer)
{
WebSocketUpgradeFilter filter = new WebSocketUpgradeFilter();
FilterHolder fholder = new FilterHolder(filter);
@ -53,10 +52,23 @@ public class WebSocketConfiguration extends AbstractConfiguration
// Store reference to the WebSocketUpgradeFilter
context.setAttribute(WebSocketUpgradeFilter.class.getName(),filter);
// Store reference to the ServerContainer
ServerContainer container = new ServerContainer(filter);
filter.setWebSocketServerFactoryListener(container);
context.setAttribute(JAVAX_WEBSOCKET_SERVER_CONTAINER,container);
// Create the Jetty ServerContainer implementation
ServerContainer jettyContainer = new ServerContainer(filter);
filter.setWebSocketServerFactoryListener(jettyContainer);
// Store a reference to the ServerContainer per javax.websocket spec 1.0 final section 6.4 Programmatic Server Deployment
context.setAttribute(javax.websocket.server.ServerContainer.class.getName(),jettyContainer);
if (startContainer)
{
jettyContainer.start();
}
}
@Override
public void configure(WebAppContext context) throws Exception
{
configureContext(context,false);
}
@Override