X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fhttpserver%2FHttpServer.java;h=b9adcc68805c5057b0e30d214d93c99c143d380b;hb=f8392b9f693b70051bd96540e9bd67477ef34160;hp=e60db9abe3452ed2bf434ac6eebac579e5ae2561;hpb=bf1ef95b21f5a0c470e33c6cf10022cc732f0df5;p=jalview.git

diff --git a/src/jalview/httpserver/HttpServer.java b/src/jalview/httpserver/HttpServer.java
index e60db9a..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 <http://www.gnu.org/licenses/>.
+ * 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;
@@ -70,7 +92,8 @@ public class HttpServer
   {
     synchronized (HttpServer.class)
     {
-      if (instance == null) {
+      if (instance == null)
+      {
         instance = new HttpServer();
       }
       return instance;
@@ -86,6 +109,11 @@ public class HttpServer
   private HttpServer() throws BindException
   {
     startServer();
+
+    /*
+     * Provides a REST server by default; add more programmatically as required
+     */
+    registerHandler(RestHandler.getInstance());
   }
 
   /**
@@ -105,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);
 
       /*
@@ -120,15 +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();
-      System.out.println("Jalview endpoint " + contextRoot);
     } 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();
@@ -166,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);
       }
     }
   }
@@ -192,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());
         }
       }
@@ -200,23 +229,28 @@ public class HttpServer
   }
 
   /**
-   * Register a handler for the given path and returns its URI
+   * Register a handler for the given path and set its URI
    * 
-   * @param path
-   *          a path below the context root (without leading or trailing
-   *          separator)
    * @param handler
    * @return
+   * @throws IllegalStateException
+   *           if handler path has not been set
    */
-  public String registerHandler(String path, AbstractRequestHandler handler)
+  public void registerHandler(AbstractRequestHandler handler)
   {
+    String path = handler.getPath();
+    if (path == null)
+    {
+      throw new IllegalStateException(
+              "Must set handler path before registering handler");
+    }
+
     // http://stackoverflow.com/questions/20043097/jetty-9-embedded-adding-handlers-during-runtime
     ContextHandler ch = new ContextHandler();
     ch.setAllowNullPathInfo(true);
     ch.setContextPath("/" + JALVIEW_PATH + "/" + path);
     ch.setResourceBase(".");
-    ch.setClassLoader(Thread.currentThread()
-            .getContextClassLoader());
+    ch.setClassLoader(Thread.currentThread().getContextClassLoader());
     ch.setHandler(handler);
 
     /*
@@ -233,11 +267,13 @@ 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());
     }
 
-    return this.contextRoot + ch.getContextPath().substring(1);
+    handler.setUri(this.contextRoot + ch.getContextPath().substring(1));
+    jalview.bin.Console.outPrintln("Jalview " + handler.getName()
+            + " handler started on " + handler.getUri());
   }
 
   /**
@@ -246,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
@@ -257,6 +293,8 @@ public class HttpServer
     {
       contextHandlers.removeHandler(ch);
       myHandlers.remove(handler);
+      jalview.bin.Console.outPrintln("Stopped Jalview " + handler.getName()
+              + " handler on " + handler.getUri());
     }
   }
 }