From 84dcf74395d1817c4a2a7861bd5d3787daa6700a Mon Sep 17 00:00:00 2001 From: Paul Hawke Date: Tue, 21 May 2013 23:00:57 -0500 Subject: [PATCH] Tidied up copyright statements, making them consistent, and updated version numbers to 2.0.0 throughout. --- README.md | 24 ++++++++----- core/pom.xml | 32 ++--------------- .../main/java/fi/iki/elonen/NanoHTTPD.java | 7 +--- pom.xml | 32 ++--------------- samples/pom.xml | 36 +++---------------- webserver/pom.xml | 34 +++--------------- .../java/fi/iki/elonen/SimpleWebServer.java | 4 +-- 7 files changed, 32 insertions(+), 137 deletions(-) diff --git a/README.md b/README.md index 21b88aa..a1d3334 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/core/pom.xml b/core/pom.xml index d736ac3..b1012a5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,15 +4,11 @@ fi.iki.elonen nanohttpd - 1.0.0 + 2.0.0 jar - NanoHTTPd - http://maven.apache.org - - - UTF-8 - + NanoHttpd + https://github.com/NanoHttpd/nanohttpd @@ -33,28 +29,6 @@ - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - - - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - nanohttpd-1.0.0 - - diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java index ca5d8b6..859a45c 100644 --- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java +++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java @@ -14,12 +14,7 @@ import java.util.*; *

*

* NanoHTTPD - * -- version 1.25, Copyright © 2001,2005-2012
- * Jarno Elonen (elonen@iki.fi, http://iki.fi/elonen/) and
- * Copyright © 2010 Konstantinos Togias (info@ktogias.gr, http://ktogias.gr) - *

- * -- version 6 and above, Copyright © 2012-
- * Uplifted to Java6 by Paul Hawke (paul.hawke@gmail.com) and Micah Hainline. + *

Copyright (c) 2012-2013 by Paul S. Hawke, 2001,2005-2013 by Jarno Elonen, 2010 by Konstantinos Togias

*

*

* Features + limitations: diff --git a/pom.xml b/pom.xml index 4b5468a..9382c44 100644 --- a/pom.xml +++ b/pom.xml @@ -3,15 +3,11 @@ fi.iki.elonen nanohttpd-project - 1.0.0 + 2.0.0 pom - NanoHTTPd-Project - http://maven.apache.org - - - UTF-8 - + NanoHttpd-Project + https://github.com/NanoHttpd/nanohttpd core @@ -19,28 +15,6 @@ webserver - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - - - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - nanohttpd-1.0.0 - - diff --git a/samples/pom.xml b/samples/pom.xml index a41c37c..5f5c2cd 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -4,51 +4,25 @@ fi.iki.elonen nanohttpd-samples - 1.0.0 + 2.0.0 jar - NanoHTTPd-samples - http://maven.apache.org - - - UTF-8 - + NanoHttpd-Samples + https://github.com/NanoHttpd/nanohttpd fi.iki.elonen nanohttpd - 1.0.0 + 2.0.0 fi.iki.elonen nanohttpd-webserver - 1.0.0 + 2.0.0 - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - - - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - nanohttpd-1.0.0 - - diff --git a/webserver/pom.xml b/webserver/pom.xml index 6b6384d..b89f691 100644 --- a/webserver/pom.xml +++ b/webserver/pom.xml @@ -4,46 +4,20 @@ fi.iki.elonen nanohttpd-webserver - 1.0.0 + 2.0.0 jar - NanoHTTPd-Webserver - http://maven.apache.org - - - UTF-8 - + NanoHttpd-Webserver + https://github.com/NanoHttpd/nanohttpd fi.iki.elonen nanohttpd - 1.0.0 + 2.0.0 - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - fictional-io - fictional.io - ftp://fictional.io/domains/fictional.io/public_html/maven/maven2 - false - - - - - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - scm:git:git://github.com/psh/nanohttpd.git - nanohttpd-1.0.0 - - diff --git a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java index ab10744..5be8bd5 100644 --- a/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java +++ b/webserver/src/main/java/fi/iki/elonen/SimpleWebServer.java @@ -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 ,\n" - + "(C) 2010 by Konstantinos Togias \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"