diff -r 30f20d9c0986 -r bdec4103bdb2 ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusDynamicHTTP.java --- a/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusDynamicHTTP.java Sat Aug 02 12:59:31 2014 +0200 +++ b/ko-ws-tyrus/src/test/java/org/netbeans/html/wstyrus/TyrusDynamicHTTP.java Wed May 27 23:37:25 2015 +0200 @@ -75,28 +75,28 @@ private static List resources; private static ServerConfiguration conf; private static HttpServer server; - + private TyrusDynamicHTTP() { } - + static URI initServer() throws Exception { server = HttpServer.createSimpleServer(null, new PortRange(8080, 65535)); final WebSocketAddOn addon = new WebSocketAddOn(); for (NetworkListener listener : server.getListeners()) { listener.registerAddOn(addon); - } + } resources = new ArrayList(); conf = server.getServerConfiguration(); final TyrusDynamicHTTP dh = new TyrusDynamicHTTP(); conf.addHttpHandler(dh, "/"); - + server.start(); return pageURL("http", server, "/test.html"); } - + @Override public void service(Request request, Response response) throws Exception { if ("/test.html".equals(request.getRequestURI())) { @@ -158,6 +158,8 @@ sb.append((char) ch); } params[i] = sb.toString(); + } else if (r.parameters[i].startsWith("http.header.")) { + params[i] = request.getHeader(r.parameters[i].substring(12)); } } if (params[i] == null) { @@ -170,7 +172,7 @@ } } } - + private URI registerWebSocket(Resource r) { WebSocketEngine.getEngine().register("", r.httpPath, new WS(r)); return pageURL("ws", server, r.httpPath); @@ -183,7 +185,7 @@ } return pageURL("http", server, r.httpPath); } - + private static URI pageURL(String proto, HttpServer server, final String page) { NetworkListener listener = server.getListeners().iterator().next(); int port = listener.getPort(); @@ -193,7 +195,7 @@ throw new IllegalStateException(ex); } } - + static final class Resource { final InputStream httpContent; @@ -234,7 +236,7 @@ } } } - + private static class WS extends WebSocketApplication { private final Resource r; @@ -255,6 +257,6 @@ } } private static final Logger LOG = Logger.getLogger(WS.class.getName()); - + } }