You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/16 01:21:11 UTC
[1/2] couchdb commit: updated refs/heads/1994-merge-rcouch to d53b3e0
Repository: couchdb
Updated Branches:
refs/heads/1994-merge-rcouch 608db4053 -> d53b3e0d5
rebar.config: make it easier to add repository
Similar change exists in the bigcouch branch, except we continue to use
a rebar.config file.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/36ea4e04
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/36ea4e04
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/36ea4e04
Branch: refs/heads/1994-merge-rcouch
Commit: 36ea4e047689381eeeacddf79da970b4a35c39e5
Parents: 608db40
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Sun Feb 16 01:18:28 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Sun Feb 16 01:18:28 2014 +0100
----------------------------------------------------------------------
rebar.config | 79 +++---------------------------------------------
rebar.config.script | 41 +++++++++++++++++++++++++
2 files changed, 45 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/36ea4e04/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index a7a255c..0b74730 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,88 +1,17 @@
%% -*- tab-width: 4;erlang-indent-level: 4;indent-tabs-mode: nil -*-
%% ex: ft=erlang ts=4 sw=4 et
+%% options
{cover_enabled, true}.
{eunit_opts, [{report,{eunit_surefire,[{dir,"."}]}}]}.
{edoc_opts, [{preprocess, true}]}.
{erl_opts, [debug_info, fail_on_warning]}.
-
{require_otp_vsn, "R14B04|R15|R16"}.
-{deps, [
- %% erlang oauth module
- {oauth, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-oauth.git",
- {branch, "1843-feature-bigcouch"}}},
-
- %% ibrowse module , http client
- {ibrowse, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse.git",
- {branch, "1843-feature-bigcouch"}}},
-
- %% mochiweb module, http framework
- {mochiweb, ".*",
- {git,"http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb.git",
- {branch, "import-upstream"}}},
-
- %% snappy module, used for compression
- {snappy, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-snappy.git",
- {branch, "1994-merge-rcouch"}}},
-
- %% json module, encode/decode module
- {jiffy, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-jiffy.git",
- {branch, "1843-feature-bigcouch"}}},
-
- %% lager logging module
- {lager, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-lager.git",
- {branch, "import-master"}}},
-
-
- %% apps
- {couch_collate, ".*",
- {git,"http://git-wip-us.apache.org/repos/asf/couchdb-couch-collate.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch_httpd, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-httpd.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch_index, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-index.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch_mrview, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch_replicator, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch_plugins, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-plugins.git",
- {branch, "1994-merge-rcouch"}}},
-
- {couch_dbupdates, ".*",
- {git, "http://git-wip-us.apache.org/repos/asf/couchdb-couch-dbupdates.git",
- {branch, "1994-merge-rcouch"}}}
-
-]}.
-
-
+%% libs
{deps_dir, ["src"]}.
-
{libs_dir, ["src/"]}.
+{sub_dirs, ["support/couch_rel", "rel"]}.
-{sub_dirs, [
- "support/couch_rel",
- "rel"
-]}.
-
+%% build hooks
{post_hooks, [{compile, "escript support/build_js.escript"}]}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/36ea4e04/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
new file mode 100644
index 0000000..8d53244
--- /dev/null
+++ b/rebar.config.script
@@ -0,0 +1,41 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+
+DepDescs = [
+ %% third-parties applications
+ {ibrowse, "couchdb-ibrowse", {branch, "1843-feature-bigcouch"}},
+ {jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
+ {mochiweb, "couchdb-mochiweb", {branch, "import-upstream"}},
+ {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
+ {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}},
+ {lager, "couchdb-lager", {branch, "import-master"}},
+
+ %% couchdb applications
+ {couch_collate, "couchdb-couch-collate", {branch, "1994-merge-rcouch"}},
+ {couch, "couchdb-couch", {branch, "1994-merge-rcouch"}},
+ {couch_httpd, "couchdb-couch-httpd", {branch, "1994-merge-rcouch"}},
+ {couch_index, "couchdb-couch-index", {branch, "1994-merge-rcouch"}},
+ {couch_mrview, "couchdb-couch-mrview", {branch, "1994-merge-rcouch"}},
+ {couch_replicator, "couchdb-couch-replicator", {branch, "1994-merge-rcouch"}},
+ {couch_plugins, "couchdb-couch-plugins", {branch, "1994-merge-rcouch"}},
+ {couch_dbupdates, "couchdb-couch-dbupdates", {branch, "1994-merge-rcouch"}}
+],
+
+MakeDep = fun({AppName, RepoName, Version}) ->
+ Url = "https://git-wip-us.apache.org/repos/asf/" ++ RepoName ++ ".git",
+ {AppName, ".*", {git, Url, Version}}
+end,
+
+Deps = [{deps, lists:map(MakeDep, DepDescs)}],
+
+lists:keymerge(1,lists:keysort(1, Deps), lists:keysort(1, CONFIG)).
[2/2] couchdb commit: updated refs/heads/1994-merge-rcouch to d53b3e0
Posted by be...@apache.org.
support validate_doc_read feature.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d53b3e0d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d53b3e0d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d53b3e0d
Branch: refs/heads/1994-merge-rcouch
Commit: d53b3e0d58d7c99bdbd1401164e6d9d1282f0abb
Parents: 36ea4e0
Author: Benoit Chesneau <bc...@gmail.com>
Authored: Sun Feb 16 01:20:17 2014 +0100
Committer: Benoit Chesneau <bc...@gmail.com>
Committed: Sun Feb 16 01:20:17 2014 +0100
----------------------------------------------------------------------
share/server/loop.js | 5 +++--
test/etap/200-view-group-no-db-leaks.t | 1 +
test/etap/201-view-group-shutdown.t | 1 +
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d53b3e0d/share/server/loop.js
----------------------------------------------------------------------
diff --git a/share/server/loop.js b/share/server/loop.js
index 644d89b..8ff51a8 100644
--- a/share/server/loop.js
+++ b/share/server/loop.js
@@ -60,9 +60,10 @@ var DDoc = (function() {
"lists" : Render.list,
"shows" : Render.show,
"filters" : Filter.filter,
- "views" : Filter.filter_view,
+ "views" : Filter.filter_view,
"updates" : Render.update,
- "validate_doc_update" : Validate.validate
+ "validate_doc_update" : Validate.validate,
+ "validate_doc_read" : Validate.validate
};
var ddocs = {};
return {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d53b3e0d/test/etap/200-view-group-no-db-leaks.t
----------------------------------------------------------------------
diff --git a/test/etap/200-view-group-no-db-leaks.t b/test/etap/200-view-group-no-db-leaks.t
index 5e4f13a..635e313 100755
--- a/test/etap/200-view-group-no-db-leaks.t
+++ b/test/etap/200-view-group-no-db-leaks.t
@@ -36,6 +36,7 @@
name,
filepath,
validate_doc_funs = [],
+ validate_doc_read_funs = [],
security = [],
security_ptr = nil,
user_ctx = #user_ctx{},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d53b3e0d/test/etap/201-view-group-shutdown.t
----------------------------------------------------------------------
diff --git a/test/etap/201-view-group-shutdown.t b/test/etap/201-view-group-shutdown.t
index 666cdf3..959b199 100755
--- a/test/etap/201-view-group-shutdown.t
+++ b/test/etap/201-view-group-shutdown.t
@@ -36,6 +36,7 @@
name,
filepath,
validate_doc_funs = [],
+ validate_doc_read_funs = [],
security = [],
security_ptr = nil,
user_ctx = #user_ctx{},