Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kazoo 824 #36

Closed
wants to merge 5 commits into from
Closed

Kazoo 824 #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ae21bb7
KAZOO-824 - Kazoo translator includes
lazedo May 10, 2013
a27bf52
KAZOO-824 - callflow includes
lazedo May 10, 2013
ba653e9
KAZOO-824 - crossbar includes
lazedo May 10, 2013
f2b002f
Merge branch 'master' into KAZOO-824
lazedo May 16, 2013
e27923e
KAZOO-824 - more corrections to include path
lazedo May 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion whistle_apps/apps/callflow/src/module/cf_conference.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
%%%-------------------------------------------------------------------
-module(cf_conference).

-include("./src/callflow.hrl").
-include("../callflow.hrl").

-export([handle/2]).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/callflow/src/module/cf_manual_presence.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ->
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/crossbar.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_about.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
,validate/1
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

%%%===================================================================
%%% API
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_accounts.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

-export([is_unique_realm/2]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(SERVER, ?MODULE).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_acls.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
,validate/1
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").
-define(ECALLMGR, <<"ecallmgr">>).
-define(ECALLMGR_ACLS, <<"acls">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_agents.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_api_auth.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_braintree.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
,delete/3
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").
-include_lib("braintree/include/braintree.hrl").

-define(CUSTOMER_PATH_TOKEN, <<"customer">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_buckets_ets.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
,code_change/3
]).

-include("./src/crossbar.hrl").
-include("../crossbar.hrl").

-define(SERVER, ?MODULE).
-define(TABLE_ID, 'cb_buckets_mgr').
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_bulk.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
,delete/1
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

%%%===================================================================
%%% API
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_callflows.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".callflows">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_cdrs.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
,validate/1, validate/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".cdrs">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_clicktocall.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(CONNECT_CALL, <<"connect">>).
-define(HISTORY, <<"history">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_conferences.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(CB_LIST, <<"conferences/crossbar_listing">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_configs.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

%%%===================================================================
%%% API
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_connectivity.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(CB_LIST, <<"trunkstore/crossbar_listing">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_contact_list.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
,validate/1
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

%%%===================================================================
%%% API
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_devices.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
,get_all_acl_ips/0
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(QUICKCALL_URL, [{<<"devices">>, [_, <<"quickcall">>, _]}
,{?WH_ACCOUNTS_DB, [_]}
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_directories.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_events.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_events_srv.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, []).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_faxes.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
,delete/3
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(OUTGOING, <<"outgoing">>).
-define(INCOMING, <<"incoming">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_global_provisioner_templates.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_global_resources.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_groups.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(CB_LIST, <<"groups/crossbar_listing">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_hotdesks.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_ip_auth.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_killio.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_kz_buckets_sup.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_limits.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_local_provisioner_templates.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_local_resources.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_media.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
,delete/2, delete/3
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(SERVER, ?MODULE).
-define(BIN_DATA, <<"raw">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_menus.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
,delete/2
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(CB_LIST, <<"menus/crossbar_listing">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_modules_util.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) ->
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_noauthn.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
,authenticate/1
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

%%%===================================================================
%%% API
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_noauthz.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
,authorize/1
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

%%%===================================================================
%%% API
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_onboard.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\": {}}}}").
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_phone_numbers.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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").

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_queues.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
,delete/2, delete/3
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(MOD_CONFIG_CAT, <<(?CONFIG_CAT)/binary, ".queues">>).

Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_rates.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>).
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_registrations.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">>
Expand Down
2 changes: 1 addition & 1 deletion whistle_apps/apps/crossbar/src/modules/cb_schemas.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
,validate/1, validate/2, validate/3
]).

-include("src/crossbar.hrl").
-include("../crossbar.hrl").

-define(VALIDATION_PATH_TOKEN, <<"validation">>).

Expand Down
Loading