Moved public API includes under include/trrep

CMakeLists.txt

@@ -3,13 +3,14 @@
 #
 
 cmake_minimum_required (VERSION 2.8)
-project (wsrep-cpp)
+project (trrep)
 include(CheckIncludeFile)
 include(CTest)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Weffc++ -Woverloaded-virtual -Wno-non-virtual-dtor -g")
 
 check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP)
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep")
 link_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep")
 
@@ -51,3 +52,5 @@ if (WITH_DOCUMENTATION)
 endif()
 
 add_subdirectory(src)
+add_subdirectory(wsrep)
+

include/trrep/provider.hpp

@@ -84,6 +84,13 @@ namespace trrep
         virtual int sst_received(const wsrep_gtid_t&, int) = 0;
 
         virtual std::vector<status_variable> status() const = 0;
+
+        /*!
+         * Return a pointer to native handle.
+         *
+         * \todo This should be eventually deprecated.
+         */
+        // virtual struct wsrep* native() = 0;
         // Factory method
         static provider* make_provider(const std::string& provider);
     };

src/client_context.cpp

@@ -2,8 +2,8 @@
 // Copyright (C) 2018 Codership Oy <info@codership.com>
 //
 
-#include "client_context.hpp"
-#include "compiler.hpp"
+#include "trrep/client_context.hpp"
+#include "trrep/compiler.hpp"
 
 #include <sstream>
 #include <iostream>

src/dbms_simulator.cpp

@@ -9,15 +9,15 @@
 //
 
 
-#include "server_context.hpp"
-#include "client_context.hpp"
-#include "transaction_context.hpp"
-#include "key.hpp"
-#include "data.hpp"
-#include "provider.hpp"
-#include "condition_variable.hpp"
-#include "view.hpp"
-#include "logger.hpp"
+#include "trrep/server_context.hpp"
+#include "trrep/client_context.hpp"
+#include "trrep/transaction_context.hpp"
+#include "trrep/key.hpp"
+#include "trrep/data.hpp"
+#include "trrep/provider.hpp"
+#include "trrep/condition_variable.hpp"
+#include "trrep/view.hpp"
+#include "trrep/logger.hpp"
 
 #include <boost/program_options.hpp>
 #include <boost/filesystem.hpp>

src/logger.cpp

@@ -1,5 +1,5 @@
 
-#include "logger.hpp"
+#include "trrep/logger.hpp"
 
 #include <iostream>
 

src/mock_client_context.cpp

@@ -2,7 +2,7 @@
 // Copyright (C) 2018 Codership Oy <info@codership.com>
 //
 
-#include "transaction_context.hpp"
+#include "trrep/transaction_context.hpp"
 #include "mock_client_context.hpp"
 
 

src/mock_client_context.hpp

@@ -5,9 +5,9 @@
 #ifndef TRREP_MOCK_CLIENT_CONTEXT_HPP
 #define TRREP_MOCK_CLIENT_CONTEXT_HPP
 
-#include "client_context.hpp"
-#include "mutex.hpp"
-#include "compiler.hpp"
+#include "trrep/client_context.hpp"
+#include "trrep/mutex.hpp"
+#include "trrep/compiler.hpp"
 
 namespace trrep
 {

src/mock_provider.hpp

@@ -5,7 +5,7 @@
 #ifndef TRREP_MOCK_PROVIDER_HPP
 #define TRREP_MOCK_PROVIDER_HPP
 
-#include "provider.hpp"
+#include "trrep/provider.hpp"
 
 #include <cstring>
 #include <map>

src/mock_server_context.hpp

@@ -5,11 +5,11 @@
 #ifndef TRREP_MOCK_SERVER_CONTEXT_HPP
 #define TRREP_MOCK_SERVER_CONTEXT_HPP
 
-#include "server_context.hpp"
+#include "trrep/server_context.hpp"
 #include "mock_client_context.hpp"
 #include "mock_provider.hpp"
 
-#include "compiler.hpp"
+#include "trrep/compiler.hpp"
 
 namespace trrep
 {

src/mock_utils.cpp

@@ -3,7 +3,7 @@
 //
 
 #include "mock_utils.hpp"
-#include "client_context.hpp"
+#include "trrep/client_context.hpp"
 #include "mock_server_context.hpp"
 
 

src/mock_utils.hpp

@@ -11,7 +11,7 @@ namespace trrep
     class mock_server_context;
 }
 
-#include "transaction_context.hpp"
+#include "trrep/transaction_context.hpp"
 
 //
 // Utility functions

src/provider.cpp

@@ -2,7 +2,7 @@
 // Copyright (C) 2018 Codership Oy <info@codership.com>
 //
 
-#include "provider.hpp"
+#include "trrep/provider.hpp"
 
 #include "provider_impl.hpp"
 

src/server_context.cpp

@@ -2,12 +2,12 @@
 // Copyright (C) 2018 Codership Oy <info@codership.com>
 //
 
-#include "server_context.hpp"
-#include "client_context.hpp"
-#include "transaction_context.hpp"
-#include "view.hpp"
-#include "logger.hpp"
-#include "compiler.hpp"
+#include "trrep/server_context.hpp"
+#include "trrep/client_context.hpp"
+#include "trrep/transaction_context.hpp"
+#include "trrep/view.hpp"
+#include "trrep/logger.hpp"
+#include "trrep/compiler.hpp"
 
 // Todo: refactor into provider factory
 #include "mock_provider.hpp"

src/transaction_context.cpp

@@ -2,13 +2,13 @@
 // Copyright (C) 2018 Codership Oy <info@codership.com>
 //
 
-#include "transaction_context.hpp"
-#include "client_context.hpp"
-#include "server_context.hpp"
-#include "key.hpp"
-#include "data.hpp"
-#include "logger.hpp"
-#include "compiler.hpp"
+#include "trrep/transaction_context.hpp"
+#include "trrep/client_context.hpp"
+#include "trrep/server_context.hpp"
+#include "trrep/key.hpp"
+#include "trrep/data.hpp"
+#include "trrep/logger.hpp"
+#include "trrep/compiler.hpp"
 
 #include <sstream>
 #include <memory>

src/transaction_context_test.cpp

@@ -2,10 +2,11 @@
 // Copyright (C) 2018 Codership Oy <info@codership.com>
 //
 
-#include "transaction_context.hpp"
+#include "trrep/transaction_context.hpp"
+#include "trrep/provider.hpp"
+
 #include "mock_client_context.hpp"
 #include "mock_server_context.hpp"
-#include "provider.hpp"
 
 #include "mock_utils.hpp"
 

src/wsrep_provider_v26.cpp

@@ -3,7 +3,7 @@
 //
 
 #include "wsrep_provider_v26.hpp"
-#include "exception.hpp"
+#include "trrep/exception.hpp"
 
 #include <wsrep_api.h>
 

src/wsrep_provider_v26.hpp

@@ -5,7 +5,7 @@
 #ifndef TRREP_WSREP_PROVIDER_V26_HPP
 #define TRREP_WSREP_PROVIDER_V26_HPP
 
-#include "provider.hpp"
+#include "trrep/provider.hpp"
 
 #include <wsrep_api.h>