From 944a7ba11cc9694cea09bc85d0cb77123eb7f971 Mon Sep 17 00:00:00 2001 From: karl anderson Date: Thu, 26 May 2011 01:00:13 +0000 Subject: [PATCH] move applications to a folder named after the application --- .gitignore | 8 ++--- applications/src/whistle_apps.app.src | 12 ------- bin/build_beams.sh | 6 ++-- .../apps/callflow/include/cf_amqp.hrl | 0 .../callflow/priv/couchdb/views/callerid.json | 0 .../priv/couchdb/views/callflows.json | 0 .../apps/callflow/rebar.config | 0 .../apps/callflow/src/callflow.app.src | 0 .../apps/callflow/src/callflow.erl | 0 .../apps/callflow/src/callflow.hrl | 0 .../apps/callflow/src/callflow_app.erl | 0 .../apps/callflow/src/callflow_sup.erl | 0 .../apps/callflow/src/cf_api.erl | 0 .../apps/callflow/src/cf_call_command.erl | 0 .../apps/callflow/src/cf_call_handler.erl.old | 0 .../apps/callflow/src/cf_call_sup.erl | 0 .../callflow/src/cf_conference_command.erl | 0 .../apps/callflow/src/cf_endpoint.erl | 0 .../apps/callflow/src/cf_exe.erl | 0 .../apps/callflow/src/cf_responder.erl | 0 .../callflow/src/module/cf_conference.erl | 0 .../apps/callflow/src/module/cf_device.erl | 0 .../apps/callflow/src/module/cf_dialplan.erl | 0 .../apps/callflow/src/module/cf_menu.erl | 0 .../apps/callflow/src/module/cf_resources.erl | 0 .../callflow/src/module/cf_ring_group.erl | 0 .../callflow/src/module/cf_temporal_route.erl | 0 .../apps/callflow/src/module/cf_voicemail.erl | 0 .../apps/callflow/start.sh | 0 .../apps/cdr/conn-to-cdr.sh | 0 .../apps/cdr/rebar.config | 0 .../apps/cdr/src/cdr.app.src | 0 .../apps/cdr/src/cdr.erl | 0 .../apps/cdr/src/cdr_app.erl | 0 .../apps/cdr/src/cdr_deps.erl | 0 .../apps/cdr/src/cdr_listener.erl | 0 .../apps/cdr/src/cdr_sup.erl | 0 .../apps/cdr/start-dev.sh | 0 .../apps/cdr/start.sh | 0 .../apps/crossbar/include/crossbar.hrl | 0 .../apps/crossbar/include/crossbar_types.hrl | 0 .../apps/crossbar/priv/confirmation_email.sh | 0 .../crossbar/priv/couchdb/schema/devices.json | 0 .../crossbar/priv/couchdb/views/account.json | 0 .../crossbar/priv/couchdb/views/accounts.json | 0 .../apps/crossbar/priv/couchdb/views/c2c.json | 0 .../priv/couchdb/views/callflows.json | 0 .../priv/couchdb/views/conferences.json | 0 .../crossbar/priv/couchdb/views/devices.json | 0 .../priv/couchdb/views/media_doc.json | 0 .../crossbar/priv/couchdb/views/menus.json | 0 .../priv/couchdb/views/registrations.json | 0 .../priv/couchdb/views/resources.json | 0 .../crossbar/priv/couchdb/views/servers.json | 0 .../crossbar/priv/couchdb/views/sessions.json | 0 .../crossbar/priv/couchdb/views/signup.json | 0 .../priv/couchdb/views/token_auth.json | 0 .../priv/couchdb/views/user_auth.json | 0 .../crossbar/priv/couchdb/views/users.json | 0 .../crossbar/priv/couchdb/views/vmboxes.json | 0 .../apps/crossbar/priv/crossbar.conf | 0 .../apps/crossbar/priv/deploy.sh | 0 .../apps/crossbar/priv/deploy_data.tmpl | 0 .../apps/crossbar/priv/dispatch.conf | 0 .../apps/crossbar/priv/signup_email.tmpl | 0 .../apps/crossbar/priv/webmachine.conf | 0 .../apps/crossbar/priv/www/assets/js/main.js | 0 .../crossbar/priv/www/assets/js/winkstart | 0 .../apps/crossbar/rebar.config | 0 .../apps/crossbar/src/crossbar.app.src | 0 .../apps/crossbar/src/crossbar.erl | 0 .../apps/crossbar/src/crossbar_app.erl | 0 .../apps/crossbar/src/crossbar_bindings.erl | 0 .../apps/crossbar/src/crossbar_doc.erl | 0 .../apps/crossbar/src/crossbar_module_sup.erl | 0 .../apps/crossbar/src/crossbar_resource.erl | 0 .../apps/crossbar/src/crossbar_session.erl | 0 .../apps/crossbar/src/crossbar_sup.erl | 0 .../apps/crossbar/src/crossbar_util.erl | 0 .../apps/crossbar/src/crossbar_validator.erl | 0 .../apps/crossbar/src/modules/accounts.erl | 0 .../apps/crossbar/src/modules/api_auth.erl | 0 .../apps/crossbar/src/modules/callflows.erl | 0 .../apps/crossbar/src/modules/clicktocall.erl | 0 .../apps/crossbar/src/modules/conferences.erl | 0 .../apps/crossbar/src/modules/devices.erl | 0 .../apps/crossbar/src/modules/evtsub.erl | 0 .../apps/crossbar/src/modules/media.erl | 0 .../apps/crossbar/src/modules/menus.erl | 0 .../apps/crossbar/src/modules/noauthn.erl | 0 .../apps/crossbar/src/modules/noauthz.erl | 0 .../crossbar/src/modules/registrations.erl | 0 .../apps/crossbar/src/modules/resources.erl | 0 .../apps/crossbar/src/modules/servers.erl | 0 .../apps/crossbar/src/modules/signup.erl | 0 .../crossbar/src/modules/simple_authz.erl | 0 .../apps/crossbar/src/modules/t_evtsub.erl | 0 .../apps/crossbar/src/modules/token_auth.erl | 0 .../apps/crossbar/src/modules/user_auth.erl | 0 .../apps/crossbar/src/modules/users.erl | 0 .../apps/crossbar/src/modules/vmboxes.erl | 0 .../apps/crossbar/src/plists.erl | 0 .../apps/crossbar/src/static_resource.erl | 0 .../apps/crossbar/src/v1_resource.erl | 0 .../apps/crossbar/start.sh | 0 .../apps/hangups/conn-to-hangups.sh | 0 .../apps/hangups/src/hangups.app.src | 0 .../apps/hangups/src/hangups.erl | 0 .../apps/hangups/src/hangups_app.erl | 0 .../apps/hangups/src/hangups_deps.erl | 0 .../apps/hangups/src/hangups_listener.erl | 0 .../apps/hangups/src/hangups_sup.erl | 0 .../apps/hangups/start-dev.sh | 0 .../apps/hangups/start.sh | 0 .../apps/media_mgr/jaerlang-code.tgz | Bin .../apps/media_mgr/src/id3_tag_lengths.erl | 0 .../apps/media_mgr/src/media.hrl | 0 .../apps/media_mgr/src/media_mgr.app.src | 0 .../apps/media_mgr/src/media_mgr.erl | 0 .../apps/media_mgr/src/media_mgr.hrl | 0 .../apps/media_mgr/src/media_mgr_app.erl | 0 .../apps/media_mgr/src/media_mgr_sup.erl | 0 .../apps/media_mgr/src/media_shout.erl | 0 .../apps/media_mgr/src/media_shout_sup.erl | 0 .../apps/media_mgr/src/media_srv.erl | 0 .../apps/monitor/priv/couchdb/monitor.json | 0 .../apps/monitor/rebar.config | 0 .../apps/monitor/src/monitor.app.src | 0 .../apps/monitor/src/monitor.erl | 0 .../apps/monitor/src/monitor_agent_call.erl | 0 .../monitor/src/monitor_agent_network.erl | 0 .../apps/monitor/src/monitor_agent_sup.erl | 0 .../apps/monitor/src/monitor_amqp.hrl | 0 .../apps/monitor/src/monitor_api.erl | 0 .../apps/monitor/src/monitor_api.hrl | 0 .../apps/monitor/src/monitor_app.erl | 0 .../apps/monitor/src/monitor_call_basic.erl | 0 .../apps/monitor/src/monitor_couch.hrl | 0 .../apps/monitor/src/monitor_deps.erl | 0 .../apps/monitor/src/monitor_icmp.erl | 0 .../apps/monitor/src/monitor_job.erl | 0 .../apps/monitor/src/monitor_job_sup.erl | 0 .../apps/monitor/src/monitor_master.erl | 0 .../apps/monitor/src/monitor_sup.erl | 0 .../apps/monitor/src/monitor_util.erl | 0 .../apps/notify/rebar.config | 0 .../apps/notify/src/notify.app.src | 0 .../apps/notify/src/notify.erl | 0 .../apps/notify/src/notify.hrl | 0 .../apps/notify/src/notify_app.erl | 0 .../apps/notify/src/notify_sup.erl | 0 .../apps/notify/src/notify_vm.erl | 0 .../apps/promocalling/rebar.config | 0 .../promocalling/src/promocalling.app.src | 0 .../apps/promocalling/src/promocalling.erl | 0 .../promocalling/src/promocalling_app.erl | 0 .../promocalling/src/promocalling_sup.erl | 0 .../apps/registrar/priv/couchdb/auth.json | 0 .../registrar/priv/couchdb/registrations.json | 0 .../apps/registrar/rebar.config | 0 .../apps/registrar/src/reg.hrl | 0 .../apps/registrar/src/reg_server.erl | 0 .../apps/registrar/src/registrar.app.src | 0 .../apps/registrar/src/registrar.erl | 0 .../apps/registrar/src/registrar_app.erl | 0 .../apps/registrar/src/registrar_sup.erl | 0 .../apps/trunkstore/conn-to-trunkstore.sh | 0 .../trunkstore/priv/couchdb/accounts.json | 0 .../trunkstore/priv/couchdb/carriers.json | 0 .../apps/trunkstore/priv/couchdb/credit.json | 0 .../apps/trunkstore/priv/couchdb/filter.json | 0 .../trunkstore/priv/couchdb/lookupdid.json | 0 .../trunkstore/priv/couchdb/lookupipauth.json | 0 .../priv/couchdb/lookupmonitor.json | 0 .../trunkstore/priv/couchdb/lookupuser.json | 0 .../priv/couchdb/lookupuserauth.json | 0 .../apps/trunkstore/priv/couchdb/rates.json | 0 .../trunkstore/priv/couchdb/sample.json.data | 0 .../apps/trunkstore/priv/couchdb/trunks.json | 0 .../apps/trunkstore/priv/couchdb/ts_cdr.json | 0 .../apps/trunkstore/rebar.config | 0 .../apps/trunkstore/rperry.notes | 0 .../apps/trunkstore/src/trunkstore.app.src | 0 .../apps/trunkstore/src/trunkstore.erl | 0 .../apps/trunkstore/src/trunkstore_app.erl | 0 .../apps/trunkstore/src/trunkstore_deps.erl | 0 .../apps/trunkstore/src/trunkstore_sup.erl | 0 .../apps/trunkstore/src/ts.hrl | 0 .../apps/trunkstore/src/ts_acctmgr.erl | 0 .../apps/trunkstore/src/ts_auth.erl | 0 .../apps/trunkstore/src/ts_call_handler.erl | 0 .../apps/trunkstore/src/ts_call_sup.erl | 0 .../apps/trunkstore/src/ts_carrier.erl | 0 .../apps/trunkstore/src/ts_cdr.erl | 0 .../apps/trunkstore/src/ts_credit.erl | 0 .../apps/trunkstore/src/ts_e911.erl | 0 .../apps/trunkstore/src/ts_responder.erl | 0 .../apps/trunkstore/src/ts_responder_sup.erl | 0 .../apps/trunkstore/src/ts_route.erl | 0 .../apps/trunkstore/src/ts_t38.erl | 0 .../apps/trunkstore/src/ts_tollfree.erl | 0 .../apps/trunkstore/src/ts_util.erl | 0 .../apps/trunkstore/start-dev.sh | 0 .../apps/trunkstore/start.sh | 0 {applications => whistle_apps}/conf/vm.args | 0 .../conn-to-apps.sh | 0 .../log/.placeholder | 0 .../priv/startup.config | 2 +- {applications => whistle_apps}/rebar.config | 0 .../src/whapps_controller.erl | 17 ++++------ .../src/whapps_util.erl | 0 whistle_apps/src/whistle_apps.app.src | 30 ++++++++++++++++++ .../src/whistle_apps.erl | 0 .../src/whistle_apps_app.erl | 0 .../src/whistle_apps_cli.erl | 0 .../src/whistle_apps_deps.erl | 0 .../src/whistle_apps_sup.erl | 0 {applications => whistle_apps}/start-dev.sh | 0 {applications => whistle_apps}/start.sh | 0 .../templates/rebar.config | 0 .../whistle_apps_ctl | 0 221 files changed, 45 insertions(+), 30 deletions(-) delete mode 100644 applications/src/whistle_apps.app.src rename {applications => whistle_apps}/apps/callflow/include/cf_amqp.hrl (100%) rename {applications => whistle_apps}/apps/callflow/priv/couchdb/views/callerid.json (100%) rename {applications => whistle_apps}/apps/callflow/priv/couchdb/views/callflows.json (100%) rename {applications => whistle_apps}/apps/callflow/rebar.config (100%) rename {applications => whistle_apps}/apps/callflow/src/callflow.app.src (100%) rename {applications => whistle_apps}/apps/callflow/src/callflow.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/callflow.hrl (100%) rename {applications => whistle_apps}/apps/callflow/src/callflow_app.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/callflow_sup.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_api.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_call_command.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_call_handler.erl.old (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_call_sup.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_conference_command.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_endpoint.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_exe.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/cf_responder.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_conference.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_device.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_dialplan.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_menu.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_resources.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_ring_group.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_temporal_route.erl (100%) rename {applications => whistle_apps}/apps/callflow/src/module/cf_voicemail.erl (100%) rename {applications => whistle_apps}/apps/callflow/start.sh (100%) rename {applications => whistle_apps}/apps/cdr/conn-to-cdr.sh (100%) rename {applications => whistle_apps}/apps/cdr/rebar.config (100%) rename {applications => whistle_apps}/apps/cdr/src/cdr.app.src (100%) rename {applications => whistle_apps}/apps/cdr/src/cdr.erl (100%) rename {applications => whistle_apps}/apps/cdr/src/cdr_app.erl (100%) rename {applications => whistle_apps}/apps/cdr/src/cdr_deps.erl (100%) rename {applications => whistle_apps}/apps/cdr/src/cdr_listener.erl (100%) rename {applications => whistle_apps}/apps/cdr/src/cdr_sup.erl (100%) rename {applications => whistle_apps}/apps/cdr/start-dev.sh (100%) rename {applications => whistle_apps}/apps/cdr/start.sh (100%) rename {applications => whistle_apps}/apps/crossbar/include/crossbar.hrl (100%) rename {applications => whistle_apps}/apps/crossbar/include/crossbar_types.hrl (100%) rename {applications => whistle_apps}/apps/crossbar/priv/confirmation_email.sh (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/schema/devices.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/account.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/accounts.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/c2c.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/callflows.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/conferences.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/devices.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/media_doc.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/menus.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/registrations.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/resources.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/servers.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/sessions.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/signup.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/token_auth.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/user_auth.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/users.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/couchdb/views/vmboxes.json (100%) rename {applications => whistle_apps}/apps/crossbar/priv/crossbar.conf (100%) rename {applications => whistle_apps}/apps/crossbar/priv/deploy.sh (100%) rename {applications => whistle_apps}/apps/crossbar/priv/deploy_data.tmpl (100%) rename {applications => whistle_apps}/apps/crossbar/priv/dispatch.conf (100%) rename {applications => whistle_apps}/apps/crossbar/priv/signup_email.tmpl (100%) rename {applications => whistle_apps}/apps/crossbar/priv/webmachine.conf (100%) rename {applications => whistle_apps}/apps/crossbar/priv/www/assets/js/main.js (100%) rename {applications => whistle_apps}/apps/crossbar/priv/www/assets/js/winkstart (100%) rename {applications => whistle_apps}/apps/crossbar/rebar.config (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar.app.src (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_app.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_bindings.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_doc.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_module_sup.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_resource.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_session.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_sup.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_util.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/crossbar_validator.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/accounts.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/api_auth.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/callflows.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/clicktocall.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/conferences.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/devices.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/evtsub.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/media.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/menus.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/noauthn.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/noauthz.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/registrations.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/resources.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/servers.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/signup.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/simple_authz.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/t_evtsub.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/token_auth.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/user_auth.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/users.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/modules/vmboxes.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/plists.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/static_resource.erl (100%) rename {applications => whistle_apps}/apps/crossbar/src/v1_resource.erl (100%) rename {applications => whistle_apps}/apps/crossbar/start.sh (100%) rename {applications => whistle_apps}/apps/hangups/conn-to-hangups.sh (100%) rename {applications => whistle_apps}/apps/hangups/src/hangups.app.src (100%) rename {applications => whistle_apps}/apps/hangups/src/hangups.erl (100%) rename {applications => whistle_apps}/apps/hangups/src/hangups_app.erl (100%) rename {applications => whistle_apps}/apps/hangups/src/hangups_deps.erl (100%) rename {applications => whistle_apps}/apps/hangups/src/hangups_listener.erl (100%) rename {applications => whistle_apps}/apps/hangups/src/hangups_sup.erl (100%) rename {applications => whistle_apps}/apps/hangups/start-dev.sh (100%) rename {applications => whistle_apps}/apps/hangups/start.sh (100%) rename {applications => whistle_apps}/apps/media_mgr/jaerlang-code.tgz (100%) rename {applications => whistle_apps}/apps/media_mgr/src/id3_tag_lengths.erl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media.hrl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_mgr.app.src (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_mgr.erl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_mgr.hrl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_mgr_app.erl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_mgr_sup.erl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_shout.erl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_shout_sup.erl (100%) rename {applications => whistle_apps}/apps/media_mgr/src/media_srv.erl (100%) rename {applications => whistle_apps}/apps/monitor/priv/couchdb/monitor.json (100%) rename {applications => whistle_apps}/apps/monitor/rebar.config (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor.app.src (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_agent_call.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_agent_network.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_agent_sup.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_amqp.hrl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_api.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_api.hrl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_app.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_call_basic.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_couch.hrl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_deps.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_icmp.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_job.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_job_sup.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_master.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_sup.erl (100%) rename {applications => whistle_apps}/apps/monitor/src/monitor_util.erl (100%) rename {applications => whistle_apps}/apps/notify/rebar.config (100%) rename {applications => whistle_apps}/apps/notify/src/notify.app.src (100%) rename {applications => whistle_apps}/apps/notify/src/notify.erl (100%) rename {applications => whistle_apps}/apps/notify/src/notify.hrl (100%) rename {applications => whistle_apps}/apps/notify/src/notify_app.erl (100%) rename {applications => whistle_apps}/apps/notify/src/notify_sup.erl (100%) rename {applications => whistle_apps}/apps/notify/src/notify_vm.erl (100%) rename {applications => whistle_apps}/apps/promocalling/rebar.config (100%) rename {applications => whistle_apps}/apps/promocalling/src/promocalling.app.src (100%) rename {applications => whistle_apps}/apps/promocalling/src/promocalling.erl (100%) rename {applications => whistle_apps}/apps/promocalling/src/promocalling_app.erl (100%) rename {applications => whistle_apps}/apps/promocalling/src/promocalling_sup.erl (100%) rename {applications => whistle_apps}/apps/registrar/priv/couchdb/auth.json (100%) rename {applications => whistle_apps}/apps/registrar/priv/couchdb/registrations.json (100%) rename {applications => whistle_apps}/apps/registrar/rebar.config (100%) rename {applications => whistle_apps}/apps/registrar/src/reg.hrl (100%) rename {applications => whistle_apps}/apps/registrar/src/reg_server.erl (100%) rename {applications => whistle_apps}/apps/registrar/src/registrar.app.src (100%) rename {applications => whistle_apps}/apps/registrar/src/registrar.erl (100%) rename {applications => whistle_apps}/apps/registrar/src/registrar_app.erl (100%) rename {applications => whistle_apps}/apps/registrar/src/registrar_sup.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/conn-to-trunkstore.sh (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/accounts.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/carriers.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/credit.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/filter.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/lookupdid.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/lookupipauth.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/lookupmonitor.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/lookupuser.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/lookupuserauth.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/rates.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/sample.json.data (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/trunks.json (100%) rename {applications => whistle_apps}/apps/trunkstore/priv/couchdb/ts_cdr.json (100%) rename {applications => whistle_apps}/apps/trunkstore/rebar.config (100%) rename {applications => whistle_apps}/apps/trunkstore/rperry.notes (100%) rename {applications => whistle_apps}/apps/trunkstore/src/trunkstore.app.src (100%) rename {applications => whistle_apps}/apps/trunkstore/src/trunkstore.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/trunkstore_app.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/trunkstore_deps.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/trunkstore_sup.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts.hrl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_acctmgr.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_auth.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_call_handler.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_call_sup.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_carrier.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_cdr.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_credit.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_e911.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_responder.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_responder_sup.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_route.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_t38.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_tollfree.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/src/ts_util.erl (100%) rename {applications => whistle_apps}/apps/trunkstore/start-dev.sh (100%) rename {applications => whistle_apps}/apps/trunkstore/start.sh (100%) rename {applications => whistle_apps}/conf/vm.args (100%) rename {applications => whistle_apps}/conn-to-apps.sh (100%) rename {applications => whistle_apps}/log/.placeholder (100%) rename {applications => whistle_apps}/priv/startup.config (62%) rename {applications => whistle_apps}/rebar.config (100%) rename {applications => whistle_apps}/src/whapps_controller.erl (95%) rename {applications => whistle_apps}/src/whapps_util.erl (100%) create mode 100644 whistle_apps/src/whistle_apps.app.src rename {applications => whistle_apps}/src/whistle_apps.erl (100%) rename {applications => whistle_apps}/src/whistle_apps_app.erl (100%) rename {applications => whistle_apps}/src/whistle_apps_cli.erl (100%) rename {applications => whistle_apps}/src/whistle_apps_deps.erl (100%) rename {applications => whistle_apps}/src/whistle_apps_sup.erl (100%) rename {applications => whistle_apps}/start-dev.sh (100%) rename {applications => whistle_apps}/start.sh (100%) rename {applications => whistle_apps}/templates/rebar.config (100%) rename {applications => whistle_apps}/whistle_apps_ctl (100%) diff --git a/.gitignore b/.gitignore index 5dadd0f7bf0..4ddb53ef48f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,14 +6,14 @@ */ebin/*.app utils/*/ebin/*.beam utils/*/ebin/*.app -applications/apps/*/ebin/*.beam -applications/apps/*/ebin/*.app +whistle_apps/apps/*/ebin/*.beam +whistle_apps/apps/*/ebin/*.app rabbit/{rabbitmq-}*/ebin/*.beam rabbit/{rabbitmq-}*/ebin/*.app .eunit lib/rabbitmq-server/log/*.log* lib/rabbitmq-server/mnesia/* -applications/apps/*/log/* -applications/priv/mnesia/*.* +whistle_apps/apps/*/log/* +whistle_apps/priv/mnesia/*.* lib/whistle*/ebin/*.beam lib/whistle*/ebin/*.app diff --git a/applications/src/whistle_apps.app.src b/applications/src/whistle_apps.app.src deleted file mode 100644 index 6cc3bc81e4f..00000000000 --- a/applications/src/whistle_apps.app.src +++ /dev/null @@ -1,12 +0,0 @@ -{application, whistle_apps, - [ - {description, "Applications on top of Whistle"}, - {vsn, "0.5.0"}, - {registered, []}, - {applications, [ - kernel, - stdlib - ]}, - {mod, { whistle_apps_app, []}}, - {env, []} - ]}. diff --git a/bin/build_beams.sh b/bin/build_beams.sh index 7d3a6e70018..a5c6b9c386c 100755 --- a/bin/build_beams.sh +++ b/bin/build_beams.sh @@ -53,7 +53,7 @@ cd $WDIR/ecallmgr $REBAR clean compile echo "Compiling Apps container and Apps" -cd $WDIR/applications +cd $WDIR/whistle_apps $REBAR clean compile for WLIB in ${WDIR}/lib/whistle* @@ -78,9 +78,9 @@ fCompileWhApps() { echo "=======================================================" echo " Compiling WhApps" echo "=======================================================" - echo "# cd ${WDIR}/applications; ${REBAR} clean compile" + echo "# cd ${WDIR}/whistle_apps; ${REBAR} clean compile" - cd ${WDIR}/applications; ${REBAR} clean compile + cd ${WDIR}/whistle_apps; ${REBAR} clean compile echo } diff --git a/applications/apps/callflow/include/cf_amqp.hrl b/whistle_apps/apps/callflow/include/cf_amqp.hrl similarity index 100% rename from applications/apps/callflow/include/cf_amqp.hrl rename to whistle_apps/apps/callflow/include/cf_amqp.hrl diff --git a/applications/apps/callflow/priv/couchdb/views/callerid.json b/whistle_apps/apps/callflow/priv/couchdb/views/callerid.json similarity index 100% rename from applications/apps/callflow/priv/couchdb/views/callerid.json rename to whistle_apps/apps/callflow/priv/couchdb/views/callerid.json diff --git a/applications/apps/callflow/priv/couchdb/views/callflows.json b/whistle_apps/apps/callflow/priv/couchdb/views/callflows.json similarity index 100% rename from applications/apps/callflow/priv/couchdb/views/callflows.json rename to whistle_apps/apps/callflow/priv/couchdb/views/callflows.json diff --git a/applications/apps/callflow/rebar.config b/whistle_apps/apps/callflow/rebar.config similarity index 100% rename from applications/apps/callflow/rebar.config rename to whistle_apps/apps/callflow/rebar.config diff --git a/applications/apps/callflow/src/callflow.app.src b/whistle_apps/apps/callflow/src/callflow.app.src similarity index 100% rename from applications/apps/callflow/src/callflow.app.src rename to whistle_apps/apps/callflow/src/callflow.app.src diff --git a/applications/apps/callflow/src/callflow.erl b/whistle_apps/apps/callflow/src/callflow.erl similarity index 100% rename from applications/apps/callflow/src/callflow.erl rename to whistle_apps/apps/callflow/src/callflow.erl diff --git a/applications/apps/callflow/src/callflow.hrl b/whistle_apps/apps/callflow/src/callflow.hrl similarity index 100% rename from applications/apps/callflow/src/callflow.hrl rename to whistle_apps/apps/callflow/src/callflow.hrl diff --git a/applications/apps/callflow/src/callflow_app.erl b/whistle_apps/apps/callflow/src/callflow_app.erl similarity index 100% rename from applications/apps/callflow/src/callflow_app.erl rename to whistle_apps/apps/callflow/src/callflow_app.erl diff --git a/applications/apps/callflow/src/callflow_sup.erl b/whistle_apps/apps/callflow/src/callflow_sup.erl similarity index 100% rename from applications/apps/callflow/src/callflow_sup.erl rename to whistle_apps/apps/callflow/src/callflow_sup.erl diff --git a/applications/apps/callflow/src/cf_api.erl b/whistle_apps/apps/callflow/src/cf_api.erl similarity index 100% rename from applications/apps/callflow/src/cf_api.erl rename to whistle_apps/apps/callflow/src/cf_api.erl diff --git a/applications/apps/callflow/src/cf_call_command.erl b/whistle_apps/apps/callflow/src/cf_call_command.erl similarity index 100% rename from applications/apps/callflow/src/cf_call_command.erl rename to whistle_apps/apps/callflow/src/cf_call_command.erl diff --git a/applications/apps/callflow/src/cf_call_handler.erl.old b/whistle_apps/apps/callflow/src/cf_call_handler.erl.old similarity index 100% rename from applications/apps/callflow/src/cf_call_handler.erl.old rename to whistle_apps/apps/callflow/src/cf_call_handler.erl.old diff --git a/applications/apps/callflow/src/cf_call_sup.erl b/whistle_apps/apps/callflow/src/cf_call_sup.erl similarity index 100% rename from applications/apps/callflow/src/cf_call_sup.erl rename to whistle_apps/apps/callflow/src/cf_call_sup.erl diff --git a/applications/apps/callflow/src/cf_conference_command.erl b/whistle_apps/apps/callflow/src/cf_conference_command.erl similarity index 100% rename from applications/apps/callflow/src/cf_conference_command.erl rename to whistle_apps/apps/callflow/src/cf_conference_command.erl diff --git a/applications/apps/callflow/src/cf_endpoint.erl b/whistle_apps/apps/callflow/src/cf_endpoint.erl similarity index 100% rename from applications/apps/callflow/src/cf_endpoint.erl rename to whistle_apps/apps/callflow/src/cf_endpoint.erl diff --git a/applications/apps/callflow/src/cf_exe.erl b/whistle_apps/apps/callflow/src/cf_exe.erl similarity index 100% rename from applications/apps/callflow/src/cf_exe.erl rename to whistle_apps/apps/callflow/src/cf_exe.erl diff --git a/applications/apps/callflow/src/cf_responder.erl b/whistle_apps/apps/callflow/src/cf_responder.erl similarity index 100% rename from applications/apps/callflow/src/cf_responder.erl rename to whistle_apps/apps/callflow/src/cf_responder.erl diff --git a/applications/apps/callflow/src/module/cf_conference.erl b/whistle_apps/apps/callflow/src/module/cf_conference.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_conference.erl rename to whistle_apps/apps/callflow/src/module/cf_conference.erl diff --git a/applications/apps/callflow/src/module/cf_device.erl b/whistle_apps/apps/callflow/src/module/cf_device.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_device.erl rename to whistle_apps/apps/callflow/src/module/cf_device.erl diff --git a/applications/apps/callflow/src/module/cf_dialplan.erl b/whistle_apps/apps/callflow/src/module/cf_dialplan.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_dialplan.erl rename to whistle_apps/apps/callflow/src/module/cf_dialplan.erl diff --git a/applications/apps/callflow/src/module/cf_menu.erl b/whistle_apps/apps/callflow/src/module/cf_menu.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_menu.erl rename to whistle_apps/apps/callflow/src/module/cf_menu.erl diff --git a/applications/apps/callflow/src/module/cf_resources.erl b/whistle_apps/apps/callflow/src/module/cf_resources.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_resources.erl rename to whistle_apps/apps/callflow/src/module/cf_resources.erl diff --git a/applications/apps/callflow/src/module/cf_ring_group.erl b/whistle_apps/apps/callflow/src/module/cf_ring_group.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_ring_group.erl rename to whistle_apps/apps/callflow/src/module/cf_ring_group.erl diff --git a/applications/apps/callflow/src/module/cf_temporal_route.erl b/whistle_apps/apps/callflow/src/module/cf_temporal_route.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_temporal_route.erl rename to whistle_apps/apps/callflow/src/module/cf_temporal_route.erl diff --git a/applications/apps/callflow/src/module/cf_voicemail.erl b/whistle_apps/apps/callflow/src/module/cf_voicemail.erl similarity index 100% rename from applications/apps/callflow/src/module/cf_voicemail.erl rename to whistle_apps/apps/callflow/src/module/cf_voicemail.erl diff --git a/applications/apps/callflow/start.sh b/whistle_apps/apps/callflow/start.sh similarity index 100% rename from applications/apps/callflow/start.sh rename to whistle_apps/apps/callflow/start.sh diff --git a/applications/apps/cdr/conn-to-cdr.sh b/whistle_apps/apps/cdr/conn-to-cdr.sh similarity index 100% rename from applications/apps/cdr/conn-to-cdr.sh rename to whistle_apps/apps/cdr/conn-to-cdr.sh diff --git a/applications/apps/cdr/rebar.config b/whistle_apps/apps/cdr/rebar.config similarity index 100% rename from applications/apps/cdr/rebar.config rename to whistle_apps/apps/cdr/rebar.config diff --git a/applications/apps/cdr/src/cdr.app.src b/whistle_apps/apps/cdr/src/cdr.app.src similarity index 100% rename from applications/apps/cdr/src/cdr.app.src rename to whistle_apps/apps/cdr/src/cdr.app.src diff --git a/applications/apps/cdr/src/cdr.erl b/whistle_apps/apps/cdr/src/cdr.erl similarity index 100% rename from applications/apps/cdr/src/cdr.erl rename to whistle_apps/apps/cdr/src/cdr.erl diff --git a/applications/apps/cdr/src/cdr_app.erl b/whistle_apps/apps/cdr/src/cdr_app.erl similarity index 100% rename from applications/apps/cdr/src/cdr_app.erl rename to whistle_apps/apps/cdr/src/cdr_app.erl diff --git a/applications/apps/cdr/src/cdr_deps.erl b/whistle_apps/apps/cdr/src/cdr_deps.erl similarity index 100% rename from applications/apps/cdr/src/cdr_deps.erl rename to whistle_apps/apps/cdr/src/cdr_deps.erl diff --git a/applications/apps/cdr/src/cdr_listener.erl b/whistle_apps/apps/cdr/src/cdr_listener.erl similarity index 100% rename from applications/apps/cdr/src/cdr_listener.erl rename to whistle_apps/apps/cdr/src/cdr_listener.erl diff --git a/applications/apps/cdr/src/cdr_sup.erl b/whistle_apps/apps/cdr/src/cdr_sup.erl similarity index 100% rename from applications/apps/cdr/src/cdr_sup.erl rename to whistle_apps/apps/cdr/src/cdr_sup.erl diff --git a/applications/apps/cdr/start-dev.sh b/whistle_apps/apps/cdr/start-dev.sh similarity index 100% rename from applications/apps/cdr/start-dev.sh rename to whistle_apps/apps/cdr/start-dev.sh diff --git a/applications/apps/cdr/start.sh b/whistle_apps/apps/cdr/start.sh similarity index 100% rename from applications/apps/cdr/start.sh rename to whistle_apps/apps/cdr/start.sh diff --git a/applications/apps/crossbar/include/crossbar.hrl b/whistle_apps/apps/crossbar/include/crossbar.hrl similarity index 100% rename from applications/apps/crossbar/include/crossbar.hrl rename to whistle_apps/apps/crossbar/include/crossbar.hrl diff --git a/applications/apps/crossbar/include/crossbar_types.hrl b/whistle_apps/apps/crossbar/include/crossbar_types.hrl similarity index 100% rename from applications/apps/crossbar/include/crossbar_types.hrl rename to whistle_apps/apps/crossbar/include/crossbar_types.hrl diff --git a/applications/apps/crossbar/priv/confirmation_email.sh b/whistle_apps/apps/crossbar/priv/confirmation_email.sh similarity index 100% rename from applications/apps/crossbar/priv/confirmation_email.sh rename to whistle_apps/apps/crossbar/priv/confirmation_email.sh diff --git a/applications/apps/crossbar/priv/couchdb/schema/devices.json b/whistle_apps/apps/crossbar/priv/couchdb/schema/devices.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/schema/devices.json rename to whistle_apps/apps/crossbar/priv/couchdb/schema/devices.json diff --git a/applications/apps/crossbar/priv/couchdb/views/account.json b/whistle_apps/apps/crossbar/priv/couchdb/views/account.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/account.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/account.json diff --git a/applications/apps/crossbar/priv/couchdb/views/accounts.json b/whistle_apps/apps/crossbar/priv/couchdb/views/accounts.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/accounts.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/accounts.json diff --git a/applications/apps/crossbar/priv/couchdb/views/c2c.json b/whistle_apps/apps/crossbar/priv/couchdb/views/c2c.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/c2c.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/c2c.json diff --git a/applications/apps/crossbar/priv/couchdb/views/callflows.json b/whistle_apps/apps/crossbar/priv/couchdb/views/callflows.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/callflows.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/callflows.json diff --git a/applications/apps/crossbar/priv/couchdb/views/conferences.json b/whistle_apps/apps/crossbar/priv/couchdb/views/conferences.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/conferences.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/conferences.json diff --git a/applications/apps/crossbar/priv/couchdb/views/devices.json b/whistle_apps/apps/crossbar/priv/couchdb/views/devices.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/devices.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/devices.json diff --git a/applications/apps/crossbar/priv/couchdb/views/media_doc.json b/whistle_apps/apps/crossbar/priv/couchdb/views/media_doc.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/media_doc.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/media_doc.json diff --git a/applications/apps/crossbar/priv/couchdb/views/menus.json b/whistle_apps/apps/crossbar/priv/couchdb/views/menus.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/menus.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/menus.json diff --git a/applications/apps/crossbar/priv/couchdb/views/registrations.json b/whistle_apps/apps/crossbar/priv/couchdb/views/registrations.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/registrations.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/registrations.json diff --git a/applications/apps/crossbar/priv/couchdb/views/resources.json b/whistle_apps/apps/crossbar/priv/couchdb/views/resources.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/resources.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/resources.json diff --git a/applications/apps/crossbar/priv/couchdb/views/servers.json b/whistle_apps/apps/crossbar/priv/couchdb/views/servers.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/servers.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/servers.json diff --git a/applications/apps/crossbar/priv/couchdb/views/sessions.json b/whistle_apps/apps/crossbar/priv/couchdb/views/sessions.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/sessions.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/sessions.json diff --git a/applications/apps/crossbar/priv/couchdb/views/signup.json b/whistle_apps/apps/crossbar/priv/couchdb/views/signup.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/signup.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/signup.json diff --git a/applications/apps/crossbar/priv/couchdb/views/token_auth.json b/whistle_apps/apps/crossbar/priv/couchdb/views/token_auth.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/token_auth.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/token_auth.json diff --git a/applications/apps/crossbar/priv/couchdb/views/user_auth.json b/whistle_apps/apps/crossbar/priv/couchdb/views/user_auth.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/user_auth.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/user_auth.json diff --git a/applications/apps/crossbar/priv/couchdb/views/users.json b/whistle_apps/apps/crossbar/priv/couchdb/views/users.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/users.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/users.json diff --git a/applications/apps/crossbar/priv/couchdb/views/vmboxes.json b/whistle_apps/apps/crossbar/priv/couchdb/views/vmboxes.json similarity index 100% rename from applications/apps/crossbar/priv/couchdb/views/vmboxes.json rename to whistle_apps/apps/crossbar/priv/couchdb/views/vmboxes.json diff --git a/applications/apps/crossbar/priv/crossbar.conf b/whistle_apps/apps/crossbar/priv/crossbar.conf similarity index 100% rename from applications/apps/crossbar/priv/crossbar.conf rename to whistle_apps/apps/crossbar/priv/crossbar.conf diff --git a/applications/apps/crossbar/priv/deploy.sh b/whistle_apps/apps/crossbar/priv/deploy.sh similarity index 100% rename from applications/apps/crossbar/priv/deploy.sh rename to whistle_apps/apps/crossbar/priv/deploy.sh diff --git a/applications/apps/crossbar/priv/deploy_data.tmpl b/whistle_apps/apps/crossbar/priv/deploy_data.tmpl similarity index 100% rename from applications/apps/crossbar/priv/deploy_data.tmpl rename to whistle_apps/apps/crossbar/priv/deploy_data.tmpl diff --git a/applications/apps/crossbar/priv/dispatch.conf b/whistle_apps/apps/crossbar/priv/dispatch.conf similarity index 100% rename from applications/apps/crossbar/priv/dispatch.conf rename to whistle_apps/apps/crossbar/priv/dispatch.conf diff --git a/applications/apps/crossbar/priv/signup_email.tmpl b/whistle_apps/apps/crossbar/priv/signup_email.tmpl similarity index 100% rename from applications/apps/crossbar/priv/signup_email.tmpl rename to whistle_apps/apps/crossbar/priv/signup_email.tmpl diff --git a/applications/apps/crossbar/priv/webmachine.conf b/whistle_apps/apps/crossbar/priv/webmachine.conf similarity index 100% rename from applications/apps/crossbar/priv/webmachine.conf rename to whistle_apps/apps/crossbar/priv/webmachine.conf diff --git a/applications/apps/crossbar/priv/www/assets/js/main.js b/whistle_apps/apps/crossbar/priv/www/assets/js/main.js similarity index 100% rename from applications/apps/crossbar/priv/www/assets/js/main.js rename to whistle_apps/apps/crossbar/priv/www/assets/js/main.js diff --git a/applications/apps/crossbar/priv/www/assets/js/winkstart b/whistle_apps/apps/crossbar/priv/www/assets/js/winkstart similarity index 100% rename from applications/apps/crossbar/priv/www/assets/js/winkstart rename to whistle_apps/apps/crossbar/priv/www/assets/js/winkstart diff --git a/applications/apps/crossbar/rebar.config b/whistle_apps/apps/crossbar/rebar.config similarity index 100% rename from applications/apps/crossbar/rebar.config rename to whistle_apps/apps/crossbar/rebar.config diff --git a/applications/apps/crossbar/src/crossbar.app.src b/whistle_apps/apps/crossbar/src/crossbar.app.src similarity index 100% rename from applications/apps/crossbar/src/crossbar.app.src rename to whistle_apps/apps/crossbar/src/crossbar.app.src diff --git a/applications/apps/crossbar/src/crossbar.erl b/whistle_apps/apps/crossbar/src/crossbar.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar.erl rename to whistle_apps/apps/crossbar/src/crossbar.erl diff --git a/applications/apps/crossbar/src/crossbar_app.erl b/whistle_apps/apps/crossbar/src/crossbar_app.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_app.erl rename to whistle_apps/apps/crossbar/src/crossbar_app.erl diff --git a/applications/apps/crossbar/src/crossbar_bindings.erl b/whistle_apps/apps/crossbar/src/crossbar_bindings.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_bindings.erl rename to whistle_apps/apps/crossbar/src/crossbar_bindings.erl diff --git a/applications/apps/crossbar/src/crossbar_doc.erl b/whistle_apps/apps/crossbar/src/crossbar_doc.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_doc.erl rename to whistle_apps/apps/crossbar/src/crossbar_doc.erl diff --git a/applications/apps/crossbar/src/crossbar_module_sup.erl b/whistle_apps/apps/crossbar/src/crossbar_module_sup.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_module_sup.erl rename to whistle_apps/apps/crossbar/src/crossbar_module_sup.erl diff --git a/applications/apps/crossbar/src/crossbar_resource.erl b/whistle_apps/apps/crossbar/src/crossbar_resource.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_resource.erl rename to whistle_apps/apps/crossbar/src/crossbar_resource.erl diff --git a/applications/apps/crossbar/src/crossbar_session.erl b/whistle_apps/apps/crossbar/src/crossbar_session.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_session.erl rename to whistle_apps/apps/crossbar/src/crossbar_session.erl diff --git a/applications/apps/crossbar/src/crossbar_sup.erl b/whistle_apps/apps/crossbar/src/crossbar_sup.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_sup.erl rename to whistle_apps/apps/crossbar/src/crossbar_sup.erl diff --git a/applications/apps/crossbar/src/crossbar_util.erl b/whistle_apps/apps/crossbar/src/crossbar_util.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_util.erl rename to whistle_apps/apps/crossbar/src/crossbar_util.erl diff --git a/applications/apps/crossbar/src/crossbar_validator.erl b/whistle_apps/apps/crossbar/src/crossbar_validator.erl similarity index 100% rename from applications/apps/crossbar/src/crossbar_validator.erl rename to whistle_apps/apps/crossbar/src/crossbar_validator.erl diff --git a/applications/apps/crossbar/src/modules/accounts.erl b/whistle_apps/apps/crossbar/src/modules/accounts.erl similarity index 100% rename from applications/apps/crossbar/src/modules/accounts.erl rename to whistle_apps/apps/crossbar/src/modules/accounts.erl diff --git a/applications/apps/crossbar/src/modules/api_auth.erl b/whistle_apps/apps/crossbar/src/modules/api_auth.erl similarity index 100% rename from applications/apps/crossbar/src/modules/api_auth.erl rename to whistle_apps/apps/crossbar/src/modules/api_auth.erl diff --git a/applications/apps/crossbar/src/modules/callflows.erl b/whistle_apps/apps/crossbar/src/modules/callflows.erl similarity index 100% rename from applications/apps/crossbar/src/modules/callflows.erl rename to whistle_apps/apps/crossbar/src/modules/callflows.erl diff --git a/applications/apps/crossbar/src/modules/clicktocall.erl b/whistle_apps/apps/crossbar/src/modules/clicktocall.erl similarity index 100% rename from applications/apps/crossbar/src/modules/clicktocall.erl rename to whistle_apps/apps/crossbar/src/modules/clicktocall.erl diff --git a/applications/apps/crossbar/src/modules/conferences.erl b/whistle_apps/apps/crossbar/src/modules/conferences.erl similarity index 100% rename from applications/apps/crossbar/src/modules/conferences.erl rename to whistle_apps/apps/crossbar/src/modules/conferences.erl diff --git a/applications/apps/crossbar/src/modules/devices.erl b/whistle_apps/apps/crossbar/src/modules/devices.erl similarity index 100% rename from applications/apps/crossbar/src/modules/devices.erl rename to whistle_apps/apps/crossbar/src/modules/devices.erl diff --git a/applications/apps/crossbar/src/modules/evtsub.erl b/whistle_apps/apps/crossbar/src/modules/evtsub.erl similarity index 100% rename from applications/apps/crossbar/src/modules/evtsub.erl rename to whistle_apps/apps/crossbar/src/modules/evtsub.erl diff --git a/applications/apps/crossbar/src/modules/media.erl b/whistle_apps/apps/crossbar/src/modules/media.erl similarity index 100% rename from applications/apps/crossbar/src/modules/media.erl rename to whistle_apps/apps/crossbar/src/modules/media.erl diff --git a/applications/apps/crossbar/src/modules/menus.erl b/whistle_apps/apps/crossbar/src/modules/menus.erl similarity index 100% rename from applications/apps/crossbar/src/modules/menus.erl rename to whistle_apps/apps/crossbar/src/modules/menus.erl diff --git a/applications/apps/crossbar/src/modules/noauthn.erl b/whistle_apps/apps/crossbar/src/modules/noauthn.erl similarity index 100% rename from applications/apps/crossbar/src/modules/noauthn.erl rename to whistle_apps/apps/crossbar/src/modules/noauthn.erl diff --git a/applications/apps/crossbar/src/modules/noauthz.erl b/whistle_apps/apps/crossbar/src/modules/noauthz.erl similarity index 100% rename from applications/apps/crossbar/src/modules/noauthz.erl rename to whistle_apps/apps/crossbar/src/modules/noauthz.erl diff --git a/applications/apps/crossbar/src/modules/registrations.erl b/whistle_apps/apps/crossbar/src/modules/registrations.erl similarity index 100% rename from applications/apps/crossbar/src/modules/registrations.erl rename to whistle_apps/apps/crossbar/src/modules/registrations.erl diff --git a/applications/apps/crossbar/src/modules/resources.erl b/whistle_apps/apps/crossbar/src/modules/resources.erl similarity index 100% rename from applications/apps/crossbar/src/modules/resources.erl rename to whistle_apps/apps/crossbar/src/modules/resources.erl diff --git a/applications/apps/crossbar/src/modules/servers.erl b/whistle_apps/apps/crossbar/src/modules/servers.erl similarity index 100% rename from applications/apps/crossbar/src/modules/servers.erl rename to whistle_apps/apps/crossbar/src/modules/servers.erl diff --git a/applications/apps/crossbar/src/modules/signup.erl b/whistle_apps/apps/crossbar/src/modules/signup.erl similarity index 100% rename from applications/apps/crossbar/src/modules/signup.erl rename to whistle_apps/apps/crossbar/src/modules/signup.erl diff --git a/applications/apps/crossbar/src/modules/simple_authz.erl b/whistle_apps/apps/crossbar/src/modules/simple_authz.erl similarity index 100% rename from applications/apps/crossbar/src/modules/simple_authz.erl rename to whistle_apps/apps/crossbar/src/modules/simple_authz.erl diff --git a/applications/apps/crossbar/src/modules/t_evtsub.erl b/whistle_apps/apps/crossbar/src/modules/t_evtsub.erl similarity index 100% rename from applications/apps/crossbar/src/modules/t_evtsub.erl rename to whistle_apps/apps/crossbar/src/modules/t_evtsub.erl diff --git a/applications/apps/crossbar/src/modules/token_auth.erl b/whistle_apps/apps/crossbar/src/modules/token_auth.erl similarity index 100% rename from applications/apps/crossbar/src/modules/token_auth.erl rename to whistle_apps/apps/crossbar/src/modules/token_auth.erl diff --git a/applications/apps/crossbar/src/modules/user_auth.erl b/whistle_apps/apps/crossbar/src/modules/user_auth.erl similarity index 100% rename from applications/apps/crossbar/src/modules/user_auth.erl rename to whistle_apps/apps/crossbar/src/modules/user_auth.erl diff --git a/applications/apps/crossbar/src/modules/users.erl b/whistle_apps/apps/crossbar/src/modules/users.erl similarity index 100% rename from applications/apps/crossbar/src/modules/users.erl rename to whistle_apps/apps/crossbar/src/modules/users.erl diff --git a/applications/apps/crossbar/src/modules/vmboxes.erl b/whistle_apps/apps/crossbar/src/modules/vmboxes.erl similarity index 100% rename from applications/apps/crossbar/src/modules/vmboxes.erl rename to whistle_apps/apps/crossbar/src/modules/vmboxes.erl diff --git a/applications/apps/crossbar/src/plists.erl b/whistle_apps/apps/crossbar/src/plists.erl similarity index 100% rename from applications/apps/crossbar/src/plists.erl rename to whistle_apps/apps/crossbar/src/plists.erl diff --git a/applications/apps/crossbar/src/static_resource.erl b/whistle_apps/apps/crossbar/src/static_resource.erl similarity index 100% rename from applications/apps/crossbar/src/static_resource.erl rename to whistle_apps/apps/crossbar/src/static_resource.erl diff --git a/applications/apps/crossbar/src/v1_resource.erl b/whistle_apps/apps/crossbar/src/v1_resource.erl similarity index 100% rename from applications/apps/crossbar/src/v1_resource.erl rename to whistle_apps/apps/crossbar/src/v1_resource.erl diff --git a/applications/apps/crossbar/start.sh b/whistle_apps/apps/crossbar/start.sh similarity index 100% rename from applications/apps/crossbar/start.sh rename to whistle_apps/apps/crossbar/start.sh diff --git a/applications/apps/hangups/conn-to-hangups.sh b/whistle_apps/apps/hangups/conn-to-hangups.sh similarity index 100% rename from applications/apps/hangups/conn-to-hangups.sh rename to whistle_apps/apps/hangups/conn-to-hangups.sh diff --git a/applications/apps/hangups/src/hangups.app.src b/whistle_apps/apps/hangups/src/hangups.app.src similarity index 100% rename from applications/apps/hangups/src/hangups.app.src rename to whistle_apps/apps/hangups/src/hangups.app.src diff --git a/applications/apps/hangups/src/hangups.erl b/whistle_apps/apps/hangups/src/hangups.erl similarity index 100% rename from applications/apps/hangups/src/hangups.erl rename to whistle_apps/apps/hangups/src/hangups.erl diff --git a/applications/apps/hangups/src/hangups_app.erl b/whistle_apps/apps/hangups/src/hangups_app.erl similarity index 100% rename from applications/apps/hangups/src/hangups_app.erl rename to whistle_apps/apps/hangups/src/hangups_app.erl diff --git a/applications/apps/hangups/src/hangups_deps.erl b/whistle_apps/apps/hangups/src/hangups_deps.erl similarity index 100% rename from applications/apps/hangups/src/hangups_deps.erl rename to whistle_apps/apps/hangups/src/hangups_deps.erl diff --git a/applications/apps/hangups/src/hangups_listener.erl b/whistle_apps/apps/hangups/src/hangups_listener.erl similarity index 100% rename from applications/apps/hangups/src/hangups_listener.erl rename to whistle_apps/apps/hangups/src/hangups_listener.erl diff --git a/applications/apps/hangups/src/hangups_sup.erl b/whistle_apps/apps/hangups/src/hangups_sup.erl similarity index 100% rename from applications/apps/hangups/src/hangups_sup.erl rename to whistle_apps/apps/hangups/src/hangups_sup.erl diff --git a/applications/apps/hangups/start-dev.sh b/whistle_apps/apps/hangups/start-dev.sh similarity index 100% rename from applications/apps/hangups/start-dev.sh rename to whistle_apps/apps/hangups/start-dev.sh diff --git a/applications/apps/hangups/start.sh b/whistle_apps/apps/hangups/start.sh similarity index 100% rename from applications/apps/hangups/start.sh rename to whistle_apps/apps/hangups/start.sh diff --git a/applications/apps/media_mgr/jaerlang-code.tgz b/whistle_apps/apps/media_mgr/jaerlang-code.tgz similarity index 100% rename from applications/apps/media_mgr/jaerlang-code.tgz rename to whistle_apps/apps/media_mgr/jaerlang-code.tgz diff --git a/applications/apps/media_mgr/src/id3_tag_lengths.erl b/whistle_apps/apps/media_mgr/src/id3_tag_lengths.erl similarity index 100% rename from applications/apps/media_mgr/src/id3_tag_lengths.erl rename to whistle_apps/apps/media_mgr/src/id3_tag_lengths.erl diff --git a/applications/apps/media_mgr/src/media.hrl b/whistle_apps/apps/media_mgr/src/media.hrl similarity index 100% rename from applications/apps/media_mgr/src/media.hrl rename to whistle_apps/apps/media_mgr/src/media.hrl diff --git a/applications/apps/media_mgr/src/media_mgr.app.src b/whistle_apps/apps/media_mgr/src/media_mgr.app.src similarity index 100% rename from applications/apps/media_mgr/src/media_mgr.app.src rename to whistle_apps/apps/media_mgr/src/media_mgr.app.src diff --git a/applications/apps/media_mgr/src/media_mgr.erl b/whistle_apps/apps/media_mgr/src/media_mgr.erl similarity index 100% rename from applications/apps/media_mgr/src/media_mgr.erl rename to whistle_apps/apps/media_mgr/src/media_mgr.erl diff --git a/applications/apps/media_mgr/src/media_mgr.hrl b/whistle_apps/apps/media_mgr/src/media_mgr.hrl similarity index 100% rename from applications/apps/media_mgr/src/media_mgr.hrl rename to whistle_apps/apps/media_mgr/src/media_mgr.hrl diff --git a/applications/apps/media_mgr/src/media_mgr_app.erl b/whistle_apps/apps/media_mgr/src/media_mgr_app.erl similarity index 100% rename from applications/apps/media_mgr/src/media_mgr_app.erl rename to whistle_apps/apps/media_mgr/src/media_mgr_app.erl diff --git a/applications/apps/media_mgr/src/media_mgr_sup.erl b/whistle_apps/apps/media_mgr/src/media_mgr_sup.erl similarity index 100% rename from applications/apps/media_mgr/src/media_mgr_sup.erl rename to whistle_apps/apps/media_mgr/src/media_mgr_sup.erl diff --git a/applications/apps/media_mgr/src/media_shout.erl b/whistle_apps/apps/media_mgr/src/media_shout.erl similarity index 100% rename from applications/apps/media_mgr/src/media_shout.erl rename to whistle_apps/apps/media_mgr/src/media_shout.erl diff --git a/applications/apps/media_mgr/src/media_shout_sup.erl b/whistle_apps/apps/media_mgr/src/media_shout_sup.erl similarity index 100% rename from applications/apps/media_mgr/src/media_shout_sup.erl rename to whistle_apps/apps/media_mgr/src/media_shout_sup.erl diff --git a/applications/apps/media_mgr/src/media_srv.erl b/whistle_apps/apps/media_mgr/src/media_srv.erl similarity index 100% rename from applications/apps/media_mgr/src/media_srv.erl rename to whistle_apps/apps/media_mgr/src/media_srv.erl diff --git a/applications/apps/monitor/priv/couchdb/monitor.json b/whistle_apps/apps/monitor/priv/couchdb/monitor.json similarity index 100% rename from applications/apps/monitor/priv/couchdb/monitor.json rename to whistle_apps/apps/monitor/priv/couchdb/monitor.json diff --git a/applications/apps/monitor/rebar.config b/whistle_apps/apps/monitor/rebar.config similarity index 100% rename from applications/apps/monitor/rebar.config rename to whistle_apps/apps/monitor/rebar.config diff --git a/applications/apps/monitor/src/monitor.app.src b/whistle_apps/apps/monitor/src/monitor.app.src similarity index 100% rename from applications/apps/monitor/src/monitor.app.src rename to whistle_apps/apps/monitor/src/monitor.app.src diff --git a/applications/apps/monitor/src/monitor.erl b/whistle_apps/apps/monitor/src/monitor.erl similarity index 100% rename from applications/apps/monitor/src/monitor.erl rename to whistle_apps/apps/monitor/src/monitor.erl diff --git a/applications/apps/monitor/src/monitor_agent_call.erl b/whistle_apps/apps/monitor/src/monitor_agent_call.erl similarity index 100% rename from applications/apps/monitor/src/monitor_agent_call.erl rename to whistle_apps/apps/monitor/src/monitor_agent_call.erl diff --git a/applications/apps/monitor/src/monitor_agent_network.erl b/whistle_apps/apps/monitor/src/monitor_agent_network.erl similarity index 100% rename from applications/apps/monitor/src/monitor_agent_network.erl rename to whistle_apps/apps/monitor/src/monitor_agent_network.erl diff --git a/applications/apps/monitor/src/monitor_agent_sup.erl b/whistle_apps/apps/monitor/src/monitor_agent_sup.erl similarity index 100% rename from applications/apps/monitor/src/monitor_agent_sup.erl rename to whistle_apps/apps/monitor/src/monitor_agent_sup.erl diff --git a/applications/apps/monitor/src/monitor_amqp.hrl b/whistle_apps/apps/monitor/src/monitor_amqp.hrl similarity index 100% rename from applications/apps/monitor/src/monitor_amqp.hrl rename to whistle_apps/apps/monitor/src/monitor_amqp.hrl diff --git a/applications/apps/monitor/src/monitor_api.erl b/whistle_apps/apps/monitor/src/monitor_api.erl similarity index 100% rename from applications/apps/monitor/src/monitor_api.erl rename to whistle_apps/apps/monitor/src/monitor_api.erl diff --git a/applications/apps/monitor/src/monitor_api.hrl b/whistle_apps/apps/monitor/src/monitor_api.hrl similarity index 100% rename from applications/apps/monitor/src/monitor_api.hrl rename to whistle_apps/apps/monitor/src/monitor_api.hrl diff --git a/applications/apps/monitor/src/monitor_app.erl b/whistle_apps/apps/monitor/src/monitor_app.erl similarity index 100% rename from applications/apps/monitor/src/monitor_app.erl rename to whistle_apps/apps/monitor/src/monitor_app.erl diff --git a/applications/apps/monitor/src/monitor_call_basic.erl b/whistle_apps/apps/monitor/src/monitor_call_basic.erl similarity index 100% rename from applications/apps/monitor/src/monitor_call_basic.erl rename to whistle_apps/apps/monitor/src/monitor_call_basic.erl diff --git a/applications/apps/monitor/src/monitor_couch.hrl b/whistle_apps/apps/monitor/src/monitor_couch.hrl similarity index 100% rename from applications/apps/monitor/src/monitor_couch.hrl rename to whistle_apps/apps/monitor/src/monitor_couch.hrl diff --git a/applications/apps/monitor/src/monitor_deps.erl b/whistle_apps/apps/monitor/src/monitor_deps.erl similarity index 100% rename from applications/apps/monitor/src/monitor_deps.erl rename to whistle_apps/apps/monitor/src/monitor_deps.erl diff --git a/applications/apps/monitor/src/monitor_icmp.erl b/whistle_apps/apps/monitor/src/monitor_icmp.erl similarity index 100% rename from applications/apps/monitor/src/monitor_icmp.erl rename to whistle_apps/apps/monitor/src/monitor_icmp.erl diff --git a/applications/apps/monitor/src/monitor_job.erl b/whistle_apps/apps/monitor/src/monitor_job.erl similarity index 100% rename from applications/apps/monitor/src/monitor_job.erl rename to whistle_apps/apps/monitor/src/monitor_job.erl diff --git a/applications/apps/monitor/src/monitor_job_sup.erl b/whistle_apps/apps/monitor/src/monitor_job_sup.erl similarity index 100% rename from applications/apps/monitor/src/monitor_job_sup.erl rename to whistle_apps/apps/monitor/src/monitor_job_sup.erl diff --git a/applications/apps/monitor/src/monitor_master.erl b/whistle_apps/apps/monitor/src/monitor_master.erl similarity index 100% rename from applications/apps/monitor/src/monitor_master.erl rename to whistle_apps/apps/monitor/src/monitor_master.erl diff --git a/applications/apps/monitor/src/monitor_sup.erl b/whistle_apps/apps/monitor/src/monitor_sup.erl similarity index 100% rename from applications/apps/monitor/src/monitor_sup.erl rename to whistle_apps/apps/monitor/src/monitor_sup.erl diff --git a/applications/apps/monitor/src/monitor_util.erl b/whistle_apps/apps/monitor/src/monitor_util.erl similarity index 100% rename from applications/apps/monitor/src/monitor_util.erl rename to whistle_apps/apps/monitor/src/monitor_util.erl diff --git a/applications/apps/notify/rebar.config b/whistle_apps/apps/notify/rebar.config similarity index 100% rename from applications/apps/notify/rebar.config rename to whistle_apps/apps/notify/rebar.config diff --git a/applications/apps/notify/src/notify.app.src b/whistle_apps/apps/notify/src/notify.app.src similarity index 100% rename from applications/apps/notify/src/notify.app.src rename to whistle_apps/apps/notify/src/notify.app.src diff --git a/applications/apps/notify/src/notify.erl b/whistle_apps/apps/notify/src/notify.erl similarity index 100% rename from applications/apps/notify/src/notify.erl rename to whistle_apps/apps/notify/src/notify.erl diff --git a/applications/apps/notify/src/notify.hrl b/whistle_apps/apps/notify/src/notify.hrl similarity index 100% rename from applications/apps/notify/src/notify.hrl rename to whistle_apps/apps/notify/src/notify.hrl diff --git a/applications/apps/notify/src/notify_app.erl b/whistle_apps/apps/notify/src/notify_app.erl similarity index 100% rename from applications/apps/notify/src/notify_app.erl rename to whistle_apps/apps/notify/src/notify_app.erl diff --git a/applications/apps/notify/src/notify_sup.erl b/whistle_apps/apps/notify/src/notify_sup.erl similarity index 100% rename from applications/apps/notify/src/notify_sup.erl rename to whistle_apps/apps/notify/src/notify_sup.erl diff --git a/applications/apps/notify/src/notify_vm.erl b/whistle_apps/apps/notify/src/notify_vm.erl similarity index 100% rename from applications/apps/notify/src/notify_vm.erl rename to whistle_apps/apps/notify/src/notify_vm.erl diff --git a/applications/apps/promocalling/rebar.config b/whistle_apps/apps/promocalling/rebar.config similarity index 100% rename from applications/apps/promocalling/rebar.config rename to whistle_apps/apps/promocalling/rebar.config diff --git a/applications/apps/promocalling/src/promocalling.app.src b/whistle_apps/apps/promocalling/src/promocalling.app.src similarity index 100% rename from applications/apps/promocalling/src/promocalling.app.src rename to whistle_apps/apps/promocalling/src/promocalling.app.src diff --git a/applications/apps/promocalling/src/promocalling.erl b/whistle_apps/apps/promocalling/src/promocalling.erl similarity index 100% rename from applications/apps/promocalling/src/promocalling.erl rename to whistle_apps/apps/promocalling/src/promocalling.erl diff --git a/applications/apps/promocalling/src/promocalling_app.erl b/whistle_apps/apps/promocalling/src/promocalling_app.erl similarity index 100% rename from applications/apps/promocalling/src/promocalling_app.erl rename to whistle_apps/apps/promocalling/src/promocalling_app.erl diff --git a/applications/apps/promocalling/src/promocalling_sup.erl b/whistle_apps/apps/promocalling/src/promocalling_sup.erl similarity index 100% rename from applications/apps/promocalling/src/promocalling_sup.erl rename to whistle_apps/apps/promocalling/src/promocalling_sup.erl diff --git a/applications/apps/registrar/priv/couchdb/auth.json b/whistle_apps/apps/registrar/priv/couchdb/auth.json similarity index 100% rename from applications/apps/registrar/priv/couchdb/auth.json rename to whistle_apps/apps/registrar/priv/couchdb/auth.json diff --git a/applications/apps/registrar/priv/couchdb/registrations.json b/whistle_apps/apps/registrar/priv/couchdb/registrations.json similarity index 100% rename from applications/apps/registrar/priv/couchdb/registrations.json rename to whistle_apps/apps/registrar/priv/couchdb/registrations.json diff --git a/applications/apps/registrar/rebar.config b/whistle_apps/apps/registrar/rebar.config similarity index 100% rename from applications/apps/registrar/rebar.config rename to whistle_apps/apps/registrar/rebar.config diff --git a/applications/apps/registrar/src/reg.hrl b/whistle_apps/apps/registrar/src/reg.hrl similarity index 100% rename from applications/apps/registrar/src/reg.hrl rename to whistle_apps/apps/registrar/src/reg.hrl diff --git a/applications/apps/registrar/src/reg_server.erl b/whistle_apps/apps/registrar/src/reg_server.erl similarity index 100% rename from applications/apps/registrar/src/reg_server.erl rename to whistle_apps/apps/registrar/src/reg_server.erl diff --git a/applications/apps/registrar/src/registrar.app.src b/whistle_apps/apps/registrar/src/registrar.app.src similarity index 100% rename from applications/apps/registrar/src/registrar.app.src rename to whistle_apps/apps/registrar/src/registrar.app.src diff --git a/applications/apps/registrar/src/registrar.erl b/whistle_apps/apps/registrar/src/registrar.erl similarity index 100% rename from applications/apps/registrar/src/registrar.erl rename to whistle_apps/apps/registrar/src/registrar.erl diff --git a/applications/apps/registrar/src/registrar_app.erl b/whistle_apps/apps/registrar/src/registrar_app.erl similarity index 100% rename from applications/apps/registrar/src/registrar_app.erl rename to whistle_apps/apps/registrar/src/registrar_app.erl diff --git a/applications/apps/registrar/src/registrar_sup.erl b/whistle_apps/apps/registrar/src/registrar_sup.erl similarity index 100% rename from applications/apps/registrar/src/registrar_sup.erl rename to whistle_apps/apps/registrar/src/registrar_sup.erl diff --git a/applications/apps/trunkstore/conn-to-trunkstore.sh b/whistle_apps/apps/trunkstore/conn-to-trunkstore.sh similarity index 100% rename from applications/apps/trunkstore/conn-to-trunkstore.sh rename to whistle_apps/apps/trunkstore/conn-to-trunkstore.sh diff --git a/applications/apps/trunkstore/priv/couchdb/accounts.json b/whistle_apps/apps/trunkstore/priv/couchdb/accounts.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/accounts.json rename to whistle_apps/apps/trunkstore/priv/couchdb/accounts.json diff --git a/applications/apps/trunkstore/priv/couchdb/carriers.json b/whistle_apps/apps/trunkstore/priv/couchdb/carriers.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/carriers.json rename to whistle_apps/apps/trunkstore/priv/couchdb/carriers.json diff --git a/applications/apps/trunkstore/priv/couchdb/credit.json b/whistle_apps/apps/trunkstore/priv/couchdb/credit.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/credit.json rename to whistle_apps/apps/trunkstore/priv/couchdb/credit.json diff --git a/applications/apps/trunkstore/priv/couchdb/filter.json b/whistle_apps/apps/trunkstore/priv/couchdb/filter.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/filter.json rename to whistle_apps/apps/trunkstore/priv/couchdb/filter.json diff --git a/applications/apps/trunkstore/priv/couchdb/lookupdid.json b/whistle_apps/apps/trunkstore/priv/couchdb/lookupdid.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/lookupdid.json rename to whistle_apps/apps/trunkstore/priv/couchdb/lookupdid.json diff --git a/applications/apps/trunkstore/priv/couchdb/lookupipauth.json b/whistle_apps/apps/trunkstore/priv/couchdb/lookupipauth.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/lookupipauth.json rename to whistle_apps/apps/trunkstore/priv/couchdb/lookupipauth.json diff --git a/applications/apps/trunkstore/priv/couchdb/lookupmonitor.json b/whistle_apps/apps/trunkstore/priv/couchdb/lookupmonitor.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/lookupmonitor.json rename to whistle_apps/apps/trunkstore/priv/couchdb/lookupmonitor.json diff --git a/applications/apps/trunkstore/priv/couchdb/lookupuser.json b/whistle_apps/apps/trunkstore/priv/couchdb/lookupuser.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/lookupuser.json rename to whistle_apps/apps/trunkstore/priv/couchdb/lookupuser.json diff --git a/applications/apps/trunkstore/priv/couchdb/lookupuserauth.json b/whistle_apps/apps/trunkstore/priv/couchdb/lookupuserauth.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/lookupuserauth.json rename to whistle_apps/apps/trunkstore/priv/couchdb/lookupuserauth.json diff --git a/applications/apps/trunkstore/priv/couchdb/rates.json b/whistle_apps/apps/trunkstore/priv/couchdb/rates.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/rates.json rename to whistle_apps/apps/trunkstore/priv/couchdb/rates.json diff --git a/applications/apps/trunkstore/priv/couchdb/sample.json.data b/whistle_apps/apps/trunkstore/priv/couchdb/sample.json.data similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/sample.json.data rename to whistle_apps/apps/trunkstore/priv/couchdb/sample.json.data diff --git a/applications/apps/trunkstore/priv/couchdb/trunks.json b/whistle_apps/apps/trunkstore/priv/couchdb/trunks.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/trunks.json rename to whistle_apps/apps/trunkstore/priv/couchdb/trunks.json diff --git a/applications/apps/trunkstore/priv/couchdb/ts_cdr.json b/whistle_apps/apps/trunkstore/priv/couchdb/ts_cdr.json similarity index 100% rename from applications/apps/trunkstore/priv/couchdb/ts_cdr.json rename to whistle_apps/apps/trunkstore/priv/couchdb/ts_cdr.json diff --git a/applications/apps/trunkstore/rebar.config b/whistle_apps/apps/trunkstore/rebar.config similarity index 100% rename from applications/apps/trunkstore/rebar.config rename to whistle_apps/apps/trunkstore/rebar.config diff --git a/applications/apps/trunkstore/rperry.notes b/whistle_apps/apps/trunkstore/rperry.notes similarity index 100% rename from applications/apps/trunkstore/rperry.notes rename to whistle_apps/apps/trunkstore/rperry.notes diff --git a/applications/apps/trunkstore/src/trunkstore.app.src b/whistle_apps/apps/trunkstore/src/trunkstore.app.src similarity index 100% rename from applications/apps/trunkstore/src/trunkstore.app.src rename to whistle_apps/apps/trunkstore/src/trunkstore.app.src diff --git a/applications/apps/trunkstore/src/trunkstore.erl b/whistle_apps/apps/trunkstore/src/trunkstore.erl similarity index 100% rename from applications/apps/trunkstore/src/trunkstore.erl rename to whistle_apps/apps/trunkstore/src/trunkstore.erl diff --git a/applications/apps/trunkstore/src/trunkstore_app.erl b/whistle_apps/apps/trunkstore/src/trunkstore_app.erl similarity index 100% rename from applications/apps/trunkstore/src/trunkstore_app.erl rename to whistle_apps/apps/trunkstore/src/trunkstore_app.erl diff --git a/applications/apps/trunkstore/src/trunkstore_deps.erl b/whistle_apps/apps/trunkstore/src/trunkstore_deps.erl similarity index 100% rename from applications/apps/trunkstore/src/trunkstore_deps.erl rename to whistle_apps/apps/trunkstore/src/trunkstore_deps.erl diff --git a/applications/apps/trunkstore/src/trunkstore_sup.erl b/whistle_apps/apps/trunkstore/src/trunkstore_sup.erl similarity index 100% rename from applications/apps/trunkstore/src/trunkstore_sup.erl rename to whistle_apps/apps/trunkstore/src/trunkstore_sup.erl diff --git a/applications/apps/trunkstore/src/ts.hrl b/whistle_apps/apps/trunkstore/src/ts.hrl similarity index 100% rename from applications/apps/trunkstore/src/ts.hrl rename to whistle_apps/apps/trunkstore/src/ts.hrl diff --git a/applications/apps/trunkstore/src/ts_acctmgr.erl b/whistle_apps/apps/trunkstore/src/ts_acctmgr.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_acctmgr.erl rename to whistle_apps/apps/trunkstore/src/ts_acctmgr.erl diff --git a/applications/apps/trunkstore/src/ts_auth.erl b/whistle_apps/apps/trunkstore/src/ts_auth.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_auth.erl rename to whistle_apps/apps/trunkstore/src/ts_auth.erl diff --git a/applications/apps/trunkstore/src/ts_call_handler.erl b/whistle_apps/apps/trunkstore/src/ts_call_handler.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_call_handler.erl rename to whistle_apps/apps/trunkstore/src/ts_call_handler.erl diff --git a/applications/apps/trunkstore/src/ts_call_sup.erl b/whistle_apps/apps/trunkstore/src/ts_call_sup.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_call_sup.erl rename to whistle_apps/apps/trunkstore/src/ts_call_sup.erl diff --git a/applications/apps/trunkstore/src/ts_carrier.erl b/whistle_apps/apps/trunkstore/src/ts_carrier.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_carrier.erl rename to whistle_apps/apps/trunkstore/src/ts_carrier.erl diff --git a/applications/apps/trunkstore/src/ts_cdr.erl b/whistle_apps/apps/trunkstore/src/ts_cdr.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_cdr.erl rename to whistle_apps/apps/trunkstore/src/ts_cdr.erl diff --git a/applications/apps/trunkstore/src/ts_credit.erl b/whistle_apps/apps/trunkstore/src/ts_credit.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_credit.erl rename to whistle_apps/apps/trunkstore/src/ts_credit.erl diff --git a/applications/apps/trunkstore/src/ts_e911.erl b/whistle_apps/apps/trunkstore/src/ts_e911.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_e911.erl rename to whistle_apps/apps/trunkstore/src/ts_e911.erl diff --git a/applications/apps/trunkstore/src/ts_responder.erl b/whistle_apps/apps/trunkstore/src/ts_responder.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_responder.erl rename to whistle_apps/apps/trunkstore/src/ts_responder.erl diff --git a/applications/apps/trunkstore/src/ts_responder_sup.erl b/whistle_apps/apps/trunkstore/src/ts_responder_sup.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_responder_sup.erl rename to whistle_apps/apps/trunkstore/src/ts_responder_sup.erl diff --git a/applications/apps/trunkstore/src/ts_route.erl b/whistle_apps/apps/trunkstore/src/ts_route.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_route.erl rename to whistle_apps/apps/trunkstore/src/ts_route.erl diff --git a/applications/apps/trunkstore/src/ts_t38.erl b/whistle_apps/apps/trunkstore/src/ts_t38.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_t38.erl rename to whistle_apps/apps/trunkstore/src/ts_t38.erl diff --git a/applications/apps/trunkstore/src/ts_tollfree.erl b/whistle_apps/apps/trunkstore/src/ts_tollfree.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_tollfree.erl rename to whistle_apps/apps/trunkstore/src/ts_tollfree.erl diff --git a/applications/apps/trunkstore/src/ts_util.erl b/whistle_apps/apps/trunkstore/src/ts_util.erl similarity index 100% rename from applications/apps/trunkstore/src/ts_util.erl rename to whistle_apps/apps/trunkstore/src/ts_util.erl diff --git a/applications/apps/trunkstore/start-dev.sh b/whistle_apps/apps/trunkstore/start-dev.sh similarity index 100% rename from applications/apps/trunkstore/start-dev.sh rename to whistle_apps/apps/trunkstore/start-dev.sh diff --git a/applications/apps/trunkstore/start.sh b/whistle_apps/apps/trunkstore/start.sh similarity index 100% rename from applications/apps/trunkstore/start.sh rename to whistle_apps/apps/trunkstore/start.sh diff --git a/applications/conf/vm.args b/whistle_apps/conf/vm.args similarity index 100% rename from applications/conf/vm.args rename to whistle_apps/conf/vm.args diff --git a/applications/conn-to-apps.sh b/whistle_apps/conn-to-apps.sh similarity index 100% rename from applications/conn-to-apps.sh rename to whistle_apps/conn-to-apps.sh diff --git a/applications/log/.placeholder b/whistle_apps/log/.placeholder similarity index 100% rename from applications/log/.placeholder rename to whistle_apps/log/.placeholder diff --git a/applications/priv/startup.config b/whistle_apps/priv/startup.config similarity index 62% rename from applications/priv/startup.config rename to whistle_apps/priv/startup.config index d2e4d82be07..35cfa13f701 100644 --- a/applications/priv/startup.config +++ b/whistle_apps/priv/startup.config @@ -1,4 +1,4 @@ -{start, []}. %[callflow, crossbar]}. +{whapps, [crossbar, callflow, registrar, media_mgr]}. {default_couch_host, "localhost", "", ""}. {default_amqp_host, "localhost"}. {nodes, []}. diff --git a/applications/rebar.config b/whistle_apps/rebar.config similarity index 100% rename from applications/rebar.config rename to whistle_apps/rebar.config diff --git a/applications/src/whapps_controller.erl b/whistle_apps/src/whapps_controller.erl similarity index 95% rename from applications/src/whapps_controller.erl rename to whistle_apps/src/whapps_controller.erl index e9176e69dfc..7ed40771aa9 100644 --- a/applications/src/whapps_controller.erl +++ b/whistle_apps/src/whapps_controller.erl @@ -150,22 +150,19 @@ handle_cast(_Msg, State) -> %% @end %%-------------------------------------------------------------------- handle_info(timeout, State) -> - handle_info(start_apps, State); + spawn(fun() -> + logger:format_log(info, "Consult ~p got ~p", [?STARTUP_FILE, file:consult(?STARTUP_FILE)]), + {ok, Startup} = file:consult(?STARTUP_FILE), + WhApps = props:get_value(whapps, Startup, []), + lists:foreach(fun(WhApp) -> start_app(WhApp) end, WhApps) + end), + {noreply, State}; handle_info({add_successful_app, undefined}, State) -> format_log(info, "WHAPPS(~p): Failed to add app~n", [self()]), {noreply, State}; handle_info({add_successful_app, A}, State) -> format_log(info, "WHAPPS(~p): Adding app to ~p~n", [self(), A]), {noreply, State#state{apps=[A | State#state.apps]}}; -handle_info(start_apps, #state{apps=As}=State) -> - State1 = case file:consult(?STARTUP_FILE) of - {ok, Ts} -> - Apps = props:get_value(start, Ts, []), - lists:foreach(fun(App) -> add_app(App, As) end, Apps), - State; - _ -> State - end, - {noreply, State1}; handle_info(_Info, State) -> format_log(info, "WHAPPS(~p): Unhandled info ~p~n", [self(), _Info]), {noreply, State}. diff --git a/applications/src/whapps_util.erl b/whistle_apps/src/whapps_util.erl similarity index 100% rename from applications/src/whapps_util.erl rename to whistle_apps/src/whapps_util.erl diff --git a/whistle_apps/src/whistle_apps.app.src b/whistle_apps/src/whistle_apps.app.src new file mode 100644 index 00000000000..9ac2cab6f48 --- /dev/null +++ b/whistle_apps/src/whistle_apps.app.src @@ -0,0 +1,30 @@ +{application, whistle_apps, + [ + {description, "Applications on top of Whistle"} + ,{id, "9fd3b140-8727-11e0-9d78-0800200c9a66"} + ,{vsn, "0.5.0"} + ,{modules, [ + whapps_controller + ,whistle_util + ,whistle_app + ,whistle_cli + ,whistle_deps + ,whistles + ,whistle_sup + ]} + ,{registered, [whapps_controller]} + ,{applications, [ + kernel + ,stdlib + ]} + ,{included_applications, [ + sasl + ,crypto + ,ibrowse + ,riak_err + ,whistle_amqp + ,whistle_couch + ]} + ,{mod, {whistle_apps_app, []}} + ,{env, []} + ]}. diff --git a/applications/src/whistle_apps.erl b/whistle_apps/src/whistle_apps.erl similarity index 100% rename from applications/src/whistle_apps.erl rename to whistle_apps/src/whistle_apps.erl diff --git a/applications/src/whistle_apps_app.erl b/whistle_apps/src/whistle_apps_app.erl similarity index 100% rename from applications/src/whistle_apps_app.erl rename to whistle_apps/src/whistle_apps_app.erl diff --git a/applications/src/whistle_apps_cli.erl b/whistle_apps/src/whistle_apps_cli.erl similarity index 100% rename from applications/src/whistle_apps_cli.erl rename to whistle_apps/src/whistle_apps_cli.erl diff --git a/applications/src/whistle_apps_deps.erl b/whistle_apps/src/whistle_apps_deps.erl similarity index 100% rename from applications/src/whistle_apps_deps.erl rename to whistle_apps/src/whistle_apps_deps.erl diff --git a/applications/src/whistle_apps_sup.erl b/whistle_apps/src/whistle_apps_sup.erl similarity index 100% rename from applications/src/whistle_apps_sup.erl rename to whistle_apps/src/whistle_apps_sup.erl diff --git a/applications/start-dev.sh b/whistle_apps/start-dev.sh similarity index 100% rename from applications/start-dev.sh rename to whistle_apps/start-dev.sh diff --git a/applications/start.sh b/whistle_apps/start.sh similarity index 100% rename from applications/start.sh rename to whistle_apps/start.sh diff --git a/applications/templates/rebar.config b/whistle_apps/templates/rebar.config similarity index 100% rename from applications/templates/rebar.config rename to whistle_apps/templates/rebar.config diff --git a/applications/whistle_apps_ctl b/whistle_apps/whistle_apps_ctl similarity index 100% rename from applications/whistle_apps_ctl rename to whistle_apps/whistle_apps_ctl