diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index d1a1fbb48..1db6a5d31 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -169,6 +169,18 @@
+
+ true
+ true
+ true
+ true
+
+
+ true
+ true
+ true
+ true
+
true
true
@@ -187,6 +199,12 @@
true
true
+
+ true
+ true
+ true
+ true
+
true
true
@@ -1124,12 +1142,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -1190,12 +1202,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -1260,12 +1266,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -1531,6 +1531,7 @@
+
@@ -1542,6 +1543,8 @@
+
+
@@ -1781,7 +1784,6 @@
-
@@ -1791,7 +1793,6 @@
-
@@ -1807,7 +1808,6 @@
-
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index e3127c5a5..7f39f1679 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -390,15 +390,9 @@
1. Modules\ripple_app\_unfactored\network
-
- 1. Modules\ripple_app\refactored
-
1. Modules\ripple_app\refactored
-
- 1. Modules\ripple_app\refactored
-
1. Modules\ripple_app\refactored
@@ -678,9 +672,6 @@
1. Modules\ripple_app\_unfactored
-
- 1. Modules\ripple_app\_unfactored
-
1. Modules\ripple_app\_unfactored
@@ -909,6 +900,15 @@
1. Modules\ripple_core\functional
+
+ 1. Modules\ripple_basics\utility
+
+
+ 1. Modules\ripple_core\functional
+
+
+ 1. Modules\ripple_core\functional
+
@@ -1208,9 +1208,6 @@
1. Modules\ripple_app\_unfactored\network
-
- 1. Modules\ripple_app\refactored
-
1. Modules\ripple_app\refactored
@@ -1220,9 +1217,6 @@
1. Modules\ripple_app\refactored
-
- 1. Modules\ripple_app\refactored
-
1. Modules\ripple_app\refactored
@@ -1491,9 +1485,6 @@
1. Modules\ripple_app
-
- 1. Modules\ripple_app\_unfactored
-
1. Modules\ripple_app\_unfactored
@@ -1740,6 +1731,15 @@
1. Modules\ripple_core\functional
+
+ 1. Modules\ripple_basics\utility
+
+
+ 1. Modules\ripple_core\functional
+
+
+ 1. Modules\ripple_core\functional
+
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 4892e1a22..ba89ab17b 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -137,9 +137,7 @@
#include "src/cpp/ripple/SerializedValidation.h"
#include "src/cpp/ripple/ripple_LoadManager.h"
-
// These have few dependencies
-#include "src/cpp/ripple/ripple_Config.h"
#include "src/cpp/ripple/ripple_DatabaseCon.h"
#include "src/cpp/ripple/ripple_ProofOfWork.h"
#include "src/cpp/ripple/ripple_InfoSub.h"
@@ -152,7 +150,6 @@
#include "src/cpp/ripple/ripple_IFeatures.h"
#include "src/cpp/ripple/ripple_IFeeVote.h"
#include "src/cpp/ripple/ripple_IHashRouter.h"
-#include "src/cpp/ripple/ripple_ILoadFeeTrack.h"
#include "src/cpp/ripple/ripple_Peer.h" // VFALCO TODO Rename to IPeer
#include "src/cpp/ripple/ripple_IPeers.h"
#include "src/cpp/ripple/ripple_IProofOfWorkFactory.h"
@@ -227,7 +224,6 @@
#include "src/cpp/ripple/OfferCreateTransactor.h"
#include "src/cpp/ripple/ripple_PathRequest.h"
#include "src/cpp/ripple/ParameterTable.h"
-#include "src/cpp/ripple/ParseSection.h"
#include "src/cpp/ripple/ripple_RippleLineCache.h"
#include "src/cpp/ripple/ripple_PathState.h"
@@ -319,11 +315,9 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/CallRPC.cpp"
#include "src/cpp/ripple/ripple_InboundLedger.cpp"
#include "src/cpp/ripple/ripple_PathState.cpp"
-#include "src/cpp/ripple/ripple_Config.cpp"
#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
#include "src/cpp/ripple/ParameterTable.cpp"
-#include "src/cpp/ripple/ParseSection.cpp"
#include "src/cpp/ripple/PaymentTransactor.cpp"
#include "src/cpp/ripple/PeerDoor.cpp"
#include "src/cpp/ripple/RegularKeySetTransactor.cpp"
@@ -389,7 +383,6 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/ripple_InboundLedgers.cpp"
#include "src/cpp/ripple/ripple_InfoSub.cpp"
#include "src/cpp/ripple/ripple_LedgerHistory.cpp"
-#include "src/cpp/ripple/ripple_LoadFeeTrack.cpp"
#include "src/cpp/ripple/ripple_OrderBook.cpp"
#include "src/cpp/ripple/ripple_PathRequest.cpp"
#include "src/cpp/ripple/ripple_PeerSet.cpp"
diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp
index 2ccf2cbfb..d94bb2ce2 100644
--- a/modules/ripple_basics/ripple_basics.cpp
+++ b/modules/ripple_basics/ripple_basics.cpp
@@ -63,6 +63,7 @@ namespace ripple
#include "utility/ripple_ByteOrder.cpp"
#include "utility/ripple_CountedObject.cpp"
#include "utility/ripple_DiffieHellmanUtil.cpp"
+#include "utility/ripple_IniFile.cpp"
#include "utility/ripple_StringUtilities.cpp"
#include "utility/ripple_Sustain.cpp"
#include "utility/ripple_ThreadName.cpp"
diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h
index e0a6f64bb..39a11237a 100644
--- a/modules/ripple_basics/ripple_basics.h
+++ b/modules/ripple_basics/ripple_basics.h
@@ -89,6 +89,7 @@ namespace ripple
#include "utility/ripple_ByteOrder.h"
#include "utility/ripple_CountedObject.h"
#include "utility/ripple_DiffieHellmanUtil.h"
+#include "utility/ripple_IniFile.h"
#include "utility/ripple_PlatformMacros.h"
#include "utility/ripple_RandomNumbers.h"
#include "utility/ripple_ScopedLock.h"
diff --git a/src/cpp/ripple/ParseSection.cpp b/modules/ripple_basics/utility/ripple_IniFile.cpp
similarity index 100%
rename from src/cpp/ripple/ParseSection.cpp
rename to modules/ripple_basics/utility/ripple_IniFile.cpp
diff --git a/src/cpp/ripple/ParseSection.h b/modules/ripple_basics/utility/ripple_IniFile.h
similarity index 73%
rename from src/cpp/ripple/ParseSection.h
rename to modules/ripple_basics/utility/ripple_IniFile.h
index a3c158ef6..fe5327ec8 100644
--- a/src/cpp/ripple/ParseSection.h
+++ b/modules/ripple_basics/utility/ripple_IniFile.h
@@ -4,10 +4,14 @@
*/
//==============================================================================
-#ifndef _PARSE_SECTION_
-#define _PARSE_SECTION_
+#ifndef RIPPLE_INIFILE_RIPPLEHEADER
+#define RIPPLE_INIFILE_RIPPLEHEADER
-typedef std::map > Section;
+// VFALCO TODO Rename to IniFile and clean up
+typedef std::map > Section;
+
+// VFALCO TODO Wrap this up in a class interface
+//
Section ParseSection (const std::string& strInput, const bool bTrim);
void SectionPrint (Section secInput);
diff --git a/src/cpp/ripple/ripple_Config.cpp b/modules/ripple_core/functional/ripple_Config.cpp
similarity index 100%
rename from src/cpp/ripple/ripple_Config.cpp
rename to modules/ripple_core/functional/ripple_Config.cpp
diff --git a/src/cpp/ripple/ripple_Config.h b/modules/ripple_core/functional/ripple_Config.h
similarity index 94%
rename from src/cpp/ripple/ripple_Config.h
rename to modules/ripple_core/functional/ripple_Config.h
index 848769509..865cc32c3 100644
--- a/src/cpp/ripple/ripple_Config.h
+++ b/modules/ripple_core/functional/ripple_Config.h
@@ -7,6 +7,15 @@
#ifndef RIPPLE_CONFIG_H
#define RIPPLE_CONFIG_H
+// VFALCO TODO Replace these with beast "unsigned long long" generators
+// VFALCO NOTE Apparently these are used elsewhere. Make them constants in the config
+// or in the IApplication
+//
+#define SYSTEM_CURRENCY_GIFT 1000ull
+#define SYSTEM_CURRENCY_USERS 100000000ull
+#define SYSTEM_CURRENCY_PARTS 1000000ull // 10^SYSTEM_CURRENCY_PRECISION
+#define SYSTEM_CURRENCY_START (SYSTEM_CURRENCY_GIFT*SYSTEM_CURRENCY_USERS*SYSTEM_CURRENCY_PARTS)
+
// VFALCO NOTE Set this to 1 to enable code which is unnecessary
#define ENABLE_INSECURE 0
diff --git a/src/cpp/ripple/ripple_ILoadFeeTrack.h b/modules/ripple_core/functional/ripple_ILoadFeeTrack.h
similarity index 100%
rename from src/cpp/ripple/ripple_ILoadFeeTrack.h
rename to modules/ripple_core/functional/ripple_ILoadFeeTrack.h
diff --git a/src/cpp/ripple/ripple_LoadFeeTrack.cpp b/modules/ripple_core/functional/ripple_LoadFeeTrack.cpp
similarity index 99%
rename from src/cpp/ripple/ripple_LoadFeeTrack.cpp
rename to modules/ripple_core/functional/ripple_LoadFeeTrack.cpp
index c6ff6d829..124c6ae77 100644
--- a/src/cpp/ripple/ripple_LoadFeeTrack.cpp
+++ b/modules/ripple_core/functional/ripple_LoadFeeTrack.cpp
@@ -4,6 +4,8 @@
*/
//==============================================================================
+class LoadManager;
+
class LoadFeeTrack : public ILoadFeeTrack
{
private:
@@ -205,5 +207,3 @@ BOOST_AUTO_TEST_CASE (LoadFeeTrack_test)
}
BOOST_AUTO_TEST_SUITE_END ()
-
-// vim:ts=4
diff --git a/modules/ripple_core/ripple_core.cpp b/modules/ripple_core/ripple_core.cpp
index f82f624a5..0c43bd21c 100644
--- a/modules/ripple_core/ripple_core.cpp
+++ b/modules/ripple_core/ripple_core.cpp
@@ -12,8 +12,15 @@
#include "ripple_core.h"
+#include
+
+#include
+#include
+#include
#include
+#include "functional/ripple_Config.cpp"
+#include "functional/ripple_LoadFeeTrack.cpp"
#include "functional/ripple_Job.cpp"
#include "functional/ripple_JobQueue.cpp"
#include "functional/ripple_LoadEvent.cpp"
diff --git a/modules/ripple_core/ripple_core.h b/modules/ripple_core/ripple_core.h
index 3162c6666..eb5c6f58d 100644
--- a/modules/ripple_core/ripple_core.h
+++ b/modules/ripple_core/ripple_core.h
@@ -22,16 +22,20 @@
#define RIPPLE_CORE_RIPPLEHEADER
#include "../ripple_basics/ripple_basics.h"
+#include "../ripple_data/ripple_data.h"
#include
#include
#include
+#include
#include
#include
// VFALCO NOTE Indentation shows dependency hierarchy
//
+/**/#include "functional/ripple_Config.h"
+/**/#include "functional/ripple_ILoadFeeTrack.h"
/*..*/#include "functional/ripple_LoadEvent.h"
/*..*/#include "functional/ripple_LoadMonitor.h"
/*.*/#include "functional/ripple_Job.h"
diff --git a/src/cpp/ripple/ripple_IApplication.h b/src/cpp/ripple/ripple_IApplication.h
index 32d9eff7d..af77f8841 100644
--- a/src/cpp/ripple/ripple_IApplication.h
+++ b/src/cpp/ripple/ripple_IApplication.h
@@ -7,15 +7,6 @@
#ifndef RIPPLE_IAPPLICATION_H
#define RIPPLE_IAPPLICATION_H
-// VFALCO TODO Replace these with beast "unsigned long long" generators
-// VFALCO NOTE Apparently these are used elsewhere. Make them constants in the config
-// or in the IApplication
-//
-#define SYSTEM_CURRENCY_GIFT 1000ull
-#define SYSTEM_CURRENCY_USERS 100000000ull
-#define SYSTEM_CURRENCY_PARTS 1000000ull // 10^SYSTEM_CURRENCY_PRECISION
-#define SYSTEM_CURRENCY_START (SYSTEM_CURRENCY_GIFT*SYSTEM_CURRENCY_USERS*SYSTEM_CURRENCY_PARTS)
-
// VFALCO TODO Fix forward declares required for header dependency loops
class IFeatures;
class IFeeVote;