Removes reference to Socket.IO from LICENSE as we replaced SOCKET.IO with Atmosphere.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/dd3e36eb Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/dd3e36eb Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/dd3e36eb Branch: refs/heads/wave-0.4-rc6 Commit: dd3e36eb9bf81591ef80427d0a60acf21d401146 Parents: 2e44343 Author: Yuri Zelikov <[email protected]> Authored: Fri Aug 22 10:25:50 2014 +0300 Committer: Yuri Zelikov <[email protected]> Committed: Wed Aug 27 21:14:25 2014 +0300 ---------------------------------------------------------------------- LICENSE.bin | 22 ++++++++++++++++++---- NOTICE.bin.cpgz | Bin 384 -> 0 bytes 2 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dd3e36eb/LICENSE.bin ---------------------------------------------------------------------- diff --git a/LICENSE.bin b/LICENSE.bin index 79e496b..db0f9fa 100644 --- a/LICENSE.bin +++ b/LICENSE.bin @@ -1,4 +1,21 @@ - Apache License + ***THE FOLLOWING LICENSE APPLIES TO*** +- Apache Wave +- Apache Commons CLI, Codec, Collection, Configuration, File Upload, HTTP +Client, Lang, Logging libraries included in the generated jar files +- Google GXP, GSON, Guava, Guice included in the generated jar files +- Javax.inject included in the generated jar files +- Apache JDO2 included in the generated jar files +- Jetty Client, Continuation, HTTP, IO, Security, Server, Servlet, Servlets, +Util, Webapp, Websocket, XML are included in the generated jar files +- Joda Time library included in the generated jar files +- LibIDN Java library included in the generated jar files +- Apache Lucene Core included in the generated jar files +- Mongo Java Driver included in the generated jar files +- OAuth Java libraries included in the generated jar files +- Servlet API Specification library included in the generated jar files +- Whack XMPP Java library included in the generated jar files + + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -234,9 +251,6 @@ conceived. - Bouncy Castle library included in the generated jar files Copyright (c) 2000 - 2013 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) -- Socket.IO libraries included in the generated jar files - Copyright (c) 2011 Guillermo Rauch <[email protected]> - Copyright (c) 2010 Tad Glines - Java Websocket Client library included in the generated jar files Copyright (c) 2009 Adam MacBeth http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/dd3e36eb/NOTICE.bin.cpgz ---------------------------------------------------------------------- diff --git a/NOTICE.bin.cpgz b/NOTICE.bin.cpgz deleted file mode 100644 index 8866de3..0000000 Binary files a/NOTICE.bin.cpgz and /dev/null differ
