diff options
author | ritchie <ritchie@gmx.at> | 2015-09-11 07:53:51 +0200 |
---|---|---|
committer | ritchie <ritchie@gmx.at> | 2015-09-11 07:53:51 +0200 |
commit | 029d66622c19af4a17ef4e47598f5f9038f9c3cf (patch) | |
tree | 2204492fb8782ca592516a549c9af1f9934d4028 /core/src/main | |
parent | 4344efd565b3ad079eff4780619a964c86ac0b11 (diff) | |
parent | 6c4d9f5a060c8621cfd1cb3c9132d2bfaecaabd3 (diff) | |
download | nanohttpd-029d66622c19af4a17ef4e47598f5f9038f9c3cf.tar.gz |
Merge branch 'vnnv-Nanolets_Condensed_in_a_single_file'
Diffstat (limited to 'core/src/main')
-rw-r--r-- | core/src/main/java/fi/iki/elonen/NanoHTTPD.java | 8 | ||||
-rw-r--r-- | core/src/main/java/fi/iki/elonen/util/ServerRunner.java | 75 |
2 files changed, 79 insertions, 4 deletions
diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index 7992650..d75c762 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -1801,21 +1801,21 @@ public abstract class NanoHTTPD { /** * Create a response with unknown length (using HTTP 1.1 chunking). */ - public Response newChunkedResponse(IStatus status, String mimeType, InputStream data) { + public static Response newChunkedResponse(IStatus status, String mimeType, InputStream data) { return new Response(status, mimeType, data, -1); } /** * Create a response with known length. */ - public Response newFixedLengthResponse(IStatus status, String mimeType, InputStream data, long totalBytes) { + public static Response newFixedLengthResponse(IStatus status, String mimeType, InputStream data, long totalBytes) { return new Response(status, mimeType, data, totalBytes); } /** * Create a text response with known length. */ - public Response newFixedLengthResponse(IStatus status, String mimeType, String txt) { + public static Response newFixedLengthResponse(IStatus status, String mimeType, String txt) { if (txt == null) { return newFixedLengthResponse(status, mimeType, new ByteArrayInputStream(new byte[0]), 0); } else { @@ -1833,7 +1833,7 @@ public abstract class NanoHTTPD { /** * Create a text response with known length. */ - public Response newFixedLengthResponse(String msg) { + public static Response newFixedLengthResponse(String msg) { return newFixedLengthResponse(Status.OK, NanoHTTPD.MIME_HTML, msg); } diff --git a/core/src/main/java/fi/iki/elonen/util/ServerRunner.java b/core/src/main/java/fi/iki/elonen/util/ServerRunner.java new file mode 100644 index 0000000..c8d22d4 --- /dev/null +++ b/core/src/main/java/fi/iki/elonen/util/ServerRunner.java @@ -0,0 +1,75 @@ +package fi.iki.elonen.util; + +/* + * #%L + * NanoHttpd-Webserver + * %% + * Copyright (C) 2012 - 2015 nanohttpd + * %% + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the nanohttpd nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * #L% + */ + +import java.io.IOException; +import java.util.logging.Level; +import java.util.logging.Logger; + +import fi.iki.elonen.NanoHTTPD; + +public class ServerRunner { + + /** + * logger to log to. + */ + private static final Logger LOG = Logger.getLogger(ServerRunner.class.getName()); + + public static void executeInstance(NanoHTTPD server) { + try { + server.start(); + } catch (IOException ioe) { + System.err.println("Couldn't start server:\n" + ioe); + System.exit(-1); + } + + System.out.println("Server started, Hit Enter to stop.\n"); + + try { + System.in.read(); + } catch (Throwable ignored) { + } + + server.stop(); + System.out.println("Server stopped.\n"); + } + + public static <T extends NanoHTTPD> void run(Class<T> serverClass) { + try { + executeInstance(serverClass.newInstance()); + } catch (Exception e) { + ServerRunner.LOG.log(Level.SEVERE, "Cound nor create server", e); + } + } +} |