aboutsummaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorJarno Elonen <elonen@iki.fi>2015-09-13 20:49:59 +0300
committerJarno Elonen <elonen@iki.fi>2015-09-13 20:49:59 +0300
commit60b7e9249246749a16bf8bc29aa117e4201eae8b (patch)
tree35c559493a5ec0e92846c51e048f683fdd5c4057 /samples
parent9f38ca21e99986290bf65a8fec17d2592d98d744 (diff)
parentf3b51b6d9e8b24f2f2e021465b0f5972ad12892d (diff)
downloadnanohttpd-60b7e9249246749a16bf8bc29aa117e4201eae8b.tar.gz
Merge branch 'master' into static-new-xx
Diffstat (limited to 'samples')
-rw-r--r--samples/pom.xml3
-rw-r--r--samples/src/main/java/fi/iki/elonen/HelloServer.java2
-rw-r--r--samples/src/main/java/fi/iki/elonen/TempFilesServer.java1
-rw-r--r--samples/src/main/java/fi/iki/elonen/debug/DebugServer.java2
4 files changed, 7 insertions, 1 deletions
diff --git a/samples/pom.xml b/samples/pom.xml
index 5ff6764..e57150a 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -20,4 +20,7 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <properties>
+ <minimal.coverage>0.0</minimal.coverage>
+ </properties>
</project>
diff --git a/samples/src/main/java/fi/iki/elonen/HelloServer.java b/samples/src/main/java/fi/iki/elonen/HelloServer.java
index 7226108..bc91231 100644
--- a/samples/src/main/java/fi/iki/elonen/HelloServer.java
+++ b/samples/src/main/java/fi/iki/elonen/HelloServer.java
@@ -36,6 +36,8 @@ package fi.iki.elonen;
import java.util.Map;
import java.util.logging.Logger;
+import fi.iki.elonen.util.ServerRunner;
+
/**
* An example of subclassing NanoHTTPD to make a custom HTTP server.
*/
diff --git a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
index dbe7d37..8429e32 100644
--- a/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
+++ b/samples/src/main/java/fi/iki/elonen/TempFilesServer.java
@@ -37,6 +37,7 @@ import java.util.ArrayList;
import java.util.List;
import fi.iki.elonen.debug.DebugServer;
+import fi.iki.elonen.util.ServerRunner;
/**
* @author Paul S. Hawke (paul.hawke@gmail.com) On: 3/9/13 at 12:47 AM
diff --git a/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
index 056673d..0ffc34f 100644
--- a/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
+++ b/samples/src/main/java/fi/iki/elonen/debug/DebugServer.java
@@ -38,7 +38,7 @@ import java.util.List;
import java.util.Map;
import fi.iki.elonen.NanoHTTPD;
-import fi.iki.elonen.ServerRunner;
+import fi.iki.elonen.util.ServerRunner;
public class DebugServer extends NanoHTTPD {