diff options
| -rw-r--r-- | rebar.config.script | 34 | ||||
| -rw-r--r-- | rel/reltool.config.script | 14 | ||||
| -rw-r--r-- | src/ejabberd_app.erl | 10 | ||||
| -rw-r--r-- | src/ejabberd_auth_pam.erl | 2 | ||||
| -rw-r--r-- | src/ejabberd_listener.erl | 2 | ||||
| -rw-r--r-- | src/mod_irc.erl | 2 |
6 files changed, 32 insertions, 32 deletions
diff --git a/rebar.config.script b/rebar.config.script index 82727a5b2..b4d1047af 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -43,7 +43,7 @@ HiPE = case lists:keysearch(hipe, 1, Cfg) of end, Includes = [{i, "include"}, - {i, filename:join(["deps", "xml", "include"])}], + {i, filename:join(["deps", "p1_xml", "include"])}], SrcDirs = lists:foldl( fun({pubsub_ng, true}, Acc) -> @@ -55,10 +55,10 @@ SrcDirs = lists:foldl( end, [], Cfg), Deps = [{p1_logger, ".*", {git, "git://github.com/processone/p1_logger"}}, - {cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, - {tls, ".*", {git, "git://github.com/processone/tls"}}, - {stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, - {xml, ".*", {git, "git://github.com/processone/xml"}}, + {p1_cache_tab, ".*", {git, "git://github.com/processone/cache_tab"}}, + {p1_tls, ".*", {git, "git://github.com/processone/tls"}}, + {p1_stringprep, ".*", {git, "git://github.com/processone/stringprep"}}, + {p1_xml, ".*", {git, "git://github.com/processone/xml"}}, {xmlrpc, ".*", {git, "git://github.com/rds13/xmlrpc"}}], ConfigureCmd = fun(Pkg, Flags) -> @@ -78,27 +78,27 @@ XMLFlags = lists:foldl( Acc end, "", Cfg), -PostHooks = [ConfigureCmd("tls", ""), - ConfigureCmd("stringprep", ""), - ConfigureCmd("xml", XMLFlags)], +PostHooks = [ConfigureCmd("p1_tls", ""), + ConfigureCmd("p1_stringprep", ""), + ConfigureCmd("p1_xml", XMLFlags)], CfgDeps = lists:flatmap( fun({mysql, true}) -> - [{mysql, ".*", {git, "git://github.com/processone/mysql"}}]; + [{p1_mysql, ".*", {git, "git://github.com/processone/mysql"}}]; ({pgsql, true}) -> - [{pgsql, ".*", {git, "git://github.com/processone/pgsql"}}]; + [{p1_pgsql, ".*", {git, "git://github.com/processone/pgsql"}}]; ({pam, true}) -> - [{epam, ".*", {git, "git://github.com/processone/epam"}}]; + [{p1_pam, ".*", {git, "git://github.com/processone/epam"}}]; ({zlib, true}) -> - [{ezlib, ".*", {git, "git://github.com/processone/zlib"}}]; + [{p1_zlib, ".*", {git, "git://github.com/processone/zlib"}}]; ({stun, true}) -> - [{stun, ".*", {git, "git://github.com/processone/stun"}}]; + [{p1_stun, ".*", {git, "git://github.com/processone/stun"}}]; ({riak, true}) -> [{riakc, ".*", {git, "git://github.com/basho/riak-erlang-client"}}]; ({json, true}) -> [{jiffy, ".*", {git, "git://github.com/davisp/jiffy"}}]; ({iconv, true}) -> - [{iconv, ".*", {git, "git://github.com/processone/eiconv"}}]; + [{p1_iconv, ".*", {git, "git://github.com/processone/eiconv"}}]; ({http, true}) -> [{ibrowse, ".*", {git, "git://github.com/cmullaparthi/ibrowse"}}, {lhttpc, ".*", {git, "git://github.com/esl/lhttpc"}}]; @@ -108,11 +108,11 @@ CfgDeps = lists:flatmap( CfgPostHooks = lists:flatmap( fun({pam, true}) -> - [ConfigureCmd("epam", "")]; + [ConfigureCmd("p1_pam", "")]; ({zlib, true}) -> - [ConfigureCmd("ezlib", "")]; + [ConfigureCmd("p1_zlib", "")]; ({iconv, true}) -> - [ConfigureCmd("iconv", "")]; + [ConfigureCmd("p1_iconv", "")]; (_) -> [] end, Cfg), diff --git a/rel/reltool.config.script b/rel/reltool.config.script index dc23ed904..64ba40491 100644 --- a/rel/reltool.config.script +++ b/rel/reltool.config.script @@ -25,17 +25,17 @@ ConfiguredOTPApps = lists:flatmap( OTPApps = RequiredOTPApps ++ ConfiguredOTPApps, -DepRequiredApps = [p1_logger, cache_tab, tls, stringprep, xml, xmlrpc], +DepRequiredApps = [p1_logger, p1_cache_tab, p1_tls, p1_stringprep, p1_xml, xmlrpc], DepConfiguredApps = lists:flatmap( - fun({mysql, true}) -> [mysql]; - ({pgsql, true}) -> [pgsql]; - ({pam, true}) -> [epam]; - ({zlib, true}) -> [ezlib]; - ({stun, true}) -> [stun]; + fun({mysql, true}) -> [p1_mysql]; + ({pgsql, true}) -> [p1_pgsql]; + ({pam, true}) -> [p1_pam]; + ({zlib, true}) -> [p1_zlib]; + ({stun, true}) -> [p1_stun]; ({riak, true}) -> [riakc, riak_pb, protobuffs]; ({json, true}) -> [jiffy]; - ({iconv, true}) -> [iconv]; + ({iconv, true}) -> [p1_iconv]; ({http, true}) -> [ibrowse, lhttpc]; (_) -> [] end, Vars), diff --git a/src/ejabberd_app.erl b/src/ejabberd_app.erl index 3cedf352f..2732e7c43 100644 --- a/src/ejabberd_app.erl +++ b/src/ejabberd_app.erl @@ -245,8 +245,8 @@ start_apps() -> application:start(crypto), application:start(public_key), application:start(ssl), - application:start(tls), - application:start(xml), - application:start(stringprep), - application:start(ezlib), - application:start(cache_tab). + application:start(p1_tls), + application:start(p1_xml), + application:start(p1_stringprep), + application:start(p1_zlib), + application:start(p1_cache_tab). diff --git a/src/ejabberd_auth_pam.erl b/src/ejabberd_auth_pam.erl index af3bb17f2..8413faaae 100644 --- a/src/ejabberd_auth_pam.erl +++ b/src/ejabberd_auth_pam.erl @@ -40,7 +40,7 @@ plain_password_required/0]). start(_Host) -> - case application:start(epam) of + case application:start(p1_pam) of {ok, _} -> ok; {error, {already_started, _}} -> ok; Err -> Err diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl index 55d607484..b675785e6 100644 --- a/src/ejabberd_listener.erl +++ b/src/ejabberd_listener.erl @@ -624,7 +624,7 @@ prepare_ip(IP) when is_binary(IP) -> prepare_mod(ejabberd_stun) -> prepare_mod(stun); prepare_mod(stun) -> - application:start(stun), + application:start(p1_stun), stun; prepare_mod(Mod) -> Mod. diff --git a/src/mod_irc.erl b/src/mod_irc.erl index 1773a3934..3a5f99844 100644 --- a/src/mod_irc.erl +++ b/src/mod_irc.erl @@ -99,7 +99,7 @@ stop(Host) -> %%==================================================================== init([Host, Opts]) -> - application:start(iconv), + application:start(p1_iconv), MyHost = gen_mod:get_opt_host(Host, Opts, <<"irc.@HOST@">>), case gen_mod:db_type(Opts) of |