mirror of
https://github.com/NanoHttpd/nanohttpd
synced 2026-06-08 11:57:38 +00:00
Tidied up copyright statements, making them consistent, and updated version numbers to 2.0.0 throughout.
This commit is contained in:
Paul Hawke
@@ -9,7 +9,7 @@
|
||||
* 2 "flavors" - one strictly Java 1.1 compatible, one at "current" standards.
|
||||
* Released as open source, free software, under a Modified BSD licence.
|
||||
* No fixed config files, logging, authorization etc. (Implement by yourself if you need them.)
|
||||
* Supports parameter parsing of GET and POST methods
|
||||
* Supports parameter parsing of GET and POST methods
|
||||
* Rudimentary PUT support (added in 1.25)
|
||||
* Support for HEAD requests
|
||||
* Parameter names must be unique, with a helper method to extract multi-value parameters if needed.
|
||||
@@ -37,8 +37,8 @@ The project is managed with a "fork and pull-request" pattern. If you want to c
|
||||
|
||||
## Where can I find the original (Java1.1) NanoHttpd?
|
||||
|
||||
The original (Java 1.1 project) and the Java 6 project merged in early 2013 to pool resources
|
||||
around "NanoHttpd" as a whole, regardless of flavor. Development of the Java 1.1 version continues
|
||||
The original (Java 1.1 project) and the Java 6 project merged in early 2013 to pool resources
|
||||
around "NanoHttpd" as a whole, regardless of flavor. Development of the Java 1.1 version continues
|
||||
as a permanent branch ("nanohttpd-for-java1.1") in the main http://github.com/NanoHttpd/nanohttpd repository.
|
||||
|
||||
## How do I use nanohttpd?
|
||||
@@ -83,11 +83,11 @@ public class DebugServer extends NanoHTTPD {
|
||||
|
||||
## Why fork the original repo?
|
||||
|
||||
The Java 6 version of *nanohttpd* was born when we realized that embedding Jetty inside our
|
||||
Android application was going to inflate the size without bringing along features that we
|
||||
were going to need. The search for a smaller more streamlined HTTP server lead us
|
||||
to *nanohttpd* as the project had started with exactly the same goals, but we wanted to
|
||||
clear up the old code - move from Java 1.1, run _static code analysis_ tools and cleanup
|
||||
The Java 6 version of *nanohttpd* was born when we realized that embedding Jetty inside our
|
||||
Android application was going to inflate the size without bringing along features that we
|
||||
were going to need. The search for a smaller more streamlined HTTP server lead us
|
||||
to *nanohttpd* as the project had started with exactly the same goals, but we wanted to
|
||||
clear up the old code - move from Java 1.1, run _static code analysis_ tools and cleanup
|
||||
the findings and pull out sample/test code from the source.
|
||||
|
||||
In the words of the original founder of the project
|
||||
@@ -97,12 +97,18 @@ In the words of the original founder of the project
|
||||
> of view - "overkill features" like servlet support, web administration,
|
||||
> configuration files, logging etc.
|
||||
|
||||
Since that time we fixed a number of bugs, moved the build to _maven_ and pulled out
|
||||
Since that time we fixed a number of bugs, moved the build to _maven_ and pulled out
|
||||
the samples from the runtime JAR to further slim it down.
|
||||
|
||||
The two projects pooled resources in early 2013, merging code-bases, to better support the
|
||||
user base and reduce confusion over why _two_ NanoHttpd projects existed.
|
||||
|
||||
## Version History (Java 6+ version)
|
||||
* (2013-05-20) : Test suite looks complete.
|
||||
* (2013-05-05) : Web server pulled out of samples and promoted to top-level project
|
||||
* (2013-03-09) : Work on test suite begins - the push for release 2.0.0 begins!
|
||||
* (2013-01-04) : Initial commit on "uplift" fork
|
||||
|
||||
## Version History (Java 1.1 version)
|
||||
|
||||
* 1.27 (2013-04-01): Merged several bug fixes from github forks
|
||||
|
||||
+3
-29
@@ -4,15 +4,11 @@
|
||||
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>NanoHTTPd</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<name>NanoHttpd</name>
|
||||
<url>https://github.com/NanoHttpd/nanohttpd</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
@@ -33,28 +29,6 @@
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git://github.com/psh/nanohttpd.git</connection>
|
||||
<url>scm:git:git://github.com/psh/nanohttpd.git</url>
|
||||
<developerConnection>scm:git:git://github.com/psh/nanohttpd.git</developerConnection>
|
||||
<tag>nanohttpd-1.0.0</tag>
|
||||
</scm>
|
||||
|
||||
<build>
|
||||
<extensions>
|
||||
<extension>
|
||||
|
||||
@@ -14,12 +14,7 @@ import java.util.*;
|
||||
* <p/>
|
||||
* <p/>
|
||||
* NanoHTTPD
|
||||
* -- version 1.25, Copyright © 2001,2005-2012<br/>
|
||||
* Jarno Elonen (elonen@iki.fi, http://iki.fi/elonen/) and<br/>
|
||||
* Copyright © 2010 Konstantinos Togias (info@ktogias.gr, http://ktogias.gr)
|
||||
* <p/>
|
||||
* -- version 6 and above, Copyright © 2012-<br/>
|
||||
* Uplifted to Java6 by Paul Hawke (paul.hawke@gmail.com) and Micah Hainline.
|
||||
* <p></p>Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias</p>
|
||||
* <p/>
|
||||
* <p/>
|
||||
* <b>Features + limitations: </b>
|
||||
|
||||
@@ -3,15 +3,11 @@
|
||||
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd-project</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<name>NanoHTTPd-Project</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<name>NanoHttpd-Project</name>
|
||||
<url>https://github.com/NanoHttpd/nanohttpd</url>
|
||||
|
||||
<modules>
|
||||
<module>core</module>
|
||||
@@ -19,28 +15,6 @@
|
||||
<module>webserver</module>
|
||||
</modules>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git://github.com/psh/nanohttpd.git</connection>
|
||||
<url>scm:git:git://github.com/psh/nanohttpd.git</url>
|
||||
<developerConnection>scm:git:git://github.com/psh/nanohttpd.git</developerConnection>
|
||||
<tag>nanohttpd-1.0.0</tag>
|
||||
</scm>
|
||||
|
||||
<build>
|
||||
<extensions>
|
||||
<extension>
|
||||
|
||||
+5
-31
@@ -4,51 +4,25 @@
|
||||
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd-samples</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>NanoHTTPd-samples</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<name>NanoHttpd-Samples</name>
|
||||
<url>https://github.com/NanoHttpd/nanohttpd</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd-webserver</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git://github.com/psh/nanohttpd.git</connection>
|
||||
<url>scm:git:git://github.com/psh/nanohttpd.git</url>
|
||||
<developerConnection>scm:git:git://github.com/psh/nanohttpd.git</developerConnection>
|
||||
<tag>nanohttpd-1.0.0</tag>
|
||||
</scm>
|
||||
|
||||
<build>
|
||||
<extensions>
|
||||
<extension>
|
||||
|
||||
+4
-30
@@ -4,46 +4,20 @@
|
||||
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd-webserver</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>NanoHTTPd-Webserver</name>
|
||||
<url>http://maven.apache.org</url>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
</properties>
|
||||
<name>NanoHttpd-Webserver</name>
|
||||
<url>https://github.com/NanoHttpd/nanohttpd</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>fi.iki.elonen</groupId>
|
||||
<artifactId>nanohttpd</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>2.0.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<distributionManagement>
|
||||
<repository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</repository>
|
||||
<snapshotRepository>
|
||||
<id>fictional-io</id>
|
||||
<name>fictional.io</name>
|
||||
<url>ftp://fictional.io/domains/fictional.io/public_html/maven/maven2</url>
|
||||
<uniqueVersion>false</uniqueVersion>
|
||||
</snapshotRepository>
|
||||
</distributionManagement>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:git://github.com/psh/nanohttpd.git</connection>
|
||||
<url>scm:git:git://github.com/psh/nanohttpd.git</url>
|
||||
<developerConnection>scm:git:git://github.com/psh/nanohttpd.git</developerConnection>
|
||||
<tag>nanohttpd-1.0.0</tag>
|
||||
</scm>
|
||||
|
||||
<build>
|
||||
<extensions>
|
||||
<extension>
|
||||
|
||||
@@ -45,9 +45,7 @@ public class SimpleWebServer extends NanoHTTPD {
|
||||
* The distribution licence
|
||||
*/
|
||||
private static final String LICENCE =
|
||||
"Copyright (C) 2001,2005-2011 by Jarno Elonen <elonen@iki.fi>,\n"
|
||||
+ "(C) 2010 by Konstantinos Togias <info@ktogias.gr>\n"
|
||||
+ "and (C) 2012- by Paul S. Hawke\n"
|
||||
"Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias\n"
|
||||
+ "\n"
|
||||
+ "Redistribution and use in source and binary forms, with or without\n"
|
||||
+ "modification, are permitted provided that the following conditions\n"
|
||||
|
||||
Reference in New Issue
Block a user