Split some framework classes into ripple_frame module

Builds/QtCreator/rippled.pro

@@ -65,6 +65,7 @@ UI_HEADERS_DIR += ../../src/ripple_basics
 SOURCES += \
     ../../src/ripple/beast/ripple_beast.cpp \
     ../../src/ripple/beast/ripple_beastc.c \
+    ../../src/ripple/frame/ripple_frame.cpp \
     ../../src/ripple/json/ripple_json.cpp \
     ../../src/ripple/sophia/ripple_sophia.c \
     ../../src/ripple/testoverlay/ripple_testoverlay.cpp \

Builds/VisualStudio2012/RippleD.vcxproj

@@ -22,6 +22,13 @@
     <ClCompile Include="..\..\build\proto\ripple.pb.cc" />
     <ClCompile Include="..\..\src\ripple\beast\ripple_beast.cpp" />
     <ClCompile Include="..\..\src\ripple\beast\ripple_beastc.c" />
+    <ClCompile Include="..\..\src\ripple\frame\api\Service.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="..\..\src\ripple\frame\ripple_frame.cpp" />
     <ClCompile Include="..\..\src\ripple\json\impl\json_reader.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -748,12 +755,6 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple_basics\utility\Service.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="..\..\src\ripple_basics\utility\StringUtilities.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1438,6 +1439,8 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\ripple\frame\api\Service.h" />
+    <ClInclude Include="..\..\src\ripple\frame\ripple_frame.h" />
     <ClInclude Include="..\..\src\ripple\json\api\json_config.h" />
     <ClInclude Include="..\..\src\ripple\json\api\json_features.h" />
     <ClInclude Include="..\..\src\ripple\json\api\json_forwards.h" />
@@ -1587,7 +1590,6 @@
     <ClInclude Include="..\..\src\ripple_basics\utility\IniFile.h" />
     <ClInclude Include="..\..\src\ripple_basics\utility\PlatformMacros.h" />
     <ClInclude Include="..\..\src\ripple_basics\utility\RandomNumbers.h" />
-    <ClInclude Include="..\..\src\ripple_basics\utility\Service.h" />
     <ClInclude Include="..\..\src\ripple_basics\utility\StringUtilities.h" />
     <ClInclude Include="..\..\src\ripple_basics\utility\Sustain.h" />
     <ClInclude Include="..\..\src\ripple_basics\utility\ThreadName.h" />

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -184,6 +184,12 @@
     <Filter Include="[1] Ripple\json\impl">
       <UniqueIdentifier>{a56f8183-6f95-4455-a6f7-097eb930abaa}</UniqueIdentifier>
     </Filter>
+    <Filter Include="[1] Ripple\frame">
+      <UniqueIdentifier>{e8545fbd-90eb-4586-9ee2-8a5956808b1a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="[1] Ripple\frame\api">
+      <UniqueIdentifier>{a4dd852c-651b-4ea9-a051-252dc0eaea24}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\ripple_basics\containers\RangeSet.cpp">
@@ -909,9 +915,6 @@
     <ClCompile Include="..\..\src\ripple\beast\ripple_beastc.c">
       <Filter>[1] Ripple\beast</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\ripple_basics\utility\Service.cpp">
-      <Filter>[2] Old Ripple\ripple_basics\utility</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\ripple_app\main\IoServicePool.cpp">
       <Filter>[2] Old Ripple\ripple_app\main</Filter>
     </ClCompile>
@@ -936,6 +939,12 @@
     <ClCompile Include="..\..\src\ripple\json\ripple_json.cpp">
       <Filter>[1] Ripple\json</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\ripple\frame\ripple_frame.cpp">
+      <Filter>[1] Ripple\frame</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ripple\frame\api\Service.cpp">
+      <Filter>[1] Ripple\frame\api</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ripple_basics\containers\KeyCache.h">
@@ -1806,9 +1815,6 @@
     <ClInclude Include="..\..\src\ripple_hyperleveldb\ripple_hyperleveldb.h">
       <Filter>[2] Old Ripple\ripple_hyperleveldb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple_basics\utility\Service.h">
-      <Filter>[2] Old Ripple\ripple_basics\utility</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple_app\main\IoServicePool.h">
       <Filter>[2] Old Ripple\ripple_app\main</Filter>
     </ClInclude>
@@ -1848,6 +1854,12 @@
     <ClInclude Include="..\..\src\ripple\json\api\json_config.h">
       <Filter>[1] Ripple\json\api</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\frame\ripple_frame.h">
+      <Filter>[1] Ripple\frame</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\ripple\frame\api\Service.h">
+      <Filter>[1] Ripple\frame\api</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">

SConstruct

@@ -146,6 +146,7 @@ COMPILED_FILES.extend (['src/ripple/beast/ripple_beastc.c'])
 # New-style Ripple unity sources
 #
 COMPILED_FILES.extend([
+    'src/ripple/frame/ripple_frame.c',
     'src/ripple/json/ripple_json.cpp',
     'src/ripple/sophia/ripple_sophia.c',
     'src/ripple/testoverlay/ripple_testoverlay.cpp',

src/ripple/beast/ripple_beast.cpp

@@ -26,3 +26,4 @@
 #include "../beast/modules/beast_sqdb/beast_sqdb.cpp"
 
 #include "../beast/beast/net/Net.cpp"
+#include "../beast/beast/utility/Utility.cpp"

src/ripple/frame/api/Service.cpp

@@ -4,6 +4,9 @@
 */
 //==============================================================================
 
+namespace ripple
+{
+
 Service::Service (char const* name)
     : m_name (name)
     , m_root (true)
@@ -198,3 +201,5 @@ void ScopedService::onServiceStop ()
 void ScopedService::onServiceChildrenStopped ()
 {
 }
+
+}

src/ripple/frame/api/Service.h

@@ -4,8 +4,15 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_BASICS_SERVICE_H_INCLUDED
+#ifndef RIPPLE_FRAME_SERVICE_H_INCLUDED
-#define RIPPLE_BASICS_SERVICE_H_INCLUDED
+#define RIPPLE_FRAME_SERVICE_H_INCLUDED
+
+#include "../../../beast/beast/utility/Journal.h"
+
+namespace ripple
+{
+
+using namespace beast;
 
 /** Abstraction for organizing partitioned support code.
 
@@ -272,4 +279,6 @@ public:
     void onServiceChildrenStopped ();
 };
 
+}
+
 #endif

src/ripple/frame/ripple_frame.cpp

@@ -0,0 +1,13 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "beast/modules/beast_core/beast_core.h"
+
+#include "ripple_frame.h"
+
+#include "api/Service.cpp"

src/ripple/frame/ripple_frame.h

@@ -0,0 +1,14 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_FRAME_H_INCLUDED
+#define RIPPLE_FRAME_H_INCLUDED
+
+#include "beast/modules/beast_core/beast_core.h"
+
+#include "api/Service.h"
+
+#endif

src/ripple/validators/ripple_validators.h

@@ -17,7 +17,8 @@
 //
 #include "beast/modules/beast_asio/beast_asio.h"
 
-#include "../ripple_basics/ripple_basics.h"
+#include "../ripple/frame/ripple_frame.h"
+//#include "../ripple_basics/ripple_basics.h"
 #include "../ripple_data/ripple_data.h"
 
 namespace ripple

src/ripple_app/ripple_app.h

@@ -34,6 +34,7 @@
 
 //------------------------------------------------------------------------------
 
+#include "../ripple/frame/ripple_frame.h"
 #include "../ripple_basics/ripple_basics.h"
 #include "../ripple_core/ripple_core.h"
 #include "../ripple_data/ripple_data.h"

src/ripple_basics/ripple_basics.cpp

@@ -70,7 +70,6 @@ namespace ripple
 #include "utility/CountedObject.cpp"
 #include "utility/DiffieHellmanUtil.cpp"
 #include "utility/IniFile.cpp"
-#include "utility/Service.cpp"
 #include "utility/StringUtilities.cpp"
 #include "utility/Sustain.cpp"
 #include "utility/ThreadName.cpp"

src/ripple_basics/ripple_basics.h

@@ -31,6 +31,8 @@
 
 #include "beast/modules/beast_crypto/beast_crypto.h"
 
+#include "../../beast/beast/Utility.h"
+
 #ifndef RIPPLE_TRACK_MUTEXES
 # define RIPPLE_TRACK_MUTEXES 0
 #endif
@@ -93,7 +95,6 @@ using namespace beast;
 #include "utility/IniFile.h"
 #include "utility/PlatformMacros.h"
 #include "utility/RandomNumbers.h"
-#include "utility/Service.h"
 #include "utility/StringUtilities.h"
 #include "utility/Sustain.h"
 #include "utility/ThreadName.h"

src/ripple_core/ripple_core.h

@@ -10,6 +10,7 @@
 // VFALCO TODO For UniformResourceLocator, remove asap
 #include "beast/modules/beast_asio/beast_asio.h"
 
+#include "../ripple/frame/ripple_frame.h"
 #include "../ripple_basics/ripple_basics.h"
 #include "../ripple_data/ripple_data.h"