From 79cbfa7c0b06f99bcdc1ca4dc412ff3c0253c50b Mon Sep 17 00:00:00 2001 From: Krzysztof Okupski Date: Thu, 23 Oct 2014 10:25:49 +0200 Subject: [PATCH] Moved jsonrpc directory --- src/{ => api}/jsonrpc/LICENSE | 0 src/{ => api}/jsonrpc/abstractauthenticator.h | 0 .../jsonrpc/abstractrequesthandler.h | 0 src/{ => api}/jsonrpc/client.cpp | 0 src/{ => api}/jsonrpc/client.h | 0 src/{ => api}/jsonrpc/clientconnector.cpp | 0 src/{ => api}/jsonrpc/clientconnector.h | 0 .../jsonrpc/connectors/MONGOOSE_LICENSE | 0 .../jsonrpc/connectors/MONGOOSE_README.md | 0 .../jsonrpc/connectors/httpclient.cpp | 0 src/{ => api}/jsonrpc/connectors/httpclient.h | 0 .../jsonrpc/connectors/httpserver.cpp | 0 src/{ => api}/jsonrpc/connectors/httpserver.h | 0 src/{ => api}/jsonrpc/connectors/mongoose.c | 0 src/{ => api}/jsonrpc/connectors/mongoose.h | 0 src/{ => api}/jsonrpc/errors.cpp | 0 src/{ => api}/jsonrpc/errors.h | 0 src/{ => api}/jsonrpc/exception.cpp | 0 src/{ => api}/jsonrpc/exception.h | 0 src/{ => api}/jsonrpc/json/LICENSE | 0 src/{ => api}/jsonrpc/json/autolink.h | 0 src/{ => api}/jsonrpc/json/config.h | 0 src/{ => api}/jsonrpc/json/features.h | 0 src/{ => api}/jsonrpc/json/forwards.h | 0 src/{ => api}/jsonrpc/json/json.h | 0 .../jsonrpc/json/json_batchallocator.h | 0 .../jsonrpc/json/json_internalarray.inl | 0 .../jsonrpc/json/json_internalmap.inl | 0 src/{ => api}/jsonrpc/json/json_reader.cpp | 0 src/{ => api}/jsonrpc/json/json_value.cpp | 0 .../jsonrpc/json/json_valueiterator.inl | 0 src/{ => api}/jsonrpc/json/json_writer.cpp | 0 src/{ => api}/jsonrpc/json/reader.h | 0 src/{ => api}/jsonrpc/json/value.h | 0 src/{ => api}/jsonrpc/json/writer.h | 0 src/{ => api}/jsonrpc/procedure.cpp | 0 src/{ => api}/jsonrpc/procedure.h | 0 src/{ => api}/jsonrpc/rpc.h | 0 src/{ => api}/jsonrpc/rpcprotocolclient.cpp | 0 src/{ => api}/jsonrpc/rpcprotocolclient.h | 0 src/{ => api}/jsonrpc/rpcprotocolserver.cpp | 0 src/{ => api}/jsonrpc/rpcprotocolserver.h | 0 src/{ => api}/jsonrpc/server.cpp | 0 src/{ => api}/jsonrpc/server.h | 0 src/{ => api}/jsonrpc/serverconnector.cpp | 0 src/{ => api}/jsonrpc/serverconnector.h | 0 src/{ => api}/jsonrpc/specification.h | 0 src/{ => api}/jsonrpc/specificationparser.cpp | 0 src/{ => api}/jsonrpc/specificationparser.h | 0 src/{ => api}/jsonrpc/specificationwriter.cpp | 0 src/{ => api}/jsonrpc/specificationwriter.h | 0 src/{ => api}/jsonrpc/version.h.in | 0 src/jsonrpc/CMakeLists.txt | 38 ------------------- 53 files changed, 38 deletions(-) rename src/{ => api}/jsonrpc/LICENSE (100%) rename src/{ => api}/jsonrpc/abstractauthenticator.h (100%) rename src/{ => api}/jsonrpc/abstractrequesthandler.h (100%) rename src/{ => api}/jsonrpc/client.cpp (100%) rename src/{ => api}/jsonrpc/client.h (100%) rename src/{ => api}/jsonrpc/clientconnector.cpp (100%) rename src/{ => api}/jsonrpc/clientconnector.h (100%) rename src/{ => api}/jsonrpc/connectors/MONGOOSE_LICENSE (100%) rename src/{ => api}/jsonrpc/connectors/MONGOOSE_README.md (100%) rename src/{ => api}/jsonrpc/connectors/httpclient.cpp (100%) rename src/{ => api}/jsonrpc/connectors/httpclient.h (100%) rename src/{ => api}/jsonrpc/connectors/httpserver.cpp (100%) rename src/{ => api}/jsonrpc/connectors/httpserver.h (100%) rename src/{ => api}/jsonrpc/connectors/mongoose.c (100%) rename src/{ => api}/jsonrpc/connectors/mongoose.h (100%) rename src/{ => api}/jsonrpc/errors.cpp (100%) rename src/{ => api}/jsonrpc/errors.h (100%) rename src/{ => api}/jsonrpc/exception.cpp (100%) rename src/{ => api}/jsonrpc/exception.h (100%) rename src/{ => api}/jsonrpc/json/LICENSE (100%) rename src/{ => api}/jsonrpc/json/autolink.h (100%) rename src/{ => api}/jsonrpc/json/config.h (100%) rename src/{ => api}/jsonrpc/json/features.h (100%) rename src/{ => api}/jsonrpc/json/forwards.h (100%) rename src/{ => api}/jsonrpc/json/json.h (100%) rename src/{ => api}/jsonrpc/json/json_batchallocator.h (100%) rename src/{ => api}/jsonrpc/json/json_internalarray.inl (100%) rename src/{ => api}/jsonrpc/json/json_internalmap.inl (100%) rename src/{ => api}/jsonrpc/json/json_reader.cpp (100%) rename src/{ => api}/jsonrpc/json/json_value.cpp (100%) rename src/{ => api}/jsonrpc/json/json_valueiterator.inl (100%) rename src/{ => api}/jsonrpc/json/json_writer.cpp (100%) rename src/{ => api}/jsonrpc/json/reader.h (100%) rename src/{ => api}/jsonrpc/json/value.h (100%) rename src/{ => api}/jsonrpc/json/writer.h (100%) rename src/{ => api}/jsonrpc/procedure.cpp (100%) rename src/{ => api}/jsonrpc/procedure.h (100%) rename src/{ => api}/jsonrpc/rpc.h (100%) rename src/{ => api}/jsonrpc/rpcprotocolclient.cpp (100%) rename src/{ => api}/jsonrpc/rpcprotocolclient.h (100%) rename src/{ => api}/jsonrpc/rpcprotocolserver.cpp (100%) rename src/{ => api}/jsonrpc/rpcprotocolserver.h (100%) rename src/{ => api}/jsonrpc/server.cpp (100%) rename src/{ => api}/jsonrpc/server.h (100%) rename src/{ => api}/jsonrpc/serverconnector.cpp (100%) rename src/{ => api}/jsonrpc/serverconnector.h (100%) rename src/{ => api}/jsonrpc/specification.h (100%) rename src/{ => api}/jsonrpc/specificationparser.cpp (100%) rename src/{ => api}/jsonrpc/specificationparser.h (100%) rename src/{ => api}/jsonrpc/specificationwriter.cpp (100%) rename src/{ => api}/jsonrpc/specificationwriter.h (100%) rename src/{ => api}/jsonrpc/version.h.in (100%) delete mode 100644 src/jsonrpc/CMakeLists.txt diff --git a/src/jsonrpc/LICENSE b/src/api/jsonrpc/LICENSE similarity index 100% rename from src/jsonrpc/LICENSE rename to src/api/jsonrpc/LICENSE diff --git a/src/jsonrpc/abstractauthenticator.h b/src/api/jsonrpc/abstractauthenticator.h similarity index 100% rename from src/jsonrpc/abstractauthenticator.h rename to src/api/jsonrpc/abstractauthenticator.h diff --git a/src/jsonrpc/abstractrequesthandler.h b/src/api/jsonrpc/abstractrequesthandler.h similarity index 100% rename from src/jsonrpc/abstractrequesthandler.h rename to src/api/jsonrpc/abstractrequesthandler.h diff --git a/src/jsonrpc/client.cpp b/src/api/jsonrpc/client.cpp similarity index 100% rename from src/jsonrpc/client.cpp rename to src/api/jsonrpc/client.cpp diff --git a/src/jsonrpc/client.h b/src/api/jsonrpc/client.h similarity index 100% rename from src/jsonrpc/client.h rename to src/api/jsonrpc/client.h diff --git a/src/jsonrpc/clientconnector.cpp b/src/api/jsonrpc/clientconnector.cpp similarity index 100% rename from src/jsonrpc/clientconnector.cpp rename to src/api/jsonrpc/clientconnector.cpp diff --git a/src/jsonrpc/clientconnector.h b/src/api/jsonrpc/clientconnector.h similarity index 100% rename from src/jsonrpc/clientconnector.h rename to src/api/jsonrpc/clientconnector.h diff --git a/src/jsonrpc/connectors/MONGOOSE_LICENSE b/src/api/jsonrpc/connectors/MONGOOSE_LICENSE similarity index 100% rename from src/jsonrpc/connectors/MONGOOSE_LICENSE rename to src/api/jsonrpc/connectors/MONGOOSE_LICENSE diff --git a/src/jsonrpc/connectors/MONGOOSE_README.md b/src/api/jsonrpc/connectors/MONGOOSE_README.md similarity index 100% rename from src/jsonrpc/connectors/MONGOOSE_README.md rename to src/api/jsonrpc/connectors/MONGOOSE_README.md diff --git a/src/jsonrpc/connectors/httpclient.cpp b/src/api/jsonrpc/connectors/httpclient.cpp similarity index 100% rename from src/jsonrpc/connectors/httpclient.cpp rename to src/api/jsonrpc/connectors/httpclient.cpp diff --git a/src/jsonrpc/connectors/httpclient.h b/src/api/jsonrpc/connectors/httpclient.h similarity index 100% rename from src/jsonrpc/connectors/httpclient.h rename to src/api/jsonrpc/connectors/httpclient.h diff --git a/src/jsonrpc/connectors/httpserver.cpp b/src/api/jsonrpc/connectors/httpserver.cpp similarity index 100% rename from src/jsonrpc/connectors/httpserver.cpp rename to src/api/jsonrpc/connectors/httpserver.cpp diff --git a/src/jsonrpc/connectors/httpserver.h b/src/api/jsonrpc/connectors/httpserver.h similarity index 100% rename from src/jsonrpc/connectors/httpserver.h rename to src/api/jsonrpc/connectors/httpserver.h diff --git a/src/jsonrpc/connectors/mongoose.c b/src/api/jsonrpc/connectors/mongoose.c similarity index 100% rename from src/jsonrpc/connectors/mongoose.c rename to src/api/jsonrpc/connectors/mongoose.c diff --git a/src/jsonrpc/connectors/mongoose.h b/src/api/jsonrpc/connectors/mongoose.h similarity index 100% rename from src/jsonrpc/connectors/mongoose.h rename to src/api/jsonrpc/connectors/mongoose.h diff --git a/src/jsonrpc/errors.cpp b/src/api/jsonrpc/errors.cpp similarity index 100% rename from src/jsonrpc/errors.cpp rename to src/api/jsonrpc/errors.cpp diff --git a/src/jsonrpc/errors.h b/src/api/jsonrpc/errors.h similarity index 100% rename from src/jsonrpc/errors.h rename to src/api/jsonrpc/errors.h diff --git a/src/jsonrpc/exception.cpp b/src/api/jsonrpc/exception.cpp similarity index 100% rename from src/jsonrpc/exception.cpp rename to src/api/jsonrpc/exception.cpp diff --git a/src/jsonrpc/exception.h b/src/api/jsonrpc/exception.h similarity index 100% rename from src/jsonrpc/exception.h rename to src/api/jsonrpc/exception.h diff --git a/src/jsonrpc/json/LICENSE b/src/api/jsonrpc/json/LICENSE similarity index 100% rename from src/jsonrpc/json/LICENSE rename to src/api/jsonrpc/json/LICENSE diff --git a/src/jsonrpc/json/autolink.h b/src/api/jsonrpc/json/autolink.h similarity index 100% rename from src/jsonrpc/json/autolink.h rename to src/api/jsonrpc/json/autolink.h diff --git a/src/jsonrpc/json/config.h b/src/api/jsonrpc/json/config.h similarity index 100% rename from src/jsonrpc/json/config.h rename to src/api/jsonrpc/json/config.h diff --git a/src/jsonrpc/json/features.h b/src/api/jsonrpc/json/features.h similarity index 100% rename from src/jsonrpc/json/features.h rename to src/api/jsonrpc/json/features.h diff --git a/src/jsonrpc/json/forwards.h b/src/api/jsonrpc/json/forwards.h similarity index 100% rename from src/jsonrpc/json/forwards.h rename to src/api/jsonrpc/json/forwards.h diff --git a/src/jsonrpc/json/json.h b/src/api/jsonrpc/json/json.h similarity index 100% rename from src/jsonrpc/json/json.h rename to src/api/jsonrpc/json/json.h diff --git a/src/jsonrpc/json/json_batchallocator.h b/src/api/jsonrpc/json/json_batchallocator.h similarity index 100% rename from src/jsonrpc/json/json_batchallocator.h rename to src/api/jsonrpc/json/json_batchallocator.h diff --git a/src/jsonrpc/json/json_internalarray.inl b/src/api/jsonrpc/json/json_internalarray.inl similarity index 100% rename from src/jsonrpc/json/json_internalarray.inl rename to src/api/jsonrpc/json/json_internalarray.inl diff --git a/src/jsonrpc/json/json_internalmap.inl b/src/api/jsonrpc/json/json_internalmap.inl similarity index 100% rename from src/jsonrpc/json/json_internalmap.inl rename to src/api/jsonrpc/json/json_internalmap.inl diff --git a/src/jsonrpc/json/json_reader.cpp b/src/api/jsonrpc/json/json_reader.cpp similarity index 100% rename from src/jsonrpc/json/json_reader.cpp rename to src/api/jsonrpc/json/json_reader.cpp diff --git a/src/jsonrpc/json/json_value.cpp b/src/api/jsonrpc/json/json_value.cpp similarity index 100% rename from src/jsonrpc/json/json_value.cpp rename to src/api/jsonrpc/json/json_value.cpp diff --git a/src/jsonrpc/json/json_valueiterator.inl b/src/api/jsonrpc/json/json_valueiterator.inl similarity index 100% rename from src/jsonrpc/json/json_valueiterator.inl rename to src/api/jsonrpc/json/json_valueiterator.inl diff --git a/src/jsonrpc/json/json_writer.cpp b/src/api/jsonrpc/json/json_writer.cpp similarity index 100% rename from src/jsonrpc/json/json_writer.cpp rename to src/api/jsonrpc/json/json_writer.cpp diff --git a/src/jsonrpc/json/reader.h b/src/api/jsonrpc/json/reader.h similarity index 100% rename from src/jsonrpc/json/reader.h rename to src/api/jsonrpc/json/reader.h diff --git a/src/jsonrpc/json/value.h b/src/api/jsonrpc/json/value.h similarity index 100% rename from src/jsonrpc/json/value.h rename to src/api/jsonrpc/json/value.h diff --git a/src/jsonrpc/json/writer.h b/src/api/jsonrpc/json/writer.h similarity index 100% rename from src/jsonrpc/json/writer.h rename to src/api/jsonrpc/json/writer.h diff --git a/src/jsonrpc/procedure.cpp b/src/api/jsonrpc/procedure.cpp similarity index 100% rename from src/jsonrpc/procedure.cpp rename to src/api/jsonrpc/procedure.cpp diff --git a/src/jsonrpc/procedure.h b/src/api/jsonrpc/procedure.h similarity index 100% rename from src/jsonrpc/procedure.h rename to src/api/jsonrpc/procedure.h diff --git a/src/jsonrpc/rpc.h b/src/api/jsonrpc/rpc.h similarity index 100% rename from src/jsonrpc/rpc.h rename to src/api/jsonrpc/rpc.h diff --git a/src/jsonrpc/rpcprotocolclient.cpp b/src/api/jsonrpc/rpcprotocolclient.cpp similarity index 100% rename from src/jsonrpc/rpcprotocolclient.cpp rename to src/api/jsonrpc/rpcprotocolclient.cpp diff --git a/src/jsonrpc/rpcprotocolclient.h b/src/api/jsonrpc/rpcprotocolclient.h similarity index 100% rename from src/jsonrpc/rpcprotocolclient.h rename to src/api/jsonrpc/rpcprotocolclient.h diff --git a/src/jsonrpc/rpcprotocolserver.cpp b/src/api/jsonrpc/rpcprotocolserver.cpp similarity index 100% rename from src/jsonrpc/rpcprotocolserver.cpp rename to src/api/jsonrpc/rpcprotocolserver.cpp diff --git a/src/jsonrpc/rpcprotocolserver.h b/src/api/jsonrpc/rpcprotocolserver.h similarity index 100% rename from src/jsonrpc/rpcprotocolserver.h rename to src/api/jsonrpc/rpcprotocolserver.h diff --git a/src/jsonrpc/server.cpp b/src/api/jsonrpc/server.cpp similarity index 100% rename from src/jsonrpc/server.cpp rename to src/api/jsonrpc/server.cpp diff --git a/src/jsonrpc/server.h b/src/api/jsonrpc/server.h similarity index 100% rename from src/jsonrpc/server.h rename to src/api/jsonrpc/server.h diff --git a/src/jsonrpc/serverconnector.cpp b/src/api/jsonrpc/serverconnector.cpp similarity index 100% rename from src/jsonrpc/serverconnector.cpp rename to src/api/jsonrpc/serverconnector.cpp diff --git a/src/jsonrpc/serverconnector.h b/src/api/jsonrpc/serverconnector.h similarity index 100% rename from src/jsonrpc/serverconnector.h rename to src/api/jsonrpc/serverconnector.h diff --git a/src/jsonrpc/specification.h b/src/api/jsonrpc/specification.h similarity index 100% rename from src/jsonrpc/specification.h rename to src/api/jsonrpc/specification.h diff --git a/src/jsonrpc/specificationparser.cpp b/src/api/jsonrpc/specificationparser.cpp similarity index 100% rename from src/jsonrpc/specificationparser.cpp rename to src/api/jsonrpc/specificationparser.cpp diff --git a/src/jsonrpc/specificationparser.h b/src/api/jsonrpc/specificationparser.h similarity index 100% rename from src/jsonrpc/specificationparser.h rename to src/api/jsonrpc/specificationparser.h diff --git a/src/jsonrpc/specificationwriter.cpp b/src/api/jsonrpc/specificationwriter.cpp similarity index 100% rename from src/jsonrpc/specificationwriter.cpp rename to src/api/jsonrpc/specificationwriter.cpp diff --git a/src/jsonrpc/specificationwriter.h b/src/api/jsonrpc/specificationwriter.h similarity index 100% rename from src/jsonrpc/specificationwriter.h rename to src/api/jsonrpc/specificationwriter.h diff --git a/src/jsonrpc/version.h.in b/src/api/jsonrpc/version.h.in similarity index 100% rename from src/jsonrpc/version.h.in rename to src/api/jsonrpc/version.h.in diff --git a/src/jsonrpc/CMakeLists.txt b/src/jsonrpc/CMakeLists.txt deleted file mode 100644 index f8179da..0000000 --- a/src/jsonrpc/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# Set compiler settings -SET(CMAKE_CXX_FLAGS "-std=c++11 -g -Wall") -SET(CMAKE_C_FLAGS "-Wall") - -# Require curl to be present -FIND_PACKAGE(Threads REQUIRED) -FIND_PACKAGE(CURL REQUIRED) - -# Find header and source files -FILE(GLOB jsonrpc_header ${CMAKE_CURRENT_SOURCE_DIR}/*.h) -FILE(GLOB connector_header ${CMAKE_CURRENT_SOURCE_DIR}/connectors/*.h) -FILE(GLOB jsoncpp_header ${CMAKE_CURRENT_SOURCE_DIR}/json/*.h) -FILE(GLOB_RECURSE jsonrpc_source ${CMAKE_CURRENT_SOURCE_DIR}/*.c*) - -# Set target libraries -ADD_LIBRARY(jsonrpc SHARED ${jsonrpc_source}) -ADD_LIBRARY(jsonrpc_static STATIC ${jsonrpc_source}) - -# Set output name of static library -SET_TARGET_PROPERTIES(jsonrpc_static PROPERTIES OUTPUT_NAME jsonrpc) - -# Set version number of both libraries -SET(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}) -SET_TARGET_PROPERTIES(jsonrpc jsonrpc_static PROPERTIES VERSION "${VERSION_STRING}" SOVERSION "${VERSION_MAJOR}") - -# Link the library with dependencies -TARGET_LINK_LIBRARIES(jsonrpc pthread dl curl) -TARGET_LINK_LIBRARIES(jsonrpc_static pthread dl curl) - -# Install to appropriate destinations -INSTALL(FILES ${jsonrpc_header} DESTINATION include/jsonrpc) -INSTALL(FILES ${connector_header} DESTINATION include/jsonrpc/connectors) -INSTALL(FILES ${jsoncpp_header} DESTINATION include/jsonrpc/json) - -INSTALL(TARGETS jsonrpc jsonrpc_static - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin)