Split some framework classes into ripple_frame module

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
-#define RIPPLE_BASICS_SERVICE_H_INCLUDED
+#ifndef RIPPLE_FRAME_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"