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

jetty-9 alternative websocket discovery

This commit is contained in:
Greg Wilkins 2012-11-15 21:23:43 +11:00
parent 49de22ea48
commit 4ff9bdc54d
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServlet.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.websocket.servlet;
import java.io.IOException;
import java.util.Iterator;
import java.util.ServiceLoader;
import javax.servlet.ServletException;
@ -128,8 +129,16 @@ public abstract class WebSocketServlet extends HttpServlet
policy.setMaxBinaryMessageSize(Integer.parseInt(max));
}
ServiceLoader<WebSocketServletFactory> loader = ServiceLoader.load(WebSocketServletFactory.class);
WebSocketServletFactory baseFactory = loader.iterator().next();
WebSocketServletFactory baseFactory ;
Iterator<WebSocketServletFactory> factories = ServiceLoader.load(WebSocketServletFactory.class).iterator();
if (factories.hasNext())
baseFactory=factories.next();
else
{
Class<WebSocketServletFactory> wssf= (Class<WebSocketServletFactory>)getServletContext().getClass().getClassLoader().loadClass("org.eclipse.jetty.websocket.server.WebSocketServerFactory");
baseFactory=wssf.newInstance();
}
factory = baseFactory.createFactory(policy);

6
test-jetty-webapp/pom.xml
View File

@ -172,6 +172,12 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.websocket</groupId>
<artifactId>websocket-server</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>

9
test-jetty-webapp/src/test/java/org/eclipse/jetty/TestServer.java
View File

@ -149,7 +149,7 @@ public class TestServer
server.setHandler(restart);
// Setup deployers
// Setup context
HashLoginService login = new HashLoginService();
login.setName("Test Realm");
@ -165,7 +165,8 @@ public class TestServer
server.setSendServerVersion(true);
WebAppContext webapp = new WebAppContext();
//webapp.setParentLoaderPriority(true);
webapp.setParentLoaderPriority(true);
webapp.prependServerClass("-org.eclipse.jetty.websocket.server.");
webapp.setResourceBase("./src/main/webapp");
webapp.setAttribute("testAttribute","testValue");
File sessiondir=File.createTempFile("sessions",null);
@ -190,7 +191,6 @@ public class TestServer
private static class RestartHandler extends HandlerWrapper
{
/* ------------------------------------------------------------ */
/**
* @see org.eclipse.jetty.server.handler.HandlerWrapper#handle(java.lang.String, org.eclipse.jetty.server.Request, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
@ -205,6 +205,7 @@ public class TestServer
new Thread()
{
@Override
public void run()
{
try
@ -222,7 +223,5 @@ public class TestServer
}.start();
}
}
}
}