From 4b4cafc21dd55252e35af3b15fcf23a952d3a5e5 Mon Sep 17 00:00:00 2001 From: lganzzzo Date: Wed, 28 Mar 2018 17:38:27 +0300 Subject: [PATCH] path changes oatpp-lib --> oatpp --- encoding/src/Hex.hpp | 6 +++--- encoding/src/Unicode.hpp | 2 +- encoding/test/UnicodeTest.hpp | 2 +- network/src/AsyncConnection.hpp | 6 +++--- network/src/Connection.hpp | 12 ++++++------ network/src/ConnectionProvider.hpp | 2 +- .../src/client/SimpleTCPConnectionProvider.cpp | 4 ++-- .../src/client/SimpleTCPConnectionProvider.hpp | 4 ++-- network/src/server/ConnectionHandler.hpp | 4 ++-- network/src/server/Server.cpp | 2 +- network/src/server/Server.hpp | 12 ++++++------ .../src/server/SimpleTCPConnectionProvider.cpp | 4 ++-- .../src/server/SimpleTCPConnectionProvider.hpp | 6 +++--- parser/src/json/Utils.cpp | 4 ++-- parser/src/json/Utils.hpp | 4 ++-- parser/src/json/mapping/Deserializer.cpp | 2 +- parser/src/json/mapping/Deserializer.hpp | 14 +++++++------- parser/src/json/mapping/ObjectMapper.hpp | 2 +- parser/src/json/mapping/Serializer.hpp | 16 ++++++++-------- parser/test/json/mapping/DTOMapperPerfTest.cpp | 6 +++--- parser/test/json/mapping/DTOMapperPerfTest.hpp | 2 +- parser/test/json/mapping/DTOMapperTest.cpp | 8 ++++---- parser/test/json/mapping/DTOMapperTest.hpp | 2 +- parser/test/json/mapping/DeserializerTest.cpp | 2 +- parser/test/json/mapping/DeserializerTest.hpp | 2 +- web/src/client/ApiClient.hpp | 16 ++++++++-------- web/src/client/HttpRequestExecutor.cpp | 6 +++--- web/src/client/HttpRequestExecutor.hpp | 2 +- .../client/macro/zzz_macro_define_ApiClient_.hpp | 4 ++-- web/src/protocol/http/Http.cpp | 2 +- web/src/protocol/http/Http.hpp | 10 +++++----- web/src/protocol/http/incoming/BodyDecoder.cpp | 4 ++-- web/src/protocol/http/incoming/BodyDecoder.hpp | 2 +- web/src/protocol/http/outgoing/Body.hpp | 6 +++--- web/src/protocol/http/outgoing/BufferBody.hpp | 2 +- .../protocol/http/outgoing/ChunkedBufferBody.hpp | 4 ++-- web/src/protocol/http/outgoing/DtoBody.hpp | 4 ++-- .../protocol/http/outgoing/ResponseFactory.hpp | 6 +++--- web/src/server/AsyncHttpConnectionHandler.cpp | 4 ++-- web/src/server/AsyncHttpConnectionHandler.hpp | 14 +++++++------- web/src/server/HttpConnectionHandler.cpp | 2 +- web/src/server/HttpConnectionHandler.hpp | 12 ++++++------ web/src/server/HttpError.hpp | 2 +- web/src/server/HttpProcessor.hpp | 4 ++-- web/src/server/api/ApiController.hpp | 2 +- web/src/server/api/Endpoint.cpp | 2 +- .../macro/zzz_macro_define_ApiController_.hpp | 4 ++-- web/src/server/handler/ErrorHandler.cpp | 2 +- web/src/url/mapping/Pattern.cpp | 4 ++-- web/src/url/mapping/Pattern.hpp | 12 ++++++------ web/src/url/mapping/Router.hpp | 10 +++++----- web/src/url/mapping/Subscriber.hpp | 4 ++-- 52 files changed, 138 insertions(+), 138 deletions(-) diff --git a/encoding/src/Hex.hpp b/encoding/src/Hex.hpp index 9a9d397d..2d91924e 100644 --- a/encoding/src/Hex.hpp +++ b/encoding/src/Hex.hpp @@ -25,10 +25,10 @@ #ifndef oatpp_encoding_Hex_hpp #define oatpp_encoding_Hex_hpp -#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp" +#include "../../../oatpp/core/src/data/stream/Stream.hpp" -#include "../../../oatpp-lib/core/src/base/PtrWrapper.hpp" -#include "../../../oatpp-lib/core/src/base/Environment.hpp" +#include "../../../oatpp/core/src/base/PtrWrapper.hpp" +#include "../../../oatpp/core/src/base/Environment.hpp" namespace oatpp { namespace encoding { diff --git a/encoding/src/Unicode.hpp b/encoding/src/Unicode.hpp index e2eb340c..f6903a13 100644 --- a/encoding/src/Unicode.hpp +++ b/encoding/src/Unicode.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_encoding_Unicode_hpp #define oatpp_encoding_Unicode_hpp -#include "../../../oatpp-lib/core/src/base/Environment.hpp" +#include "../../../oatpp/core/src/base/Environment.hpp" namespace oatpp { namespace encoding { diff --git a/encoding/test/UnicodeTest.hpp b/encoding/test/UnicodeTest.hpp index dc8d61bb..a0827613 100644 --- a/encoding/test/UnicodeTest.hpp +++ b/encoding/test/UnicodeTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_encoding_UnicodeTest_hpp #define oatpp_test_encoding_UnicodeTest_hpp -#include "../../../oatpp-lib/core/test/UnitTest.hpp" +#include "../../../oatpp/core/test/UnitTest.hpp" namespace oatpp { namespace test { namespace encoding { diff --git a/network/src/AsyncConnection.hpp b/network/src/AsyncConnection.hpp index 58d67ffb..29495ab8 100644 --- a/network/src/AsyncConnection.hpp +++ b/network/src/AsyncConnection.hpp @@ -9,9 +9,9 @@ #ifndef oatpp_network_AsyncConnection_hpp #define oatpp_network_AsyncConnection_hpp -#include "../../../oatpp-lib/core/src/base/memory/ObjectPool.hpp" -#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp" -#include "../../../oatpp-lib/core/src/os/io/Library.hpp" +#include "../../../oatpp/core/src/base/memory/ObjectPool.hpp" +#include "../../../oatpp/core/src/data/stream/Stream.hpp" +#include "../../../oatpp/core/src/os/io/Library.hpp" namespace oatpp { namespace network { diff --git a/network/src/Connection.hpp b/network/src/Connection.hpp index b73fe808..866e54d6 100644 --- a/network/src/Connection.hpp +++ b/network/src/Connection.hpp @@ -25,15 +25,15 @@ #ifndef oatpp_network_Connection_hpp #define oatpp_network_Connection_hpp -#include "../../../oatpp-lib/core/src/base/memory/ObjectPool.hpp" +#include "../../../oatpp/core/src/base/memory/ObjectPool.hpp" -#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp" +#include "../../../oatpp/core/src/data/stream/Stream.hpp" -#include "../../../oatpp-lib/core/src/base/Controllable.hpp" -#include "../../../oatpp-lib/core/src/base/PtrWrapper.hpp" -#include "../../../oatpp-lib/core/src/base/Environment.hpp" +#include "../../../oatpp/core/src/base/Controllable.hpp" +#include "../../../oatpp/core/src/base/PtrWrapper.hpp" +#include "../../../oatpp/core/src/base/Environment.hpp" -#include "../../../oatpp-lib/core/src/os/io/Library.hpp" +#include "../../../oatpp/core/src/os/io/Library.hpp" namespace oatpp { namespace network { diff --git a/network/src/ConnectionProvider.hpp b/network/src/ConnectionProvider.hpp index 888be406..9f78bc4f 100644 --- a/network/src/ConnectionProvider.hpp +++ b/network/src/ConnectionProvider.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_netword_ConnectionsProvider_hpp #define oatpp_netword_ConnectionsProvider_hpp -#include "../../../oatpp-lib/core/src/data/stream/Stream.hpp" +#include "../../../oatpp/core/src/data/stream/Stream.hpp" namespace oatpp { namespace network { diff --git a/network/src/client/SimpleTCPConnectionProvider.cpp b/network/src/client/SimpleTCPConnectionProvider.cpp index d1921358..7d7ee7bb 100644 --- a/network/src/client/SimpleTCPConnectionProvider.cpp +++ b/network/src/client/SimpleTCPConnectionProvider.cpp @@ -26,8 +26,8 @@ #include "../Connection.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" -#include "../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../oatpp/core/test/Checker.hpp" #include #include diff --git a/network/src/client/SimpleTCPConnectionProvider.hpp b/network/src/client/SimpleTCPConnectionProvider.hpp index 9ac15571..edc75f7f 100644 --- a/network/src/client/SimpleTCPConnectionProvider.hpp +++ b/network/src/client/SimpleTCPConnectionProvider.hpp @@ -27,8 +27,8 @@ #include "../ConnectionProvider.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/Stream.hpp" -#include "../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../oatpp/core/src/data/stream/Stream.hpp" +#include "../../../../oatpp/core/src/base/String.hpp" namespace oatpp { namespace network { namespace client { diff --git a/network/src/server/ConnectionHandler.hpp b/network/src/server/ConnectionHandler.hpp index cacb105d..4f9c5dd6 100644 --- a/network/src/server/ConnectionHandler.hpp +++ b/network/src/server/ConnectionHandler.hpp @@ -25,8 +25,8 @@ #ifndef network_server_ConnectionHandler_hpp #define network_server_ConnectionHandler_hpp -#include "../../../../oatpp-lib/core/src/data/stream/Stream.hpp" -#include "../../../../oatpp-lib/core/src/base/PtrWrapper.hpp" +#include "../../../../oatpp/core/src/data/stream/Stream.hpp" +#include "../../../../oatpp/core/src/base/PtrWrapper.hpp" namespace oatpp { namespace network { namespace server { diff --git a/network/src/server/Server.cpp b/network/src/server/Server.cpp index 8525c104..52884405 100644 --- a/network/src/server/Server.cpp +++ b/network/src/server/Server.cpp @@ -24,7 +24,7 @@ #include "Server.hpp" -#include "../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../oatpp/core/test/Checker.hpp" #include #include diff --git a/network/src/server/Server.hpp b/network/src/server/Server.hpp index 832b0c50..d789232a 100644 --- a/network/src/server/Server.hpp +++ b/network/src/server/Server.hpp @@ -29,15 +29,15 @@ #include "./ConnectionHandler.hpp" -#include "../../../../oatpp-lib/core/src/concurrency/Runnable.hpp" +#include "../../../../oatpp/core/src/concurrency/Runnable.hpp" -#include "../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../oatpp/core/src/base/String.hpp" -#include "../../../../oatpp-lib/core/src/os/io/Library.hpp" +#include "../../../../oatpp/core/src/os/io/Library.hpp" -#include "../../../../oatpp-lib/core/src/base/PtrWrapper.hpp" -#include "../../../../oatpp-lib/core/src/base/Controllable.hpp" -#include "../../../../oatpp-lib/core/src/base/Environment.hpp" +#include "../../../../oatpp/core/src/base/PtrWrapper.hpp" +#include "../../../../oatpp/core/src/base/Controllable.hpp" +#include "../../../../oatpp/core/src/base/Environment.hpp" #include diff --git a/network/src/server/SimpleTCPConnectionProvider.cpp b/network/src/server/SimpleTCPConnectionProvider.cpp index 46760f07..e123d19a 100644 --- a/network/src/server/SimpleTCPConnectionProvider.cpp +++ b/network/src/server/SimpleTCPConnectionProvider.cpp @@ -27,8 +27,8 @@ #include "../AsyncConnection.hpp" #include "../Connection.hpp" -#include "../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" -#include "../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../oatpp/core/src/utils/ConversionUtils.hpp" +#include "../../../../oatpp/core/test/Checker.hpp" #include #include diff --git a/network/src/server/SimpleTCPConnectionProvider.hpp b/network/src/server/SimpleTCPConnectionProvider.hpp index 11935d36..4582db9e 100644 --- a/network/src/server/SimpleTCPConnectionProvider.hpp +++ b/network/src/server/SimpleTCPConnectionProvider.hpp @@ -27,9 +27,9 @@ #include "../ConnectionProvider.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/Stream.hpp" -#include "../../../../oatpp-lib/core/src/base/String.hpp" -#include "../../../../oatpp-lib/core/src/os/io/Library.hpp" +#include "../../../../oatpp/core/src/data/stream/Stream.hpp" +#include "../../../../oatpp/core/src/base/String.hpp" +#include "../../../../oatpp/core/src/os/io/Library.hpp" namespace oatpp { namespace network { namespace server { diff --git a/parser/src/json/Utils.cpp b/parser/src/json/Utils.cpp index 90c63865..d6ab2b3d 100644 --- a/parser/src/json/Utils.cpp +++ b/parser/src/json/Utils.cpp @@ -24,8 +24,8 @@ #include "Utils.hpp" -#include "../../../../oatpp-lib/encoding/src/Unicode.hpp" -#include "../../../../oatpp-lib/encoding/src/Hex.hpp" +#include "../../../../oatpp/encoding/src/Unicode.hpp" +#include "../../../../oatpp/encoding/src/Hex.hpp" namespace oatpp { namespace parser { namespace json{ diff --git a/parser/src/json/Utils.hpp b/parser/src/json/Utils.hpp index a80a2a1d..ce191fc7 100644 --- a/parser/src/json/Utils.hpp +++ b/parser/src/json/Utils.hpp @@ -25,8 +25,8 @@ #ifndef oatpp_parser_json_Utils_hpp #define oatpp_parser_json_Utils_hpp -#include "../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp" -#include "../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../oatpp/core/src/parser/ParsingCaret.hpp" +#include "../../../../oatpp/core/src/base/String.hpp" #include diff --git a/parser/src/json/mapping/Deserializer.cpp b/parser/src/json/mapping/Deserializer.cpp index 0de21338..06d83b28 100644 --- a/parser/src/json/mapping/Deserializer.cpp +++ b/parser/src/json/mapping/Deserializer.cpp @@ -25,7 +25,7 @@ #include "./Deserializer.hpp" #include "../Utils.hpp" -#include "../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" +#include "../../../../../oatpp/core/src/utils/ConversionUtils.hpp" namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/parser/src/json/mapping/Deserializer.hpp b/parser/src/json/mapping/Deserializer.hpp index 2f91f723..d9625cca 100644 --- a/parser/src/json/mapping/Deserializer.hpp +++ b/parser/src/json/mapping/Deserializer.hpp @@ -25,15 +25,15 @@ #ifndef oatpp_parser_json_mapping_Deserializer_hpp #define oatpp_parser_json_mapping_Deserializer_hpp -#include "../../../../../oatpp-lib/core/src/data/mapping/type/List.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Object.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/List.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Object.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Primitive.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Type.hpp" -#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp" +#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp" -#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp" -#include "../../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../../oatpp/core/src/collection/LinkedList.hpp" +#include "../../../../../oatpp/core/src/base/String.hpp" namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/parser/src/json/mapping/ObjectMapper.hpp b/parser/src/json/mapping/ObjectMapper.hpp index 8de6345b..6e3c67cb 100644 --- a/parser/src/json/mapping/ObjectMapper.hpp +++ b/parser/src/json/mapping/ObjectMapper.hpp @@ -28,7 +28,7 @@ #include "./Serializer.hpp" #include "./Deserializer.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp" +#include "../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp" namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/parser/src/json/mapping/Serializer.hpp b/parser/src/json/mapping/Serializer.hpp index c4ce0391..dfbe1066 100644 --- a/parser/src/json/mapping/Serializer.hpp +++ b/parser/src/json/mapping/Serializer.hpp @@ -25,16 +25,16 @@ #ifndef oatpp_parser_json_mapping_Serializer_hpp #define oatpp_parser_json_mapping_Serializer_hpp -#include "../../../../../oatpp-lib/core/src/data/mapping/type/List.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Object.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp" -#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/List.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Object.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Primitive.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Type.hpp" +#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" -#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp" +#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp" -#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp" -#include "../../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../../oatpp/core/src/collection/LinkedList.hpp" +#include "../../../../../oatpp/core/src/base/String.hpp" namespace oatpp { namespace parser { namespace json { namespace mapping { diff --git a/parser/test/json/mapping/DTOMapperPerfTest.cpp b/parser/test/json/mapping/DTOMapperPerfTest.cpp index e609477f..dd4e4b24 100644 --- a/parser/test/json/mapping/DTOMapperPerfTest.cpp +++ b/parser/test/json/mapping/DTOMapperPerfTest.cpp @@ -24,12 +24,12 @@ #include "DTOMapperPerfTest.hpp" -#include "../../../../../oatpp-lib/core/src/macro/basic.hpp" -#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp" +#include "../../../../../oatpp/core/src/macro/basic.hpp" +#include "../../../../../oatpp/core/src/macro/codegen.hpp" #include "../../../src/json/mapping/ObjectMapper.hpp" -#include "../../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../../oatpp/core/test/Checker.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/parser/test/json/mapping/DTOMapperPerfTest.hpp b/parser/test/json/mapping/DTOMapperPerfTest.hpp index e1e324eb..189810b4 100644 --- a/parser/test/json/mapping/DTOMapperPerfTest.hpp +++ b/parser/test/json/mapping/DTOMapperPerfTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_parser_json_mapping_DTOMapperPerfTest_hpp #define oatpp_test_parser_json_mapping_DTOMapperPerfTest_hpp -#include "../../../../../oatpp-lib/core/test/UnitTest.hpp" +#include "../../../../../oatpp/core/test/UnitTest.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/parser/test/json/mapping/DTOMapperTest.cpp b/parser/test/json/mapping/DTOMapperTest.cpp index 3d516bb6..575d8205 100644 --- a/parser/test/json/mapping/DTOMapperTest.cpp +++ b/parser/test/json/mapping/DTOMapperTest.cpp @@ -26,11 +26,11 @@ #include "../../../src/json/mapping/ObjectMapper.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Object.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/List.hpp" -#include "../../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Object.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/List.hpp" +#include "../../../../../oatpp/core/src/data/mapping/type/Primitive.hpp" -#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp" +#include "../../../../../oatpp/core/src/macro/codegen.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/parser/test/json/mapping/DTOMapperTest.hpp b/parser/test/json/mapping/DTOMapperTest.hpp index c0419c05..fd5fa079 100644 --- a/parser/test/json/mapping/DTOMapperTest.hpp +++ b/parser/test/json/mapping/DTOMapperTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_parser_json_mapping_DTOMapperTest_hpp #define oatpp_test_parser_json_mapping_DTOMapperTest_hpp -#include "../../../../../oatpp-lib/core/test/UnitTest.hpp" +#include "../../../../../oatpp/core/test/UnitTest.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/parser/test/json/mapping/DeserializerTest.cpp b/parser/test/json/mapping/DeserializerTest.cpp index cd8b8d2b..2c8db982 100644 --- a/parser/test/json/mapping/DeserializerTest.cpp +++ b/parser/test/json/mapping/DeserializerTest.cpp @@ -25,7 +25,7 @@ #include "DeserializerTest.hpp" #include "../../../src/json/mapping/ObjectMapper.hpp" -#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp" +#include "../../../../../oatpp/core/src/macro/codegen.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/parser/test/json/mapping/DeserializerTest.hpp b/parser/test/json/mapping/DeserializerTest.hpp index 7d37d3c0..dfcba705 100644 --- a/parser/test/json/mapping/DeserializerTest.hpp +++ b/parser/test/json/mapping/DeserializerTest.hpp @@ -25,7 +25,7 @@ #ifndef oatpp_test_parser_json_mapping_DeserializerTest_hpp #define oatpp_test_parser_json_mapping_DeserializerTest_hpp -#include "../../../../../oatpp-lib/core/test/UnitTest.hpp" +#include "../../../../../oatpp/core/test/UnitTest.hpp" namespace oatpp { namespace test { namespace parser { namespace json { namespace mapping { diff --git a/web/src/client/ApiClient.hpp b/web/src/client/ApiClient.hpp index d147607d..d23648d7 100644 --- a/web/src/client/ApiClient.hpp +++ b/web/src/client/ApiClient.hpp @@ -32,18 +32,18 @@ #include "../protocol/http/outgoing/DtoBody.hpp" #include "../protocol/http/outgoing/BufferBody.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" -#include "../../../../oatpp-lib/core/src/data/mapping/type/Primitive.hpp" -#include "../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp" -#include "../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp" +#include "../../../../oatpp/core/src/data/mapping/type/Primitive.hpp" +#include "../../../../oatpp/core/src/data/mapping/type/Type.hpp" +#include "../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp" -#include "../../../../oatpp-lib/core/src/collection/ListMap.hpp" +#include "../../../../oatpp/core/src/collection/ListMap.hpp" -#include "../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" +#include "../../../../oatpp/core/src/utils/ConversionUtils.hpp" -#include "../../../../oatpp-lib/core/src/base/Controllable.hpp" -#include "../../../../oatpp-lib/core/src/base/PtrWrapper.hpp" +#include "../../../../oatpp/core/src/base/Controllable.hpp" +#include "../../../../oatpp/core/src/base/PtrWrapper.hpp" #include #include diff --git a/web/src/client/HttpRequestExecutor.cpp b/web/src/client/HttpRequestExecutor.cpp index f0357428..e77c6fbf 100644 --- a/web/src/client/HttpRequestExecutor.cpp +++ b/web/src/client/HttpRequestExecutor.cpp @@ -27,9 +27,9 @@ #include "../protocol/http/outgoing/Request.hpp" #include "../protocol/http/outgoing/BufferBody.hpp" -#include "../../../../oatpp-lib/network/src/Connection.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp" +#include "../../../../oatpp/network/src/Connection.hpp" +#include "../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp" #include #include diff --git a/web/src/client/HttpRequestExecutor.hpp b/web/src/client/HttpRequestExecutor.hpp index 4e742252..6d9b698b 100644 --- a/web/src/client/HttpRequestExecutor.hpp +++ b/web/src/client/HttpRequestExecutor.hpp @@ -26,7 +26,7 @@ #define oatpp_web_client_HttpRequestExecutor_hpp #include "./RequestExecutor.hpp" -#include "../../../../oatpp-lib/network/src/ConnectionProvider.hpp" +#include "../../../../oatpp/network/src/ConnectionProvider.hpp" namespace oatpp { namespace web { namespace client { diff --git a/web/src/client/macro/zzz_macro_define_ApiClient_.hpp b/web/src/client/macro/zzz_macro_define_ApiClient_.hpp index 7ab8407c..3690c9ac 100644 --- a/web/src/client/macro/zzz_macro_define_ApiClient_.hpp +++ b/web/src/client/macro/zzz_macro_define_ApiClient_.hpp @@ -22,8 +22,8 @@ * ***************************************************************************/ -#include "../../../../../oatpp-lib/core/src/macro/basic.hpp" -#include "../../../../../oatpp-lib/core/src/macro/codegen.hpp" +#include "../../../../../oatpp/core/src/macro/basic.hpp" +#include "../../../../../oatpp/core/src/macro/codegen.hpp" #define OATPP_MACRO_API_CLIENT_PARAM_MACRO(MACRO, TYPE, NAME, PARAM_LIST) MACRO(TYPE, NAME, PARAM_LIST) #define OATPP_MACRO_API_CLIENT_PARAM_TYPE(MACRO, TYPE, NAME, PARAM_LIST) TYPE diff --git a/web/src/protocol/http/Http.cpp b/web/src/protocol/http/Http.cpp index f8cde185..96b5117b 100644 --- a/web/src/protocol/http/Http.cpp +++ b/web/src/protocol/http/Http.cpp @@ -24,7 +24,7 @@ #include "./Http.hpp" -#include "../../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../../oatpp/core/test/Checker.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { diff --git a/web/src/protocol/http/Http.hpp b/web/src/protocol/http/Http.hpp index 5f5940b7..9e7022de 100644 --- a/web/src/protocol/http/Http.hpp +++ b/web/src/protocol/http/Http.hpp @@ -25,13 +25,13 @@ #ifndef oatpp_network_http_Protocol_hpp #define oatpp_network_http_Protocol_hpp -#include "../../../../../oatpp-lib/network/src/Connection.hpp" +#include "../../../../../oatpp/network/src/Connection.hpp" -#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp" +#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp" -#include "../../../../../oatpp-lib/core/src/data/stream/Delegate.hpp" -#include "../../../../../oatpp-lib/core/src/collection/ListMap.hpp" -#include "../../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../../oatpp/core/src/data/stream/Delegate.hpp" +#include "../../../../../oatpp/core/src/collection/ListMap.hpp" +#include "../../../../../oatpp/core/src/base/String.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { diff --git a/web/src/protocol/http/incoming/BodyDecoder.cpp b/web/src/protocol/http/incoming/BodyDecoder.cpp index e7283c04..d37bed24 100644 --- a/web/src/protocol/http/incoming/BodyDecoder.cpp +++ b/web/src/protocol/http/incoming/BodyDecoder.cpp @@ -24,8 +24,8 @@ #include "BodyDecoder.hpp" -#include "../../../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp" -#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" +#include "../../../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp" +#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/web/src/protocol/http/incoming/BodyDecoder.hpp b/web/src/protocol/http/incoming/BodyDecoder.hpp index 61622a3e..6e4408a7 100644 --- a/web/src/protocol/http/incoming/BodyDecoder.hpp +++ b/web/src/protocol/http/incoming/BodyDecoder.hpp @@ -26,7 +26,7 @@ #define oatpp_web_protocol_http_incoming_BodyDecoder_hpp #include "../Http.hpp" -#include "../../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp" +#include "../../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace incoming { diff --git a/web/src/protocol/http/outgoing/Body.hpp b/web/src/protocol/http/outgoing/Body.hpp index 288d5b9b..2c922189 100644 --- a/web/src/protocol/http/outgoing/Body.hpp +++ b/web/src/protocol/http/outgoing/Body.hpp @@ -25,9 +25,9 @@ #ifndef oatpp_web_protocol_http_outgoing_Body_hpp #define oatpp_web_protocol_http_outgoing_Body_hpp -#include "../../../../../../oatpp-lib/core/src/data/stream/Stream.hpp" -#include "../../../../../../oatpp-lib/core/src/collection/ListMap.hpp" -#include "../../../../../../oatpp-lib/core/src/async/Coroutine.hpp" +#include "../../../../../../oatpp/core/src/data/stream/Stream.hpp" +#include "../../../../../../oatpp/core/src/collection/ListMap.hpp" +#include "../../../../../../oatpp/core/src/async/Coroutine.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/web/src/protocol/http/outgoing/BufferBody.hpp b/web/src/protocol/http/outgoing/BufferBody.hpp index 9c6eb036..087dee6f 100644 --- a/web/src/protocol/http/outgoing/BufferBody.hpp +++ b/web/src/protocol/http/outgoing/BufferBody.hpp @@ -28,7 +28,7 @@ #include "../Http.hpp" #include "./Body.hpp" -#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" +#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/web/src/protocol/http/outgoing/ChunkedBufferBody.hpp b/web/src/protocol/http/outgoing/ChunkedBufferBody.hpp index 74fb9227..5e665d0e 100644 --- a/web/src/protocol/http/outgoing/ChunkedBufferBody.hpp +++ b/web/src/protocol/http/outgoing/ChunkedBufferBody.hpp @@ -28,8 +28,8 @@ #include "../Http.hpp" #include "./Body.hpp" -#include "../../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" -#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" +#include "../../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/web/src/protocol/http/outgoing/DtoBody.hpp b/web/src/protocol/http/outgoing/DtoBody.hpp index ca391dba..d64bba4c 100644 --- a/web/src/protocol/http/outgoing/DtoBody.hpp +++ b/web/src/protocol/http/outgoing/DtoBody.hpp @@ -28,8 +28,8 @@ #include "../Http.hpp" #include "./ChunkedBufferBody.hpp" -#include "../../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp" -#include "../../../../../../oatpp-lib/core/src/utils/ConversionUtils.hpp" +#include "../../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp" +#include "../../../../../../oatpp/core/src/utils/ConversionUtils.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/web/src/protocol/http/outgoing/ResponseFactory.hpp b/web/src/protocol/http/outgoing/ResponseFactory.hpp index 2e536e44..3b4aee8b 100644 --- a/web/src/protocol/http/outgoing/ResponseFactory.hpp +++ b/web/src/protocol/http/outgoing/ResponseFactory.hpp @@ -27,9 +27,9 @@ #include "./Response.hpp" -#include "../../../../../../oatpp-lib/core/src/data/mapping/ObjectMapper.hpp" -#include "../../../../../../oatpp-lib/core/src/data/mapping/type/Type.hpp" -#include "../../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../../../oatpp/core/src/data/mapping/ObjectMapper.hpp" +#include "../../../../../../oatpp/core/src/data/mapping/type/Type.hpp" +#include "../../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" namespace oatpp { namespace web { namespace protocol { namespace http { namespace outgoing { diff --git a/web/src/server/AsyncHttpConnectionHandler.cpp b/web/src/server/AsyncHttpConnectionHandler.cpp index ca6d95fc..cc17dd58 100644 --- a/web/src/server/AsyncHttpConnectionHandler.cpp +++ b/web/src/server/AsyncHttpConnectionHandler.cpp @@ -31,9 +31,9 @@ #include "./HttpError.hpp" -#include "../../../../oatpp-lib/network/src/AsyncConnection.hpp" +#include "../../../../oatpp/network/src/AsyncConnection.hpp" -#include "../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../oatpp/core/test/Checker.hpp" #include diff --git a/web/src/server/AsyncHttpConnectionHandler.hpp b/web/src/server/AsyncHttpConnectionHandler.hpp index 593caafe..504e9f54 100644 --- a/web/src/server/AsyncHttpConnectionHandler.hpp +++ b/web/src/server/AsyncHttpConnectionHandler.hpp @@ -34,15 +34,15 @@ #include "../protocol/http/incoming/Request.hpp" #include "../protocol/http/outgoing/Response.hpp" -#include "../../../../oatpp-lib/network/src/server/Server.hpp" -#include "../../../../oatpp-lib/network/src/Connection.hpp" +#include "../../../../oatpp/network/src/server/Server.hpp" +#include "../../../../oatpp/network/src/Connection.hpp" -#include "../../../../oatpp-lib/core/src/concurrency/Thread.hpp" -#include "../../../../oatpp-lib/core/src/concurrency/Runnable.hpp" +#include "../../../../oatpp/core/src/concurrency/Thread.hpp" +#include "../../../../oatpp/core/src/concurrency/Runnable.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp" -#include "../../../../oatpp-lib/core/src/data/buffer/IOBuffer.hpp" -#include "../../../../oatpp-lib/core/src/async/Processor.hpp" +#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp" +#include "../../../../oatpp/core/src/data/buffer/IOBuffer.hpp" +#include "../../../../oatpp/core/src/async/Processor.hpp" namespace oatpp { namespace web { namespace server { diff --git a/web/src/server/HttpConnectionHandler.cpp b/web/src/server/HttpConnectionHandler.cpp index a4245deb..3190b60c 100644 --- a/web/src/server/HttpConnectionHandler.cpp +++ b/web/src/server/HttpConnectionHandler.cpp @@ -33,7 +33,7 @@ #include "./HttpError.hpp" -#include "../../../../oatpp-lib/core/test/Checker.hpp" +#include "../../../../oatpp/core/test/Checker.hpp" #include diff --git a/web/src/server/HttpConnectionHandler.hpp b/web/src/server/HttpConnectionHandler.hpp index 4c79125f..5c0d40ee 100644 --- a/web/src/server/HttpConnectionHandler.hpp +++ b/web/src/server/HttpConnectionHandler.hpp @@ -32,14 +32,14 @@ #include "../protocol/http/incoming/Request.hpp" #include "../protocol/http/outgoing/Response.hpp" -#include "../../../../oatpp-lib/network/src/server/Server.hpp" -#include "../../../../oatpp-lib/network/src/Connection.hpp" +#include "../../../../oatpp/network/src/server/Server.hpp" +#include "../../../../oatpp/network/src/Connection.hpp" -#include "../../../../oatpp-lib/core/src/concurrency/Thread.hpp" -#include "../../../../oatpp-lib/core/src/concurrency/Runnable.hpp" +#include "../../../../oatpp/core/src/concurrency/Thread.hpp" +#include "../../../../oatpp/core/src/concurrency/Runnable.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp" -#include "../../../../oatpp-lib/core/src/data/buffer/IOBuffer.hpp" +#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp" +#include "../../../../oatpp/core/src/data/buffer/IOBuffer.hpp" namespace oatpp { namespace web { namespace server { diff --git a/web/src/server/HttpError.hpp b/web/src/server/HttpError.hpp index a9499eb7..60d9c00c 100644 --- a/web/src/server/HttpError.hpp +++ b/web/src/server/HttpError.hpp @@ -26,7 +26,7 @@ #define oatpp_web_server_HttpError_hpp #include "../protocol/http/Http.hpp" -#include "../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../oatpp/core/src/base/String.hpp" namespace oatpp { namespace web { namespace server { diff --git a/web/src/server/HttpProcessor.hpp b/web/src/server/HttpProcessor.hpp index 7d77f3a8..d425561c 100644 --- a/web/src/server/HttpProcessor.hpp +++ b/web/src/server/HttpProcessor.hpp @@ -16,9 +16,9 @@ #include "../protocol/http/incoming/Request.hpp" #include "../protocol/http/outgoing/Response.hpp" -#include "../../../../oatpp-lib/core/src/data/stream/StreamBufferedProxy.hpp" +#include "../../../../oatpp/core/src/data/stream/StreamBufferedProxy.hpp" -#include "../../../../oatpp-lib/core/src/async/Processor.hpp" +#include "../../../../oatpp/core/src/async/Processor.hpp" namespace oatpp { namespace web { namespace server { diff --git a/web/src/server/api/ApiController.hpp b/web/src/server/api/ApiController.hpp index d1f5c16c..4336211a 100644 --- a/web/src/server/api/ApiController.hpp +++ b/web/src/server/api/ApiController.hpp @@ -32,7 +32,7 @@ #include "../../url/mapping/Router.hpp" #include "../../protocol/http/outgoing/ResponseFactory.hpp" -#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp" +#include "../../../../../oatpp/core/src/collection/LinkedList.hpp" #include diff --git a/web/src/server/api/Endpoint.cpp b/web/src/server/api/Endpoint.cpp index 8a1be7ad..eccffead 100644 --- a/web/src/server/api/Endpoint.cpp +++ b/web/src/server/api/Endpoint.cpp @@ -24,7 +24,7 @@ #include "Endpoint.hpp" -#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" namespace oatpp { namespace web { namespace server { namespace api { diff --git a/web/src/server/api/macro/zzz_macro_define_ApiController_.hpp b/web/src/server/api/macro/zzz_macro_define_ApiController_.hpp index cbb3454a..20a54295 100644 --- a/web/src/server/api/macro/zzz_macro_define_ApiController_.hpp +++ b/web/src/server/api/macro/zzz_macro_define_ApiController_.hpp @@ -22,8 +22,8 @@ * ***************************************************************************/ -#include "../../../../../../oatpp-lib/core/src/macro/basic.hpp" -#include "../../../../../../oatpp-lib/core/src/macro/codegen.hpp" +#include "../../../../../../oatpp/core/src/macro/basic.hpp" +#include "../../../../../../oatpp/core/src/macro/codegen.hpp" #define OATPP_MACRO_API_CONTROLLER_PARAM_MACRO(MACRO, INFO, TYPE, NAME, PARAM_LIST) MACRO(TYPE, NAME, PARAM_LIST) #define OATPP_MACRO_API_CONTROLLER_PARAM_INFO(MACRO, INFO, TYPE, NAME, PARAM_LIST) INFO(TYPE, NAME, PARAM_LIST) diff --git a/web/src/server/handler/ErrorHandler.cpp b/web/src/server/handler/ErrorHandler.cpp index 51d24839..9f45a967 100644 --- a/web/src/server/handler/ErrorHandler.cpp +++ b/web/src/server/handler/ErrorHandler.cpp @@ -25,7 +25,7 @@ #include "./ErrorHandler.hpp" #include "../../protocol/http/outgoing/ChunkedBufferBody.hpp" -#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" namespace oatpp { namespace web { namespace server { namespace handler { diff --git a/web/src/url/mapping/Pattern.cpp b/web/src/url/mapping/Pattern.cpp index 6fac379e..fb342ba5 100644 --- a/web/src/url/mapping/Pattern.cpp +++ b/web/src/url/mapping/Pattern.cpp @@ -24,9 +24,9 @@ #include "Pattern.hpp" -#include "../../../../../oatpp-lib/core/src/parser/ParsingCaret.hpp" +#include "../../../../../oatpp/core/src/parser/ParsingCaret.hpp" -#include "../../../../../oatpp-lib/core/src/data/stream/ChunkedBuffer.hpp" +#include "../../../../../oatpp/core/src/data/stream/ChunkedBuffer.hpp" namespace oatpp { namespace web { namespace url { namespace mapping { diff --git a/web/src/url/mapping/Pattern.hpp b/web/src/url/mapping/Pattern.hpp index ec29e465..cf2bebc1 100644 --- a/web/src/url/mapping/Pattern.hpp +++ b/web/src/url/mapping/Pattern.hpp @@ -25,14 +25,14 @@ #ifndef network_url_Pattern_hpp #define network_url_Pattern_hpp -#include "../../../../../oatpp-lib/core/src/collection/ListMap.hpp" -#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp" +#include "../../../../../oatpp/core/src/collection/ListMap.hpp" +#include "../../../../../oatpp/core/src/collection/LinkedList.hpp" -#include "../../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../../oatpp/core/src/base/String.hpp" -#include "../../../../../oatpp-lib/core/src/base/PtrWrapper.hpp" -#include "../../../../../oatpp-lib/core/src/base/Controllable.hpp" -#include "../../../../../oatpp-lib/core/src/base/Environment.hpp" +#include "../../../../../oatpp/core/src/base/PtrWrapper.hpp" +#include "../../../../../oatpp/core/src/base/Controllable.hpp" +#include "../../../../../oatpp/core/src/base/Environment.hpp" namespace oatpp { namespace web { namespace url { namespace mapping { diff --git a/web/src/url/mapping/Router.hpp b/web/src/url/mapping/Router.hpp index 0f487097..0df8b6ad 100644 --- a/web/src/url/mapping/Router.hpp +++ b/web/src/url/mapping/Router.hpp @@ -28,13 +28,13 @@ #include "./Subscriber.hpp" #include "./Pattern.hpp" -#include "../../../../../oatpp-lib/core/src/collection/LinkedList.hpp" +#include "../../../../../oatpp/core/src/collection/LinkedList.hpp" -#include "../../../../../oatpp-lib/core/src/base/String.hpp" +#include "../../../../../oatpp/core/src/base/String.hpp" -#include "../../../../../oatpp-lib/core/src/base/PtrWrapper.hpp" -#include "../../../../../oatpp-lib/core/src/base/Controllable.hpp" -#include "../../../../../oatpp-lib/core/src/base/Environment.hpp" +#include "../../../../../oatpp/core/src/base/PtrWrapper.hpp" +#include "../../../../../oatpp/core/src/base/Controllable.hpp" +#include "../../../../../oatpp/core/src/base/Environment.hpp" namespace oatpp { namespace web { namespace url { namespace mapping { diff --git a/web/src/url/mapping/Subscriber.hpp b/web/src/url/mapping/Subscriber.hpp index da15addb..88bb2608 100644 --- a/web/src/url/mapping/Subscriber.hpp +++ b/web/src/url/mapping/Subscriber.hpp @@ -25,8 +25,8 @@ #ifndef oatpp_network_url_Subscriber_hpp #define oatpp_network_url_Subscriber_hpp -#include "../../../../../oatpp-lib/core/src/base/PtrWrapper.hpp" -#include "../../../../../oatpp-lib/core/src/async/Coroutine.hpp" +#include "../../../../../oatpp/core/src/base/PtrWrapper.hpp" +#include "../../../../../oatpp/core/src/async/Coroutine.hpp" namespace oatpp { namespace web { namespace url { namespace mapping {