move applications to a folder named after the application

.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

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
 }
 

applications/priv/startup.config → 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, []}.

applications/src/whapps_controller.erl → 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}.

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, []}
+ ]}.