Move RPCServerHandler to ripple_app/rpc

This commit is contained in:
Vinnie Falco
2013-08-31 22:24:41 -07:00
parent 98b630d8db
commit 0d5bd937b1
6 changed files with 34 additions and 19 deletions

View File

@@ -19,12 +19,6 @@
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.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="..\..\modules\ripple_app\boost\ripple_IoService.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -474,6 +468,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\rpc\RPCServerHandler.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="..\..\modules\ripple_app\rpc\RPCUtil.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1370,7 +1370,6 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\BeastConfig.h" />
<ClInclude Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.h" />
<ClInclude Include="..\..\modules\ripple_app\boost\ripple_IoService.h" />
<ClInclude Include="..\..\modules\ripple_app\consensus\ripple_DisputedTx.h" />
<ClInclude Include="..\..\modules\ripple_app\consensus\ripple_LedgerConsensus.h" />
@@ -1441,6 +1440,7 @@
<ClInclude Include="..\..\modules\ripple_app\peers\ripple_UniqueNodeList.h" />
<ClInclude Include="..\..\modules\ripple_app\ripple_app.h" />
<ClInclude Include="..\..\modules\ripple_app\rpc\CallRPC.h" />
<ClInclude Include="..\..\modules\ripple_app\rpc\RPCServerHandler.h" />
<ClInclude Include="..\..\modules\ripple_app\rpc\RPCUtil.h" />
<ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h" />
<ClInclude Include="..\..\modules\ripple_app\rpc\RPCHandler.h" />

View File

@@ -34,9 +34,6 @@
<Filter Include="[1] Ripple\ripple_websocket">
<UniqueIdentifier>{6ad1f6a2-1710-43ac-96d4-f6b54fd8379e}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_app\basics">
<UniqueIdentifier>{f238bebe-dfcc-48f3-9d89-9c5c7c72ebed}</UniqueIdentifier>
</Filter>
<Filter Include="[1] Ripple\ripple_basics\containers">
<UniqueIdentifier>{2bf8c9ef-13f7-477a-8a78-2a52a26bb4f8}</UniqueIdentifier>
</Filter>
@@ -504,9 +501,6 @@
<ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
<Filter>[1] Ripple\ripple_net</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.cpp">
<Filter>[1] Ripple\ripple_app\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeObject.cpp">
<Filter>[1] Ripple\ripple_app\node</Filter>
</ClCompile>
@@ -879,6 +873,21 @@
<ClCompile Include="..\..\modules\ripple_app\ripple_app.cpp">
<Filter>[1] Ripple\ripple_app</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_reader.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_value.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_basics\json\json_writer.cpp">
<Filter>[1] Ripple\ripple_basics\json</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_data\protocol\BuildInfo.cpp">
<Filter>[1] Ripple\ripple_data\protocol</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\rpc\RPCServerHandler.cpp">
<Filter>[1] Ripple\ripple_app\rpc</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
@@ -1274,9 +1283,6 @@
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h">
<Filter>[1] Ripple\ripple_net</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.h">
<Filter>[1] Ripple\ripple_app\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h">
<Filter>[1] Ripple\ripple_app\node</Filter>
</ClInclude>
@@ -1679,6 +1685,12 @@
<ClInclude Include="..\..\modules\ripple_net\basics\RPCDoor.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_data\protocol\BuildInfo.h">
<Filter>[1] Ripple\ripple_data\protocol</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\rpc\RPCServerHandler.h">
<Filter>[1] Ripple\ripple_app\rpc</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

View File

@@ -28,8 +28,8 @@ namespace ripple
#include "main/ripple_FatalErrorReporter.h"
#include "main/ripple_FatalErrorReporter.cpp"
# include "basics/ripple_RPCServerHandler.h"
#include "basics/ripple_RPCServerHandler.cpp"
# include "rpc/RPCServerHandler.h"
#include "rpc/RPCServerHandler.cpp"
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data

View File

@@ -9,6 +9,9 @@
#include "beast/modules/beast_core/beast_core.h" // Must come before <boost/bind.hpp>
// This is unfortunate...remove ASAP
#include "../ripple_websocket/ripple_websocket.h"
#if BEAST_LINUX || BEAST_MAC || BEAST_BSD
#include <sys/resource.h>
#endif
@@ -151,7 +154,7 @@ namespace ripple
#include "paths/ripple_RippleState.h"
#include "tx/AccountSetTransactor.h"
#include "tx/TrustSetTransactor.h"
#include "websocket/WSServerHandler.h"
#include "websocket/WSServerHandler.h" // remove ripple_websocket.h with this
#include "tx/WalletAddTransactor.h"
#include "contracts/ripple_ScriptData.h"