diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro
index 114ce207c..a29bcfb49 100644
--- a/Builds/QtCreator/rippled.pro
+++ b/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 \
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index c7191a64f..dbbc2b671 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -22,6 +22,13 @@
+
+ true
+ true
+ true
+ true
+
+
true
true
@@ -748,12 +755,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -1438,6 +1439,8 @@
+
+
@@ -1587,7 +1590,6 @@
-
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 95e42a648..7e8c3ad5f 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -184,6 +184,12 @@
{a56f8183-6f95-4455-a6f7-097eb930abaa}
+
+ {e8545fbd-90eb-4586-9ee2-8a5956808b1a}
+
+
+ {a4dd852c-651b-4ea9-a051-252dc0eaea24}
+
@@ -909,9 +915,6 @@
[1] Ripple\beast
-
- [2] Old Ripple\ripple_basics\utility
-
[2] Old Ripple\ripple_app\main
@@ -936,6 +939,12 @@
[1] Ripple\json
+
+ [1] Ripple\frame
+
+
+ [1] Ripple\frame\api
+
@@ -1806,9 +1815,6 @@
[2] Old Ripple\ripple_hyperleveldb
-
- [2] Old Ripple\ripple_basics\utility
-
[2] Old Ripple\ripple_app\main
@@ -1848,6 +1854,12 @@
[1] Ripple\json\api
+
+ [1] Ripple\frame
+
+
+ [1] Ripple\frame\api
+
diff --git a/SConstruct b/SConstruct
index 95313c97e..ea041dd94 100644
--- a/SConstruct
+++ b/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',
diff --git a/src/ripple/beast/ripple_beast.cpp b/src/ripple/beast/ripple_beast.cpp
index 197d56d3c..6e8bdf73c 100644
--- a/src/ripple/beast/ripple_beast.cpp
+++ b/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"
diff --git a/src/ripple_basics/utility/Service.cpp b/src/ripple/frame/api/Service.cpp
similarity index 99%
rename from src/ripple_basics/utility/Service.cpp
rename to src/ripple/frame/api/Service.cpp
index 23b6f0a13..64fd45300 100644
--- a/src/ripple_basics/utility/Service.cpp
+++ b/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 ()
{
}
+
+}
diff --git a/src/ripple_basics/utility/Service.h b/src/ripple/frame/api/Service.h
similarity index 98%
rename from src/ripple_basics/utility/Service.h
rename to src/ripple/frame/api/Service.h
index cd8dd44b3..4cda60dd7 100644
--- a/src/ripple_basics/utility/Service.h
+++ b/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
diff --git a/src/ripple/frame/ripple_frame.cpp b/src/ripple/frame/ripple_frame.cpp
new file mode 100644
index 000000000..148605c6b
--- /dev/null
+++ b/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"
diff --git a/src/ripple/frame/ripple_frame.h b/src/ripple/frame/ripple_frame.h
new file mode 100644
index 000000000..4c1a75e7a
--- /dev/null
+++ b/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
diff --git a/src/ripple/validators/ripple_validators.h b/src/ripple/validators/ripple_validators.h
index 9c322d7a8..b68e92256 100644
--- a/src/ripple/validators/ripple_validators.h
+++ b/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
diff --git a/src/ripple_app/ripple_app.h b/src/ripple_app/ripple_app.h
index 67a2490c4..2a209226c 100644
--- a/src/ripple_app/ripple_app.h
+++ b/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"
diff --git a/src/ripple_basics/ripple_basics.cpp b/src/ripple_basics/ripple_basics.cpp
index a1fece0f4..e9f718cce 100644
--- a/src/ripple_basics/ripple_basics.cpp
+++ b/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"
diff --git a/src/ripple_basics/ripple_basics.h b/src/ripple_basics/ripple_basics.h
index afd40eb13..d65aa02a7 100644
--- a/src/ripple_basics/ripple_basics.h
+++ b/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"
diff --git a/src/ripple_core/ripple_core.h b/src/ripple_core/ripple_core.h
index 68ccd4272..dbcb12c48 100644
--- a/src/ripple_core/ripple_core.h
+++ b/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"