Merge branch 'release/v0.4.2'

Peter Spiess-Knafl · Peter Spiess-Knafl · commit 5a189778429f · 2015-01-21T17:23:35.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,13 @@
+Changes in v0.4.2
+- Fix of spelling mistakes.
+- Use CMAKE versioning in manpage.
+- Improving include scheme of jsoncpp.
+- Bugfix in HttpServer with Threading option in SSL startup.
+
 Changes in v0.4.1
 -----------------
 - Added coverity scan support
-- [Added API compatiblity report](http://upstream.rosalinux.ru/versions/libjson-rpc-cpp.html)
+- [Added API compatibility report](http://upstream.rosalinux.ru/versions/libjson-rpc-cpp.html)
 - Improved manpage
 - Extended Stubgenerator for protocol switches (JSON-RPC 1.0 & 2.0)
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_CXX_FLAGS_DEBUG} -Wall -Wextra -Wnon-virtua
 
 SET(MAJOR_VERSION 0)
 SET(MINOR_VERSION 4)
-SET(PATCH_VERSION 1)
+SET(PATCH_VERSION 2)
 SET(SO_VERSION    0)
 
 #possible modules that can be enabled/disabled
@@ -31,6 +31,10 @@ ENDIF()
 #the core framework
 add_subdirectory(src/jsonrpccpp)
 
+include_directories("${PROJECT_SOURCE_DIR}/src/")
+include_directories("${PROJECT_BINARY_DIR}/gen/")
+include_directories("${PROJECT_BINARY_DIR}/gen/jsonrpccpp/common")
+
 #the stubgenerator
 IF(COMPILE_STUBGEN)
     add_subdirectory(src/stubgenerator)
diff --git a/README.md b/README.md
@@ -218,7 +218,7 @@ References
 - [LaseShark 3D Printer](https://github.com/macpod/lasershark_3dp): used to control the firmware of the 3D printer.
 - [cpp-ethereum](https://github.com/ethereum/cpp-ethereum): a distributed computing framework.
 - [mage-sdk-cpp](https://github.com/mage/mage-sdk-cpp): a game engine.
-- [bitcodin](http://www.bitmovin.net): a scaleable cloud based video transcoding platform.
+- [bitcodin](http://www.bitmovin.net): a scalable cloud based video transcoding platform.
 - [wgslib](http://wgslib.com/): A web geostatistics library.
 - [bitcoin-api-cpp](https://github.com/minium/bitcoin-api-cpp): a C++ interface to bitcoin.
 - [NIT DASH Content Server](http://www.nit.eu/offer/research-projects-products/334-http2dash): Dynamic Adaptive Streaming over HTTP server.
@@ -239,7 +239,7 @@ Changelogs
 ----------
 Changelogs can be found [here](https://github.com/cinemast/libjson-rpc-cpp/blob/master/CHANGELOG.md).
 
-API compatiblity
+API compatibility
 ----------------
 Can be found [here](http://upstream.rosalinux.ru/versions/libjson-rpc-cpp.html)
 
diff --git a/cmake/FindJSONCPP.cmake b/cmake/FindJSONCPP.cmake
@@ -25,9 +25,13 @@ IF(JSONCPP_INCLUDE_DIRS AND JSONCPP_LIBRARIES)
 ENDIF(JSONCPP_INCLUDE_DIRS AND JSONCPP_LIBRARIES)
 
 IF(JSONCPP_FOUND)
-    IF(NOT JSONCPP_FIND_QUIETLY)
-        MESSAGE(STATUS "Found libjsoncpp: ${JSONCPP_LIBRARIES}")
-    ENDIF(NOT JSONCPP_FIND_QUIETLY)
+    if(EXISTS "${JSONCPP_INCLUDE_DIRS}/version.h")
+        MESSAGE(STATUS "Found New libjsoncpp: ${JSONCPP_LIBRARIES}")
+        set(JSONCPP_INCLUDE_PREFIX "json")
+    else()
+        MESSAGE(STATUS "Found old libjsoncpp: ${JSONCPP_LIBRARIES}")
+        set(JSONCPP_INCLUDE_PREFIX "jsoncpp/json")
+    endif()
 ELSE(JSONCPP_FOUND)
     IF(JSONCPP_FIND_REQUIRED)
         MESSAGE(FATAL_ERROR "Could not find libjsoncpp")
diff --git a/doc/manpage.in b/doc/manpage.in
@@ -1,6 +1,6 @@
 .\" Manpage for jsonrpcstub.
 .\" Contact psk@autistici.org to correct errors or typos.
-.TH man 1 "22 November 2014" "0.4.1" "jsonrpcstub man page"
+.TH man 1 "22 November 2014" "@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" "jsonrpcstub man page"
 .SH NAME
 jsonrpcstub \- genearate stubs for the libjson\-rpc\-cpp framework.
 .SH SYNOPSIS
@@ -67,16 +67,16 @@ Defines the filename to use when generating the JavaScrip client class.
 Generate C++ Stubs for Server and Client, the classes will be named AbstractStubServer and StubClient:
 .P P
 .B
-\&  	  jsonrpcstub  spec.json --cpp--server=AbstractStubServer --cpp-client=StubClient
+\&  	  jsonrpcstub  spec.json \-\-cpp\-server=AbstractStubServer \-\-cpp\-client=StubClient
 .B
 .PP
 Generate JavaScript Client class MyRpcClient into file someclient.js:
 .PP
 .B
-\&  	  jsonrpcstub  spec.json --js--client=MyRpcClient --js-client-file=someclient.js
+\&  	  jsonrpcstub  spec.json \-\-js\-client=MyRpcClient \-\-js\-client\-file=someclient.js
 .B
 .SH EXIT STATUS
-This command returns 0 if no error occured. In any other case, it returns 1.
+This command returns 0 if no error occurred. In any other case, it returns 1.
 .SH SEE ALSO
 https://github.com/cinemast/libjson\-rpc\-cpp
 .SH BUGS
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
@@ -21,7 +21,6 @@ add_custom_command(OUTPUT xbmcremote.h
                    COMMENT "Generating Client XBMC Stubfile"
                    VERBATIM)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
 
 IF(HTTP_SERVER AND HTTP_CLIENT)
diff --git a/src/jsonrpccpp/CMakeLists.txt b/src/jsonrpccpp/CMakeLists.txt
@@ -29,16 +29,19 @@ set(server_connector_source "")
 set(server_connector_header "")
 set(server_connector_libs   "")
 
-include_directories("${PROJECT_SOURCE_DIR}/src/")
 
 # configure a header file to pass some of the CMake settings
 # to the source code
-configure_file (
-  "${PROJECT_SOURCE_DIR}/src/jsonrpccpp/version.h.in"
-  "${PROJECT_BINARY_DIR}/version.h"
-)
-install(FILES ${PROJECT_BINARY_DIR}/version.h DESTINATION include/jsonrpccpp) 
+file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/gen/jsonrpccpp/common")
+configure_file("${PROJECT_SOURCE_DIR}/src/jsonrpccpp/version.h.in" "${PROJECT_BINARY_DIR}/gen/jsonrpccpp/version.h")
+configure_file("${PROJECT_SOURCE_DIR}/src/jsonrpccpp/common/jsonparser.h.in" "${PROJECT_BINARY_DIR}/gen/jsonrpccpp/common/jsonparser.h")
 
+install(FILES "${PROJECT_BINARY_DIR}/gen/jsonrpccpp/version.h" DESTINATION include/jsonrpccpp)
+install(FILES "${PROJECT_BINARY_DIR}/gen/jsonrpccpp/common/jsonparser.h" DESTINATION include/jsonrpccpp/common)
+
+include_directories("${PROJECT_SOURCE_DIR}/src/")
+include_directories("${PROJECT_BINARY_DIR}/gen/")
+include_directories("${PROJECT_BINARY_DIR}/gen/jsonrpccpp/common")
 
 IF(HTTP_CLIENT)
     find_package(CURL REQUIRED)
diff --git a/src/jsonrpccpp/client/batchcall.h b/src/jsonrpccpp/client/batchcall.h
@@ -10,7 +10,7 @@
 #ifndef JSONRPC_CPP_BATCHCALL_H
 #define JSONRPC_CPP_BATCHCALL_H
 
-#include <jsoncpp/json/json.h>
+#include <jsonrpccpp/common/jsonparser.h>
 
 namespace jsonrpc
 {
diff --git a/src/jsonrpccpp/client/batchresponse.h b/src/jsonrpccpp/client/batchresponse.h
@@ -11,7 +11,7 @@
 #define JSONRPC_BATCHRESPONSE_H
 
 #include <map>
-#include <jsoncpp/json/json.h>
+#include <jsonrpccpp/common/jsonparser.h>
 
 namespace jsonrpc {
 
@@ -43,7 +43,7 @@ namespace jsonrpc {
             void getResult(int id, Json::Value &result);
 
             /**
-             * @brief getErrorCode method checks if for a given id, an error occured in the batch request.
+             * @brief getErrorCode method checks if for a given id, an error occurred in the batch request.
              * @param id
              */
             int getErrorCode(int id);
diff --git a/src/jsonrpccpp/client/client.cpp b/src/jsonrpccpp/client/client.cpp
@@ -23,10 +23,10 @@ Client::~Client()
     delete this->protocol;
 }
 
-void Client::CallMethod(const std::string &name, const Json::Value &paramter, Json::Value& result) throw(JsonRpcException)
+void Client::CallMethod(const std::string &name, const Json::Value &parameter, Json::Value& result) throw(JsonRpcException)
 {
     std::string request, response;
-    protocol->BuildRequest(name, paramter, request, false);
+    protocol->BuildRequest(name, parameter, request, false);
     connector.SendRPCMessage(request, response);
     protocol->HandleResponse(response, result);
 }
diff --git a/src/jsonrpccpp/client/client.h b/src/jsonrpccpp/client/client.h
@@ -13,7 +13,7 @@
 #include "iclientconnector.h"
 #include "batchcall.h"
 #include "batchresponse.h"
-#include <jsoncpp/json/json.h>
+#include <jsonrpccpp/common/jsonparser.h>
 
 #include <vector>
 #include <map>
@@ -30,13 +30,13 @@ namespace jsonrpc
             Client(IClientConnector &connector, clientVersion_t version = JSONRPC_CLIENT_V2);
             virtual ~Client();
 
-            void        CallMethod          (const std::string &name, const Json::Value &paramter, Json::Value& result) throw (JsonRpcException);
-            Json::Value CallMethod          (const std::string &name, const Json::Value &paramter) throw (JsonRpcException);
+            void        CallMethod          (const std::string &name, const Json::Value &parameter, Json::Value& result) throw (JsonRpcException);
+            Json::Value CallMethod          (const std::string &name, const Json::Value &parameter) throw (JsonRpcException);
 
             void           CallProcedures      (const BatchCall &calls, BatchResponse &response) throw (JsonRpcException);
             BatchResponse  CallProcedures      (const BatchCall &calls) throw (JsonRpcException);
 
-            void        CallNotification    (const std::string& name, const Json::Value& paramter) throw (JsonRpcException);
+            void        CallNotification    (const std::string& name, const Json::Value& parameter) throw (JsonRpcException);
 
         private:
            IClientConnector  &connector;
diff --git a/src/jsonrpccpp/client/rpcprotocolclient.cpp b/src/jsonrpccpp/client/rpcprotocolclient.cpp
@@ -8,7 +8,7 @@
  ************************************************************************/
 
 #include "rpcprotocolclient.h"
-#include <jsoncpp/json/writer.h>
+#include <jsonrpccpp/common/jsonparser.h>
 
 using namespace jsonrpc;
 
diff --git a/src/jsonrpccpp/client/rpcprotocolclient.h b/src/jsonrpccpp/client/rpcprotocolclient.h
@@ -11,7 +11,7 @@
 #define RESPONSEHANDLER_H
 
 #include <jsonrpccpp/common/exception.h>
-#include <jsoncpp/json/value.h>
+#include <jsonrpccpp/common/jsonparser.h>
 #include <string>
 #include "client.h"
 
@@ -27,7 +27,7 @@ namespace jsonrpc {
             RpcProtocolClient(clientVersion_t version = JSONRPC_CLIENT_V2);
 
             /**
-             * @brief This method builds a valid json-rpc 2.0 request object based on passed paramters.
+             * @brief This method builds a valid json-rpc 2.0 request object based on passed parameters.
              * The id starts at 1 and is incremented for each request. To reset this value to one, call
              * the jsonrpc::RpcProRpcProtocolClient::resetId() method.
              * @param method - name of method or notification to be called
diff --git a/src/jsonrpccpp/common/errors.h b/src/jsonrpccpp/common/errors.h
@@ -13,7 +13,7 @@
 #include <map>
 #include <string>
 
-#include <jsoncpp/json/json.h>
+#include "jsonparser.h"
 
 namespace jsonrpc
 {   
diff --git a/src/jsonrpccpp/common/jsonparser.h.in b/src/jsonrpccpp/common/jsonparser.h.in
@@ -0,0 +1,15 @@
+/*************************************************************************
+ * libjson-rpc-cpp
+ *************************************************************************
+ * @file    jsonparser.h
+ * @date    1/21/2015
+ * @author  Peter Spiess-Knafl <peter.knafl@gmail.com>
+ * @license See attached LICENSE.txt
+ ************************************************************************/
+
+#ifndef JSONRPC_CPP_JSONPARSER_H_
+#define JSONRPC_CPP_JSONPARSER_H_
+
+#include <@JSONCPP_INCLUDE_PREFIX@/json.h>
+
+#endif // JSONRPC_CPP_JSONPARSER_H_
diff --git a/src/jsonrpccpp/common/procedure.h b/src/jsonrpccpp/common/procedure.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <map>
 
-#include <jsoncpp/json/json.h>
+#include "jsonparser.h"
 #include "specification.h"
 
 namespace jsonrpc
@@ -72,8 +72,8 @@ namespace jsonrpc
 
             /**
              * @brief AddParameter
-             * @param name describes the name of the parameter. In case of an positional paramters, this value can be anything.
-             * @param type describes the defined type for this paramter.
+             * @param name describes the name of the parameter. In case of an positional parameters, this value can be anything.
+             * @param type describes the defined type for this parameter.
              */
             void AddParameter(const std::string& name, jsontype_t type);
 
diff --git a/src/jsonrpccpp/common/specificationparser.cpp b/src/jsonrpccpp/common/specificationparser.cpp
@@ -8,7 +8,7 @@
  ************************************************************************/
 
 #include "specificationparser.h"
-#include <jsoncpp/json/reader.h>
+#include <jsonrpccpp/common/jsonparser.h>
 #include <fstream>
 
 using namespace std;
diff --git a/src/jsonrpccpp/common/specificationwriter.cpp b/src/jsonrpccpp/common/specificationwriter.cpp
@@ -8,9 +8,9 @@
  ************************************************************************/
 
 #include "specificationwriter.h"
+#include "jsonparser.h"
 #include <fstream>
-#include <jsoncpp/json/json.h>
-#include <jsoncpp/json/writer.h>
+#include <jsonrpccpp/common/jsonparser.h>
 #include <iostream>
 
 using namespace std;
diff --git a/src/jsonrpccpp/server/abstractprotocolhandler.cpp b/src/jsonrpccpp/server/abstractprotocolhandler.cpp
@@ -9,9 +9,8 @@
 
 #include "abstractprotocolhandler.h"
 #include <jsonrpccpp/common/errors.h>
-#include <jsoncpp/json/value.h>
-#include <jsoncpp/json/reader.h>
-#include <jsoncpp/json/writer.h>
+#include <jsonrpccpp/common/jsonparser.h>
+
 #include <map>
 
 using namespace jsonrpc;
diff --git a/src/jsonrpccpp/server/connectors/httpserver.cpp b/src/jsonrpccpp/server/connectors/httpserver.cpp
@@ -57,7 +57,7 @@ bool HttpServer::StartListening()
                 SpecificationParser::GetFileContent(this->path_sslcert, this->sslcert);
                 SpecificationParser::GetFileContent(this->path_sslkey, this->sslkey);
 
-                this->daemon = MHD_start_daemon(MHD_USE_SSL | MHD_USE_SELECT_INTERNALLY, this->port, NULL, NULL, HttpServer::callback, this, MHD_OPTION_HTTPS_MEM_KEY, this->sslkey.c_str(), MHD_OPTION_HTTPS_MEM_CERT, this->sslcert.c_str(), MHD_OPTION_END, this->threads, MHD_OPTION_END);
+                this->daemon = MHD_start_daemon(MHD_USE_SSL | MHD_USE_SELECT_INTERNALLY, this->port, NULL, NULL, HttpServer::callback, this, MHD_OPTION_HTTPS_MEM_KEY, this->sslkey.c_str(), MHD_OPTION_HTTPS_MEM_CERT, this->sslcert.c_str(), MHD_OPTION_THREAD_POOL_SIZE, this->threads, MHD_OPTION_END);
             }
             catch (JsonRpcException& ex)
             {
diff --git a/src/jsonrpccpp/server/rpcprotocolserver12.cpp b/src/jsonrpccpp/server/rpcprotocolserver12.cpp
@@ -8,7 +8,7 @@
  ************************************************************************/
 
 #include "rpcprotocolserver12.h"
-#include <jsoncpp/json/json.h>
+#include <jsonrpccpp/common/jsonparser.h>
 
 using namespace jsonrpc;
 
diff --git a/src/stubgenerator/CMakeLists.txt b/src/stubgenerator/CMakeLists.txt
@@ -2,7 +2,6 @@ file(GLOB_RECURSE jsonrpcstub_source *.cpp)
 file(GLOB_RECURSE libstubgen_source *.cpp)
 list(REMOVE_ITEM libstubgen_source main.cpp)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 
 find_package(Argtable REQUIRED)
 
@@ -16,9 +15,9 @@ target_link_libraries(jsonrpcstub jsonrpccommon ${ARGTABLE_LIBRARIES})
 
 #Generate manpage
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    configure_file("${CMAKE_SOURCE_DIR}/doc/manpage.in" "${CMAKE_BINARY_DIR}/manpage" @ONLY)
     add_custom_command(OUTPUT jsonrpcstub.1.gz
-                   COMMAND gzip -c ${CMAKE_SOURCE_DIR}/doc/manpage > ${CMAKE_BINARY_DIR}/jsonrpcstub.1.gz
-                   MAIN_DEPENDENCY ${CMAKE_SOURCE_DIR}/doc/manpage
+                   COMMAND gzip -c "${CMAKE_BINARY_DIR}/manpage" > ${CMAKE_BINARY_DIR}/jsonrpcstub.1.gz
                    COMMENT "Generating man pages"
                    VERBATIM)
 
diff --git a/src/test/mockserverconnector.h b/src/test/mockserverconnector.h
@@ -11,7 +11,7 @@
 #define JSONRPC_MOCKSERVERCONNECTOR_H
 
 #include <jsonrpccpp/server/abstractserverconnector.h>
-#include <jsoncpp/json/json.h>
+#include <jsonrpccpp/common/jsonparser.h>
 
 namespace jsonrpc {
 
diff --git a/src/test/test_client.cpp b/src/test/test_client.cpp
@@ -7,7 +7,6 @@
  * @license See attached LICENSE.txt
  ************************************************************************/
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE client
 
 #include <boost/test/unit_test.hpp>
diff --git a/src/test/test_common.cpp b/src/test/test_common.cpp
@@ -13,8 +13,7 @@
 #include <jsonrpccpp/common/specificationparser.h>
 #include <jsonrpccpp/common/specificationwriter.h>
 
-#define BOOST_TEST_DYN_LINK
-#define BOOST_TEST_MODULE
+#define BOOST_TEST_MODULE common
 
 using namespace jsonrpc;
 using namespace std;
diff --git a/src/test/test_server.cpp b/src/test/test_server.cpp
@@ -11,7 +11,6 @@
 #include "testserver.h"
 #include "mockserverconnector.h"
 
-#define BOOST_TEST_DYN_LINK
 #define BOOST_TEST_MODULE server
 
 using namespace jsonrpc;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#ifndef JSONRPC_CPP_BATCHCALL_H`
`11`	`11`	`#define JSONRPC_CPP_BATCHCALL_H`
`12`	`12`
`13`		`-#include <jsoncpp/json/json.h>`
	`13`	`+#include <jsonrpccpp/common/jsonparser.h>`
`14`	`14`
`15`	`15`	`namespace jsonrpc`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,10 @@ Client::~Client()`
`23`	`23`	`delete this->protocol;`
`24`	`24`	`}`
`25`	`25`
`26`		`-void Client::CallMethod(const std::string &name, const Json::Value &paramter, Json::Value& result) throw(JsonRpcException)`
	`26`	`+void Client::CallMethod(const std::string &name, const Json::Value &parameter, Json::Value& result) throw(JsonRpcException)`
`27`	`27`	`{`
`28`	`28`	`std::string request, response;`
`29`		`- protocol->BuildRequest(name, paramter, request, false);`
	`29`	`+ protocol->BuildRequest(name, parameter, request, false);`
`30`	`30`	`connector.SendRPCMessage(request, response);`
`31`	`31`	`protocol->HandleResponse(response, result);`
`32`	`32`	`}`