Get rid of "jlib.hrl" dependency in some modules

diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl
index 6b53f46c6a27be1183c41bdc35a585e8bc71327e..1c8de2fbf87c13b2283488db0ddd1712bd2066c8 100644 (file)
--- a/src/ejabberd_http.erl
+++ b/src/ejabberd_http.erl
@@ -39,7 +39,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 

diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl
index e66cf33a5c0d23a1f6530b97372e634f6555b8ba..02df19e639231918aa9b09448c3083cd4f45c3f8 100644 (file)
--- a/src/ejabberd_http_ws.erl
+++ b/src/ejabberd_http_ws.erl
@@ -39,7 +39,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 

diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl
index 459423aa4b5754d68245c63a16d9d344f4c68288..523feb9c7867c979c9c9610e72e71563f5d1ef5b 100644 (file)
--- a/src/ejabberd_web.erl
+++ b/src/ejabberd_web.erl
@@ -34,7 +34,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 

diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl
index 0cdd9bac5934a1e15a805d3fdc979cef23f058f1..76568aa2d462870e16857f26832ebeb9d6ef5fe1 100644 (file)
--- a/src/ejabberd_websocket.erl
+++ b/src/ejabberd_websocket.erl
@@ -47,7 +47,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 

diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl
index 73583af0268e242e2f3a27d205729c4c91076466..a18bc8d39fe3bfa5cc0c9add69674e45466956bf 100644 (file)
--- a/src/gen_pubsub_nodetree.erl
+++ b/src/gen_pubsub_nodetree.erl
@@ -25,7 +25,6 @@
 
 -module(gen_pubsub_nodetree).
 
--include("jlib.hrl").
 
 -type(host() :: mod_pubsub:host()).
 -type(nodeId() :: mod_pubsub:nodeId()).
@@ -42,25 +41,25 @@
 -callback options() -> nodeOptions().
 
 -callback set_node(PubsubNode :: pubsubNode()) ->
-    ok | {result, NodeIdx::nodeIdx()} | {error, xmlel()}.
+    ok | {result, NodeIdx::nodeIdx()} | {error, fxml:xmlel()}.
 
 -callback get_node(Host   :: host(),
        NodeId :: nodeId(),
-       From   :: jid()) ->
+       From   :: jid:jid()) ->
     pubsubNode() |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_node(Host :: host(),
        NodeId :: nodeId()) ->
     pubsubNode() |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_node(NodeIdx :: nodeIdx()) ->
     pubsubNode() |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_nodes(Host :: host(),
-       From :: jid())->
+       From :: jid:jid())->
     [pubsubNode()].
 
 -callback get_nodes(Host :: host())->
@@ -68,33 +67,33 @@
 
 -callback get_parentnodes(Host :: host(),
        NodeId :: nodeId(),
-       From :: jid()) ->
+       From :: jid:jid()) ->
     [pubsubNode()] |
-    {error, xmlel()}.
+    {error, fxml:xmlel()}.
 
 -callback get_parentnodes_tree(Host :: host(),
        NodeId :: nodeId(),
-       From :: jid()) ->
+       From :: jid:jid()) ->
     [{0, [pubsubNode(),...]}].
 
 -callback get_subnodes(Host :: host(),
        NodeId :: nodeId(),
-       From :: jid()) ->
+       From :: jid:jid()) ->
     [pubsubNode()].
 
 -callback get_subnodes_tree(Host :: host(),
        NodeId :: nodeId(),
-       From :: jid()) ->
+       From :: jid:jid()) ->
     [pubsubNode()].
 
 -callback create_node(Host :: host(),
        NodeId :: nodeId(),
        Type :: binary(),
-       Owner :: jid(),
+       Owner :: jid:jid(),
        Options :: nodeOptions(),
        Parents :: [nodeId()]) ->
     {ok, NodeIdx::nodeIdx()} |
-    {error, xmlel()} |
+    {error, fxml:xmlel()} |
     {error, {virtual, {host(), nodeId()}}}.
 
 -callback delete_node(Host :: host(),

diff --git a/src/mod_http_bind.erl b/src/mod_http_bind.erl
index 9a3a379f7e64135a446242625485ae19e8435090..471b38c00e8d5bc60274b11f67ba99a7cc4be54f 100644 (file)
--- a/src/mod_http_bind.erl
+++ b/src/mod_http_bind.erl
@@ -42,7 +42,7 @@
 -include("ejabberd.hrl").
 -include("logger.hrl").
 
--include("jlib.hrl").
+-include("xmpp.hrl").
 
 -include("ejabberd_http.hrl").
 

diff --git a/src/node_buddy.erl b/src/node_buddy.erl
index bdaa4a89af819e1bb04c7ff784cb15c88483fecf..fb2fd1f2ef4cfa6bc583e675153a87271b353fda 100644 (file)
--- a/src/node_buddy.erl
+++ b/src/node_buddy.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/node_club.erl b/src/node_club.erl
index 7f6ae6520495545293b7ead5ddc5dfb0ecad5034..837fa6fbbd4601e219cbd7dcbf01dbdadbfdfaa1 100644 (file)
--- a/src/node_club.erl
+++ b/src/node_club.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/node_hometree.erl b/src/node_hometree.erl
index def7b983d0cd28bc0f0884ffe3df571948c233a8..67c5e9332acdab1a3e2772d1d8f651b960635377 100644 (file)
--- a/src/node_hometree.erl
+++ b/src/node_hometree.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/node_hometree_sql.erl b/src/node_hometree_sql.erl
index d9af49843efd984e025de4c76ce99986f47d62fd..661a2aab453a8489f6c8051dfd1420a3741372de 100644 (file)
--- a/src/node_hometree_sql.erl
+++ b/src/node_hometree_sql.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/node_mb.erl b/src/node_mb.erl
index 6c7f0978046586c0db94e409295fbfd5ab216ef1..0c3bd3722420931b773ab315ac7706959b07cc06 100644 (file)
--- a/src/node_mb.erl
+++ b/src/node_mb.erl
@@ -28,7 +28,6 @@
 -author('ecestari@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 %%% @doc The module <strong>{@module}</strong> is the pep microblog PubSub plugin.
 %%% <p>To be used, mod_pubsub must be configured:<pre>

diff --git a/src/node_online.erl b/src/node_online.erl
index 1c2ab5a03b3526ca6e248da4cfa3fea52540e9ef..4b01d2a2c367367fafd8ac324c15245282809511 100644 (file)
--- a/src/node_online.erl
+++ b/src/node_online.erl
@@ -28,7 +28,7 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
+-include("jid.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/node_pep.erl b/src/node_pep.erl
index 1677ed4bd681548fb427ce391aa853ca1c74294f..f3b5836cfdf622c45930ada966d5802356da820b 100644 (file)
--- a/src/node_pep.erl
+++ b/src/node_pep.erl
@@ -31,7 +31,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 -include("logger.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,

diff --git a/src/node_pep_sql.erl b/src/node_pep_sql.erl
index ec77954751af766ea2fda0b6d34dc2392e46732b..ac42cb94fd7931b6f524985498e005c48cdea973 100644 (file)
--- a/src/node_pep_sql.erl
+++ b/src/node_pep_sql.erl
@@ -31,7 +31,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 -include("logger.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,

diff --git a/src/node_private.erl b/src/node_private.erl
index 0cd04b9dd86d7fd101f689b084fb8175d435fcb2..1888ce33d02ff13b0896f2540cadbd3fe98ab2b0 100644 (file)
--- a/src/node_private.erl
+++ b/src/node_private.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/node_public.erl b/src/node_public.erl
index 0786d99955c686455dd89a9fbf886ed1b6366c46..ca200e002005f123d68eec4deaed25fff8bb9bbf 100644 (file)
--- a/src/node_public.erl
+++ b/src/node_public.erl
@@ -28,7 +28,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, features/0,
     create_node_permission/6, create_node/2, delete_node/1,

diff --git a/src/nodetree_virtual.erl b/src/nodetree_virtual.erl
index 934950dd231be8ffc5df8622fd57c5b15d56ccc9..31802db2b4408fe4acae5699a85dca58798f71dc 100644 (file)
--- a/src/nodetree_virtual.erl
+++ b/src/nodetree_virtual.erl
@@ -35,7 +35,6 @@
 -author('christophe.romain@process-one.net').
 
 -include("pubsub.hrl").
--include("jlib.hrl").
 
 -export([init/3, terminate/2, options/0, set_node/1,
     get_node/3, get_node/2, get_node/1, get_nodes/2,