You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2006/12/11 21:35:03 UTC

svn commit: r485858 - in /incubator/tuscany/cpp/sca/runtime: core/src/tuscany/sca/core/ extensions/ruby/src/tuscany/sca/ruby/ extensions/ws/reference/axis2c/src/tuscany/sca/ws/ extensions/ws/service/axis2c/src/tuscany/sca/ws/

Author: jsdelfino
Date: Mon Dec 11 12:35:02 2006
New Revision: 485858

URL: http://svn.apache.org/viewvc?view=rev&rev=485858
Log:
Added logging of parameters and return value set into an Operation, and logging when we convert between SDO and XML.

Modified:
    incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
    incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp

Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp?view=diff&rev=485858&r1=485857&r2=485858
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/core/Operation.cpp Mon Dec 11 12:35:02 2006
@@ -22,6 +22,8 @@
 #include "tuscany/sca/core/Operation.h"
 #include <stdarg.h>
 
+#include <sstream>
+
 #include "tuscany/sca/util/Logging.h"
 #include "tuscany/sca/util/Exceptions.h"
 #include "tuscany/sca/core/SCARuntime.h"
@@ -176,90 +178,107 @@
         void Operation::addParameter(const void *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: void, value: %p", parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, VOID_TYPE));
          }
 
         void Operation::addParameter(const bool *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: bool, value: %d", (int)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, BOOL));
         }
 
         void Operation::addParameter(const short *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: short, value: %hd", (short)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, SHORT));
         }
 
         void Operation::addParameter(const int *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: int, value: %d", (int)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, INT));
         }
 
         void Operation::addParameter(const long *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: long, value: %ld", (long)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, LONG));
         }
 
         void Operation::addParameter(const unsigned short *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: unsigned short, value: %hu", (unsigned short)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, USHORT));
         }
 
         void Operation::addParameter(const unsigned int *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: unsigned int, value: %u", (unsigned int)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, UINT));
         }
 
         void Operation::addParameter(const unsigned long *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: unsigned long, value: %lu", (unsigned long)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, ULONG));
         }
 
        void Operation::addParameter(const float *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: float, value: %f", (float)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, FLOAT));
         }
 
        void Operation::addParameter(const double *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: double, value: %lf", (double)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, DOUBLE));
         }
 
        void Operation::addParameter(const long double *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: long double, value: %Lf", (long double)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, LONGDOUBLE));
         }
 
         void Operation::addParameter(const char* *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: char*, value: %s", (const char*)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, CHARS));
         }
 
         void Operation::addParameter(const char *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: char, value: %d", (int)*parm);
             parameters.insert(parameters.end(), Parameter((void*)parm, CHAR));
         }
 
         void Operation::addParameter(const string *parm)
         {
             logentry();
+            loginfo("Adding operation parameter, type: string, value: %s", (const char*)(*parm).c_str());
             parameters.insert(parameters.end(), Parameter((void*)parm, STRING));
         }
 
         void Operation::addParameter(const DataObjectPtr *parm)
         {
             logentry();
+            ostringstream os;
+            os << *parm;
+            loginfo("Adding operation parameter, type: DataObject, value: %s", os.str().c_str());
             parameters.insert(parameters.end(), Parameter((void*)new DataObjectPtr(*parm), DATAOBJECT));
         }
 
@@ -274,93 +293,109 @@
         void Operation::setReturnValue(const void *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: void, value: %p", parm);
             returnValue = Parameter((void*)parm, VOID_TYPE);
         }
 
         void Operation::setReturnValue(const bool *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: bool, value: %d", (bool)*parm);
             returnValue = Parameter((void*)parm, BOOL);
         }
 
         void Operation::setReturnValue(const short *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: short, value: %h", (short)*parm);
             returnValue = Parameter((void*)parm, SHORT);
         }
 
         void Operation::setReturnValue(const int *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: int, value: %d", (int)*parm);
             returnValue = Parameter((void*)parm, INT);
         }
 
         void Operation::setReturnValue(const long *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: long, value: %l", (long)*parm);
             returnValue = Parameter((void*)parm, LONG);
         }
 
         void Operation::setReturnValue(const unsigned short *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: unsigned short, value: %hu", (unsigned short)*parm);
             returnValue = Parameter((void*)parm, USHORT);
         }
 
         void Operation::setReturnValue(const unsigned int *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: unsigned short, value: %u", (unsigned int)*parm);
             returnValue = Parameter((void*)parm, UINT);
         }
 
         void Operation::setReturnValue(const unsigned long *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: unsigned long, value: %lu", (unsigned long)*parm);
             returnValue = Parameter((void*)parm, ULONG);
         }
 
        void Operation::setReturnValue(const float *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: float, value: %f", (float)*parm);
             returnValue = Parameter((void*)parm, FLOAT);
         }
 
        void Operation::setReturnValue(const double *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: double, value: %lf", (double)*parm);
             returnValue = Parameter((void*)parm, DOUBLE);
         }
 
        void Operation::setReturnValue(const long double *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: long double, value: %Lf", (long double)*parm);
             returnValue = Parameter((void*)parm, LONGDOUBLE);
         }
 
         void Operation::setReturnValue(const char *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: char, value: %d", (char)*parm);
             returnValue = Parameter((void*)parm, CHAR);
         }
 
         void Operation::setReturnValue(const char* *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: char*, value: %s", (char*)*parm);
             returnValue = Parameter((void*)parm, CHARS);
         }
 
         void Operation::setReturnValue(const string *parm)
         {
             logentry();
+            loginfo("Setting operation return value, type: string, value: %s", (*parm).c_str());
             returnValue = Parameter((void*)parm, STRING);
         }
 
         void Operation::setReturnValue(const DataObjectPtr *parm)
         {
             logentry();
+            ostringstream os;
+            os << *parm;
+            loginfo("Setting operation return value, type: DataObject, value: %s", os.str().c_str());
             returnValue = Parameter((void*)new DataObjectPtr(*parm), DATAOBJECT);
         }
-
  
     } // End namespace sca
 } // End namespace tuscany

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp?view=diff&rev=485858&r1=485857&r2=485858
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceProxy.cpp Mon Dec 11 12:35:02 2006
@@ -223,6 +223,8 @@
                                 ID to_s = rb_intern("to_s");
                                 VALUE vstr = rb_funcall(value, to_s, 0);
                                 string str = string(rb_string_value_cstr(&vstr));
+                                
+                                loginfo("Converting Rexml document to SDO: %s", str.c_str());
                                                                 
                                 Composite* composite = getReference()->getComponent()->getComposite();                                   
                                 commonj::sdo::XMLHelper* xmlHelper = composite->getXMLHelper();
@@ -341,6 +343,9 @@
                                 dob,
                                 dob->getType().getURI(),
                                 dob->getType().getName());
+                                
+                            loginfo("Converting SDO to Rexml document: %s", str);
+                                
                             VALUE vstr[1];
                             vstr[0] = rb_str_new2(str);
 

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp?view=diff&rev=485858&r1=485857&r2=485858
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ruby/src/tuscany/sca/ruby/RubyServiceWrapper.cpp Mon Dec 11 12:35:02 2006
@@ -257,6 +257,9 @@
                                         dob,
                                         dob->getType().getURI(),
                                         dob->getType().getName());
+                                        
+                                    loginfo("Converting SDO to Rexml document: %s", str);
+                                        
                                     VALUE vstr[1];
                                     vstr[0] = rb_str_new2(str);
 
@@ -735,6 +738,8 @@
                                 VALUE vstr = rb_funcall(result, to_s, 0);
                                 string str = string(rb_string_value_cstr(&vstr));
                                                                 
+                                loginfo("Converting Rexml document to SDO: %s", str.c_str());
+                                        
                                 Composite* composite = component->getComposite();                                   
                                 commonj::sdo::XMLHelper* xmlHelper = composite->getXMLHelper();
                                 commonj::sdo::XMLDocumentPtr xmlDoc = xmlHelper->load(str.c_str());

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp?view=diff&rev=485858&r1=485857&r2=485858
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/reference/axis2c/src/tuscany/sca/ws/Axis2Client.cpp Mon Dec 11 12:35:02 2006
@@ -559,6 +559,12 @@
                     string msg = "Could not convert Axis2 OM node to SDO";
                     throwException(ServiceInvocationException, msg.c_str());
                 }
+                else
+                {
+                    ostringstream os;
+                    os << outputBodyDataObject;
+                    loginfo("Converted Axis2 OM node to SDO: %s", os.str().c_str());
+                }
                 
                 XMLHelperPtr xmlHelper = compositeReference->getComposite()->getXMLHelper();
 

Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp?view=diff&rev=485858&r1=485857&r2=485858
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Service.cpp Mon Dec 11 12:35:02 2006
@@ -452,8 +452,14 @@
                                         {
                                             string msg = "Could not convert request Axis2 OM to SDO";
                                             throwException(ServiceInvocationException, msg.c_str());
-                                        }                    
-                    
+                                        }
+                                        else
+                                        {
+                                            ostringstream os;
+                                            os << inputBodyDataObject;
+                                            loginfo("Converted Axis2 OM node to SDO: %s", os.str().c_str());
+                                        }                   
+
                                         // Get the first body part representing the doc-lit-wrapped wrapper element
                                         PropertyList bpl = inputBodyDataObject->getInstanceProperties();
                                         if (bpl.size()!=0)



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org