From 54300ed30c94cedfe9e352b3e64cf243f1f659ea Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Wed, 1 Jun 2016 09:27:29 +0200 Subject: [PATCH] moved Console/ClientFeature to arangosh --- arangosh/Benchmark/BenchFeature.cpp | 2 +- arangosh/Benchmark/BenchmarkThread.h | 3 ++- arangosh/Benchmark/arangobench.cpp | 2 +- arangosh/CMakeLists.txt | 10 ++++++++++ arangosh/Dump/DumpFeature.cpp | 3 ++- arangosh/Dump/arangodump.cpp | 2 +- arangosh/Import/ImportFeature.cpp | 4 ++-- arangosh/Import/arangoimp.cpp | 2 +- arangosh/Restore/RestoreFeature.h | 2 +- arangosh/Restore/arangorestore.cpp | 2 +- .../Shell}/ClientFeature.cpp | 4 ++-- .../Shell}/ClientFeature.h | 0 .../Shell}/ConsoleFeature.cpp | 4 ++-- .../Shell}/ConsoleFeature.h | 0 arangosh/Shell/ShellFeature.cpp | 2 +- arangosh/Shell/V8ClientConnection.cpp | 4 ++-- arangosh/Shell/V8ShellFeature.cpp | 2 +- arangosh/Shell/V8ShellFeature.h | 2 +- arangosh/Shell/arangosh.cpp | 4 ++-- arangosh/V8Client/ArangoClientHelper.cpp | 2 +- lib/CMakeLists.txt | 2 -- 21 files changed, 34 insertions(+), 24 deletions(-) rename {lib/ApplicationFeatures => arangosh/Shell}/ClientFeature.cpp (98%) rename {lib/ApplicationFeatures => arangosh/Shell}/ClientFeature.h (100%) rename {lib/ApplicationFeatures => arangosh/Shell}/ConsoleFeature.cpp (99%) rename {lib/ApplicationFeatures => arangosh/Shell}/ConsoleFeature.h (100%) diff --git a/arangosh/Benchmark/BenchFeature.cpp b/arangosh/Benchmark/BenchFeature.cpp index 5d9619eec8..84891e10bf 100644 --- a/arangosh/Benchmark/BenchFeature.cpp +++ b/arangosh/Benchmark/BenchFeature.cpp @@ -25,13 +25,13 @@ #include #include "ApplicationFeatures/ApplicationServer.h" -#include "ApplicationFeatures/ClientFeature.h" #include "Basics/StringUtils.h" #include "Benchmark/BenchmarkCounter.h" #include "Benchmark/BenchmarkOperation.h" #include "Benchmark/BenchmarkThread.h" #include "ProgramOptions/ProgramOptions.h" #include "ProgramOptions/Section.h" +#include "Shell/ClientFeature.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" diff --git a/arangosh/Benchmark/BenchmarkThread.h b/arangosh/Benchmark/BenchmarkThread.h index 85677d29cd..1dcbc661ca 100644 --- a/arangosh/Benchmark/BenchmarkThread.h +++ b/arangosh/Benchmark/BenchmarkThread.h @@ -29,12 +29,13 @@ #include "Basics/ConditionLocker.h" #include "Basics/ConditionVariable.h" #include "Basics/Exceptions.h" -#include "Logger/Logger.h" #include "Basics/Thread.h" #include "Basics/hashes.h" #include "Benchmark/BenchmarkCounter.h" #include "Benchmark/BenchmarkOperation.h" +#include "Logger/Logger.h" #include "Rest/HttpResponse.h" +#include "Shell/ClientFeature.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" diff --git a/arangosh/Benchmark/arangobench.cpp b/arangosh/Benchmark/arangobench.cpp index b8d11881f3..ee72e941b5 100644 --- a/arangosh/Benchmark/arangobench.cpp +++ b/arangosh/Benchmark/arangobench.cpp @@ -23,7 +23,6 @@ #include "Basics/Common.h" -#include "ApplicationFeatures/ClientFeature.h" #include "ApplicationFeatures/ConfigFeature.h" #include "ApplicationFeatures/ShutdownFeature.h" #include "ApplicationFeatures/TempFeature.h" @@ -33,6 +32,7 @@ #include "Logger/LoggerFeature.h" #include "ProgramOptions/ProgramOptions.h" #include "Random/RandomFeature.h" +#include "Shell/ClientFeature.h" #include "Ssl/SslFeature.h" using namespace arangodb; diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt index 53bae1fe8c..73046b3b0b 100644 --- a/arangosh/CMakeLists.txt +++ b/arangosh/CMakeLists.txt @@ -25,6 +25,8 @@ add_executable(${BIN_ARANGOBENCH} ${PROJECT_SOURCE_DIR}/lib/Basics/WorkMonitorDummy.cpp Benchmark/BenchFeature.cpp Benchmark/arangobench.cpp + Shell/ClientFeature.cpp + Shell/ConsoleFeature.cpp ) target_link_libraries(${BIN_ARANGOBENCH} @@ -67,6 +69,8 @@ add_executable(${BIN_ARANGODUMP} ${PROJECT_SOURCE_DIR}/lib/Basics/WorkMonitorDummy.cpp Dump/DumpFeature.cpp Dump/arangodump.cpp + Shell/ClientFeature.cpp + Shell/ConsoleFeature.cpp V8Client/ArangoClientHelper.cpp ) @@ -111,6 +115,8 @@ add_executable(${BIN_ARANGOIMP} Import/ImportFeature.cpp Import/ImportHelper.cpp Import/arangoimp.cpp + Shell/ClientFeature.cpp + Shell/ConsoleFeature.cpp V8Client/ArangoClientHelper.cpp ) @@ -154,6 +160,8 @@ add_executable(${BIN_ARANGORESTORE} ${PROJECT_SOURCE_DIR}/lib/Basics/WorkMonitorDummy.cpp Restore/RestoreFeature.cpp Restore/arangorestore.cpp + Shell/ClientFeature.cpp + Shell/ConsoleFeature.cpp V8Client/ArangoClientHelper.cpp ) @@ -196,6 +204,8 @@ add_executable(${BIN_ARANGOSH} ${ProductVersionFiles_arangosh} ${PROJECT_SOURCE_DIR}/lib/Basics/WorkMonitorDummy.cpp Import/ImportHelper.cpp + Shell/ClientFeature.cpp + Shell/ConsoleFeature.cpp Shell/ShellFeature.cpp Shell/V8ClientConnection.cpp Shell/V8ShellFeature.cpp diff --git a/arangosh/Dump/DumpFeature.cpp b/arangosh/Dump/DumpFeature.cpp index 7da71fb663..4b432d3742 100644 --- a/arangosh/Dump/DumpFeature.cpp +++ b/arangosh/Dump/DumpFeature.cpp @@ -21,8 +21,8 @@ //////////////////////////////////////////////////////////////////////////////// #include "DumpFeature.h" + #include "ApplicationFeatures/ApplicationServer.h" -#include "ApplicationFeatures/ClientFeature.h" #include "Basics/FileUtils.h" #include "Basics/StringUtils.h" #include "Basics/VelocyPackHelper.h" @@ -32,6 +32,7 @@ #include "ProgramOptions/ProgramOptions.h" #include "Rest/HttpResponse.h" #include "Rest/Version.h" +#include "Shell/ClientFeature.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" diff --git a/arangosh/Dump/arangodump.cpp b/arangosh/Dump/arangodump.cpp index ebc19ac778..ca24cc662a 100644 --- a/arangosh/Dump/arangodump.cpp +++ b/arangosh/Dump/arangodump.cpp @@ -23,7 +23,6 @@ #include "Basics/Common.h" -#include "ApplicationFeatures/ClientFeature.h" #include "ApplicationFeatures/ConfigFeature.h" #include "ApplicationFeatures/ShutdownFeature.h" #include "ApplicationFeatures/VersionFeature.h" @@ -32,6 +31,7 @@ #include "Logger/LoggerFeature.h" #include "ProgramOptions/ProgramOptions.h" #include "Random/RandomFeature.h" +#include "Shell/ClientFeature.h" #include "Ssl/SslFeature.h" using namespace arangodb; diff --git a/arangosh/Import/ImportFeature.cpp b/arangosh/Import/ImportFeature.cpp index ae77e4a92d..5f7758686d 100644 --- a/arangosh/Import/ImportFeature.cpp +++ b/arangosh/Import/ImportFeature.cpp @@ -23,12 +23,12 @@ #include "ImportFeature.h" #include "ApplicationFeatures/ApplicationServer.h" -#include "ApplicationFeatures/ClientFeature.h" -#include "Basics/StringUtils.h" #include "Basics/FileUtils.h" +#include "Basics/StringUtils.h" #include "Import/ImportHelper.h" #include "Logger/Logger.h" #include "ProgramOptions/ProgramOptions.h" +#include "Shell/ClientFeature.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/SimpleHttpClient.h" diff --git a/arangosh/Import/arangoimp.cpp b/arangosh/Import/arangoimp.cpp index fa8ce71140..fdd5451c45 100644 --- a/arangosh/Import/arangoimp.cpp +++ b/arangosh/Import/arangoimp.cpp @@ -23,7 +23,6 @@ #include "Basics/Common.h" -#include "ApplicationFeatures/ClientFeature.h" #include "ApplicationFeatures/ConfigFeature.h" #include "ApplicationFeatures/ShutdownFeature.h" #include "ApplicationFeatures/TempFeature.h" @@ -33,6 +32,7 @@ #include "Logger/LoggerFeature.h" #include "ProgramOptions/ProgramOptions.h" #include "Random/RandomFeature.h" +#include "Shell/ClientFeature.h" #include "Ssl/SslFeature.h" using namespace arangodb; diff --git a/arangosh/Restore/RestoreFeature.h b/arangosh/Restore/RestoreFeature.h index 8d1c734352..3064de865b 100644 --- a/arangosh/Restore/RestoreFeature.h +++ b/arangosh/Restore/RestoreFeature.h @@ -25,8 +25,8 @@ #include "ApplicationFeatures/ApplicationFeature.h" -#include "ApplicationFeatures/ClientFeature.h" #include "Basics/VelocyPackHelper.h" +#include "Shell/ClientFeature.h" #include "V8Client/ArangoClientHelper.h" namespace arangodb { diff --git a/arangosh/Restore/arangorestore.cpp b/arangosh/Restore/arangorestore.cpp index 564a60178d..116fa539da 100644 --- a/arangosh/Restore/arangorestore.cpp +++ b/arangosh/Restore/arangorestore.cpp @@ -23,7 +23,6 @@ #include "Basics/Common.h" -#include "ApplicationFeatures/ClientFeature.h" #include "ApplicationFeatures/ConfigFeature.h" #include "ApplicationFeatures/ShutdownFeature.h" #include "ApplicationFeatures/TempFeature.h" @@ -33,6 +32,7 @@ #include "ProgramOptions/ProgramOptions.h" #include "Random/RandomFeature.h" #include "Restore/RestoreFeature.h" +#include "Shell/ClientFeature.h" using namespace arangodb; using namespace arangodb::application_features; diff --git a/lib/ApplicationFeatures/ClientFeature.cpp b/arangosh/Shell/ClientFeature.cpp similarity index 98% rename from lib/ApplicationFeatures/ClientFeature.cpp rename to arangosh/Shell/ClientFeature.cpp index 23de94c229..fc25b45f54 100644 --- a/lib/ApplicationFeatures/ClientFeature.cpp +++ b/arangosh/Shell/ClientFeature.cpp @@ -20,14 +20,14 @@ /// @author Dr. Frank Celler //////////////////////////////////////////////////////////////////////////////// -#include "ApplicationFeatures/ClientFeature.h" +#include "ClientFeature.h" #include "ApplicationFeatures/ApplicationServer.h" -#include "ApplicationFeatures/ConsoleFeature.h" #include "Endpoint/Endpoint.h" #include "Logger/Logger.h" #include "ProgramOptions/ProgramOptions.h" #include "ProgramOptions/Section.h" +#include "Shell/ConsoleFeature.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/SimpleHttpClient.h" diff --git a/lib/ApplicationFeatures/ClientFeature.h b/arangosh/Shell/ClientFeature.h similarity index 100% rename from lib/ApplicationFeatures/ClientFeature.h rename to arangosh/Shell/ClientFeature.h diff --git a/lib/ApplicationFeatures/ConsoleFeature.cpp b/arangosh/Shell/ConsoleFeature.cpp similarity index 99% rename from lib/ApplicationFeatures/ConsoleFeature.cpp rename to arangosh/Shell/ConsoleFeature.cpp index 9ce516cee9..25298b11f6 100644 --- a/lib/ApplicationFeatures/ConsoleFeature.cpp +++ b/arangosh/Shell/ConsoleFeature.cpp @@ -20,9 +20,8 @@ /// @author Dr. Frank Celler //////////////////////////////////////////////////////////////////////////////// -#include "ApplicationFeatures/ConsoleFeature.h" +#include "ConsoleFeature.h" -#include "ApplicationFeatures/ClientFeature.h" #include "Basics/StringUtils.h" #include "Basics/messages.h" #include "Basics/shell-colors.h" @@ -30,6 +29,7 @@ #include "Logger/Logger.h" #include "ProgramOptions/ProgramOptions.h" #include "ProgramOptions/Section.h" +#include "Shell/ClientFeature.h" using namespace arangodb; using namespace arangodb::basics; diff --git a/lib/ApplicationFeatures/ConsoleFeature.h b/arangosh/Shell/ConsoleFeature.h similarity index 100% rename from lib/ApplicationFeatures/ConsoleFeature.h rename to arangosh/Shell/ConsoleFeature.h diff --git a/arangosh/Shell/ShellFeature.cpp b/arangosh/Shell/ShellFeature.cpp index 50bc0fcb24..727c996bd7 100644 --- a/arangosh/Shell/ShellFeature.cpp +++ b/arangosh/Shell/ShellFeature.cpp @@ -23,9 +23,9 @@ #include "ShellFeature.h" #include "ApplicationFeatures/ApplicationServer.h" -#include "ApplicationFeatures/ClientFeature.h" #include "Logger/Logger.h" #include "ProgramOptions/ProgramOptions.h" +#include "Shell/ClientFeature.h" #include "Shell/V8ShellFeature.h" using namespace arangodb; diff --git a/arangosh/Shell/V8ClientConnection.cpp b/arangosh/Shell/V8ClientConnection.cpp index a20f497c2a..d03fd6b319 100644 --- a/arangosh/Shell/V8ClientConnection.cpp +++ b/arangosh/Shell/V8ClientConnection.cpp @@ -27,14 +27,14 @@ #include #include -#include "ApplicationFeatures/ClientFeature.h" -#include "ApplicationFeatures/ConsoleFeature.h" #include "Basics/FileUtils.h" #include "Basics/StringUtils.h" #include "Basics/VelocyPackHelper.h" #include "Import/ImportHelper.h" #include "Rest/HttpResponse.h" #include "Rest/Version.h" +#include "Shell/ClientFeature.h" +#include "Shell/ConsoleFeature.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" diff --git a/arangosh/Shell/V8ShellFeature.cpp b/arangosh/Shell/V8ShellFeature.cpp index 0df6d11622..edc33e8a66 100644 --- a/arangosh/Shell/V8ShellFeature.cpp +++ b/arangosh/Shell/V8ShellFeature.cpp @@ -22,7 +22,6 @@ #include "V8ShellFeature.h" -#include "ApplicationFeatures/ClientFeature.h" #include "ApplicationFeatures/V8PlatformFeature.h" #include "Basics/FileUtils.h" #include "Basics/StringUtils.h" @@ -33,6 +32,7 @@ #include "ProgramOptions/Section.h" #include "Rest/HttpResponse.h" #include "Rest/Version.h" +#include "Shell/ClientFeature.h" #include "Shell/V8ClientConnection.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "V8/JSLoader.h" diff --git a/arangosh/Shell/V8ShellFeature.h b/arangosh/Shell/V8ShellFeature.h index b1dd19d99b..06822d2d41 100644 --- a/arangosh/Shell/V8ShellFeature.h +++ b/arangosh/Shell/V8ShellFeature.h @@ -28,7 +28,7 @@ #include #include -#include "ApplicationFeatures/ConsoleFeature.h" +#include "Shell/ConsoleFeature.h" #include "Shell/ShellFeature.h" namespace arangodb { diff --git a/arangosh/Shell/arangosh.cpp b/arangosh/Shell/arangosh.cpp index 127d415aa8..da37f8b301 100644 --- a/arangosh/Shell/arangosh.cpp +++ b/arangosh/Shell/arangosh.cpp @@ -23,9 +23,7 @@ #include "Basics/Common.h" -#include "ApplicationFeatures/ClientFeature.h" #include "ApplicationFeatures/ConfigFeature.h" -#include "ApplicationFeatures/ConsoleFeature.h" #include "ApplicationFeatures/LanguageFeature.h" #include "ApplicationFeatures/ShutdownFeature.h" #include "ApplicationFeatures/TempFeature.h" @@ -35,6 +33,8 @@ #include "Logger/LoggerFeature.h" #include "ProgramOptions/ProgramOptions.h" #include "Random/RandomFeature.h" +#include "Shell/ClientFeature.h" +#include "Shell/ConsoleFeature.h" #include "Shell/ShellFeature.h" #include "Shell/V8ShellFeature.h" #include "Ssl/SslFeature.h" diff --git a/arangosh/V8Client/ArangoClientHelper.cpp b/arangosh/V8Client/ArangoClientHelper.cpp index fe80b0704b..bb32121dd3 100644 --- a/arangosh/V8Client/ArangoClientHelper.cpp +++ b/arangosh/V8Client/ArangoClientHelper.cpp @@ -25,9 +25,9 @@ #include #include -#include "ApplicationFeatures/ClientFeature.h" #include "Basics/VelocyPackHelper.h" #include "Rest/HttpResponse.h" +#include "Shell/ClientFeature.h" #include "SimpleHttpClient/GeneralClientConnection.h" #include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpResult.h" diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 5a933fc277..cc0d9d24e5 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -119,9 +119,7 @@ add_library(${LIB_ARANGO} STATIC ${LIB_ASM_SOURCES} ApplicationFeatures/ApplicationFeature.cpp ApplicationFeatures/ApplicationServer.cpp - ApplicationFeatures/ClientFeature.cpp ApplicationFeatures/ConfigFeature.cpp - ApplicationFeatures/ConsoleFeature.cpp ApplicationFeatures/LanguageFeature.cpp ApplicationFeatures/NonceFeature.cpp ApplicationFeatures/PrivilegeFeature.cpp