From ae21bb73b562ad7b9bf68be4ad9ed5a0259dd6ca Mon Sep 17 00:00:00 2001 From: lazedo Date: Fri, 10 May 2013 11:55:31 +0100 Subject: [PATCH 1/4] KAZOO-824 - Kazoo translator includes --- .../lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl | 2 +- .../kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl index 322fbc835fd..e87a51b34b8 100644 --- a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl +++ b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_kazoo.erl @@ -13,7 +13,7 @@ ,req_params/1 ]). --include("./src/kzt.hrl"). +-include("../kzt.hrl"). -spec exec(whapps_call:call(), wh_json:object()) -> usurp_return(). exec(Call, FlowJObj) -> diff --git a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl index 23372fd028e..e0d7ea69e9a 100644 --- a/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl +++ b/whistle_apps/lib/kazoo_translator-1.0.0/src/convertors/kzt_twiml_dial.erl @@ -10,7 +10,7 @@ -export([exec/3]). --include("./src/kzt.hrl"). +-include("../kzt.hrl"). -spec exec(whapps_call:call(), xml_els(), xml_els()) -> {'ok' | 'stop', whapps_call:call()}. From a27bf52bac80d1d0edd057d370ded32e2f014e59 Mon Sep 17 00:00:00 2001 From: lazedo Date: Fri, 10 May 2013 11:58:20 +0100 Subject: [PATCH 2/4] KAZOO-824 - callflow includes --- whistle_apps/apps/callflow/src/module/cf_conference.erl | 2 +- whistle_apps/apps/callflow/src/module/cf_manual_presence.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/whistle_apps/apps/callflow/src/module/cf_conference.erl b/whistle_apps/apps/callflow/src/module/cf_conference.erl index a2b43d32d98..42994d9ce6d 100644 --- a/whistle_apps/apps/callflow/src/module/cf_conference.erl +++ b/whistle_apps/apps/callflow/src/module/cf_conference.erl @@ -8,7 +8,7 @@ %%%------------------------------------------------------------------- -module(cf_conference). --include("./src/callflow.hrl"). +-include("../callflow.hrl"). -export([handle/2]). diff --git a/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl b/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl index f6f2c66b282..1576e49e1a1 100644 --- a/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl +++ b/whistle_apps/apps/callflow/src/module/cf_manual_presence.erl @@ -10,7 +10,7 @@ -export([handle/2]). --include("./src/callflow.hrl"). +-include("../callflow.hrl"). -spec handle(wh_json:object(), whapps_call:call()) -> 'ok'. handle(Data, Call) -> From ba653e9bddec2eef78f3a7e5a3c4c9b4ae5a4dd6 Mon Sep 17 00:00:00 2001 From: lazedo Date: Fri, 10 May 2013 12:05:22 +0100 Subject: [PATCH 3/4] KAZOO-824 - crossbar includes --- whistle_apps/apps/crossbar/src/crossbar.hrl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_about.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_accounts.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_acls.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_agents.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_braintree.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_bulk.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_callflows.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_conferences.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_configs.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_devices.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_directories.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_events.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_faxes.erl | 2 +- .../crossbar/src/modules/cb_global_provisioner_templates.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_groups.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_killio.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_limits.erl | 2 +- .../crossbar/src/modules/cb_local_provisioner_templates.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_media.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_menus.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_onboard.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_queues.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_rates.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_registrations.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_schemas.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_servers.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_services.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_signup.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_skels.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_templates.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_transactions.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_users.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl | 2 +- .../apps/crossbar/src/modules/provisioner_contact_list.erl | 2 +- whistle_apps/apps/crossbar/src/modules/provisioner_util.erl | 2 +- 58 files changed, 58 insertions(+), 58 deletions(-) diff --git a/whistle_apps/apps/crossbar/src/crossbar.hrl b/whistle_apps/apps/crossbar/src/crossbar.hrl index f7e9bca1906..6744dd755a7 100644 --- a/whistle_apps/apps/crossbar/src/crossbar.hrl +++ b/whistle_apps/apps/crossbar/src/crossbar.hrl @@ -5,7 +5,7 @@ -include_lib("whistle/include/wh_log.hrl"). -include_lib("whistle/include/wh_databases.hrl"). --include("src/crossbar_types.hrl"). +-include("crossbar_types.hrl"). -define(CONFIG_CAT, <<"crossbar">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_about.erl b/whistle_apps/apps/crossbar/src/modules/cb_about.erl index 159a90e9c29..dcb7ca31372 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_about.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_about.erl @@ -16,7 +16,7 @@ ,validate/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl b/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl index 8e141a07a73..e0a6bdbdef6 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_accounts.erl @@ -23,7 +23,7 @@ -export([is_unique_realm/2]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER, ?MODULE). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_acls.erl b/whistle_apps/apps/crossbar/src/modules/cb_acls.erl index a137b02aa05..7dc59288c07 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_acls.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_acls.erl @@ -17,7 +17,7 @@ ,validate/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(ECALLMGR, <<"ecallmgr">>). -define(ECALLMGR_ACLS, <<"acls">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_agents.erl b/whistle_apps/apps/crossbar/src/modules/cb_agents.erl index c4b8e6b63c5..5c7b78b19e9 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_agents.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_agents.erl @@ -27,7 +27,7 @@ ,validate/1, validate/2, validate/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl index 98aed0d5873..31bbad00116 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl @@ -25,7 +25,7 @@ ,put/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(AGG_VIEW_FILE, <<"views/accounts.json">>). -define(AGG_VIEW_API, <<"accounts/listing_by_api">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl b/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl index b4255f385d9..3329c6de90b 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_braintree.erl @@ -20,7 +20,7 @@ ,delete/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -include_lib("braintree/include/braintree.hrl"). -define(CUSTOMER_PATH_TOKEN, <<"customer">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl b/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl index f3713fe6d83..cef7eaee17e 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_bulk.erl @@ -19,7 +19,7 @@ ,delete/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl b/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl index 22fff910344..934c5fa5888 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_callflows.erl @@ -19,7 +19,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".callflows">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl b/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl index f0326966fcb..d5be6b48634 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl @@ -20,7 +20,7 @@ ,validate/1, validate/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".cdrs">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl b/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl index 28a63b079bf..ba37c0d2667 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl @@ -26,7 +26,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CONNECT_CALL, <<"connect">>). -define(HISTORY, <<"history">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl b/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl index 55ead3acacd..27c90f018d8 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_conferences.erl @@ -21,7 +21,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"conferences/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_configs.erl b/whistle_apps/apps/crossbar/src/modules/cb_configs.erl index 25730712ce3..a5ac1f01f2b 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_configs.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_configs.erl @@ -21,7 +21,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl b/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl index 5da184eb0b2..68ffbb9176a 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl @@ -20,7 +20,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"trunkstore/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl b/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl index 81b4ea49f67..0d63c04eb5d 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl @@ -17,7 +17,7 @@ ,validate/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_devices.erl b/whistle_apps/apps/crossbar/src/modules/cb_devices.erl index 0b993bee40b..5a1eee84391 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_devices.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_devices.erl @@ -27,7 +27,7 @@ ,get_all_acl_ips/0 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(QUICKCALL_URL, [{<<"devices">>, [_, <<"quickcall">>, _]} ,{?WH_ACCOUNTS_DB, [_]} diff --git a/whistle_apps/apps/crossbar/src/modules/cb_directories.erl b/whistle_apps/apps/crossbar/src/modules/cb_directories.erl index ae8320662c1..71ae2872545 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_directories.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_directories.erl @@ -19,7 +19,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(PVT_FUNS, [fun add_pvt_type/2]). -define(CB_LIST, <<"directories/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_events.erl b/whistle_apps/apps/crossbar/src/modules/cb_events.erl index 4bb9c6fbce3..aec03a7c68b 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_events.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_events.erl @@ -46,7 +46,7 @@ ,delete/1, delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(DEFAULT_USER, <<"events_user">>). -define(EVENT_DOC_ID(User), <<"event_sub_", User/binary>>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl b/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl index be3dbad54d0..d3dd865540e 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl @@ -35,7 +35,7 @@ %% gen_listener handler callback -export([handle_req/2]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(RESPONDERS, [{?MODULE, [{<<"*">>, <<"*">>}]}]). % all matching event cat/name combos go to here -define(BINDINGS, []). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl b/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl index b6e58e4a811..d3622d0a775 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_faxes.erl @@ -21,7 +21,7 @@ ,delete/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(OUTGOING, <<"outgoing">>). -define(INCOMING, <<"incoming">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl b/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl index 0ef2229e249..be8cb859ec9 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl @@ -33,7 +33,7 @@ ,delete/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".provisioner_templates">>). -define(CB_LIST, <<"provisioner_templates/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl b/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl index b37dc885eb3..09dc8f7c2a8 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl @@ -21,7 +21,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"global_resources/crossbar_listing">>). -define(GLOBAL_RESOURCE_DB, <<"offnet">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_groups.erl b/whistle_apps/apps/crossbar/src/modules/cb_groups.erl index 4c2e74ffe9e..a95286bdce7 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_groups.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_groups.erl @@ -20,7 +20,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"groups/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl b/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl index c9569e90223..2e5b1eb5c44 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl @@ -18,7 +18,7 @@ ,validate/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(VIEW_FILE, <<"views/hotdesks.json">>). -define(CB_LIST, <<"hotdesks/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl index f49a3314954..4d8e299d449 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl @@ -20,7 +20,7 @@ ,put/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(AGG_VIEW_FILE, <<"views/accounts.json">>). -define(AGG_VIEW_IP, <<"accounts/listing_by_ip">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_killio.erl b/whistle_apps/apps/crossbar/src/modules/cb_killio.erl index 1cd2a1c67ee..4fef5a2b3d5 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_killio.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_killio.erl @@ -19,7 +19,7 @@ ,post/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(PVT_TYPE, <<"skel">>). -define(PVT_FUNS, [fun add_pvt_type/2]). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_limits.erl b/whistle_apps/apps/crossbar/src/modules/cb_limits.erl index 819d31e2848..187f360e48b 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_limits.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_limits.erl @@ -17,7 +17,7 @@ ,reconcile_services/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -include_lib("whistle/src/wh_json.hrl"). -define(CB_LIST, <<"limits/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl b/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl index 1c2fed85635..f886192f67d 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl @@ -33,7 +33,7 @@ ,delete/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".provisioner_templates">>). -define(CB_LIST, <<"provisioner_templates/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl b/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl index d0c5fcae4ad..46c9d105036 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl @@ -20,7 +20,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"local_resources/crossbar_listing">>). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".local_resources">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_media.erl b/whistle_apps/apps/crossbar/src/modules/cb_media.erl index 7160ffb02e2..d7581a71f75 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_media.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_media.erl @@ -23,7 +23,7 @@ ,delete/2, delete/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER, ?MODULE). -define(BIN_DATA, <<"raw">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_menus.erl b/whistle_apps/apps/crossbar/src/modules/cb_menus.erl index c254e33a459..d27cb404c1a 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_menus.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_menus.erl @@ -21,7 +21,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"menus/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl b/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl index fe927a24117..54d151f8ca8 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl @@ -15,7 +15,7 @@ ,is_superduper_admin/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -spec pass_hashes(ne_binary(), ne_binary()) -> {ne_binary(), ne_binary()}. pass_hashes(Username, Password) -> diff --git a/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl b/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl index 5b470496977..877b3bace77 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl @@ -16,7 +16,7 @@ ,authenticate/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl b/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl index 059ccfdbd27..a7c01d88e39 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl @@ -16,7 +16,7 @@ ,authorize/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl b/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl index 961088880b5..cacb6310cfc 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_onboard.erl @@ -20,7 +20,7 @@ ,put/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(OB_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".onboard">>). -define(DEFAULT_FLOW, "{\"data\": { \"id\": \"~s\" }, \"module\": \"user\", \"children\": { \"_\": { \"data\": { \"id\": \"~s\" }, \"module\": \"voicemail\", \"children\": {}}}}"). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl b/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl index d6edf4ff192..60cf7a10dfa 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl @@ -24,7 +24,7 @@ ,populate_phone_numbers/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -include_lib("whistle_number_manager/include/wh_number_manager.hrl"). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_queues.erl b/whistle_apps/apps/crossbar/src/modules/cb_queues.erl index 2577e274faa..baf8d6fe4b0 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_queues.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_queues.erl @@ -46,7 +46,7 @@ ,delete/2, delete/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_rates.erl b/whistle_apps/apps/crossbar/src/modules/cb_rates.erl index 5c9c4e46478..0432d7d88b6 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_rates.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_rates.erl @@ -18,7 +18,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(PVT_FUNS, [fun add_pvt_type/2]). -define(PVT_TYPE, <<"rate">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl b/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl index 50588b68d49..7096c10c433 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_registrations.erl @@ -15,7 +15,7 @@ ,lookup_regs/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(MASK_REG_FIELDS, [<<"Account-DB">>, <<"Account-ID">>, <<"App-Name">> ,<<"App-Version">>, <<"Event-Category">>, <<"Event-Name">> diff --git a/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl b/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl index 12d6b5bf4f2..443c6d7922e 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_schemas.erl @@ -18,7 +18,7 @@ ,validate/1, validate/2, validate/3 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(VALIDATION_PATH_TOKEN, <<"validation">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_servers.erl b/whistle_apps/apps/crossbar/src/modules/cb_servers.erl index f08ddc3a674..07d1c1ec527 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_servers.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_servers.erl @@ -24,7 +24,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER_CONF, [code:lib_dir(crossbar, priv), "/servers/servers.conf"]). -define(SERVER_CONFIG_CATEGORY, <<"crossbar.servers">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl b/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl index 9769e028ad9..762347bd85d 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_service_plans.erl @@ -20,7 +20,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"service_plans/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_services.erl b/whistle_apps/apps/crossbar/src/modules/cb_services.erl index cb5cf208926..6fd5ba32249 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_services.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_services.erl @@ -18,7 +18,7 @@ ,post/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(PVT_TYPE, <<"service">>). -define(PVT_FUNS, [fun add_pvt_type/2]). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl index 4117ecf1543..d3f7280830a 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_shared_auth.erl @@ -30,7 +30,7 @@ ,put/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%%=================================================================== %%% API diff --git a/whistle_apps/apps/crossbar/src/modules/cb_signup.erl b/whistle_apps/apps/crossbar/src/modules/cb_signup.erl index 2f20a9e9859..b5020345855 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_signup.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_signup.erl @@ -29,7 +29,7 @@ %% cleanup process -export([start_link/0, init_it/0]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SIGNUP_DB, <<"signups">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl b/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl index 773e1eb47c0..02b45cf3ab5 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_simple_authz.erl @@ -18,7 +18,7 @@ ,authorize/1 ]). --include("../../src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER, ?MODULE). -define(VIEW_SUMMARY, <<"accounts/listing_by_id">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_skels.erl b/whistle_apps/apps/crossbar/src/modules/cb_skels.erl index 73a6b7f48f8..a778fc2f591 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_skels.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_skels.erl @@ -32,7 +32,7 @@ ,finish_request/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"skels/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_templates.erl b/whistle_apps/apps/crossbar/src/modules/cb_templates.erl index 51dd6fcbf9d..3f93c02bcc4 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_templates.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_templates.erl @@ -20,7 +20,7 @@ ,account_created/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(DB_PREFIX, "template/"). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl b/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl index 5eba7a0c693..e8d163ffedb 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_temporal_rules.erl @@ -18,7 +18,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"temporal_rules/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl index 8994813fb34..0f45a7ee755 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_token_auth.erl @@ -23,7 +23,7 @@ %% cleanup proc -export([start_link/0, init/1]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CHILDSPEC, {?MODULE, {?MODULE, 'start_link', []}, 'permanent', 5000, 'worker', [?MODULE]}). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl b/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl index 5db977f097a..aee4b6803b3 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_transactions.erl @@ -14,7 +14,7 @@ ,validate/1, validate/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). %%-ifdef(TEST). -include_lib("eunit/include/eunit.hrl"). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl b/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl index a4da136bcfc..8add14cb863 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_user_auth.erl @@ -18,7 +18,7 @@ ,put/1, put/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(ACCT_MD5_LIST, <<"users/creds_by_md5">>). -define(ACCT_SHA1_LIST, <<"users/creds_by_sha">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_users.erl b/whistle_apps/apps/crossbar/src/modules/cb_users.erl index e9b9968218d..26cb393bb3b 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_users.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_users.erl @@ -24,7 +24,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER, ?MODULE). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl b/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl index 70202f6f33a..0f9933d6f38 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_vmboxes.erl @@ -22,7 +22,7 @@ ,delete/2, delete/4 ]). --include("../../src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"vmboxes/crossbar_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl b/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl index eb5678098d5..d6e14412c56 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_webhooks.erl @@ -19,7 +19,7 @@ ,delete/2 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(CB_LIST, <<"webhooks/crossbar_listing">>). -define(CB_USERS_LIST, <<"webhooks/users_listing">>). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl b/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl index 234bd9ea51a..e93a232271a 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_whitelabel.erl @@ -22,7 +22,7 @@ ,delete/1 ]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(WHITELABEL_ID, <<"whitelabel">>). -define(LOGO_REQ, <<"logo">>). diff --git a/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl b/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl index cb93c7fedb4..cd671281cf1 100644 --- a/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl +++ b/whistle_apps/apps/crossbar/src/modules/provisioner_contact_list.erl @@ -12,7 +12,7 @@ -export([build/1]). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -record(contact, {id ,callflow diff --git a/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl b/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl index fb85bf1b157..18cf173a077 100644 --- a/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl +++ b/whistle_apps/apps/crossbar/src/modules/provisioner_util.erl @@ -10,7 +10,7 @@ %%%------------------------------------------------------------------- -module(provisioner_util). --include("src/crossbar.hrl"). +-include("../crossbar.hrl"). -export([get_mac_address/1]). -export([get_old_mac_address/1]). From e27923ee89c8faf501979352f2066821e86a30b7 Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 16 May 2013 13:45:53 +0100 Subject: [PATCH 4/4] KAZOO-824 - more corrections to include path --- whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl | 2 +- whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl b/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl index ac081bdf1f2..b278e80870f 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl @@ -27,7 +27,7 @@ ,code_change/3 ]). --include("./src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER, ?MODULE). -define(TABLE_ID, 'cb_buckets_mgr'). diff --git a/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl b/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl index 06648f043fe..524dc4b4228 100644 --- a/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl +++ b/whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl @@ -19,7 +19,7 @@ %% Supervisor callbacks -export([init/1]). --include("./src/crossbar.hrl"). +-include("../crossbar.hrl"). -define(SERVER, ?MODULE). -define(MAX_TOKENS, whapps_config:get_integer(?CONFIG_CAT, <<"max_bucket_tokens">>, 100)).