Author: jsdelfino
Date: Mon Dec  4 00:14:36 2006
New Revision: 482099

URL: http://svn.apache.org/viewvc?view=rev&rev=482099
Log:
Revert back to use sdo:OpenDataObject instead of a custom Wrapper. The SDO 
writer generates and xsi:type attribute if a custom Wrapper is used and we 
don't need it.

Modified:
    
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/WSServiceProxy.cpp

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=482099&r1=482098&r2=482099
==============================================================================
--- 
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  4 00:14:36 2006
@@ -203,7 +203,6 @@
                 axis2_char_t* soap_action = 
(axis2_char_t*)wsdlOperation.getSoapAction().c_str();
                 axis2_char_t* serviceName = 
(axis2_char_t*)binding->getServiceName().c_str();
                 
-
                 // create OM from Operation and wsdlOperation
                 axiom_node_t* payload = createPayload(operation, 
wsdlOperation, env);
                 /* Create EPR with given address */
@@ -324,7 +323,8 @@
                     {
                         
                         // The input wrapper type is not known, create an open 
DataObject 
-                        inputDataObject = 
dataFactory->create("http://tempuri.org";, "Wrapper");
+                        //inputDataObject = 
dataFactory->create("http://tempuri.org";, "Wrapper");
+                        inputDataObject = 
dataFactory->create(Type::SDOTypeNamespaceURI, "OpenDataObject");
                     }
                 }
                         
@@ -569,7 +569,7 @@
                     string msg = "Could not convert Axis2 body part to SDO";
                     throwException(ServiceInvocationException, msg.c_str());
                 }
-
+                
                 PropertyList pl = outputDataObject->getType().getProperties();
                 if (pl.size() == 0)
                 {

Modified: 
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp?view=diff&rev=482099&r1=482098&r2=482099
==============================================================================
--- 
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
 (original)
+++ 
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
 Mon Dec  4 00:14:36 2006
@@ -349,7 +349,8 @@
                         catch (SDORuntimeException&)
                         {
                             // The output wrapper type is not known, create an 
open DataObject 
-                            outputDataObject = 
dataFactoryPtr->create("http://tempuri.org";, "Wrapper");
+                            //outputDataObject = 
dataFactoryPtr->create("http://tempuri.org";, "Wrapper");
+                            outputDataObject = 
dataFactoryPtr->create(Type::SDOTypeNamespaceURI, "OpenDataObject");
                         }
                     }
                     



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to