diff --git a/LICENSE b/LICENSE index dbdbaf6..6b4272c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,202 +1,29 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2015-2016 ProcessOne SARL - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +BSD 3-Clause License + +Copyright (c) 2017, ProcessOne SARL +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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. + +* Neither the name of the copyright holder 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. diff --git a/README.md b/README.md index 0a85226..f57e784 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build Status](https://travis-ci.org/processone/gox.svg?branch=master)](https://travis-ci.org/processone/gox) [![Coverage Status](https://coveralls.io/repos/github/processone/gox/badge.svg?branch=master)](https://coveralls.io/github/processone/gox?branch=master) -Gox is a Go XMPP library, focusing on simplicity, simple automation, and IoT. +Fluux XMPP is a Go XMPP library, focusing on simplicity, simple automation, and IoT. The goal is to make simple to write simple adhoc XMPP clients: diff --git a/xmpp/auth.go b/auth.go similarity index 98% rename from xmpp/auth.go rename to auth.go index 23e76c2..846dd33 100644 --- a/xmpp/auth.go +++ b/auth.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "encoding/base64" diff --git a/xmpp/client.go b/client.go similarity index 98% rename from xmpp/client.go rename to client.go index bac1f0f..689720e 100644 --- a/xmpp/client.go +++ b/client.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "bytes" diff --git a/xmpp/client_test.go b/client_test.go similarity index 99% rename from xmpp/client_test.go rename to client_test.go index 0c6c216..a6746d2 100644 --- a/xmpp/client_test.go +++ b/client_test.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "encoding/xml" diff --git a/cmd/xmpp_echo/xmpp_echo.go b/cmd/xmpp_echo/xmpp_echo.go index d2ab573..69067be 100644 --- a/cmd/xmpp_echo/xmpp_echo.go +++ b/cmd/xmpp_echo/xmpp_echo.go @@ -9,7 +9,7 @@ import ( "log" "os" - "github.com/processone/gox/xmpp" + "fluux.io/xmpp" ) func main() { diff --git a/cmd/xmpp_jukebox/xmpp_jukebox.go b/cmd/xmpp_jukebox/xmpp_jukebox.go index 8d49608..0591b4b 100644 --- a/cmd/xmpp_jukebox/xmpp_jukebox.go +++ b/cmd/xmpp_jukebox/xmpp_jukebox.go @@ -9,9 +9,9 @@ import ( "os" "strings" - "github.com/processone/gox/xmpp" - "github.com/processone/gox/xmpp/iot" - "github.com/processone/gox/xmpp/pep" + "fluux.io/xmpp" + "fluux.io/xmpp/iot" + "fluux.io/xmpp/pep" "github.com/processone/mpg123" "github.com/processone/soundcloud" ) diff --git a/xmpp/iot/control.go b/iot/control.go similarity index 92% rename from xmpp/iot/control.go rename to iot/control.go index 20c384d..3f5673f 100644 --- a/xmpp/iot/control.go +++ b/iot/control.go @@ -1,4 +1,4 @@ -package iot +package iot // import "fluux.io/xmpp/iot" import "encoding/xml" diff --git a/xmpp/iq.go b/iq.go similarity index 98% rename from xmpp/iq.go rename to iq.go index e0f3177..40cec46 100644 --- a/xmpp/iq.go +++ b/iq.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "encoding/xml" diff --git a/xmpp/iq_test.go b/iq_test.go similarity index 96% rename from xmpp/iq_test.go rename to iq_test.go index b9e8b55..b8859c0 100644 --- a/xmpp/iq_test.go +++ b/iq_test.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "encoding/xml" diff --git a/xmpp/jid.go b/jid.go similarity index 92% rename from xmpp/jid.go rename to jid.go index 6ff9364..3bc7507 100644 --- a/xmpp/jid.go +++ b/jid.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "errors" diff --git a/xmpp/jid_test.go b/jid_test.go similarity index 95% rename from xmpp/jid_test.go rename to jid_test.go index 66aa17d..66f9871 100644 --- a/xmpp/jid_test.go +++ b/jid_test.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "testing" diff --git a/xmpp/message.go b/message.go similarity index 93% rename from xmpp/message.go rename to message.go index 813d9c0..dbcd0ad 100644 --- a/xmpp/message.go +++ b/message.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "encoding/xml" diff --git a/xmpp/ns.go b/ns.go similarity index 87% rename from xmpp/ns.go rename to ns.go index 6e9e5ef..9b3bdac 100644 --- a/xmpp/ns.go +++ b/ns.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" const ( NSStream = "http://etherx.jabber.org/streams" diff --git a/xmpp/options.go b/options.go similarity index 92% rename from xmpp/options.go rename to options.go index c81d71f..2ae548a 100644 --- a/xmpp/options.go +++ b/options.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import "os" diff --git a/xmpp/packet.go b/packet.go similarity index 89% rename from xmpp/packet.go rename to packet.go index 2d5b1b1..a896440 100644 --- a/xmpp/packet.go +++ b/packet.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" // Packet represents the root default structure for an XMPP packet. type Packet struct { diff --git a/xmpp/parser.go b/parser.go similarity index 98% rename from xmpp/parser.go rename to parser.go index 2b8bb19..39165cb 100644 --- a/xmpp/parser.go +++ b/parser.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "encoding/xml" diff --git a/xmpp/pep/user_tune.go b/pep/user_tune.go similarity index 98% rename from xmpp/pep/user_tune.go rename to pep/user_tune.go index c562687..77353be 100644 --- a/xmpp/pep/user_tune.go +++ b/pep/user_tune.go @@ -1,4 +1,4 @@ -package pep +package pep // import "fluux.io/xmpp/pep" import ( "encoding/xml" diff --git a/xmpp/presence.go b/presence.go similarity index 89% rename from xmpp/presence.go rename to presence.go index 9871f39..21cfd77 100644 --- a/xmpp/presence.go +++ b/presence.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import "encoding/xml" diff --git a/xmpp/session.go b/session.go similarity index 99% rename from xmpp/session.go rename to session.go index d07d485..6012dad 100644 --- a/xmpp/session.go +++ b/session.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "crypto/tls" diff --git a/xmpp/socket_proxy.go b/socket_proxy.go similarity index 96% rename from xmpp/socket_proxy.go rename to socket_proxy.go index 59a3ee3..6cabcee 100644 --- a/xmpp/socket_proxy.go +++ b/socket_proxy.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "io" diff --git a/xmpp/starttls.go b/starttls.go similarity index 91% rename from xmpp/starttls.go rename to starttls.go index fef56ee..9e034b2 100644 --- a/xmpp/starttls.go +++ b/starttls.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "crypto/tls" diff --git a/xmpp/stream.go b/stream.go similarity index 93% rename from xmpp/stream.go rename to stream.go index b83ccc8..9138c2f 100644 --- a/xmpp/stream.go +++ b/stream.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import "encoding/xml" diff --git a/xmpp/tcp_server_mock.go b/tcp_server_mock.go similarity index 98% rename from xmpp/tcp_server_mock.go rename to tcp_server_mock.go index bdc4397..8f86e08 100644 --- a/xmpp/tcp_server_mock.go +++ b/tcp_server_mock.go @@ -1,4 +1,4 @@ -package xmpp +package xmpp // import "fluux.io/xmpp" import ( "net"