From c62daaeeef582deb444a3ba5643eef17d986fbe5 Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:14:15 +0200 Subject: [PATCH 1/7] fix includes for mod_cron --- mod_cron/src/mod_cron.erl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod_cron/src/mod_cron.erl b/mod_cron/src/mod_cron.erl index 107200d..2b80909 100644 --- a/mod_cron/src/mod_cron.erl +++ b/mod_cron/src/mod_cron.erl @@ -20,8 +20,10 @@ -include("ejabberd_commands.hrl"). -include("ejabberd.hrl"). --include("web/ejabberd_http.hrl"). --include("web/ejabberd_web_admin.hrl"). +-include("ejabberd_http.hrl"). +-include("ejabberd_web_admin.hrl"). +-include("logger.hrl"). +-include("xml.hrl"). -record(task, {taskid, timerref, host, task}). From de820d073faf57ed3d52d9ee068733b5c6191cbc Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:15:06 +0200 Subject: [PATCH 2/7] fix includes for mod_profile --- mod_profile/src/mod_profile.erl | 1 + 1 file changed, 1 insertion(+) diff --git a/mod_profile/src/mod_profile.erl b/mod_profile/src/mod_profile.erl index 600b15f..a0e9866 100644 --- a/mod_profile/src/mod_profile.erl +++ b/mod_profile/src/mod_profile.erl @@ -87,6 +87,7 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). +-include("logger.hrl"). -record(profile, {us, fields}). From ba56d730775d6cff7b8dec4469524c9ff733fde1 Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:16:11 +0200 Subject: [PATCH 3/7] fix includes for mod_archive --- mod_archive/src/mod_archive_odbc.erl | 1 + mod_archive/src/mod_archive_webview.erl | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mod_archive/src/mod_archive_odbc.erl b/mod_archive/src/mod_archive_odbc.erl index d25ab19..c91784f 100644 --- a/mod_archive/src/mod_archive_odbc.erl +++ b/mod_archive/src/mod_archive_odbc.erl @@ -84,6 +84,7 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). +-include("logger.hrl"). -record(state, {host, sessions, diff --git a/mod_archive/src/mod_archive_webview.erl b/mod_archive/src/mod_archive_webview.erl index d8a5fa2..3aa18c8 100644 --- a/mod_archive/src/mod_archive_webview.erl +++ b/mod_archive/src/mod_archive_webview.erl @@ -15,8 +15,9 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). --include("web/ejabberd_http.hrl"). --include("web/ejabberd_web_admin.hrl"). %for all the defines +-include("logger.hrl"). +-include("ejabberd_http.hrl"). +-include("ejabberd_web_admin.hrl"). %for all the defines -define(LINK(L) , "/archive/" ++ L). %-define(P(Els), ?XE("p", Els)). From 9bf84ad5f785e2291cfc8a89b4bd957692674c9f Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:18:28 +0200 Subject: [PATCH 4/7] fix includes for atom_pubsub --- atom_pubsub/src/atom_microblog.erl | 5 +++-- atom_pubsub/src/atom_pubsub.erl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/atom_pubsub/src/atom_microblog.erl b/atom_pubsub/src/atom_microblog.erl index c00cb58..7819c26 100644 --- a/atom_pubsub/src/atom_microblog.erl +++ b/atom_pubsub/src/atom_microblog.erl @@ -7,8 +7,9 @@ -author('eric@ohmforce.com'). -include("ejabberd.hrl"). -include("jlib.hrl"). --include("mod_pubsub/pubsub.hrl"). --include("web/ejabberd_http.hrl"). +-include("pubsub.hrl"). +-include("ejabberd_http.hrl"). +-include("logger.hrl"). -export([process/2]). process([Domain,User|_]=LocalPath, #request{auth = Auth} = Request)-> diff --git a/atom_pubsub/src/atom_pubsub.erl b/atom_pubsub/src/atom_pubsub.erl index a7d8bec..d518931 100644 --- a/atom_pubsub/src/atom_pubsub.erl +++ b/atom_pubsub/src/atom_pubsub.erl @@ -7,8 +7,9 @@ -author('eric@ohmforce.com'). -include("ejabberd.hrl"). -include("jlib.hrl"). --include("mod_pubsub/pubsub.hrl"). --include("web/ejabberd_http.hrl"). +-include("pubsub.hrl"). +-include("ejabberd_http.hrl"). +-include("logger.hrl"). -export([process/2]). process([Domain,User|_]=LocalPath, #request{auth = Auth} = Request)-> From 7aa2808cda9211034adb16abd33a432b041d8a6f Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:19:35 +0200 Subject: [PATCH 5/7] add .keepme file for atom_pubsub/ebin --- atom_pubsub/ebin/.keepme | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 atom_pubsub/ebin/.keepme diff --git a/atom_pubsub/ebin/.keepme b/atom_pubsub/ebin/.keepme new file mode 100644 index 0000000..e69de29 From 142ab9d4775c40b9e8ce5f15e92dec7e6146ac18 Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:20:13 +0200 Subject: [PATCH 6/7] fix includes for ejabberd_ircd.erl --- ircd/src/ejabberd_ircd.erl | 1 + 1 file changed, 1 insertion(+) diff --git a/ircd/src/ejabberd_ircd.erl b/ircd/src/ejabberd_ircd.erl index 3f6e203..21482e5 100644 --- a/ircd/src/ejabberd_ircd.erl +++ b/ircd/src/ejabberd_ircd.erl @@ -24,6 +24,7 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). +-include("logger.hrl"). -define(DICT, dict). From b710783208a06d519dcea3f4377723b5ebf512f9 Mon Sep 17 00:00:00 2001 From: Mathias Ertl Date: Sun, 29 Jun 2014 10:20:50 +0200 Subject: [PATCH 7/7] fix includes --- mod_muc_log_http/src/mod_muc_log_http.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod_muc_log_http/src/mod_muc_log_http.erl b/mod_muc_log_http/src/mod_muc_log_http.erl index f6b52ee..50f0b17 100644 --- a/mod_muc_log_http/src/mod_muc_log_http.erl +++ b/mod_muc_log_http/src/mod_muc_log_http.erl @@ -19,8 +19,9 @@ -include("ejabberd.hrl"). -include("jlib.hrl"). --include("web/ejabberd_http.hrl"). --include("mod_muc/mod_muc_room.hrl"). +-include("ejabberd_http.hrl"). +-include("mod_muc_room.hrl"). +-include("logger.hrl"). -include_lib("kernel/include/file.hrl"). -define(PROCNAME, mod_muc_log_http).