SERVER-8510 Killed old unused Module class

hww3 · Sep 5, 2013 · 3de119f · 3de119f
1 parent ace97f9
commit 3de119f
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 158 deletions.
diff --git a/src/mongo/SConscript b/src/mongo/SConscript
@@ -681,8 +681,7 @@ serverOnlyFiles += [ "s/d_logic.cpp",
                      "s/d_state.cpp",
                      "s/d_split.cpp",
                      "s/d_merge.cpp",
-                     "client/distlock_test.cpp",
-                     "db/module.cpp" ]
+                     "client/distlock_test.cpp" ]
 
 env.StaticLibrary("defaultversion", "s/default_version.cpp")
 

diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
@@ -45,7 +45,6 @@
 #include "mongo/db/introspect.h"
 #include "mongo/db/json.h"
 #include "mongo/db/kill_current_op.h"
-#include "mongo/db/module.h"
 #include "mongo/db/pdfile.h"
 #include "mongo/db/query/internal_plans.h"
 #include "mongo/db/range_deleter_service.h"
@@ -695,8 +694,6 @@ namespace mongo {
             log() << startupWarningsLog;
         }
 
-        Module::initAll();
-
         if ( scriptingEnabled ) {
             ScriptEngine::setup();
             globalScriptEngine->setCheckInterruptCallback( jsInterruptCallback );
@@ -932,7 +929,6 @@ static void buildOptionsDescriptions(po::options_description *pVisible,
 #ifdef MONGO_SSL
     visible_options.add(ssl_options);
 #endif
-    Module::addOptions( visible_options );
 }
 
 static void processCommandLineOptions(const std::vector<std::string>& argv) {
@@ -1298,8 +1294,6 @@ static void processCommandLineOptions(const std::vector<std::string>& argv) {
             log() << endl;
         }
 
-        Module::configAll(params);
-
 #ifdef _WIN32
         ntservice::configureService(initService,
                                     params,

diff --git a/src/mongo/db/module.cpp b/src/mongo/db/module.cpp
diff --git a/src/mongo/db/module.h b/src/mongo/db/module.h
diff --git a/src/mongo/db/mongod.vcxproj b/src/mongo/db/mongod.vcxproj
@@ -4516,7 +4516,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="matcher_covered.h" />
     <ClInclude Include="memconcept.h" />
     <ClInclude Include="minilex.h" />
-    <ClInclude Include="module.h" />
     <ClInclude Include="namespace_details-inl.h" />
     <ClInclude Include="namespace_details.h" />
     <ClInclude Include="field_ref.h" />
@@ -4573,7 +4572,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClCompile Include="lasterror.cpp" />
     <ClCompile Include="matcher_covered.cpp" />
     <ClCompile Include="..\util\mmap_win.cpp" />
-    <ClCompile Include="module.cpp" />
     <ClCompile Include="..\client\parallel.cpp" />
     <ClCompile Include="pdfile.cpp" />
     <ClCompile Include="scanandorder.cpp" />

diff --git a/src/mongo/db/mongod.vcxproj.filters b/src/mongo/db/mongod.vcxproj.filters
@@ -623,9 +623,6 @@
     <ClCompile Include="memconcept.cpp">
       <Filter>db\Source Files\e to n</Filter>
     </ClCompile>
-    <ClCompile Include="module.cpp">
-      <Filter>db\Source Files\e to n</Filter>
-    </ClCompile>
     <ClCompile Include="namespace_details.cpp">
       <Filter>db\Source Files\e to n</Filter>
     </ClCompile>
@@ -3929,9 +3926,6 @@
     <ClInclude Include="minilex.h">
       <Filter>db\Header Files\e to n</Filter>
     </ClInclude>
-    <ClInclude Include="module.h">
-      <Filter>db\Header Files\e to n</Filter>
-    </ClInclude>
     <ClInclude Include="cloner.h">
       <Filter>db\Header Files\a to d</Filter>
     </ClInclude>

diff --git a/src/mongo/dbtests/test.vcxproj b/src/mongo/dbtests/test.vcxproj
@@ -758,7 +758,6 @@ cscript //Nologo "$(ProjectDir)..\shell\createCPPfromJavaScriptFiles.js" "$(Proj
     <ClInclude Include="..\db\matcher\match_details.h" />
     <ClInclude Include="..\db\matcher_covered.h" />
     <ClInclude Include="..\db\memconcept.h" />
-    <ClInclude Include="..\db\module.h" />
     <ClInclude Include="..\db\mongomutex.h" />
     <ClInclude Include="..\db\namespace_details-inl.h" />
     <ClInclude Include="..\db\namespace_details.h" />

diff --git a/src/mongo/dbtests/test.vcxproj.filters b/src/mongo/dbtests/test.vcxproj.filters
@@ -880,9 +880,6 @@
     <ClInclude Include="..\db\memconcept.h">
       <Filter>db\Header Files\e to n</Filter>
     </ClInclude>
-    <ClInclude Include="..\db\module.h">
-      <Filter>db\Header Files\e to n</Filter>
-    </ClInclude>
     <ClInclude Include="..\util\admin_access.h">
       <Filter>util\Header Files</Filter>
     </ClInclude>