Merge pull request #213 from thecodefactory/move-default-page

Move default web page data out of protocol.

Author: thecodefactory

Makefile.am

@@ -37,7 +37,6 @@ src_libbitcoin_protocol_la_LIBADD = ${zmq_LIBS} ${mbedtls_LIBS} ${bitcoin_system
 src_libbitcoin_protocol_la_SOURCES = \
     src/settings.cpp \
     src/web/connection.cpp \
-    src/web/default_page_data.cpp \
     src/web/json_string.cpp \
     src/web/manager.cpp \
     src/web/socket.cpp \
@@ -96,7 +95,6 @@ include_bitcoin_protocol_web_HEADERS = \
     include/bitcoin/protocol/web/bind_options.hpp \
     include/bitcoin/protocol/web/connection.hpp \
     include/bitcoin/protocol/web/connection_state.hpp \
-    include/bitcoin/protocol/web/default_page_data.hpp \
     include/bitcoin/protocol/web/event.hpp \
     include/bitcoin/protocol/web/file_transfer.hpp \
     include/bitcoin/protocol/web/http.hpp \

builds/cmake/CMakeLists.txt

@@ -179,7 +179,6 @@ add_definitions(
 add_library( ${CANONICAL_LIB_NAME}
     "../../src/settings.cpp"
     "../../src/web/connection.cpp"
-    "../../src/web/default_page_data.cpp"
     "../../src/web/json_string.cpp"
     "../../src/web/manager.cpp"
     "../../src/web/socket.cpp"

builds/msvc/vs2013/libbitcoin-protocol/libbitcoin-protocol.vcxproj

@@ -75,7 +75,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\settings.cpp" />
     <ClCompile Include="..\..\..\..\src\web\connection.cpp" />
-    <ClCompile Include="..\..\..\..\src\web\default_page_data.cpp" />
     <ClCompile Include="..\..\..\..\src\web\json_string.cpp" />
     <ClCompile Include="..\..\..\..\src\web\manager.cpp" />
     <ClCompile Include="..\..\..\..\src\web\socket.cpp">
@@ -104,7 +103,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\bind_options.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection_state.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\default_page_data.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\event.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\file_transfer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\http.hpp" />

builds/msvc/vs2013/libbitcoin-protocol/libbitcoin-protocol.vcxproj.filters

@@ -42,9 +42,6 @@
     <ClCompile Include="..\..\..\..\src\web\connection.cpp">
       <Filter>src\web</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\web\default_page_data.cpp">
-      <Filter>src\web</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\web\json_string.cpp">
       <Filter>src\web</Filter>
     </ClCompile>
@@ -113,9 +110,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection_state.hpp">
       <Filter>include\bitcoin\protocol\web</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\default_page_data.hpp">
-      <Filter>include\bitcoin\protocol\web</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\event.hpp">
       <Filter>include\bitcoin\protocol\web</Filter>
     </ClInclude>

builds/msvc/vs2015/libbitcoin-protocol/libbitcoin-protocol.vcxproj

@@ -75,7 +75,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\settings.cpp" />
     <ClCompile Include="..\..\..\..\src\web\connection.cpp" />
-    <ClCompile Include="..\..\..\..\src\web\default_page_data.cpp" />
     <ClCompile Include="..\..\..\..\src\web\json_string.cpp" />
     <ClCompile Include="..\..\..\..\src\web\manager.cpp" />
     <ClCompile Include="..\..\..\..\src\web\socket.cpp">
@@ -104,7 +103,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\bind_options.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection_state.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\default_page_data.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\event.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\file_transfer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\http.hpp" />

builds/msvc/vs2015/libbitcoin-protocol/libbitcoin-protocol.vcxproj.filters

@@ -42,9 +42,6 @@
     <ClCompile Include="..\..\..\..\src\web\connection.cpp">
       <Filter>src\web</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\web\default_page_data.cpp">
-      <Filter>src\web</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\web\json_string.cpp">
       <Filter>src\web</Filter>
     </ClCompile>
@@ -113,9 +110,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection_state.hpp">
       <Filter>include\bitcoin\protocol\web</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\default_page_data.hpp">
-      <Filter>include\bitcoin\protocol\web</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\event.hpp">
       <Filter>include\bitcoin\protocol\web</Filter>
     </ClInclude>

builds/msvc/vs2017/libbitcoin-protocol/libbitcoin-protocol.vcxproj

@@ -75,7 +75,6 @@
   <ItemGroup>
     <ClCompile Include="..\..\..\..\src\settings.cpp" />
     <ClCompile Include="..\..\..\..\src\web\connection.cpp" />
-    <ClCompile Include="..\..\..\..\src\web\default_page_data.cpp" />
     <ClCompile Include="..\..\..\..\src\web\json_string.cpp" />
     <ClCompile Include="..\..\..\..\src\web\manager.cpp" />
     <ClCompile Include="..\..\..\..\src\web\socket.cpp">
@@ -104,7 +103,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\bind_options.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection_state.hpp" />
-    <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\default_page_data.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\event.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\file_transfer.hpp" />
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\http.hpp" />

builds/msvc/vs2017/libbitcoin-protocol/libbitcoin-protocol.vcxproj.filters

@@ -42,9 +42,6 @@
     <ClCompile Include="..\..\..\..\src\web\connection.cpp">
       <Filter>src\web</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\web\default_page_data.cpp">
-      <Filter>src\web</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\web\json_string.cpp">
       <Filter>src\web</Filter>
     </ClCompile>
@@ -113,9 +110,6 @@
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\connection_state.hpp">
       <Filter>include\bitcoin\protocol\web</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\default_page_data.hpp">
-      <Filter>include\bitcoin\protocol\web</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\..\include\bitcoin\protocol\web\event.hpp">
       <Filter>include\bitcoin\protocol\web</Filter>
     </ClInclude>

include/bitcoin/protocol.hpp

@@ -21,7 +21,6 @@
 #include <bitcoin/protocol/web/bind_options.hpp>
 #include <bitcoin/protocol/web/connection.hpp>
 #include <bitcoin/protocol/web/connection_state.hpp>
-#include <bitcoin/protocol/web/default_page_data.hpp>
 #include <bitcoin/protocol/web/event.hpp>
 #include <bitcoin/protocol/web/file_transfer.hpp>
 #include <bitcoin/protocol/web/http.hpp>