diff --git a/Builds/VisualStudio2012/Ripple.sln b/Builds/VisualStudio2012/Ripple.sln
index 0d7f6c5a0..dd446fe8e 100644
--- a/Builds/VisualStudio2012/Ripple.sln
+++ b/Builds/VisualStudio2012/Ripple.sln
@@ -1,10 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "beast", "..\..\Subtrees\beast\Builds\VisualStudio2012\beast.vcxproj", "{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}"
-EndProject
+# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RippleD", "RippleD.vcxproj", "{B7F39ECD-473C-484D-BC34-31F8362506A5}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "beast", "..\..\src\beast\Builds\VisualStudio2012\beast.vcxproj", "{73C5A0F0-7629-4DE7-9194-BE7AC6C19535}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -13,14 +13,6 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.ActiveCfg = Debug|Win32
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.Build.0 = Debug|Win32
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.ActiveCfg = Debug|x64
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.Build.0 = Debug|x64
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.ActiveCfg = Release|Win32
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.Build.0 = Release|Win32
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.ActiveCfg = Release|x64
- {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.Build.0 = Release|x64
{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|Win32.ActiveCfg = Debug|Win32
{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|Win32.Build.0 = Debug|Win32
{B7F39ECD-473C-484D-BC34-31F8362506A5}.Debug|x64.ActiveCfg = Debug|x64
@@ -29,6 +21,14 @@ Global
{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|Win32.Build.0 = Release|Win32
{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|x64.ActiveCfg = Release|x64
{B7F39ECD-473C-484D-BC34-31F8362506A5}.Release|x64.Build.0 = Release|x64
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.ActiveCfg = Debug|Win32
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|Win32.Build.0 = Debug|Win32
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.ActiveCfg = Debug|x64
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Debug|x64.Build.0 = Debug|x64
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.ActiveCfg = Release|Win32
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|Win32.Build.0 = Release|Win32
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.ActiveCfg = Release|x64
+ {73C5A0F0-7629-4DE7-9194-BE7AC6C19535}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Builds/VisualStudio2012/RippleD.props b/Builds/VisualStudio2012/RippleD.props
index 8f183956c..81f88ccd8 100644
--- a/Builds/VisualStudio2012/RippleD.props
+++ b/Builds/VisualStudio2012/RippleD.props
@@ -14,7 +14,7 @@
_VARIADIC_MAX=10;_WIN32_WINNT=0x0600;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;%(PreprocessorDefinitions)
true
Level3
- $(RepoDir);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;%(AdditionalIncludeDirectories)
+ $(RepoDir)\src;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\src\leveldb;$(RepoDir)\src\leveldb\include;$(RepoDir)\build\proto;%(AdditionalIncludeDirectories)
/bigobj %(AdditionalOptions)
Async
4018;4244
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index d9fbfe448..b1fd563f6 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -1022,349 +1022,349 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
true
-
+
true
true
true
@@ -1372,7 +1372,6 @@
-
@@ -1574,75 +1573,76 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 497e812fc..94eb88c41 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -1,7 +1,7 @@
-
+
{ddf42dfe-eaad-4275-8cb7-5c02be627366}
@@ -10,13 +10,13 @@
{bcc68889-41a4-4090-ac3f-12a3ba1d8961}
-
+
{f669c93c-60da-4674-a693-9eebcddacb6f}
-
+
{3debb18d-0f76-4208-accb-f96cb9ce6dab}
-
+
{1f093002-9955-4915-a17b-398d55c9fc76}
@@ -61,22 +61,22 @@
{99ac4d07-04a7-4ce3-96c7-b8ea578f1a61}
-
+
{6967f835-a1b0-47e3-9bd9-6fc8bd0f3df7}
-
+
{fe2722a9-6550-4098-91eb-1575f7419a42}
-
+
{e1f02660-3d99-4ef3-b79a-2a8da16e2ec7}
-
+
{5280f25b-a657-45f7-a0e6-822891d0f20f}
-
+
{8710b403-2cfa-4991-b8b4-8214d1947528}
-
+
{223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00}
@@ -130,9 +130,6 @@
{73c81ca5-1f7e-4ffc-bb42-72306afc78ed}
-
- {c69b07a2-44e5-4b06-99a9-81f5d137ea15}
-
{7c14e9df-6d8d-4ba3-b208-f89c1d0b6b30}
@@ -154,13 +151,16 @@
{129c51dc-e885-4023-999b-e133d800fb80}
+
+ {c69b07a2-44e5-4b06-99a9-81f5d137ea15}
+
-
- [0] Subtrees\beast
+
+ [0] src\beast
- [0] Subtrees\protobuf
+ [0] src\protobuf
[1] Ripple\ripple_basics\containers
@@ -297,176 +297,176 @@
[1] Ripple\ripple_websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
[1] Ripple\ripple_app
@@ -567,11 +567,11 @@
[1] Ripple\ripple_app\ledger
-
- [0] Subtrees\beast
+
+ [0] src\beast
-
- [0] Subtrees\beast
+
+ [0] src\beast
[1] Ripple\ripple_app\main
@@ -738,11 +738,11 @@
[1] Ripple\ripple_app\tx
-
- [0] Subtrees\beast
+
+ [0] src\beast
-
- [0] Subtrees\beast
+
+ [0] src\beast
[1] Ripple\ripple_app\main
@@ -750,8 +750,8 @@
[1] Ripple\ripple_app\main
-
- [0] Subtrees\beast
+
+ [0] src\beast
[1] Ripple\ripple_app\websocket
@@ -1049,212 +1049,212 @@
[1] Ripple\ripple_websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\websocket
+
+ [0] src\websocket
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\db
+
+ [0] src\leveldb\db
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\util
+
+ [0] src\leveldb\util
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\table
+
+ [0] src\leveldb\table
-
- [0] Subtrees\leveldb\port\win
+
+ [0] src\leveldb\port\win
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
-
- [0] Subtrees\leveldb\port
+
+ [0] src\leveldb\port
[1] Ripple\ripple_basics\utility
@@ -1496,9 +1496,6 @@
[1] Ripple\ripple_app\main
-
- [2] Build
-
[1] Ripple\ripple_app\main
@@ -1730,6 +1727,7 @@
[1] Ripple\ripple_core\validator
+
@@ -1737,12 +1735,6 @@
-
- [2] Build
-
-
- [2] Build
-
[1] Ripple\ripple_basics\json
@@ -1764,13 +1756,17 @@
%28Notes%29
-
- [2] Build
+ [2] doc
- [2] Build
+ [2] doc
+
+ [2] doc
+
+
+
diff --git a/BeastConfig.h b/src/BeastConfig.h
similarity index 100%
rename from BeastConfig.h
rename to src/BeastConfig.h
diff --git a/src/README.md b/src/README.md
index 457688b26..e59d130c1 100644
--- a/src/README.md
+++ b/src/README.md
@@ -1,16 +1,55 @@
-# Subtrees
+# src
-These directories come from entire outside repositories
-brought in using git-subtree.
+Some of these directories come from entire outside repositories
+brought in using git-subtree. This means that the source files are
+inserted directly into the rippled repository. They can be edited
+and committed just as if they were normal files.
+
+However, if you create a commit that contains files both from a
+subtree, and from the ripple source tree please use care when designing
+the commit message, since it will appear in the subtree's individual
+repository when the changes are pushed back to the upstream.
+
+When submitting pull request, make sure that any commits which include
+files from subtrees are isolated - i.e. do not mix files from subtrees
+and ripple in the same commit. This way, the commit message will make
+sense. We don't want to see "Fix pathfinding bug with XRP" appearing
+in the LevelDB or Beast commit log, for example.
About git-subtree:
https://github.com/apenwarr/git-subtree
http://blogs.atlassian.com/2013/05/alternatives-to-git-submodule-git-subtree/
+## ./beast
+
+Beast, the amazing cross-platform library.
+
+Repository
+```
+git@github.com:vinniefalco/Beast.git
+```
+Branch
+```
+master
+```
+
+## HyperLevelDB
+
+Ripple's fork of HyperLevelDB
+
+Repository
+```
+git@github.com:ripple/HyperLevelDB.git
+```
+Branch
+```
+ripple-fork
+```
+
## LevelDB
-Ripple's fork of LevelDB is shared by the Bitcoin reference client project.
+Ripple's fork of LevelDB.
Repository
```
@@ -23,15 +62,15 @@ ripple-fork
## LightningDB (a.k.a. MDB)
-A supposedly fast memory-mapped key value database system
+Ripple's fork of MDB, a fast memory-mapped key value database system.
Repository
```
-git://gitorious.org/mdb/mdb.git
+git@github.com:ripple/LightningDB.git
```
Branch
```
-mdb.master
+ripple-fork
```
## websocket