Permalink
Browse files

net cleaning: move message.* to net/

net cleaning: move http tools to net/
  • Loading branch information...
1 parent 3b185ee commit 142a86b237c98eeb73b7c9658df8c232e02dda8f @erh erh committed Jun 26, 2011
View
@@ -310,12 +310,12 @@ if has_option( "full" ):
# ------ SOURCE FILE SETUP -----------
commonFiles = Split( "pch.cpp buildinfo.cpp db/indexkey.cpp db/jsobj.cpp bson/oid.cpp db/json.cpp db/lasterror.cpp db/nonce.cpp db/queryutil.cpp db/querypattern.cpp db/projection.cpp shell/mongo.cpp db/security_common.cpp db/security_commands.cpp" )
-commonFiles += [ "util/background.cpp" , "util/util.cpp" , "util/file_allocator.cpp" , "util/message.cpp" ,
- "util/assert_util.cpp" , "util/log.cpp" , "util/ramlog.cpp" , "util/httpclient.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/concurrency/task.cpp", "util/debug_util.cpp",
+commonFiles += [ "util/background.cpp" , "util/util.cpp" , "util/file_allocator.cpp" ,
+ "util/assert_util.cpp" , "util/log.cpp" , "util/ramlog.cpp" , "util/md5main.cpp" , "util/base64.cpp", "util/concurrency/vars.cpp", "util/concurrency/task.cpp", "util/debug_util.cpp",
"util/concurrency/thread_pool.cpp", "util/password.cpp", "util/version.cpp", "util/signal_handlers.cpp",
"util/histogram.cpp", "util/concurrency/spin_lock.cpp", "util/text.cpp" , "util/stringutils.cpp" ,
"util/concurrency/synchronization.cpp" ]
-commonFiles += [ "util/net/sock.cpp" ]
+commonFiles += [ "util/net/sock.cpp" , "util/net/httpclient.cpp" , "util/net/message.cpp" ]
commonFiles += Glob( "util/*.c" )
commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclient_rs.cpp client/dbclientcursor.cpp client/model.cpp client/syncclusterconnection.cpp client/distlock.cpp s/shardconnection.cpp" )
@@ -324,7 +324,7 @@ commonFiles += Split( "client/connpool.cpp client/dbclient.cpp client/dbclient_r
coreDbFiles = [ "db/commands.cpp" ]
coreServerFiles = [ "util/net/message_server_port.cpp" ,
"client/parallel.cpp" , "db/common.cpp",
- "util/miniwebserver.cpp" , "db/dbwebserver.cpp" ,
+ "util/net/miniwebserver.cpp" , "db/dbwebserver.cpp" ,
"db/matcher.cpp" , "db/dbcommands_generic.cpp" ]
mmapFiles = [ "util/mmap.cpp" ]
View
@@ -21,7 +21,7 @@
#pragma once
#include "../pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/jsobj.h"
#include "../db/json.h"
#include <stack>
View
@@ -18,7 +18,7 @@
#pragma once
#include "../pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/jsobj.h"
#include "../db/json.h"
#include <stack>
@@ -18,7 +18,7 @@
#include <iostream>
#include "client/dbclient.h"
-#include "util/httpclient.h"
+#include "util/net/httpclient.h"
using namespace mongo;
View
@@ -27,7 +27,7 @@
#include "../pch.h"
#include "cursor.h"
#include "jsobj.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/background.h"
#include "diskloc.h"
#include "dbhelpers.h"
View
@@ -20,7 +20,7 @@
#include "cmdline.h"
#include "commands.h"
#include "../util/processinfo.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "security_common.h"
#ifdef _WIN32
View
@@ -1,7 +1,7 @@
// isself.cpp
#include "pch.h"
-#include "../../util/message.h"
+#include "../../util/net/message.h"
#include "../commands.h"
#include "../../client/dbclient.h"
View
@@ -17,7 +17,7 @@
#pragma once
#include "../pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "concurrency.h"
#include "pdfile.h"
#include "curop.h"
View
@@ -19,7 +19,7 @@
#include "diskloc.h"
#include "jsobj.h"
#include "namespace-inl.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../client/constants.h"
namespace mongo {
View
@@ -20,7 +20,7 @@
*/
#include "pch.h"
-#include "../util/miniwebserver.h"
+#include "../util/net/miniwebserver.h"
#include "../util/mongoutils/html.h"
#include "../util/md5.hpp"
#include "db.h"
View
@@ -25,7 +25,7 @@
#include "../util/logfile.h"
#include "../util/timer.h"
#include "../util/alignedbuilder.h"
-#include "../util/message.h" // getelapsedtimemillis
+#include "../util/net/message.h" // getelapsedtimemillis
#include "../util/concurrency/race.h"
#include <boost/static_assert.hpp>
#undef assert
View
@@ -18,7 +18,7 @@
#include "pch.h"
#include "../util/unittest.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "lasterror.h"
View
@@ -20,7 +20,7 @@
#include "../db.h"
#include "../instance.h"
#include "../module.h"
-#include "../../util/httpclient.h"
+#include "../../util/net/httpclient.h"
#include "../../util/background.h"
#include "../commands.h"
View
@@ -19,7 +19,7 @@
#pragma once
#include "../../pch.h"
-#include "../../util/message.h"
+#include "../../util/net/message.h"
#include "../dbmessage.h"
#include "../jsobj.h"
#include "../diskloc.h"
View
@@ -22,7 +22,7 @@
#include "jsobj.h"
#include "queryutil.h"
#include "matcher.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include <queue>
namespace mongo {
View
@@ -3,7 +3,7 @@
#include "pch.h"
#include "pdfile.h"
#include "../util/processinfo.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
namespace mongo {
View
@@ -35,7 +35,7 @@
#include "jsobj.h"
#include "../util/goodies.h"
#include "repl.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/background.h"
#include "../client/dbclient.h"
#include "../client/connpool.h"
View
@@ -18,7 +18,7 @@
*/
#include "pch.h"
-#include "../util/miniwebserver.h"
+#include "../util/net/miniwebserver.h"
#include "../util/mongoutils/html.h"
#include "../util/md5.hpp"
#include "instance.h"
View
@@ -19,7 +19,7 @@
#include "../../pch.h"
#include "../jsobj.h"
-#include "../../util/message.h"
+#include "../../util/net/message.h"
#include "../../util/processinfo.h"
#include "../../util/concurrency/spin_lock.h"
View
@@ -18,7 +18,7 @@
#include "pch.h"
#include "top.h"
-#include "../../util/message.h"
+#include "../../util/net/message.h"
#include "../commands.h"
namespace mongo {
View
@@ -26,7 +26,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/processinfo.h"
#include "../util/stringutils.h"
#include "../util/version.h"
View
@@ -18,7 +18,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/dbmessage.h"
#include "../client/connpool.h"
#include "../client/parallel.h"
View
@@ -17,7 +17,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/stringutils.h"
#include "../util/unittest.h"
#include "../client/connpool.h"
View
@@ -17,7 +17,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/unittest.h"
#include "../client/connpool.h"
#include "../client/model.h"
View
@@ -20,7 +20,7 @@
#include "../db/commands.h"
#include "../util/queue.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "d_writeback.h"
View
@@ -16,7 +16,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/dbmessage.h"
#include "../scripting/engine.h"
View
@@ -19,7 +19,7 @@
#pragma once
#include "../pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/dbmessage.h"
#include "config.h"
#include "util.h"
View
@@ -17,7 +17,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/unittest.h"
#include "../client/connpool.h"
#include "../util/net/message_server.h"
View
@@ -17,7 +17,7 @@
*/
#include <string>
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/jsobj.h"
namespace mongo {
@@ -43,7 +43,7 @@ namespace mongo {
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../db/db.h"
using namespace std;
View
@@ -17,7 +17,7 @@
*/
#include "pch.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../client/dbclient.h"
#include "../db/dbmessage.h"
View
@@ -35,7 +35,7 @@
#endif
#include "../bson/util/builder.h"
-#include "../util/message.h"
+#include "../util/net/message.h"
#include "../util/mmap.h"
#include "../db/dbmessage.h"
#include "../client/dbclient.h"
View
@@ -19,7 +19,7 @@
#include "pch.h"
#include "client/dbclient.h"
#include "db/json.h"
-#include "../util/httpclient.h"
+#include "../util/net/httpclient.h"
#include "../util/text.h"
#include "tool.h"
#include <fstream>
View
@@ -19,7 +19,6 @@
#include "pch.h"
#include "client/dbclient.h"
#include "db/json.h"
-#include "../util/httpclient.h"
#include "../util/text.h"
#include "tool.h"
#include <fstream>
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "../../pch.h"
#include "httpclient.h"
-#include "net/sock.h"
+#include "sock.h"
#include "message.h"
-#include "../bson/util/builder.h"
+#include "../..//bson/util/builder.h"
namespace mongo {
@@ -17,7 +17,7 @@
#pragma once
-#include "../pch.h"
+#include "../../pch.h"
namespace mongo {
@@ -18,16 +18,19 @@
* limitations under the License.
*/
-#include "pch.h"
-#include "message.h"
-#include <time.h>
-#include "../util/goodies.h"
-#include "../util/background.h"
+#include "../../pch.h"
+
#include <fcntl.h>
#include <errno.h>
-#include "../db/cmdline.h"
-#include "../client/dbclient.h"
-#include "../util/time_support.h"
+#include <time.h>
+
+#include "message.h"
+#include "../goodies.h"
+#include "../background.h"
+#include "../time_support.h"
+#include "../../db/cmdline.h"
+#include "../../client/dbclient.h"
+
#ifndef _WIN32
# ifndef __sunos__
@@ -17,9 +17,9 @@
#pragma once
-#include "../util/net/sock.h"
-#include "../bson/util/atomic_int.h"
-#include "net/hostandport.h"
+#include "sock.h"
+#include "../../bson/util/atomic_int.h"
+#include "hostandport.h"
namespace mongo {
@@ -19,7 +19,7 @@
#ifndef USE_ASIO
-#include "../message.h"
+#include "message.h"
#include "message_server.h"
#include "../../db/cmdline.h"
Oops, something went wrong.

0 comments on commit 142a86b

Please sign in to comment.