You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2006/07/12 12:51:50 UTC

svn commit: r421230 - in /incubator/tuscany/cpp/sca/runtime: core/src/tuscany/sca/ws/EntryPointProxy.cpp ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp

Author: robbinspg
Date: Wed Jul 12 03:51:49 2006
New Revision: 421230

URL: http://svn.apache.org/viewvc?rev=421230&view=rev
Log:
TUSCANY-540 - Andy Borley's WSEntryPoint patch

Modified:
    incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
    incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp

Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp?rev=421230&r1=421229&r2=421230&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/ws/EntryPointProxy.cpp Wed Jul 12 03:51:49 2006
@@ -388,6 +388,18 @@
     // Now go through outputDataObject to set the return value
     pl = outputDataObject->getInstanceProperties();
 
+    // Set up the possible return value pointers
+    bool boolData = 0;
+    char byteData = 0;
+    wchar_t charData = 0;
+    long double doubleData = 0;
+    float floatData = 0;
+    long intData = 0;
+    short shortData = 0;
+    const char* stringData;
+    DataObjectPtr dataObjectData;
+
+
     // There should only be one return value, but go through any list anyway?
     if(pl.size() > 1)
     {
@@ -403,7 +415,6 @@
              */
            
             // An OpenDataObject for the data to return in
-            DataObjectPtr dataObjectData;
             operation.setReturnValue(&dataObjectData);            
         }
         else
@@ -422,49 +433,42 @@
         case Type::BooleanType:
             {
                 //printf("outputDataObject has BooleanType named %s\n", name);
-                bool boolData = 0;
                 operation.setReturnValue(&boolData);
             }
             break;
         case Type::ByteType:
             {
                 //printf("outputDataObject has ByteType named %s\n", name);
-                char byteData = 0;
                 operation.setReturnValue(&byteData);
             }
             break;
         case Type::CharacterType:
             {
                 //printf("outputDataObject has CharacterType named %s\n", name);
-                wchar_t charData = 0;
                 operation.setReturnValue(&charData);
             }
             break;
         case Type::DoubleType:
             {
                 //printf("outputDataObject has DoubleType named %s\n", name);
-                long double doubleData = 0;
                 operation.setReturnValue((long double*) &doubleData);
             }
             break;
         case Type::FloatType:
             {
                 //printf("outputDataObject has FloatType named %s\n", name);
-                float floatData = 0;
                 operation.setReturnValue(&floatData);
             }
             break;
         case Type::IntegerType:
             {
                 //printf("outputDataObject has IntegerType named %s\n", name);
-                long intData = 0;
                 operation.setReturnValue(&intData);
             }
             break;
         case Type::ShortType:
             {
                 //printf("outputDataObject has ShortType named %s\n", name);
-                short shortData = 0;
                 operation.setReturnValue(&shortData);
             }
             break;
@@ -472,14 +476,12 @@
         case Type::BytesType:
              {
                 //printf("outputDataObject has StringType or BytesType named %s\n", name);
-                const char* stringData;
                 operation.setReturnValue((const char**) &stringData);
             }
             break;
         case Type::DataObjectType:
             {
                 // printf("outputDataObject has DataObjectType named %s with type %s # %s\n", name, pl[0].getType().getURI(), pl[0].getType().getName());
-                DataObjectPtr dataObjectData;// = dataFactoryPtr->create(pl[0].getType());
                 operation.setReturnValue(&dataObjectData);
             }
             break;
@@ -620,7 +622,7 @@
         case Type::FloatType:
             {
                 float* floatData = (float*) operation.getReturnValue();
-                //printf("outputDataObject has FloatType named %s with value %f\n", name, *floatData);
+                //printf("outputDataObject has FloatType named %s with value %f \n", name, *floatData);
                 outputDataObject->setFloat(pl[i], *floatData);
             }
             break;

Modified: incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp?rev=421230&r1=421229&r2=421230&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp Wed Jul 12 03:51:49 2006
@@ -158,10 +158,13 @@
                 		AXIS2_LOG_ERROR((env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: EntryPoint has no SCA implementation");
                         return 0;
                     }
-                    //char* om_str = NULL;
-                    //om_str = AXIOM_NODE_TO_STRING(node, env);
-                    //if (om_str)
-                    //    printf("Axis2EntryPoint Request OM : %s\n", om_str);
+
+                    char* om_str = NULL;
+                    om_str = AXIOM_NODE_TO_STRING(node, env);
+                    if (om_str)
+                    {
+                        AXIS2_LOG_INFO((env)->log, "Axis2EntryPointService invoke has request OM: %s\n", om_str);
+                    }
 
                     DataObjectPtr inputDataObject = axiomHelper->toSdo(node, entryPointProxy->getDataFactory());
 
@@ -191,10 +194,12 @@
 
 					returnNode = axiomHelper->toAxiomNode(outputDataObject);
 						
-                    //om_str = NULL;
-                    //om_str = AXIOM_NODE_TO_STRING(returnNode, env);
-                    //if (om_str)
-                    //    printf("Axis2EntryPoint Response OM : %s\n", om_str);									
+                    om_str = NULL;
+                    om_str = AXIOM_NODE_TO_STRING(returnNode, env);
+                    if (om_str)
+                    {
+                        AXIS2_LOG_INFO((env)->log, "Axis2EntryPointService invoke has response OM : %s\n", om_str);
+                    }
                         
 					AxiomHelper::releaseHelper(axiomHelper);												
 



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