SERVER-14376 Move mongoutils::html namespace into mongo::html namespace.

10 files changed, 9 insertions, 23 deletions

diff --git a/src/mongo/db/clientlistplugin.cpp b/src/mongo/db/clientlistplugin.cpp
index 37046a3c05a..18d7ae04156 100644
--- a/src/mongo/db/clientlistplugin.cpp
+++ b/src/mongo/db/clientlistplugin.cpp
@@ -46,7 +46,7 @@ namespace mongo {
         }
 
         virtual void processOpContext(OperationContext* txn) {
-            using namespace mongoutils::html;
+            using namespace html;
 
             CurOp& co = *(txn->getCurOp());
 
@@ -90,7 +90,7 @@ namespace {
         virtual void init() {}
 
         virtual void run(OperationContext* txn, std::stringstream& ss ) {
-            using namespace mongoutils::html;
+            using namespace html;
 
             ss << "\n<table border=1 cellpadding=2 cellspacing=0>";
             ss << "<tr align='left'>"
diff --git a/src/mongo/db/dbwebserver.cpp b/src/mongo/db/dbwebserver.cpp
index f37dcb32c61..33d5e7da9a5 100644
--- a/src/mongo/db/dbwebserver.cpp
+++ b/src/mongo/db/dbwebserver.cpp
@@ -62,7 +62,7 @@
 
 namespace mongo {
 
-    using namespace mongoutils::html;
+    using namespace html;
     using namespace bson;
 
     struct Timing {
diff --git a/src/mongo/db/repl/health.cpp b/src/mongo/db/repl/health.cpp
index aaf11da5759..960c56267b0 100644
--- a/src/mongo/db/repl/health.cpp
+++ b/src/mongo/db/repl/health.cpp
@@ -52,7 +52,7 @@ namespace repl {
     ScopedConn::M& ScopedConn::_map = *(new ScopedConn::M());
     mutex ScopedConn::mapMutex("ScopedConn::mapMutex");
 
-    using namespace mongoutils::html;
+    using namespace html;
     using namespace bson;
 
     static RamLog * _rsLog = RamLog::get("rs");
diff --git a/src/mongo/db/repl/heartbeat.cpp b/src/mongo/db/repl/heartbeat.cpp
index 3de04416de8..3e1e3ae3564 100644
--- a/src/mongo/db/repl/heartbeat.cpp
+++ b/src/mongo/db/repl/heartbeat.cpp
@@ -45,7 +45,6 @@
 #include "mongo/util/concurrency/task.h"
 #include "mongo/util/fail_point_service.h"
 #include "mongo/util/goodies.h"
-#include "mongo/util/mongoutils/html.h"
 #include "mongo/util/ramlog.h"
 
 namespace mongo {
diff --git a/src/mongo/db/repl/member.cpp b/src/mongo/db/repl/member.cpp
index 03d55a0fb3c..fd953519c00 100644
--- a/src/mongo/db/repl/member.cpp
+++ b/src/mongo/db/repl/member.cpp
@@ -35,7 +35,7 @@
 namespace mongo {
 namespace repl {
 
-    using namespace mongoutils::html;
+    using namespace html;
 
     void Member::summarizeMember(stringstream& s) const {
         s << tr();
diff --git a/src/mongo/db/repl/replset_web_handler.cpp b/src/mongo/db/repl/replset_web_handler.cpp
index 21f013318ea..3480014607d 100644
--- a/src/mongo/db/repl/replset_web_handler.cpp
+++ b/src/mongo/db/repl/replset_web_handler.cpp
@@ -39,8 +39,7 @@ namespace mongo {
 namespace repl {
 
     using namespace bson;
-    using namespace mongoutils;
-    using namespace mongoutils::html;
+    using namespace html;
 
     class ReplSetHandler : public DbWebHandler {
     public:
diff --git a/src/mongo/db/restapi.cpp b/src/mongo/db/restapi.cpp
index 47f9e0d1421..7e3965b6d7f 100644
--- a/src/mongo/db/restapi.cpp
+++ b/src/mongo/db/restapi.cpp
@@ -53,7 +53,7 @@ namespace mongo {
     bool getInitialSyncCompleted();
 
     using namespace bson;
-    using namespace mongoutils::html;
+    using namespace html;
 
     class RESTHandler : public DbWebHandler {
     public:
diff --git a/src/mongo/db/stats/snapshots_webplugins.cpp b/src/mongo/db/stats/snapshots_webplugins.cpp
index caa4b611109..176ccf24ac5 100644
--- a/src/mongo/db/stats/snapshots_webplugins.cpp
+++ b/src/mongo/db/stats/snapshots_webplugins.cpp
@@ -37,8 +37,7 @@
 namespace mongo {
 namespace {
 
-    using namespace mongoutils;
-    using namespace mongoutils::html;
+    using namespace html;
 
     class WriteLockStatus : public WebStatusPlugin {
     public:
diff --git a/src/mongo/logger/ramlog.cpp b/src/mongo/logger/ramlog.cpp
index 5c9b5d0b704..4b1efc81b0c 100644
--- a/src/mongo/logger/ramlog.cpp
+++ b/src/mongo/logger/ramlog.cpp
@@ -46,8 +46,6 @@ namespace {
 
 }  // namespace
 
-    using namespace mongoutils;
-
     RamLog::RamLog( const std::string& name ) : _name(name), _totalLinesWritten(0), _lastWrite(0) {
         h = 0;
         n = 0;
diff --git a/src/mongo/util/mongoutils/html.h b/src/mongo/util/mongoutils/html.h
index 78bcc49ec55..3113208e93d 100644
--- a/src/mongo/util/mongoutils/html.h
+++ b/src/mongo/util/mongoutils/html.h
@@ -1,5 +1,3 @@
-// @file html.h
-
 /**
 *    Copyright (C) 2012 10gen Inc.
 *
@@ -30,16 +28,9 @@
 
 #pragma once
 
-/* Things in the mongoutils namespace
-   (1) are not database specific, rather, true utilities
-   (2) are cross platform
-   (3) may require boost headers, but not libs
-   (4) are clean and easy to use in any c++ project without pulling in lots of other stuff
-*/
-
 #include <sstream>
 
-namespace mongoutils {
+namespace mongo {
 
     namespace html {