moved Console/ClientFeature to arangosh

arangosh/Benchmark/BenchFeature.cpp

@@ -25,13 +25,13 @@
 #include <iostream>
 
 #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"
 

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"

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;

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

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"

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;

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"
 

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;

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 {

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;

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"
 

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;

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;

arangosh/Shell/V8ClientConnection.cpp

@@ -27,14 +27,14 @@
 #include <iostream>
 #include <v8.h>
 
-#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"

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"

arangosh/Shell/V8ShellFeature.h

@@ -28,7 +28,7 @@
 #include <v8.h>
 #include <libplatform/libplatform.h>
 
-#include "ApplicationFeatures/ConsoleFeature.h"
+#include "Shell/ConsoleFeature.h"
 #include "Shell/ShellFeature.h"
 
 namespace arangodb {

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"

arangosh/V8Client/ArangoClientHelper.cpp

@@ -25,9 +25,9 @@
 #include <velocypack/Iterator.h>
 #include <velocypack/velocypack-aliases.h>
 
-#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"

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