X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fhttpserver%2FHttpServer.java;h=b9adcc68805c5057b0e30d214d93c99c143d380b;hb=85299bc2db43c8b108169661ebc1c4d9b2d3d2e5;hp=34b39cd4d452395a34ea271b575810e9b39b1c83;hpb=ac207fd787051c6e0f4f9f10ea6b94452480d931;p=jalview.git
diff --git a/src/jalview/httpserver/HttpServer.java b/src/jalview/httpserver/HttpServer.java
index 34b39cd..b9adcc6 100644
--- a/src/jalview/httpserver/HttpServer.java
+++ b/src/jalview/httpserver/HttpServer.java
@@ -1,5 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.httpserver;
+import jalview.rest.RestHandler;
+
import java.net.BindException;
import java.net.URI;
import java.util.Collections;
@@ -16,8 +38,6 @@ import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
-import jalview.rest.RestHandler;
-
/**
* An HttpServer built on Jetty. To use it
*
@@ -72,7 +92,8 @@ public class HttpServer
{
synchronized (HttpServer.class)
{
- if (instance == null) {
+ if (instance == null)
+ {
instance = new HttpServer();
}
return instance;
@@ -112,6 +133,8 @@ public class HttpServer
server = new Server(tp);
// 2 selector threads to handle incoming connections
ServerConnector connector = new ServerConnector(server, 0, 2);
+ // restrict to localhost
+ connector.setHost("localhost");
server.addConnector(connector);
/*
@@ -127,14 +150,14 @@ public class HttpServer
contextHandlers = new HandlerCollection(true);
server.setHandler(contextHandlers);
server.start();
- // System.out.println(String.format(
+ // jalview.bin.Console.outPrintln(String.format(
// "HttpServer started with %d threads", server.getThreadPool()
// .getThreads()));
contextRoot = server.getURI();
} catch (Exception e)
{
- System.err.println("Error trying to start HttpServer: "
- + e.getMessage());
+ jalview.bin.Console.errPrintln(
+ "Error trying to start HttpServer: " + e.getMessage());
try
{
server.stop();
@@ -172,14 +195,14 @@ public class HttpServer
{
for (String val : Collections.list(request.getHeaders(hdr)))
{
- System.out.println(hdr + ": " + val);
+ jalview.bin.Console.outPrintln(hdr + ": " + val);
}
}
for (String param : Collections.list(request.getParameterNames()))
{
for (String val : request.getParameterValues(param))
{
- System.out.println(param + "=" + val);
+ jalview.bin.Console.outPrintln(param + "=" + val);
}
}
}
@@ -198,7 +221,7 @@ public class HttpServer
server.stop();
} catch (Exception e)
{
- System.err.println("Error stopping Http Server on "
+ jalview.bin.Console.errPrintln("Error stopping Http Server on "
+ server.getURI() + ": " + e.getMessage());
}
}
@@ -227,8 +250,7 @@ public class HttpServer
ch.setAllowNullPathInfo(true);
ch.setContextPath("/" + JALVIEW_PATH + "/" + path);
ch.setResourceBase(".");
- ch.setClassLoader(Thread.currentThread()
- .getContextClassLoader());
+ ch.setClassLoader(Thread.currentThread().getContextClassLoader());
ch.setHandler(handler);
/*
@@ -245,12 +267,12 @@ public class HttpServer
ch.start();
} catch (Exception e)
{
- System.err.println("Error starting handler for " + path + ": "
- + e.getMessage());
+ jalview.bin.Console.errPrintln(
+ "Error starting handler for " + path + ": " + e.getMessage());
}
handler.setUri(this.contextRoot + ch.getContextPath().substring(1));
- System.out.println("Jalview " + handler.getName()
+ jalview.bin.Console.outPrintln("Jalview " + handler.getName()
+ " handler started on " + handler.getUri());
}
@@ -260,7 +282,7 @@ public class HttpServer
*
* @param handler
*/
- public void removeHandler(Handler handler)
+ public void removeHandler(AbstractRequestHandler handler)
{
/*
* Have to use this cached lookup table since there is no method
@@ -271,6 +293,8 @@ public class HttpServer
{
contextHandlers.removeHandler(ch);
myHandlers.remove(handler);
+ jalview.bin.Console.outPrintln("Stopped Jalview " + handler.getName()
+ + " handler on " + handler.getUri());
}
}
}