Skip to content

Commit 7780a4f

Browse files
evoskuilevoskuil
committed
Rename web to admin.
1 parent ea5c093 commit 7780a4f

27 files changed

+121
-121
lines changed

‎Makefile.am‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,17 +100,17 @@ console_bs_SOURCES = \
100100
console/main.cpp \
101101
console/stack_trace.cpp \
102102
console/stack_trace.hpp \
103+
console/embedded/admin_css.cpp \
104+
console/embedded/admin_font.cpp \
105+
console/embedded/admin_html.cpp \
106+
console/embedded/admin_icon.cpp \
107+
console/embedded/amin_ecma.cpp \
103108
console/embedded/embedded.hpp \
104109
console/embedded/native_css.cpp \
105110
console/embedded/native_ecma.cpp \
106111
console/embedded/native_font.cpp \
107112
console/embedded/native_html.cpp \
108-
console/embedded/native_icon.cpp \
109-
console/embedded/web_css.cpp \
110-
console/embedded/web_ecma.cpp \
111-
console/embedded/web_font.cpp \
112-
console/embedded/web_html.cpp \
113-
console/embedded/web_icon.cpp
113+
console/embedded/native_icon.cpp
114114

115115
endif WITH_CONSOLE
116116

@@ -166,6 +166,7 @@ include_bitcoin_server_parsers_HEADERS = \
166166
include_bitcoin_server_protocolsdir = ${includedir}/bitcoin/server/protocols
167167
include_bitcoin_server_protocols_HEADERS = \
168168
include/bitcoin/server/protocols/protocol.hpp \
169+
include/bitcoin/server/protocols/protocol_admin.hpp \
169170
include/bitcoin/server/protocols/protocol_bitcoind_rest.hpp \
170171
include/bitcoin/server/protocols/protocol_bitcoind_rpc.hpp \
171172
include/bitcoin/server/protocols/protocol_electrum.hpp \
@@ -176,7 +177,6 @@ include_bitcoin_server_protocols_HEADERS = \
176177
include/bitcoin/server/protocols/protocol_rpc.hpp \
177178
include/bitcoin/server/protocols/protocol_stratum_v1.hpp \
178179
include/bitcoin/server/protocols/protocol_stratum_v2.hpp \
179-
include/bitcoin/server/protocols/protocol_web.hpp \
180180
include/bitcoin/server/protocols/protocols.hpp
181181

182182
include_bitcoin_server_sessionsdir = ${includedir}/bitcoin/server/sessions

‎builds/cmake/CMakeLists.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,17 +339,17 @@ if (with-console)
339339
"../../console/main.cpp"
340340
"../../console/stack_trace.cpp"
341341
"../../console/stack_trace.hpp"
342+
"../../console/embedded/admin_css.cpp"
343+
"../../console/embedded/admin_font.cpp"
344+
"../../console/embedded/admin_html.cpp"
345+
"../../console/embedded/admin_icon.cpp"
346+
"../../console/embedded/amin_ecma.cpp"
342347
"../../console/embedded/embedded.hpp"
343348
"../../console/embedded/native_css.cpp"
344349
"../../console/embedded/native_ecma.cpp"
345350
"../../console/embedded/native_font.cpp"
346351
"../../console/embedded/native_html.cpp"
347-
"../../console/embedded/native_icon.cpp"
348-
"../../console/embedded/web_css.cpp"
349-
"../../console/embedded/web_ecma.cpp"
350-
"../../console/embedded/web_font.cpp"
351-
"../../console/embedded/web_html.cpp"
352-
"../../console/embedded/web_icon.cpp" )
352+
"../../console/embedded/native_icon.cpp" )
353353

354354
# bs project specific include directories.
355355
#------------------------------------------------------------------------------

‎builds/msvc/vs2022/bs/bs.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,16 @@
118118
<Import Project="$(ProjectDir)$(ProjectName).props" />
119119
</ImportGroup>
120120
<ItemGroup>
121+
<ClCompile Include="..\..\..\..\console\embedded\admin_css.cpp" />
122+
<ClCompile Include="..\..\..\..\console\embedded\admin_font.cpp" />
123+
<ClCompile Include="..\..\..\..\console\embedded\admin_html.cpp" />
124+
<ClCompile Include="..\..\..\..\console\embedded\admin_icon.cpp" />
125+
<ClCompile Include="..\..\..\..\console\embedded\amin_ecma.cpp" />
121126
<ClCompile Include="..\..\..\..\console\embedded\native_css.cpp" />
122127
<ClCompile Include="..\..\..\..\console\embedded\native_ecma.cpp" />
123128
<ClCompile Include="..\..\..\..\console\embedded\native_font.cpp" />
124129
<ClCompile Include="..\..\..\..\console\embedded\native_html.cpp" />
125130
<ClCompile Include="..\..\..\..\console\embedded\native_icon.cpp" />
126-
<ClCompile Include="..\..\..\..\console\embedded\web_css.cpp" />
127-
<ClCompile Include="..\..\..\..\console\embedded\web_ecma.cpp" />
128-
<ClCompile Include="..\..\..\..\console\embedded\web_font.cpp" />
129-
<ClCompile Include="..\..\..\..\console\embedded\web_html.cpp" />
130-
<ClCompile Include="..\..\..\..\console\embedded\web_icon.cpp" />
131131
<ClCompile Include="..\..\..\..\console\executor.cpp" />
132132
<ClCompile Include="..\..\..\..\console\executor_commands.cpp" />
133133
<ClCompile Include="..\..\..\..\console\executor_dumps.cpp" />

‎builds/msvc/vs2022/bs/bs.vcxproj.filters‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
</Filter>
1919
</ItemGroup>
2020
<ItemGroup>
21-
<ClCompile Include="..\..\..\..\console\embedded\native_css.cpp">
21+
<ClCompile Include="..\..\..\..\console\embedded\admin_css.cpp">
2222
<Filter>src\embedded</Filter>
2323
</ClCompile>
24-
<ClCompile Include="..\..\..\..\console\embedded\native_ecma.cpp">
24+
<ClCompile Include="..\..\..\..\console\embedded\admin_font.cpp">
2525
<Filter>src\embedded</Filter>
2626
</ClCompile>
27-
<ClCompile Include="..\..\..\..\console\embedded\native_font.cpp">
27+
<ClCompile Include="..\..\..\..\console\embedded\admin_html.cpp">
2828
<Filter>src\embedded</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\..\..\..\console\embedded\native_html.cpp">
30+
<ClCompile Include="..\..\..\..\console\embedded\admin_icon.cpp">
3131
<Filter>src\embedded</Filter>
3232
</ClCompile>
33-
<ClCompile Include="..\..\..\..\console\embedded\native_icon.cpp">
33+
<ClCompile Include="..\..\..\..\console\embedded\amin_ecma.cpp">
3434
<Filter>src\embedded</Filter>
3535
</ClCompile>
36-
<ClCompile Include="..\..\..\..\console\embedded\web_css.cpp">
36+
<ClCompile Include="..\..\..\..\console\embedded\native_css.cpp">
3737
<Filter>src\embedded</Filter>
3838
</ClCompile>
39-
<ClCompile Include="..\..\..\..\console\embedded\web_ecma.cpp">
39+
<ClCompile Include="..\..\..\..\console\embedded\native_ecma.cpp">
4040
<Filter>src\embedded</Filter>
4141
</ClCompile>
42-
<ClCompile Include="..\..\..\..\console\embedded\web_font.cpp">
42+
<ClCompile Include="..\..\..\..\console\embedded\native_font.cpp">
4343
<Filter>src\embedded</Filter>
4444
</ClCompile>
45-
<ClCompile Include="..\..\..\..\console\embedded\web_html.cpp">
45+
<ClCompile Include="..\..\..\..\console\embedded\native_html.cpp">
4646
<Filter>src\embedded</Filter>
4747
</ClCompile>
48-
<ClCompile Include="..\..\..\..\console\embedded\web_icon.cpp">
48+
<ClCompile Include="..\..\..\..\console\embedded\native_icon.cpp">
4949
<Filter>src\embedded</Filter>
5050
</ClCompile>
5151
<ClCompile Include="..\..\..\..\console\executor.cpp">

‎builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@
166166
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_target.hpp" />
167167
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\parsers.hpp" />
168168
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol.hpp" />
169+
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_admin.hpp" />
169170
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_bitcoind_rest.hpp" />
170171
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_bitcoind_rpc.hpp" />
171172
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_electrum.hpp" />
@@ -176,7 +177,6 @@
176177
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_rpc.hpp" />
177178
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v1.hpp" />
178179
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v2.hpp" />
179-
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_web.hpp" />
180180
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocols.hpp" />
181181
<ClInclude Include="..\..\..\..\include\bitcoin\server\server_node.hpp" />
182182
<ClInclude Include="..\..\..\..\include\bitcoin\server\sessions\session_handshake.hpp" />

‎builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj.filters‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@
182182
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol.hpp">
183183
<Filter>include\bitcoin\server\protocols</Filter>
184184
</ClInclude>
185+
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_admin.hpp">
186+
<Filter>include\bitcoin\server\protocols</Filter>
187+
</ClInclude>
185188
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_bitcoind_rest.hpp">
186189
<Filter>include\bitcoin\server\protocols</Filter>
187190
</ClInclude>
@@ -212,9 +215,6 @@
212215
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_stratum_v2.hpp">
213216
<Filter>include\bitcoin\server\protocols</Filter>
214217
</ClInclude>
215-
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_web.hpp">
216-
<Filter>include\bitcoin\server\protocols</Filter>
217-
</ClInclude>
218218
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocols.hpp">
219219
<Filter>include\bitcoin\server\protocols</Filter>
220220
</ClInclude>

console/embedded/web_css.cpp renamed to console/embedded/admin_css.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace libbitcoin {
2222
namespace server {
2323

2424
// Simple test css for embedded page, links in font.
25-
DEFINE_EMBEDDED_PAGE(web_pages, char, css,
25+
DEFINE_EMBEDDED_PAGE(admin_pages, char, css,
2626
R"(@font-face
2727
{
2828
font-family: 'Boston';

console/embedded/web_font.cpp renamed to console/embedded/admin_font.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace libbitcoin {
2222
namespace server {
2323

24-
DEFINE_EMBEDDED_PAGE(web_pages, uint8_t, font,
24+
DEFINE_EMBEDDED_PAGE(admin_pages, uint8_t, font,
2525
{
2626
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2727
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

console/embedded/web_html.cpp renamed to console/embedded/admin_html.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace libbitcoin {
2222
namespace server {
2323

2424
// Simple test html for embedded page, links in css and page icon.
25-
DEFINE_EMBEDDED_PAGE(web_pages, char, html,
25+
DEFINE_EMBEDDED_PAGE(admin_pages, char, html,
2626
R"(<html>
2727
<head>
2828
<title>Libbitcoin Server</title>

console/embedded/web_icon.cpp renamed to console/embedded/admin_icon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
namespace libbitcoin {
2222
namespace server {
2323

24-
DEFINE_EMBEDDED_PAGE(web_pages, uint8_t, icon,
24+
DEFINE_EMBEDDED_PAGE(admin_pages, uint8_t, icon,
2525
{
2626
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
2727
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

0 commit comments

Comments
 (0)