small update

4 files changed, 62 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 117ff9cb1..a88b9ec32 100644
--- a/Makefile
+++ b/Makefile
@@ -119,13 +119,13 @@ export ERL_LIBS
 
 test: testbuild
 	prove $(COUCHDB_ETAP_DIR)/*.t
-	prove $(BASE_DIR)/apps/couch_mrview/test/*.t
-	prove $(BASE_DIR)/apps/couch_replicator/test/*.t
+	prove $(BASE_DIR)/deps/couch_mrview/test/*.t
+	prove $(BASE_DIR)/deps/couch_replicator/test/*.t
 
 verbose-test: testbuild
 	prove -v $(COUCHDB_ETAP_DIR)/*.t
-	prove -v $(BASE_DIR)/apps/couch_mrview/test/*.t
-	prove -v $(BASE_DIR)/apps/couch_replicator/test/*.t
+	prove -v $(BASE_DIR)/deps/couch_mrview/test/*.t
+	prove -v $(BASE_DIR)/deps/couch_replicator/test/*.t
 
 testjs: testbuild
 	$(ESCRIPT) $(BASE_DIR)/test/javascript/test_js.escript
@@ -141,7 +141,7 @@ testbuild: testclean
 	mkdir -p $(BASE_DIR)/test/out/bin
 	mkdir -p $(BASE_DIR)/test/out/share
 	mkdir -p $(BASE_DIR)/test/out/log
-	cp $(BASE_DIR)/apps/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
+	cp $(BASE_DIR)/deps/couch/priv/couchjs $(BASE_DIR)/test/out/bin/
 	cp -r $(BASE_DIR)/share/server $(BASE_DIR)/test/out/share
 	cp -r $(BASE_DIR)/share/www $(BASE_DIR)/test/out/share
 	cp $(BASE_DIR)/etc/couchdb/local.ini $(BASE_DIR)/test/out/
diff --git a/rebar.config b/rebar.config
index 81f7e487f..4c956aba9 100644
--- a/rebar.config
+++ b/rebar.config
@@ -14,42 +14,77 @@
                          {tag, "1.3.8"}}},
 
     %% erlang oauth module
-    {oauth, ".*", {git, "git://github.com/refuge/erlang-oauth.git", {branch,
-        "master"}}},
+    {oauth, ".*",
+     {git, "http://git-wip-us.apache.org/repos/asf/couchdb-oauth.git",
+      {branch, "import"}}},
 
     %% ibrowse module , http client
-    {ibrowse, ".*", {git, "git://github.com/refuge/ibrowse.git",
-                     {branch, "master"}}},
+    {ibrowse, ".*",
+     {git, "http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse.git",
+      {branch, "import"}}},
 
     %% mochiweb module, http framework
-    {mochiweb, ".*", {git,"git://github.com/refuge/mochiweb.git",
-                        {branch, "master"}}},
+    {mochiweb, ".*",
+     {git,"http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb.git",
+      {branch, "import-upstream"}}},
 
     %% snappy module, used for compression
-    {snappy, ".*", {git, "git://github.com/refuge/snappy-erlang.git",
-                   {branch, "refuge"}}},
+    {snappy, ".*",
+     {git, "http://git-wip-us.apache.org/repos/asf/couchdb-snappy.git",
+      {branch, "import"}}},
 
     %% json module, encode/decode module
-    {jiffy, ".*", {git, "git://github.com/refuge/jiffy.git", "master"}},
+    {jiffy, ".*",
+        {git, "http://git-wip-us.apache.org/repos/asf/couchdb-jiffy.git",
+         {branch, "import"}}},
 
     %% lager logging module
-    {lager, ".*", {git, "git://github.com/refuge/lager.git", "master"}}
+    {lager, ".*",
+     {git, "http://git-wip-us.apache.org/repos/asf/couchdb-lager.git",
+      {branch, "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"}}}
+
 ]}.
 
 
 {deps_dir, ["deps"]}.
 
-{libs_dir, ["apps", "deps/"]}.
+{libs_dir, ["deps/"]}.
 
 {sub_dirs, [
-    "apps/couch_collate",
-    "apps/couch",
-    "apps/couch_httpd",
-    "apps/couch_index",
-    "apps/couch_mrview",
-    "apps/couch_replicator",
-    "apps/couch_plugins",
-    "apps/couch_dbupdates",
     "support/couch_rel",
     "rel"
 ]}.
diff --git a/rel/reltool.config.script b/rel/reltool.config.script
index c4135577c..44c47cc0a 100644
--- a/rel/reltool.config.script
+++ b/rel/reltool.config.script
@@ -43,7 +43,7 @@ CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"),
 
 [
     {sys, [
-            {lib_dirs, ["../deps", "../apps"]},
+            {lib_dirs, ["../deps"]},
             {rel, "couchdb", Vsn,
                 [
                     kernel,
@@ -145,7 +145,7 @@ CouchJSName = proplists:get_value(couchjs_name, Cfg, "couchjs"),
         {copy, "../share/server/main.js", "share/server"},
         {copy, "../share/server/main-coffee.js", "share/server"},
         {copy, "../share/www", "share"},
-        {copy, "../apps/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName},
+        {copy, "../deps/couch/priv/" ++ CouchJSName, "bin/" ++ CouchJSName},
 
         %% misc
         {mkdir, "lib/couch-patches"},
diff --git a/test/etap/test_util.erl b/test/etap/test_util.erl
index 92083350c..caad0b4cd 100644
--- a/test/etap/test_util.erl
+++ b/test/etap/test_util.erl
@@ -25,7 +25,7 @@ builddir() ->
     filename:absname(filename:join([Current, "..", ".."])).
 
 srcdir() ->
-    filename:join([builddir(), "apps"]).
+    filename:join([builddir(), "deps"]).
 
 depsdir() ->
     filename:join([builddir(), "deps"]).