Move NodeStore and backends to ripple_core

Builds/VisualStudio2012/RippleD.vcxproj

@@ -283,52 +283,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_HyperLevelDBBackendFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_KeyvaDBBackendFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_MdbBackendFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_MemoryBackendFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeObject.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeStore.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_LevelDBBackendFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_NullBackendFactory.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\node\ripple_SqliteBackendFactory.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -775,6 +729,54 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\HyperLevelDBBackendFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\KeyvaDBBackendFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\LevelDBBackendFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\MdbBackendFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\MemoryBackendFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\NodeObject.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\NodeStore.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\NullBackendFactory.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_core\ripple_core.cpp" />
     <ClCompile Include="..\..\modules\ripple_core\validator\ripple_StringsValidatorSource.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -1403,14 +1405,6 @@
     <ClInclude Include="..\..\modules\ripple_app\misc\ProofOfWork.h" />
     <ClInclude Include="..\..\modules\ripple_app\misc\ripple_SerializedLedger.h" />
     <ClInclude Include="..\..\modules\ripple_app\misc\ripple_SerializedTransaction.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_HyperLevelDBBackendFactory.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_KeyvaDBBackendFactory.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_MdbBackendFactory.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_MemoryBackendFactory.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeStore.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_LevelDBBackendFactory.h" />
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_NullBackendFactory.h" />
     <ClInclude Include="..\..\modules\ripple_app\node\ripple_SqliteBackendFactory.h" />
     <ClInclude Include="..\..\modules\ripple_app\paths\ripple_Pathfinder.h" />
     <ClInclude Include="..\..\modules\ripple_app\paths\ripple_PathRequest.h" />
@@ -1498,6 +1492,14 @@
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_LoadEvent.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_LoadFeeTrack.h" />
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_LoadMonitor.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\HyperLevelDBBackendFactory.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\KeyvaDBBackendFactory.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\LevelDBBackendFactory.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\MdbBackendFactory.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\MemoryBackendFactory.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\NodeObject.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\NodeStore.h" />
+    <ClInclude Include="..\..\modules\ripple_core\node\NullBackendFactory.h" />
     <ClInclude Include="..\..\modules\ripple_core\ripple_core.h" />
     <ClInclude Include="..\..\modules\ripple_core\validator\ripple_StringsValidatorSource.h" />
     <ClInclude Include="..\..\modules\ripple_core\validator\ripple_TrustedUriValidatorSource.h" />

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -85,9 +85,6 @@
     <Filter Include="[1] Ripple\ripple_net\basics">
       <UniqueIdentifier>{febf2e7e-f071-4a6c-9b81-68498fc8ea57}</UniqueIdentifier>
     </Filter>
-    <Filter Include="[1] Ripple\ripple_app\node">
-      <UniqueIdentifier>{bd48a825-192f-4d5e-9230-661fdd65f9b6}</UniqueIdentifier>
-    </Filter>
     <Filter Include="[1] Ripple\ripple_app\contracts">
       <UniqueIdentifier>{3ac448dc-9f2e-472b-9f3c-cf9140dddf3a}</UniqueIdentifier>
     </Filter>
@@ -148,6 +145,12 @@
     <Filter Include="[1] Ripple\ripple_net\rpc">
       <UniqueIdentifier>{045285aa-9043-4cee-b8ca-cc8881e52f6a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[1] Ripple\ripple_core\node">
+      <UniqueIdentifier>{7270818b-573d-45b7-b10b-42f63bedcc50}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\ripple_app\node">
+      <UniqueIdentifier>{1d9bc26d-d76e-4fd4-a737-b968e31e614b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp">
@@ -495,18 +498,6 @@
     <ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
       <Filter>[1] Ripple\ripple_net</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeObject.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeStore.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_SqliteBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_LevelDBBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_mdb\ripple_mdb.c">
       <Filter>[1] Ripple\ripple_mdb</Filter>
     </ClCompile>
@@ -588,24 +579,9 @@
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_crypto\beast_crypto.cpp">
       <Filter>[0] Subtrees\beast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_HyperLevelDBBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_KeyvaDBBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_NullBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_MdbBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_db\beast_db.cpp">
       <Filter>[0] Subtrees\beast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\node\ripple_MemoryBackendFactory.cpp">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\modules\ripple_app\main\ParameterTable.cpp">
       <Filter>[1] Ripple\ripple_app\main</Filter>
     </ClCompile>
@@ -876,6 +852,33 @@
     <ClCompile Include="..\..\modules\ripple_app\tx\TxQueueEntry.cpp">
       <Filter>[1] Ripple\ripple_app\tx</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_app\node\ripple_SqliteBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_app\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\HyperLevelDBBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\KeyvaDBBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\LevelDBBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\MdbBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\MemoryBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\NodeObject.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\NodeStore.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_core\node\NullBackendFactory.cpp">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
@@ -1268,18 +1271,6 @@
     <ClInclude Include="..\..\modules\ripple_net\ripple_net.h">
       <Filter>[1] Ripple\ripple_net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeStore.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_SqliteBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_LevelDBBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h">
       <Filter>[1] Ripple\ripple_mdb</Filter>
     </ClInclude>
@@ -1361,24 +1352,9 @@
     <ClInclude Include="..\..\modules\ripple_core\validator\ripple_StringsValidatorSource.h">
       <Filter>[1] Ripple\ripple_core\validator</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_HyperLevelDBBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_KeyvaDBBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_NullBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_MdbBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_core\functional\ripple_ConfigSections.h">
       <Filter>[1] Ripple\ripple_core\functional</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\node\ripple_MemoryBackendFactory.h">
-      <Filter>[1] Ripple\ripple_app\node</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\modules\ripple_app\main\ParameterTable.h">
       <Filter>[1] Ripple\ripple_app\main</Filter>
     </ClInclude>
@@ -1700,6 +1676,33 @@
     <ClInclude Include="..\..\modules\ripple_app\tx\TxQueueEntry.h">
       <Filter>[1] Ripple\ripple_app\tx</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_app\node\ripple_SqliteBackendFactory.h">
+      <Filter>[1] Ripple\ripple_app\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\HyperLevelDBBackendFactory.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\KeyvaDBBackendFactory.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\LevelDBBackendFactory.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\MdbBackendFactory.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\MemoryBackendFactory.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\NodeObject.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\NodeStore.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_core\node\NullBackendFactory.h">
+      <Filter>[1] Ripple\ripple_core\node</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

modules/ripple_app/main/ripple_RippleMain.cpp

@@ -298,37 +298,16 @@ int RippleMain::run (int argc, char const* const* argv)
     po::positional_options_description p;
     p.add ("parameters", -1);
 
-    //--------------------------------------------------------------------------
+    // NOTE: These must be added before the
-    //
+    //       Application object is created.
-    // NodeStore backend choices
-    //
-    // Note: These must be added before the Application object is created
     //
+    NodeStore::addAvailableBackends ();
 
-    NodeStore::addBackendFactory (LevelDBBackendFactory::getInstance ());
+    // VFALCO NOTE SqliteBackendFactory is here because it has
-    NodeStore::addBackendFactory (MemoryBackendFactory::getInstance ());
+    //             dependencies like SqliteDatabase and DatabaseCon
-    NodeStore::addBackendFactory (NullBackendFactory::getInstance ());
+    //
     NodeStore::addBackendFactory (SqliteBackendFactory::getInstance ());
 
-#if RIPPLE_HYPERLEVELDB_AVAILABLE
-    NodeStore::addBackendFactory (HyperLevelDBBackendFactory::getInstance ());
-#endif
-
-#if RIPPLE_MDB_AVAILABLE
-    NodeStore::addBackendFactory (MdbBackendFactory::getInstance ());
-#endif
-
-    // VFALCO: Disabling KeyvaDB because it is unfinished experimental
-    //         code and there's no sense anyone running it until it meets
-    //         the requirements of a full backend. Now if a programmer wants
-    //         to un-comment it and work on bringing it up to spec on their
-    //         own machine, I certainly won't complain. Let me know, I have
-    //         some new code in a branch.
-    //
-    //NodeStore::addBackendFactory (KeyvaDBBackendFactory::getInstance ());
-
-    //--------------------------------------------------------------------------
-
     if (! RandomNumbers::getInstance ().initialize ())
     {
         Log::out() << "Unable to add system entropy";

modules/ripple_app/ripple_app.cpp

@@ -6,8 +6,7 @@
 
 #include "BeastConfig.h"
 
-#include "beast/modules/beast_core/beast_core.h"
+#include "beast/modules/beast_core/system/BeforeBoost.h" // must come first
-
 #include <boost/bimap.hpp>
 #include <boost/bimap/list_of.hpp>
 #include <boost/bimap/multiset_of.hpp>
@@ -15,13 +14,8 @@
 
 #include "ripple_app.h"
 
-#include "beast/modules/beast_db/beast_db.h"
-
-#include "../ripple_hyperleveldb/ripple_hyperleveldb.h"
 #include "../ripple_net/ripple_net.h"
 #include "../ripple_websocket/ripple_websocket.h"
-#include "../ripple_leveldb/ripple_leveldb.h"
-#include "../ripple_mdb/ripple_mdb.h"
 
 // This .cpp will end up including all of the public header
 // material in Ripple since it holds the Application object.
@@ -65,22 +59,9 @@ namespace ripple
 //
 // RippleMain
 //
-
-#  include "node/ripple_HyperLevelDBBackendFactory.h"
-# include "node/ripple_HyperLevelDBBackendFactory.cpp"
-#  include "node/ripple_KeyvaDBBackendFactory.h"
-# include "node/ripple_KeyvaDBBackendFactory.cpp"
-#  include "node/ripple_LevelDBBackendFactory.h"
-# include "node/ripple_LevelDBBackendFactory.cpp"
-#  include "node/ripple_MemoryBackendFactory.h"
-# include "node/ripple_MemoryBackendFactory.cpp"
-#  include "node/ripple_NullBackendFactory.h"
-# include "node/ripple_NullBackendFactory.cpp"
-#  include "node/ripple_MdbBackendFactory.h"
-# include "node/ripple_MdbBackendFactory.cpp"
-#  include "node/ripple_SqliteBackendFactory.h"
-# include "node/ripple_SqliteBackendFactory.cpp"
 # include "main/ripple_RippleMain.h"
+# include "node/ripple_SqliteBackendFactory.h"
+#include "node/ripple_SqliteBackendFactory.cpp"
 #include "main/ripple_RippleMain.cpp"
 
 }

modules/ripple_app/ripple_app.h

@@ -34,8 +34,9 @@
 
 //------------------------------------------------------------------------------
 
+#include "../ripple_basics/ripple_basics.h"
 #include "../ripple_core/ripple_core.h"
-
+#include "../ripple_data/ripple_data.h"
 #include "../ripple_net/ripple_net.h"
 
 #include "beast/modules/beast_sqdb/beast_sqdb.h"
@@ -52,9 +53,6 @@ namespace ripple
 #include "data/ripple_SqliteDatabase.h"
 #include "data/ripple_DBInit.h"
 
-#include "node/ripple_NodeObject.h"
-#include "node/ripple_NodeStore.h"
-
 #include "shamap/ripple_SHAMapItem.h"
 #include "shamap/ripple_SHAMapNode.h"
 #include "shamap/ripple_SHAMapTreeNode.h"

modules/ripple_app/ripple_app_pt3.cpp

@@ -12,8 +12,6 @@ namespace ripple
 {
 
 #include "ledger/Ledger.cpp"
-#include "node/ripple_NodeStore.cpp"
-#include "node/ripple_NodeObject.cpp"
 #include "shamap/ripple_SHAMapDelta.cpp"
 #include "shamap/ripple_SHAMapNode.cpp"
 #include "shamap/ripple_SHAMapTreeNode.cpp"

modules/ripple_core/node/HyperLevelDBBackendFactory.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED
-#define RIPPLE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED
+#define RIPPLE_CORE_NODE_HYPERLEVELDBBACKENDFACTORY_H_INCLUDED
 
 #if RIPPLE_HYPERLEVELDB_AVAILABLE
 

modules/ripple_core/node/KeyvaDBBackendFactory.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_KEYVABACKENDFACTORY_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_KEYVABACKENDFACTORY_H_INCLUDED
-#define RIPPLE_KEYVABACKENDFACTORY_H_INCLUDED
+#define RIPPLE_CORE_NODE_KEYVABACKENDFACTORY_H_INCLUDED
 
 /** Factory to produce KeyvaDB backends for the NodeStore.
 

modules/ripple_core/node/LevelDBBackendFactory.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_LEVELDBBACKENDFACTORY_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_LEVELDBBACKENDFACTORY_H_INCLUDED
-#define RIPPLE_LEVELDBBACKENDFACTORY_H_INCLUDED
+#define RIPPLE_CORE_NODE_LEVELDBBACKENDFACTORY_H_INCLUDED
 
 /** Factory to produce LevelDB backends for the NodeStore.
 

modules/ripple_core/node/MdbBackendFactory.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_MDBBACKENDFACTORY_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_MDBBACKENDFACTORY_H_INCLUDED
-#define RIPPLE_MDBBACKENDFACTORY_H_INCLUDED
+#define RIPPLE_CORE_NODE_MDBBACKENDFACTORY_H_INCLUDED
 
 #if RIPPLE_MDB_AVAILABLE
 

modules/ripple_core/node/MemoryBackendFactory.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_MEMORYBACKENDFACTORY_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_MEMORYBACKENDFACTORY_H_INCLUDED
-#define RIPPLE_MEMORYBACKENDFACTORY_H_INCLUDED
+#define RIPPLE_CORE_NODE_MEMORYBACKENDFACTORY_H_INCLUDED
 
 /** Factory to produce a RAM based backend for the NodeStore.
 

modules/ripple_core/node/NodeObject.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_NODEOBJECT_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_NODEOBJECT_H_INCLUDED
-#define RIPPLE_NODEOBJECT_H_INCLUDED
+#define RIPPLE_CORE_NODE_NODEOBJECT_H_INCLUDED
 
 /** The types of node objects.
 */

modules/ripple_core/node/NodeStore.cpp

@@ -537,6 +537,26 @@ NodeStore::Scheduler& NodeStore::getSynchronousScheduler ()
     return scheduler;
 }
 
+void NodeStore::addAvailableBackends ()
+{
+    // This is part of the ripple_app module since it has dependencies
+    //NodeStore::addBackendFactory (SqliteBackendFactory::getInstance ());
+
+    NodeStore::addBackendFactory (LevelDBBackendFactory::getInstance ());
+    NodeStore::addBackendFactory (MemoryBackendFactory::getInstance ());
+    NodeStore::addBackendFactory (NullBackendFactory::getInstance ());
+
+#if RIPPLE_HYPERLEVELDB_AVAILABLE
+    NodeStore::addBackendFactory (HyperLevelDBBackendFactory::getInstance ());
+#endif
+
+#if RIPPLE_MDB_AVAILABLE
+    NodeStore::addBackendFactory (MdbBackendFactory::getInstance ());
+#endif
+
+    NodeStore::addBackendFactory (KeyvaDBBackendFactory::getInstance ());
+}
+
 NodeStore* NodeStore::New (Parameters const& backendParameters,
                            Parameters fastBackendParameters,
                            Scheduler& scheduler)

modules/ripple_core/node/NodeStore.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_NODESTORE_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_NODESTORE_H_INCLUDED
-#define RIPPLE_NODESTORE_H_INCLUDED
+#define RIPPLE_CORE_NODE_NODESTORE_H_INCLUDED
 
 /** Persistency layer for NodeObject
 
@@ -410,9 +410,7 @@ public:
     /** Import objects from another database. */
     virtual void import (NodeStore& sourceDatabase) = 0;
 
-
     /** Retrieve the estimated number of pending write operations.
-
         This is used for diagnostics.
     */
     virtual int getWriteLoad () = 0;
@@ -427,6 +425,9 @@ public:
     // VFALCO TODO Document this.
     virtual void sweep () = 0;
 
+    /** Add the known Backend factories to the singleton.
+    */
+    static void addAvailableBackends ();
 };
 
 #endif

modules/ripple_core/node/NullBackendFactory.h

@@ -4,8 +4,8 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_NULLBACKENDFACTORY_H_INCLUDED
+#ifndef RIPPLE_CORE_NODE_NULLBACKENDFACTORY_H_INCLUDED
-#define RIPPLE_NULLBACKENDFACTORY_H_INCLUDED
+#define RIPPLE_CORE_NODE_NULLBACKENDFACTORY_H_INCLUDED
 
 /** Factory to produce a null backend.
 

modules/ripple_core/ripple_core.cpp

@@ -4,33 +4,48 @@
 */
 //==============================================================================
 
-/** Add this to get the @ref ripple_core module.
-
-    @file ripple_core.cpp
-    @ingroup ripple_core
-*/
-
 #include "BeastConfig.h"
 
 #include "ripple_core.h"
 
 #include <fstream>
 
+#include "beast/modules/beast_core/system/BeforeBoost.h" // must come first
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-//#include <boost/thread.hpp>
+
+// For NodeStore backends
+#include "beast/modules/beast_db/beast_db.h"
+#include "../ripple_hyperleveldb/ripple_hyperleveldb.h"
+#include "../ripple_leveldb/ripple_leveldb.h"
+#include "../ripple_mdb/ripple_mdb.h"
 
 namespace ripple
 {
 
 #include "functional/ripple_Config.cpp"
- #include "functional/ripple_LoadFeeTrack.h" // private
+# include "functional/ripple_LoadFeeTrack.h" // private
 #include "functional/ripple_LoadFeeTrack.cpp"
 #include "functional/ripple_Job.cpp"
 #include "functional/ripple_JobQueue.cpp"
 #include "functional/ripple_LoadEvent.cpp"
 #include "functional/ripple_LoadMonitor.cpp"
 
+#  include "node/HyperLevelDBBackendFactory.h"
+# include "node/HyperLevelDBBackendFactory.cpp"
+#  include "node/KeyvaDBBackendFactory.h"
+# include "node/KeyvaDBBackendFactory.cpp"
+#  include "node/LevelDBBackendFactory.h"
+# include "node/LevelDBBackendFactory.cpp"
+#  include "node/MemoryBackendFactory.h"
+# include "node/MemoryBackendFactory.cpp"
+#  include "node/NullBackendFactory.h"
+# include "node/NullBackendFactory.cpp"
+#  include "node/MdbBackendFactory.h"
+# include "node/MdbBackendFactory.cpp"
+#include "node/NodeStore.cpp"
+#include "node/NodeObject.cpp"
+
 #include "validator/ripple_Validator.cpp"
 #include "validator/ripple_ValidatorImp.h" // private
 #include "validator/ripple_Validators.cpp"

modules/ripple_core/ripple_core.h

@@ -4,25 +4,10 @@
 */
 //==============================================================================
 
-/** Include this to get the @ref ripple_core module.
-
-    @file ripple_core.h
-    @ingroup ripple_core
-*/
-
-/** Core classes.
-
-    These objects form the execution framework in which the Ripple
-    protocol is implemented.
-
-    @defgroup ripple_core
-*/
-
 #ifndef RIPPLE_CORE_RIPPLEHEADER
 #define RIPPLE_CORE_RIPPLEHEADER
 
 #include "../ripple_basics/ripple_basics.h"
-
 #include "../ripple_data/ripple_data.h"
 
 namespace ripple
@@ -30,15 +15,18 @@ namespace ripple
 
 // Order matters
 
-/***/#include "functional/ripple_ConfigSections.h"
+# include "functional/ripple_ConfigSections.h"
-/**/#include "functional/ripple_Config.h"
+#include "functional/ripple_Config.h"
-/**/#include "functional/ripple_ILoadFeeTrack.h"
+#include "functional/ripple_ILoadFeeTrack.h"
-/*..*/#include "functional/ripple_LoadEvent.h"
+#  include "functional/ripple_LoadEvent.h"
-/*..*/#include "functional/ripple_LoadMonitor.h"
+#  include "functional/ripple_LoadMonitor.h"
-/*.*/#include "functional/ripple_Job.h"
+# include "functional/ripple_Job.h"
-/**/#include "functional/ripple_JobQueue.h"
+#include "functional/ripple_JobQueue.h"
-/*.*/#include "functional/LoadType.h"
+# include "functional/LoadType.h"
-/**/#include "functional/LoadSource.h"
+#include "functional/LoadSource.h"
+
+#include "node/NodeObject.h"
+#include "node/NodeStore.h"
 
 #include "validator/ripple_Validator.h"
 #include "validator/ripple_ValidatorList.h"

modules/ripple_data/ripple_data.cpp

@@ -4,26 +4,13 @@
 */
 //==============================================================================
 
-/** Add this to get the @ref ripple_data module.
-
-    @file ripple_data.cpp
-    @ingroup ripple_data
-*/
-
 #include "BeastConfig.h"
 
 #include "ripple_data.h"
 
-#include <algorithm>
+//#include <cmath>
-#include <cassert>
-#include <cmath>
-#include <iomanip>
-#include <iostream>
-#include <limits.h>
-#include <map>
-#include <string>
-#include <vector>
 
+#include "beast/modules/beast_core/system/BeforeBoost.h" // must come first
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>

modules/ripple_data/ripple_data.h

@@ -56,6 +56,8 @@ namespace ripple
 
 }
 
+//------------------------------------------------------------------------------
+
 namespace boost
 {
     template <>