Merge branch 'release/v0.4.1'

Author: Peter Spiess-Knafl

CHANGELOG.md

@@ -1,3 +1,10 @@
+Changes in v0.4.1
+-----------------
+- Added coverity scan support
+- [Added API compatiblity report](http://upstream.rosalinux.ru/versions/libjson-rpc-cpp.html)
+- Improved manpage
+- Extended Stubgenerator for protocol switches (JSON-RPC 1.0 & 2.0)
+
 Changes in v0.4
 ---------------
 - Memory leak fixes

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 0)
+SET(PATCH_VERSION 1)
 SET(SO_VERSION    0)
 
 #possible modules that can be enabled/disabled

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/cinemast/libjson-rpc-cpp.png?branch=master)](https://travis-ci.org/cinemast/libjson-rpc-cpp) [![Coverage Status](https://coveralls.io/repos/cinemast/libjson-rpc-cpp/badge.png?branch=develop)](https://coveralls.io/r/cinemast/libjson-rpc-cpp?branch=develop)
+[![Build Status](https://travis-ci.org/cinemast/libjson-rpc-cpp.png?branch=master)](https://travis-ci.org/cinemast/libjson-rpc-cpp) [![Coverage Status](https://coveralls.io/repos/cinemast/libjson-rpc-cpp/badge.png?branch=develop)](https://coveralls.io/r/cinemast/libjson-rpc-cpp?branch=develop) [![Coverity Status](https://scan.coverity.com/projects/3169/badge.svg?flat=1)](https://scan.coverity.com/projects/3169)
 
 libjson-rpc-cpp
 ===============
@@ -14,7 +14,7 @@ It is fully JSON-RPC [2.0 & 1.0 compatible](http://www.jsonrpc.org/specification
 - Full JSON-RPC 2.0 & 1.0 Client and Server Support.
 - jsonrpcstub - a tool that generates stub-classes for your JSON-RPC client AND server applications.
 - Ready to use HTTP server and client to provide simple interfaces for your JSON-RPC application.
-- Cross platform build support and [precompiled binaries for WIN32](https://spiessknafl.at/libjson-rpc-cpp/libjson-rpc-cpp-0.4.0-win32.exe).
+- Cross platform build support and [precompiled binaries for WIN32](http://spiessknafl.at/libjson-rpc-cpp/libjson-rpc-cpp-win32.exe).
 - Super liberal [MIT-License](http://en.wikipedia.org/wiki/MIT_License). 
 
 **Other good reasons to use libjson-rpc-cpp**
@@ -57,7 +57,7 @@ brew install argtable cmake jsoncpp libmicrohttpd
 
 **Windows**
 
-There is a ready to use compiled package for WIN32 [here](https://spiessknafl.at/libjson-rpc-cpp/libjson-rpc-cpp-0.4.0-win32.exe).
+There is a ready to use compiled package for WIN32 [here](http://spiessknafl.at/libjson-rpc-cpp/libjson-rpc-cpp-win32.exe).
 
 If you want to compile on your own, here is how:
 
@@ -221,6 +221,7 @@ References
 - [bitcodin](http://www.bitmovin.net): a scaleable 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.
 
 If you use this library and find it useful, I would be very pleased if you let me know about it.
 
@@ -235,8 +236,12 @@ Changelogs
 ----------
 Changelogs can be found [here](https://github.com/cinemast/libjson-rpc-cpp/blob/master/CHANGELOG.md).
 
-Licsense
---------
+API compatiblity
+----------------
+Can be found [here](http://upstream.rosalinux.ru/versions/libjson-rpc-cpp.html)
+
+License
+-------
 This framework is licensed under [MIT](http://en.wikipedia.org/wiki/MIT_License). 
 All of this libraries dependencies are licensed under MIT compatible licenses.
 

doc/manpage

@@ -1,6 +1,6 @@
 .\" Manpage for jsonrpcstub.
 .\" Contact [email protected] to correct errors or typos.
-.TH man 1 "22 November 2014" "0.4" "jsonrpcstub man page"
+.TH man 1 "22 November 2014" "0.4.1" "jsonrpcstub man page"
 .SH NAME
 jsonrpcstub \- genearate stubs for the libjson\-rpc\-cpp framework.
 .SH SYNOPSIS
@@ -75,6 +75,8 @@ Generate JavaScript Client class MyRpcClient into file someclient.js:
 .B
 \&  	  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.
 .SH SEE ALSO
 https://github.com/cinemast/libjson\-rpc\-cpp
 .SH BUGS

src/examples/stubclient.cpp

@@ -18,7 +18,9 @@ using namespace std;
 int main()
 {
     HttpClient httpclient("http://localhost:8383");
-    StubClient c(httpclient);
+    //StubClient c(httpclient, JSONRPC_CLIENT_V1); //json-rpc 1.0
+    StubClient c(httpclient, JSONRPC_CLIENT_V2);   //json-rpc 2.0
+
 
     try
     {
@@ -35,7 +37,5 @@ int main()
     {
         cerr << e.what() << endl;
     }
-
-
 }
 

src/examples/stubserver.cpp

@@ -18,7 +18,7 @@ using namespace std;
 class MyStubServer : public AbstractStubServer
 {
     public:
-        MyStubServer(AbstractServerConnector &connector);
+        MyStubServer(AbstractServerConnector &connector, serverVersion_t type);
 
         virtual void notifyServer();
         virtual std::string sayHello(const std::string& name);
@@ -30,8 +30,8 @@ class MyStubServer : public AbstractStubServer
 
 };
 
-MyStubServer::MyStubServer(AbstractServerConnector &connector) :
-    AbstractStubServer(connector)
+MyStubServer::MyStubServer(AbstractServerConnector &connector, serverVersion_t type) :
+    AbstractStubServer(connector, type)
 {
 }
 
@@ -76,9 +76,9 @@ string MyStubServer::methodWithoutParameters()
 int main()
 {
     HttpServer httpserver(8383);
-    MyStubServer s(httpserver);
+    MyStubServer s(httpserver, JSONRPC_SERVER_V1V2); //hybrid server (json-rpc 1.0 & 2.0)
     s.StartListening();
-
+    cout << "Hit enter to stop the server" << endl;
     getchar();
 
     s.StopListening();

src/jsonrpccpp/common/procedure.cpp

@@ -16,7 +16,11 @@
 using namespace std;
 using namespace jsonrpc;
 
-Procedure::Procedure()
+Procedure::Procedure() :
+    procedureName(""),
+    procedureType(RPC_METHOD),
+    returntype(JSON_BOOLEAN),
+    paramDeclaration(PARAMS_BY_NAME)
 {
 }
 
@@ -27,7 +31,7 @@ Procedure::Procedure(const string &name, parameterDeclaration_t paramType, jsont
     const char* paramname = va_arg(parameters, const char*);
     jsontype_t type;
     while(paramname != NULL) {
-        type = (jsontype_t)va_arg(parameters, int);     //Needs to be tested
+        type = (jsontype_t)va_arg(parameters, int);
         this->AddParameter(paramname, type);
         paramname = va_arg(parameters, const char*);
     }
@@ -44,14 +48,15 @@ Procedure::Procedure(const string &name, parameterDeclaration_t paramType, ...)
     const char* paramname = va_arg(parameters, const char*);
     jsontype_t type;
     while(paramname != NULL) {
-        type = (jsontype_t)va_arg(parameters, int);     //Needs to be tested
+        type = (jsontype_t)va_arg(parameters, int);
         this->AddParameter(paramname, type);
         paramname = va_arg(parameters, const char*);
     }
     va_end(parameters);
     this->procedureName = name;
     this->procedureType = RPC_NOTIFICATION;
     this->paramDeclaration = paramType;
+    this->returntype = JSON_BOOLEAN;
 }
 
 bool                        Procedure::ValdiateParameters           (const Json::Value& parameters) const

src/stubgenerator/client/cppclientstubgenerator.cpp

@@ -12,7 +12,7 @@
 
 #define TEMPLATE_CPPCLIENT_SIGCLASS "class <stubname> : public jsonrpc::Client"
 
-#define TEMPLATE_CPPCLIENT_SIGCONSTRUCTOR "<stubname>(jsonrpc::IClientConnector &conn) : jsonrpc::Client(conn) {}"
+#define TEMPLATE_CPPCLIENT_SIGCONSTRUCTOR "<stubname>(jsonrpc::IClientConnector &conn, jsonrpc::clientVersion_t type = jsonrpc::JSONRPC_CLIENT_V2) : jsonrpc::Client(conn, type) {}"
 
 #define TEMPLATE_CPPCLIENT_SIGMETHOD "<returntype> <methodname>(<parameters>) throw (jsonrpc::JsonRpcException)"
 

src/stubgenerator/server/cppserverstubgenerator.cpp

@@ -18,7 +18,7 @@
 #define TEMPLATE_CPPSERVER_NOTIFICATIONBINDING "this->bindAndAddNotification(jsonrpc::Procedure(\"<procedurename>\", <paramtype>, <parameterlist> NULL), &<stubname>::<procedurename>I);"
 
 #define TEMPLATE_CPPSERVER_SIGCLASS "class <stubname> : public jsonrpc::AbstractServer<<stubname>>"
-#define TEMPLATE_CPPSERVER_SIGCONSTRUCTOR "<stubname>(jsonrpc::AbstractServerConnector &conn) : jsonrpc::AbstractServer<<stubname>>(conn)"
+#define TEMPLATE_CPPSERVER_SIGCONSTRUCTOR "<stubname>(jsonrpc::AbstractServerConnector &conn, jsonrpc::serverVersion_t type = jsonrpc::JSONRPC_SERVER_V2) : jsonrpc::AbstractServer<<stubname>>(conn, type)"
 
 #define TEMPLATE_CPPSERVER_SIGMETHOD "inline virtual void <procedurename>I(const Json::Value &request, Json::Value &response)"
 #define TEMPLATE_CPPSERVER_SIGNOTIFICATION "inline virtual void <procedurename>I(const Json::Value &request)"