Merge pull request #870 from esl/rel-2.0

MongooseIM 2.0.0beta1

CHANGELOG.md

@@ -1,26 +1,43 @@
-# MongooseIM 1.7.0
+# MongooseIM 2.0.0beta1
 
-2016-MM-DD
+2016-06-28
 
 This release includes:
 
-- token based authentication [#633](https://github.com/esl/MongooseIM/pull/633)
+- new XMPP extensions:
+   - [XEP-0060: Publish Subscribe](http://www.xmpp.org/extensions/xep-0060.html) [#732](https://github.com/esl/MongooseIM/pull/732)
+   - [XEP-0092: Software Version](http://www.xmpp.org/extensions/xep-0092.html) [#731](https://github.com/esl/MongooseIM/pull/731)
+   - [XEP-0191: Blocking Command](https://xmpp.org/extensions/xep-0191.html), [#829](https://github.com/esl/MongooseIM/pull/829)
+   - [XEP-0352: Client State Indication](https://xmpp.org/extensions/xep-0352.html) [#703](https://github.com/esl/MongooseIM/pull/703)
+   - MUC light: [#577](https://github.com/esl/MongooseIM/pull/577)
+   - token based authentication [#633](https://github.com/esl/MongooseIM/pull/633)
+- HTTP notifications [#684](https://github.com/esl/MongooseIM/pull/684)
 - support for FIPS mode [#628](https://github.com/esl/MongooseIM/pull/628)
 - reverse Proxy [#628](https://github.com/esl/MongooseIM/pull/638)
-- improved routing layer [#639](https://github.com/esl/MongooseIM/pull/639), [#729](https://github.com/esl/MongooseIM/pull/729)
-- fix for TCP backlog setting [#708](https://github.com/esl/MongooseIM/pull/708)
-- new XMPP extentions:
-   - [XEP-0352: Client State Indication](https://xmpp.org/extensions/xep-0352.html) [#703](https://github.com/esl/MongooseIM/pull/703)
+- improved routing layer [#639](https://github.com/esl/MongooseIM/pull/639), [#729](https://github.com/esl/MongooseIM/pull/729), [#746](https://github.com/esl/MongooseIM/pull/746)
 - external components improvements:
    - [#640](https://github.com/esl/MongooseIM/pull/640)
 - parallelized tests:
    - [#706](https://github.com/esl/MongooseIM/pull/706)
+   - [#740](https://github.com/esl/MongooseIM/pull/740)
+   - [#741](https://github.com/esl/MongooseIM/pull/741)
+   - [#751](https://github.com/esl/MongooseIM/pull/751)
 - other improvements:
+   - stream compression possible only after auth [#616](https://github.com/esl/MongooseIM/pull/616)
+   - fix for TCP backlog setting [#708](https://github.com/esl/MongooseIM/pull/708)
    - carbon copies data optimisation [#700](https://github.com/esl/MongooseIM/pull/700)
-   - update deps [#705](https://github.com/esl/MongooseIM/pull/705) and exometer 1.2 TODO add PR after mergin rel-1.7 to master
+   - update deps [#705](https://github.com/esl/MongooseIM/pull/705) and [#707](https://github.com/esl/MongooseIM/pull/707)
    - dialyzer checks on travis [#677](https://github.com/esl/MongooseIM/pull/677)
    - docker image building on travis [#710](https://github.com/esl/MongooseIM/pull/710)
+   - improved build and installation process [#704](https://github.com/esl/MongooseIM/pull/704)
+   - improved clustering [#683](https://github.com/esl/MongooseIM/683), [#717](https://github.com/esl/MongooseIM/pull/717), [#825](https://github.com/esl/MongooseIM/pull/825)
+   - improved documentation
+   - [complete list of merged PRs](https://github.com/esl/MongooseIM/pulls?utf8=%E2%9C%93&q=is%3Apr%20base%3Amaster%20merged%3A%222016-02-13..2016-06-28%22%20sort%3Acreated-asc%20)
+   - [complete list of closed issues](https://github.com/esl/MongooseIM/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20closed%3A%222016-02-13..2016-06-28%22%20)
+
+Special thanks to our contributors: @zsuidakra, @arkdro, @bernardd, @kshamko
 
+This release repo [history](https://github.com/esl/MongooseIM/graphs/contributors?from=2016-02-13&to=2016-06-28&type=c)
 
 # MongooseIM 1.6.2
 
@@ -111,7 +128,7 @@ This release includes:
   - unified xml parsing and memory footprint optimisations [#183](https://github.com/esl/MongooseIM/pull/183)
   - supported XEPs are now documented
   - Dialyzer fixes & additions [#508](https://github.com/esl/MongooseIM/pull/508)
-  - experimental [Docker image](https://hub.docker.com/r/mongooseim/mongooseim-docker/) 
+  - experimental [Docker image](https://hub.docker.com/r/mongooseim/mongooseim-docker/)
   - [complete list of merged PRs](https://github.com/esl/MongooseIM/pulls?utf8=%E2%9C%93&q=is%3Apr+base%3Amaster+merged%3A%222015-02-04..2015-10-15%22+sort%3Acreated-asc+)
   - [complete list of closed issues](https://github.com/esl/MongooseIM/issues?utf8=%E2%9C%93&q=closed%3A%222015-02-04..2015-10-15%22+is%3Aissue+sort%3Acreated-desc+)
 
@@ -238,11 +255,11 @@ zlib driver configuration (in c2s or s2s section) takes new parameter which is m
 
 2013-05-12
 
-- BOSH support (XMPP over HTTP) 
-- WSS (WebSocekt Secure) 
+- BOSH support (XMPP over HTTP)
+- WSS (WebSocekt Secure)
 - various XMPP related metrics exposed via REST API
-  (https://github.com/esl/ejabberd/wiki/REST-interface-to-folsom-metrics) 
-- alarm handler for better monitoring and bottleneck finding 
+  (https://github.com/esl/ejabberd/wiki/REST-interface-to-folsom-metrics)
+- alarm handler for better monitoring and bottleneck finding
 
 We've also assured compatibility with the latest ejabberd Community Edition by
 ProcessOne, so that backporting ejabberd modules to MongooseIM requires

README.md

@@ -89,7 +89,7 @@ Features and supported standards
 |[0185 - Dialback Key Generation and Validation](http://www.xmpp.org/extensions/xep-0185.html)| [0184 - Message Delivery Receipts](http://xmpp.org/extensions/xep-0184.html)| [0191 - Blocking Command](http://xmpp.org/extensions/xep-0191.html)|[0198 - Stream Management](http://xmpp.org/extensions/xep-0198.html)|
 |[0199 - XMPP Ping](http://xmpp.org/extensions/xep-0199.html)|[0202 - Entity Time](http://www.xmpp.org/extensions/xep-0202.html) | [0203 - Delayed Delivery](http://xmpp.org/extensions/xep-0203.html)| [0206 - XMPP Over BOSH](http://xmpp.org/extensions/xep-0206.html)|
 |[0212 - XMPP Basic Server 2008](http://xmpp.org/extensions/xep-0212.html)|[0237 - Roster Versioning](http://xmpp.org/extensions/xep-0237.html)| [0279 - Server IP Check](http://xmpp.org/extensions/xep-0279.html)| [0280 - Message Carbons](http://xmpp.org/extensions/xep-0280.html)|
-|[0313 - Message Archive Management v0.2 ](http://xmpp.org/extensions/attic/xep-0313-0.2.html)|[0352 - Client State Indication](http://www.xmpp.org/extensions/xep-0352.html)| | |
+|[0313 - Message Archive Management](http://xmpp.org/extensions/attic/xep-0313.html)|[0352 - Client State Indication](http://www.xmpp.org/extensions/xep-0352.html)| | |
 
 
 How to build

VERSION

@@ -1 +1 @@
-1.6.2
+2.0.0beta1

doc/advanced-configuration/Modules.md

@@ -13,7 +13,7 @@ A module configuration generally looks like:
 Some of the modules feature an `iqdisc` parameter. It defines the method of handling incoming IQ stanzas. Please refer to [[IQ handlers]] for more information. Valid values: `no_queue`, `one_queue`, `{queues, N}`, `parallel`. Default: `one_queue`.
 
 ### [mod_admin_extra](../modules/mod_admin_extra.md)
-Significantly extends the `mongooseimctl` script capabilities. 
+Significantly extends the `mongooseimctl` script capabilities.
 
 ### [mod_adhoc](../modules/mod_adhoc.md)
 Implements [XEP-0050: Ad-Hoc Commands](http://xmpp.org/extensions/xep-0050.html) for advertising and executing application-specific commands, such as those related to a configuration workflow, using [XEP-0004: Data Forms](http://xmpp.org/extensions/xep-0004.html) in order to structure the information exchange. This is extremely useful for use cases such as remote administration, user engagement via polls, and ChatBots.
@@ -40,7 +40,7 @@ Enables forwarding events to an external HTTP service, such as messages or prese
 Implements [XEP-0012: Last Activity)](http://xmpp.org/extensions/xep-0012.html) for communicating information about the last activity associated with an XMPP entity (most recent presence information from an offline contact).
 
 ### [mod_mam](../modules/mod_mam.md)
-Implements revision 0.2 of [XEP-0313: Message Archive Management](http://xmpp.org/extensions/attic/xep-0313-0.2.html) ([current version](http://xmpp.org/extensions/xep-0313.html)), that defines a protocol to query and control an archive of messages stored on a server.
+Implements [XEP-0313: Message Archive Management](http://xmpp.org/extensions/attic/xep-0313.html) ([current version](http://xmpp.org/extensions/xep-0313.html)), that defines a protocol to query and control an archive of messages stored on a server.
 
 ### [mod_muc](../modules/mod_muc.md)
 Implements [XEP-0045: Multi-User Chat)](http://xmpp.org/extensions/xep-0045.html), for a featureful multi-user text chat (group chat), whereby multiple XMPP users can exchange messages in the context of a chat room. It is tightly coupled to users' presences in chat rooms.
@@ -67,7 +67,7 @@ Implements [XEP-0077: In-Band Registration)](http://xmpp.org/extensions/xep-0077
 Roster support, specified in [RFC 6121](http://xmpp.org/rfcs/rfc6121.html). Includes support for [XEP-0237: Roster Versioning](http://xmpp.org/extensions/xep-0237.html).
 
 ### [mod_shared_roster_ldap](../modules/mod_shared_roster_ldap.md)
-This module, when enabled, will inject roster entries fetched from LDAP. 
+This module, when enabled, will inject roster entries fetched from LDAP.
 
 ### [mod_sic](../modules/mod_sic.md)
 Implements [XEP-0279: Server IP Check)](http://xmpp.org/extensions/xep-0279.html) that enables a client to discover its external IP address.

doc/modules/mod_mam.md

@@ -1,5 +1,5 @@
 ### Module Description
-This module implements [XEP-0313 (Message Archive Management)](http://xmpp.org/extensions/attic/xep-0313-0.2.html). It enables a service to store all users messages for one-to-one chats as well as group chats (MUC, MultiUser Chat). It uses [XEP-0059: Result Set Management](http://xmpp.org/extensions/xep-0059.html) for paging. It is a highly customizable module, that requires some skill and knowledge to operate properly and efficiently.
+This module implements [XEP-0313 (Message Archive Management)](http://xmpp.org/extensions/attic/xep-0313.html). It enables a service to store all users messages for one-to-one chats as well as group chats (MUC, MultiUser Chat). It uses [XEP-0059: Result Set Management](http://xmpp.org/extensions/xep-0059.html) for paging. It is a highly customizable module, that requires some skill and knowledge to operate properly and efficiently.
 
 Configure MAM with different storage backends:
 

doc/user-guide/Features-and-supported-standards.md

@@ -16,13 +16,13 @@ Features and supported standards
 | [0004 - Data Forms](http://xmpp.org/extensions/xep-0004.html) | [0012 - Last Activity](http://xmpp.org/extensions/xep-0012.html) | [0016 - Privacy Lists](http://xmpp.org/extensions/xep-0016.html)|[0018 - Invisible Presence](http://xmpp.org/extensions/xep-0018.html)|
 |[0022 - Message Events](http://xmpp.org/extensions/xep-0022.html)| [0023 - Message Expiration](http://xmpp.org/extensions/xep-0023.html)|[0030 - Service Discovery](http://xmpp.org/extensions/xep-0030.html)| [0045 - Multi-User Chat](http://xmpp.org/extensions/xep-0045.html)|
 |[0049 - Private XML Storage](http://xmpp.org/extensions/xep-0049.html)| [0050 - Ad-Hoc Commands](http://xmpp.org/extensions/xep-0050.html)| [0054 - vcard-temp](http://xmpp.org/extensions/xep-0054.html)| [0055 - Jabber Search](http://xmpp.org/extensions/xep-0055.html)
-|[0059 - Result Set Management](http://xmpp.org/extensions/xep-0059.html)|[0068 - Field Standardization for Data Forms](http://xmpp.org/extensions/xep-0068.html)| [0073 - Basic IM Protocol Suite](http://xmpp.org/extensions/xep-0073.html)| [0077 - In-Band Registration](http://xmpp.org/extensions/xep-0077.html)| 
+|[0059 - Result Set Management](http://xmpp.org/extensions/xep-0059.html)|[0068 - Field Standardization for Data Forms](http://xmpp.org/extensions/xep-0068.html)| [0073 - Basic IM Protocol Suite](http://xmpp.org/extensions/xep-0073.html)| [0077 - In-Band Registration](http://xmpp.org/extensions/xep-0077.html)|
 |[0078 - Non-SASL Authentication](http://xmpp.org/extensions/xep-0078.html)|[0079 partial - Advanced Message Processin](http://xmpp.org/extensions/xep-0079.html)| [0082 - XMPP Date and Time Profiles](http://xmpp.org/extensions/xep-0082.html)| [0083 - Nested Roster Groups](http://xmpp.org/extensions/xep-0083.html)|
 |[0085 - Chat State Notifications](http://xmpp.org/extensions/xep-0085.html)|[0086 - Error Condition Mappings](http://xmpp.org/extensions/xep-0086.html) | [0093 -  Roster Item Exchange](http://xmpp.org/extensions/xep-0093.html)| [0114 - Jabber Component Protocol](http://xmpp.org/extensions/xep-0114.html)|
 |[0124 - Bidirectional-streams Over Synchronous HTTP (BOSH)](http://xmpp.org/extensions/xep-0124.html)|[0126 - Invisibility](http://xmpp.org/extensions/xep-0126.html)| [0138 - Stream Compression](http://xmpp.org/extensions/xep-0138.html) | [0153 - vCard-Based Avatars](http://xmpp.org/extensions/xep-0153.html)|
 |[0157 - Contact Addresses for XMPP Services](http://xmpp.org/extensions/xep-0157.html)| [0160 - Best Practices for Handling Offline Messages](http://xmpp.org/extensions/xep-0160.html)| [0170 - Recommended Order of Stream Feature Negotiation](http://xmpp.org/extensions/xep-0170.html)| [0175 - Best Practices for Use of SASL ANONYMOUS](http://xmpp.org/extensions/xep-0175.html)|
 |[0185 - Dialback Key Generation and Validation](http://www.xmpp.org/extensions/xep-0185.html)| [0184 - Message Delivery Receipts](http://xmpp.org/extensions/xep-0184.html)| [0198 - Stream Management](http://xmpp.org/extensions/xep-0198.html)| [0199 - XMPP Ping](http://xmpp.org/extensions/xep-0199.html)|
 |[0202 - Entity Time](http://www.xmpp.org/extensions/xep-0202.html) | [0203 - Delayed Delivery](http://xmpp.org/extensions/xep-0203.html)| [0206 - XMPP Over BOSH](http://xmpp.org/extensions/xep-0206.html)| [0212 - XMPP Basic Server 2008](http://xmpp.org/extensions/xep-0212.html)|
-|[0237 - Roster Versioning](http://xmpp.org/extensions/xep-0237.html)| [0279 - Server IP Check](http://xmpp.org/extensions/xep-0279.html)| [0280 - Message Carbons](http://xmpp.org/extensions/xep-0280.html)| [0313 - Message Archive Management v0.2 ](http://xmpp.org/extensions/attic/xep-0313-0.2.html)|
+|[0237 - Roster Versioning](http://xmpp.org/extensions/xep-0237.html)| [0279 - Server IP Check](http://xmpp.org/extensions/xep-0279.html)| [0280 - Message Carbons](http://xmpp.org/extensions/xep-0280.html)| [0313 - Message Archive Management](http://xmpp.org/extensions/attic/xep-0313.html)|
 |[0352 - Client State Indication](http://www.xmpp.org/extensions/xep-0352.html)| | |
 

test/ejabberd_tests/rebar.config

@@ -5,8 +5,8 @@
 
 {deps, [
         {amoc, ".*", {git, "git://github.com/esl/amoc.git", "9acfdc4b57cd37e8030831a4493847d2e01d1ec9"}},
-        {escalus, ".*", {git, "git://github.com/esl/escalus.git", "2cebd9b"}},
-        {exml, ".*", {git, "git://github.com/esl/exml.git", "2547164950b65a86b79a5a5669821cff9bde17a7"}},
+        {escalus, ".*", {git, "git://github.com/esl/escalus.git", "2.7.0"}},
+        {exml, ".*", {git, "git://github.com/esl/exml.git", "2.3.0"}},
         {usec, ".*", {git, "git://github.com/esl/usec.git", {branch, "master"}}},
         {mustache, ".*", {git, "git://github.com/mojombo/mustache.erl.git", {branch, "master"}}},
         {katt, ".*", {git, "git://github.com/for-GET/katt.git", {tag, "1.5.2"}}},