JAL-1925 update source version in license

[jalview.git] / src / jalview / rest / RestHandler.java

diff --git a/src/jalview/rest/RestHandler.java b/src/jalview/rest/RestHandler.java
index 88f23f4..70b1edf 100644 (file)
--- a/src/jalview/rest/RestHandler.java
+++ b/src/jalview/rest/RestHandler.java
@@ -1,5 +1,27 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 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.rest;
 
+import jalview.httpserver.AbstractRequestHandler;
+
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.BindException;
@@ -7,8 +29,6 @@ import java.net.BindException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import jalview.httpserver.AbstractRequestHandler;
-
 /**
  * A simple handler to process (or delegate) HTTP requests on /jalview/rest
  */
@@ -64,7 +84,7 @@ public class RestHandler extends AbstractRequestHandler
    */
   @Override
   protected void processRequest(HttpServletRequest request,
-          HttpServletResponse response)
+          HttpServletResponse response) throws IOException
   {
     /*
      * Currently just echoes the request; add helper classes as required to
@@ -72,19 +92,15 @@ public class RestHandler extends AbstractRequestHandler
      */
     final String queryString = request.getQueryString();
     final String reply = "REST not yet implemented; received "
-            + request.getRequestURL()
+            + request.getMethod() + ": " + request.getRequestURL()
             + (queryString == null ? "" : "?" + queryString);
     System.out.println(reply);
 
-    try
-    {
-      final PrintWriter writer = response.getWriter();
-      writer.write(reply);
-      writer.close();
-    } catch (IOException e)
-    {
-      System.err.println("Error writing REST response: " + e.getMessage());
-    }
+    response.setHeader("Cache-Control", "no-cache/no-store");
+    response.setHeader("Content-type", "text/plain");
+    final PrintWriter writer = response.getWriter();
+    writer.write(reply);
+    writer.close();
   }
 
   /**