Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

manifests >> GH1 - Move S3 and JSON-RPC out from Hibari.

  • Loading branch information...
commit 38d7355dc2af9103095a6053301b9a652dae7b55 1 parent f10111d
@tatsuya6502 tatsuya6502 authored
View
14 Makefile
@@ -26,7 +26,7 @@ endif
.PHONY: all test \
compile compile-eqc compile-proper \
eunit-compile eqc-compile proper-compile \
- eunit eunit-core eunit-thrift eunit-s3 eunit-json \
+ eunit eunit-core eunit-thrift \
eqc proper \
doc \
build-plt check-plt \
@@ -109,19 +109,11 @@ eunit: eunit-compile
eunit-core: eunit-compile
@echo "eunit testing (core): $(RELPKG) ..."
- ./rebar eunit skip_apps='meck,asciiedoc,edown,gdss_ubf_proto,ubf_thrift,ubf,gdss_json_rpc_proto,ubf_jsonrpc,mochiweb,gdss_s3_proto,s3'
+ ./rebar eunit skip_apps='meck,asciiedoc,edown,gdss_ubf_proto,ubf_thrift,ubf'
eunit-thrift: eunit-compile
@echo "eunit testing (thrift): $(RELPKG) ..."
- ./rebar eunit skip_apps='gdss_brick,gdss_client,gdss_admin,cluster_info,partition_detector,congestion_watcher,gmt_util,riak_err,meck,asciiedoc,edown,gdss_json_rpc_proto,ubf_jsonrpc,mochiweb,gdss_s3_proto,s3'
-
-eunit-s3: eunit-compile
- @echo "eunit testing (s3): $(RELPKG) ..."
- ./rebar eunit skip_apps='gdss_brick,gdss_client,gdss_admin,cluster_info,partition_detector,congestion_watcher,gmt_util,riak_err,meck,asciiedoc,edown,gdss_ubf_proto,ubf_thrift,ubf,gdss_json_rpc_proto,ubf_jsonrpc,mochiweb'
-
-eunit-json: eunit-compile
- @echo "eunit testing (json-rpc): $(RELPKG) ..."
- ./rebar eunit skip_apps='gdss_brick,gdss_client,gdss_admin,cluster_info,partition_detector,congestion_watcher,gmt_util,riak_err,meck,asciiedoc,edown,gdss_ubf_proto,ubf_thrift,gdss_s3_proto,s3'
+ ./rebar eunit skip_apps='gdss_brick,gdss_client,gdss_admin,cluster_info,partition_detector,congestion_watcher,gmt_util,riak_err,meck,asciiedoc,edown'
eqc: eqc-compile
@echo "eqc testing: $(RELPKG) ... not implemented yet"
View
5 rebar.config
@@ -16,15 +16,10 @@
, {meck, "0.7.1", "lib/meck"}
, {edown, "0.2.9", "lib/edown"}
, {asciiedoc, "0.1.2", "lib/asciiedoc"}
- , {mochiweb, "2.3.1", "lib/mochiweb"}
- , {s3, "0.1.1", "lib/s3"}
, {ubf, "1.15.11", "lib/ubf"}
- , {ubf_jsonrpc, "0.1.6", "lib/ubf_jsonrpc"}
, {ubf_thrift, "0.1.6", "lib/ubf_thrift"}
, {gdss_brick, "0.1.6", "lib/gdss_brick"}
, {gdss_client, "0.1.6", "lib/gdss_client"}
, {gdss_admin, "0.1.5", "lib/gdss_admin"}
, {gdss_ubf_proto, "0.1.7", "lib/gdss_ubf_proto"}
- , {gdss_json_rpc_proto, "0.1.1", "lib/gdss_json_rpc_proto"}
- , {gdss_s3_proto, "0.1.2", "lib/gdss_s3_proto"}
]}.
View
11 rel/files/sys.config
@@ -64,19 +64,10 @@
]},
%%
- %% GDSS S3 Proc config
- %%
- {gdss_s3_proto,
- [
- {brick_s3_conf_path, "root/conf/s3.conf"}
- ]},
-
- %%
%% GDSS Admin config
%%
{gdss_admin,
[{application_data_dir, "."},
- {brick_admin_conf_path, "root/conf/admin.conf"},
- {brick_s3_conf_path, "root/conf/s3.conf"}
+ {brick_admin_conf_path, "root/conf/admin.conf"}
]}
].
View
10 rel/reltool.config
@@ -22,15 +22,11 @@
gmt_util,
partition_detector,
congestion_watcher,
- s3,
ubf,
ubf_thrift,
- ubf_jsonrpc,
gdss_brick,
gdss_client,
- gdss_s3_proto,
gdss_ubf_proto,
- gdss_json_rpc_proto,
gdss_admin
]},
{rel, "start_clean", "",
@@ -63,16 +59,11 @@
{app, partition_detector, [{incl_cond, include}]},
{app, congestion_watcher, [{incl_cond, include}]},
{app, meck, [{incl_cond, include}]},
- {app, mochiweb, [{incl_cond, include}]},
- {app, s3, [{incl_cond, include}]},
{app, ubf, [{incl_cond, include}]},
{app, ubf_thrift, [{incl_cond, include}]},
- {app, ubf_jsonrpc, [{incl_cond, include}]},
{app, gdss_brick, [{incl_cond, include}]},
{app, gdss_client, [{incl_cond, include}]},
- {app, gdss_s3_proto, [{incl_cond, include}]},
{app, gdss_ubf_proto, [{incl_cond, include}]},
- {app, gdss_json_rpc_proto, [{incl_cond, include}]},
{app, gdss_admin, [{incl_cond, include}]},
%% Including HiPE can cause issues generating your first upgrade.
%% If you plan to distribute HiPE in your release remove the
@@ -113,7 +104,6 @@
{copy, "../lib/gdss_admin/priv/root/htdocs/css/admin.css", "root/htdocs/css/admin.css"},
{copy, "../lib/gdss_admin/priv/root/ssl/ssl_client.pem", "root/ssl/ssl_client.pem"},
{copy, "../lib/gdss_admin/priv/root/ssl/ssl_server.pem", "root/ssl/ssl_server.pem"},
- {copy, "../lib/gdss_s3_proto/priv/root/conf/s3.conf", "root/conf/s3.conf"},
%% data/
{mkdir, "{{gdss_data_dir}}"},
Please sign in to comment.
Something went wrong with that request. Please try again.