Merge branch 'develop' into master

AUTHORS.md

@@ -78,3 +78,7 @@ Trevor Vannoy <[email protected]>
 
 Ranganathan Balakrishnan <[email protected]>
 + add JSON NUMERIC data type to accept both real and integer values
+
+Evgeny Petrov <[email protected]>
++ added data field for error handler
++ 

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Build example for Centos 7 (#267)
 - `Json::Value` example code (#281)
 - IPv6 Support for `HttpServer` (#275)
+- Added data field in error handler in JS stub generator
 
 ### Fixed
 - Incorrect README sections (#280)

dev/artwork/overview.dia

@@ -172,7 +172,7 @@
       <dia:attribute name="text">
         <dia:composite type="text">
           <dia:attribute name="string">
-            <dia:string>#sepc.json
+            <dia:string>#spec.json
 {
   add()
 }#</dia:string>

src/jsonrpccpp/client/connectors/filedescriptorclient.h

@@ -22,7 +22,7 @@ namespace jsonrpc
       virtual ~FileDescriptorClient();
       virtual void SendRPCMessage(const std::string& message, std::string& result) ;
 
-    private:
+    protected:
       int inputfd;
       int outputfd;
 

src/jsonrpccpp/client/connectors/httpclient.h

@@ -28,7 +28,7 @@ class HttpClient : public IClientConnector {
   void AddHeader(const std::string &attr, const std::string &val);
   void RemoveHeader(const std::string &attr);
 
-private:
+protected:
   std::map<std::string, std::string> headers;
   std::string url;
 

src/jsonrpccpp/client/connectors/linuxserialportclient.h

@@ -40,7 +40,7 @@ namespace jsonrpc
              */
             virtual void SendRPCMessage(const std::string& message, std::string& result) ;
 
-        private:
+        protected:
             int fd;
             std::string deviceName;    /*!< The serial port device name on which the client should try to connect*/
             /**

src/jsonrpccpp/client/connectors/linuxtcpsocketclient.h

@@ -39,7 +39,7 @@ namespace jsonrpc
              */
             virtual void SendRPCMessage(const std::string& message, std::string& result) ;
 
-        private:
+        protected:
             std::string hostToConnect;    /*!< The hostname or the ipv4 address on which the client should try to connect*/
             unsigned int port;          /*!< The port on which the client should try to connect*/
             /**

src/jsonrpccpp/client/connectors/redisclient.h

@@ -67,7 +67,7 @@ namespace jsonrpc
              */
             void SetTimeout(long timeout);
 
-        private:
+        protected:
 
             /**
              * @brief Queue that we are messaging

src/jsonrpccpp/client/connectors/tcpsocketclient.h

@@ -47,7 +47,7 @@ namespace jsonrpc
                          */
             virtual void SendRPCMessage(const std::string& message, std::string& result) ;
 
-        private:
+        protected:
             IClientConnector *realSocket; /*!< A pointer to the real implementation of this class depending of running OS*/
     };
 

src/jsonrpccpp/client/connectors/unixdomainsocketclient.h

@@ -22,7 +22,7 @@ namespace jsonrpc
             virtual ~UnixDomainSocketClient();
             virtual void SendRPCMessage(const std::string& message, std::string& result) ;
 
-        private:
+        protected:
             std::string path;
     };
 

src/jsonrpccpp/client/connectors/windowstcpsocketclient.h

@@ -42,7 +42,7 @@ namespace jsonrpc
              */
             virtual void SendRPCMessage(const std::string& message, std::string& result) ;
 
-        private:
+        protected:
             std::string hostToConnect;    /*!< The hostname or the ipv4 address on which the client should try to connect*/
             unsigned int port;          /*!< The port on which the client should try to connect*/
             /**

src/jsonrpccpp/server/connectors/filedescriptorserver.h

@@ -38,7 +38,7 @@ class FileDescriptorServer : public AbstractThreadedServer {
   virtual int CheckForConnection();
   virtual void HandleConnection(int connection);
 
-private:
+protected:
   int inputfd;
   int outputfd;
   StreamReader reader;

src/jsonrpccpp/server/connectors/linuxserialportserver.h

@@ -45,7 +45,7 @@ class LinuxSerialPortServer : public AbstractThreadedServer {
   virtual int CheckForConnection();
   virtual void HandleConnection(int connection);
 
-private:
+protected:
   std::string deviceName;
   int serial_fd;
 

src/jsonrpccpp/server/connectors/linuxtcpsocketserver.h

@@ -46,7 +46,7 @@ class LinuxTcpSocketServer : public AbstractThreadedServer {
   virtual int CheckForConnection();
   virtual void HandleConnection(int connection);
 
-private:
+protected:
   std::string ipToBind;
   unsigned int port;
   int socket_fd;

src/jsonrpccpp/server/connectors/redisserver.h

@@ -60,8 +60,8 @@ namespace jsonrpc
        * @return A boolean that indicates the success or the failure of the operation.
        */
       bool SendResponse(const std::string& response, const std::string& ret_queue);
-
-    private:
+    
+    protected:
 
       /**
        * Callback for listening thread to start ListenLoop.
@@ -79,7 +79,7 @@ namespace jsonrpc
        */
       void ListenLoop();
 
-    private:
+
 
       /**
        * @brief Keeps track of whether the server is running.

src/jsonrpccpp/server/connectors/tcpsocketserver.h

@@ -67,7 +67,7 @@ class TcpSocketServer : public AbstractServerConnector {
    */
   bool StopListening();
 
-private:
+protected:
   AbstractServerConnector *realSocket;
 };
 

src/jsonrpccpp/server/connectors/unixdomainsocketserver.h

@@ -42,7 +42,7 @@ class UnixDomainSocketServer : public AbstractThreadedServer {
   virtual int CheckForConnection();
   virtual void HandleConnection(int connection);
 
-private:
+protected:
   std::string socket_path;
   int socket_fd;
   struct sockaddr_un address;

src/jsonrpccpp/server/connectors/windowstcpsocketserver.h

@@ -70,7 +70,7 @@ namespace jsonrpc
                          */
             bool SendResponse(const std::string& response, void* addInfo = NULL);
 
-        private:
+        protected:
             bool running;               /*!< A boolean that is used to know the listening state*/
             std::string ipToBind;       /*!< The ipv4 address on which the server should bind and listen*/
             unsigned int port;          /*!< The port on which the server should bind and listen*/

src/stubgenerator/client/jsclientstubgenerator.cpp

@@ -39,7 +39,7 @@ using namespace std;
                         callback_success(response.id, response.result);\n\
                     } else if (response.hasOwnProperty(\"error\")) {\n\
                         if (callback_error != null)\n\
-                            callback_error(response.error.code,response.error.message);\n\
+                            callback_error(response.error.code,response.error.message,response.error.data);\n\
                     } else {\n\
                         if (callback_error != null)\n\
                             callback_error(-32001, \"Invalid Server response: \" + response);\n\