cleanup

RestServer/ActionDispatcherThread.cpp

@@ -27,7 +27,7 @@
 
 #include "ActionDispatcherThread.h"
 
-#include <Basics/Logger.h>
+#include <Logger/Logger.h>
 #include <BasicsC/files.h>
 #include <BasicsC/strings.h>
 #include <Rest/Initialise.h>

RestServer/ActionDispatcherThread.h

@@ -25,8 +25,8 @@
 /// @author Copyright 2011, triagens GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER2_H
-#define TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER2_H 1
+#ifndef TRIAGENS_AVOCADO_DB_REST_SERVER_ACTION_DISPATCHER_THREAD_H
+#define TRIAGENS_AVOCADO_DB_REST_SERVER_ACTION_DISPATCHER_THREAD_H 1
 
 #include "Dispatcher/DispatcherThread.h"
 
@@ -256,5 +256,5 @@ namespace triagens {
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\)"
+// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)"
 // End:

RestServer/AvocadoHttpServer.h

@@ -25,8 +25,8 @@
 /// @author Copyright 2011, triagens GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER3_H
-#define TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER3_H 1
+#ifndef TRIAGENS_AVOCADO_DB_REST_SERVER_AVOCADO_HTTP_SERVER_H
+#define TRIAGENS_AVOCADO_DB_REST_SERVER_AVOCADO_HTTP_SERVER_H 1
 
 #include "HttpServer/HttpServerImpl.h"
 
@@ -80,5 +80,5 @@ namespace triagens {
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\)"
+// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)"
 // End:

RestServer/AvocadoServer.cpp

@@ -31,31 +31,26 @@
 
 #include "build.h"
 
-#include <Basics/Logger.h>
-#include <Basics/ProgramOptions.h>
-#include <Basics/ProgramOptionsDescription.h>
-#include <BasicsC/files.h>
-#include <BasicsC/init.h>
-#include <BasicsC/logging.h>
-#include <Basics/safe_cast.h>
-#include <BasicsC/strings.h>
-
-#include <Rest/ApplicationServerDispatcher.h>
-#include <Rest/HttpHandlerFactory.h>
-#include <Rest/Initialise.h>
-
+#include "Admin/RestHandlerCreator.h"
+#include "Basics/ProgramOptions.h"
+#include "Basics/ProgramOptionsDescription.h"
+#include "Basics/safe_cast.h"
+#include "BasicsC/files.h"
+#include "BasicsC/init.h"
+#include "BasicsC/logging.h"
+#include "BasicsC/strings.h"
+#include "Dispatcher/ApplicationServerDispatcher.h"
 #include "Dispatcher/DispatcherImpl.h"
-
-#include <Admin/RestHandlerCreator.h>
-
+#include "HttpServer/HttpHandlerFactory.h"
+#include "Logger/Logger.h"
+#include "Rest/Initialise.h"
 #include "RestHandler/RestActionHandler.h"
 #include "RestHandler/RestDocumentHandler.h"
 #include "RestHandler/RestSystemActionHandler.h"
-
 #include "RestServer/ActionDispatcherThread.h"
-#include "RestServer/SystemActionDispatcherThread.h"
 #include "RestServer/AvocadoHttpServer.h"
 #include "RestServer/JSLoader.h"
+#include "RestServer/SystemActionDispatcherThread.h"
 
 #include "V8/v8-actions.h"
 #include "V8/v8-globals.h"
@@ -69,11 +64,11 @@ using namespace triagens::rest;
 using namespace triagens::admin;
 using namespace triagens::avocado;
 
-#include "RestServer/js-actions.h"
-#include "RestServer/js-graph.h"
-#include "RestServer/js-json.h"
-#include "RestServer/js-modules.h"
-#include "RestServer/js-shell.h"
+#include "js/js-actions.h"
+#include "js/js-graph.h"
+#include "js/js-json.h"
+#include "js/js-modules.h"
+#include "js/js-shell.h"
 
 // -----------------------------------------------------------------------------
 // --SECTION--                                                 private variables

RestServer/AvocadoServer.h

@@ -25,13 +25,13 @@
 /// @author Copyright 2011, triagens GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER45_H
-#define TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER45_H 1
+#ifndef TRIAGENS_AVOCADO_DB_REST_SERVER_AVOCADO_SERVER_H
+#define TRIAGENS_AVOCADO_DB_REST_SERVER_AVOCADO_SERVER_H 1
 
 #include <Rest/AnyServer.h>
 
 #include <Admin/ApplicationAdminServer.h>
-#include <Rest/ApplicationHttpServer.h>
+#include <HttpServer/ApplicationHttpServer.h>
 #include <VocBase/vocbase.h>
 
 // -----------------------------------------------------------------------------
@@ -296,5 +296,5 @@ namespace triagens {
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\)"
+// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)"
 // End:

RestServer/JSLoader.cpp

@@ -28,7 +28,7 @@
 #include "JSLoader.h"
 
 #include <Basics/MutexLocker.h>
-#include <Basics/Logger.h>
+#include <Logger/Logger.h>
 #include <BasicsC/files.h>
 #include <BasicsC/strings.h>
 

RestServer/JSLoader.h

@@ -25,8 +25,8 @@
 /// @author Copyright 2011, triagens GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER37_H
-#define TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER37_H 1
+#ifndef TRIAGENS_AVOCADO_DB_REST_SERVER_JSLOADER_H
+#define TRIAGENS_AVOCADO_DB_REST_SERVER_JSLOADER_H 1
 
 #include <Basics/Common.h>
 
@@ -162,5 +162,5 @@ namespace triagens {
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\)"
+// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)"
 // End:

RestServer/SystemActionDispatcherThread.h

@@ -25,8 +25,8 @@
 /// @author Copyright 2011, triagens GmbH, Cologne, Germany
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifndef TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER32_H
-#define TRIAGENS_AVOCADODB_RESTHANDLER_REST_ACTION_HANDLER32_H 1
+#ifndef TRIAGENS_AVOCADO_DB_REST_SERVER_SYSTEM_ACTION_DISPATCHER_THREAD_H
+#define TRIAGENS_AVOCADO_DB_REST_SERVER_SYSTEM_ACTION_DISPATCHER_THREAD_H 1
 
 #include "RestServer/ActionDispatcherThread.h"
 
@@ -124,5 +124,5 @@ namespace triagens {
 
 // Local Variables:
 // mode: outline-minor
-// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\)"
+// outline-regexp: "^\\(/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|// --SECTION--\\|/// @\\}\\)"
 // End: