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/06/19 12:19:57 UTC
svn commit: r415278 - in /incubator/tuscany/cpp/sca: ./
runtime/ws_reference/axis2c/src/ runtime/ws_service/axis2c/src/
Author: robbinspg
Date: Mon Jun 19 03:19:56 2006
New Revision: 415278
URL: http://svn.apache.org/viewvc?rev=415278&view=rev
Log:
TUSCANY-478 - SCA Linux build for AXIS2 0.92
Modified:
incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp
incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.h
incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Makefile.am
incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2EntryPointService_skeleton.cpp
incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp
incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.h
incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Makefile.am
incubator/tuscany/cpp/sca/scatest.sh
Modified: incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.cpp Mon Jun 19 03:19:56 2006
@@ -24,7 +24,7 @@
#include <axis2_error_default.h>
#include <axis2_log_default.h>
#include <axis2_defines.h>
-#include <axis2_soap.h>
+#include <axiom_soap_const.h>
#include <platforms/axis2_platform_auto_sense.h>
#include <sdo_axiom.h>
@@ -95,22 +95,22 @@
axis2_char_t* serviceName = (axis2_char_t*)binding->getServiceName().c_str();
// create OM from Operation and wsdlOperation
- axis2_om_node_t* payload = createPayload(operation, wsdlOperation, &env);
+ axiom_node_t* payload = createPayload(operation, wsdlOperation, env);
/* Create EPR with given address */
- axis2_endpoint_ref_t* endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ axis2_endpoint_ref_t* endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- axis2_options_t* options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
- int soap_version = AXIS2_SOAP11;
+ axis2_options_t* options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
+ int soap_version = AXIOM_SOAP11;
if (wsdlOperation.getSoapVersion() == WsdlOperation::SOAP12)
{
- soap_version = AXIS2_SOAP12;
+ soap_version = AXIOM_SOAP12;
}
- AXIS2_OPTIONS_SET_SOAP_VERSION(options, &env, soap_version);
- AXIS2_OPTIONS_SET_ACTION(options, &env, soap_action);
+ AXIS2_OPTIONS_SET_SOAP_VERSION(options, env, soap_version);
+ AXIS2_OPTIONS_SET_ACTION(options, env, soap_action);
/* Create service client */
@@ -119,7 +119,7 @@
{
throw SystemConfigurationException("Environment error: AXIS2C_HOME not set");
}
- axis2_svc_client_t* svc_client = axis2_svc_client_create(&env, client_home);
+ axis2_svc_client_t* svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "invoke FAILED: Error code:"
@@ -130,13 +130,13 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Send request */
- axis2_om_node_t* ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ axiom_node_t* ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
- setReturn(ret_node, operation, wsdlOperation, &env);
+ setReturn(ret_node, operation, wsdlOperation, env);
}
else
{
@@ -148,19 +148,19 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
LOGEXIT(1, "Axis2Client::invoke");
}
-axis2_om_node_t* Axis2Client::createPayload(Operation& operation,
+axiom_node_t* Axis2Client::createPayload(Operation& operation,
const WsdlOperation& wsdlOp,
- axis2_env_t** env)
+ axis2_env_t* env)
{
LOGENTRY(1, "Axis2Client::createPayload");
- axis2_om_node_t* requestOM = NULL;
+ axiom_node_t* requestOM = NULL;
// map the operation request to the wsdl
if (wsdlOp.isDocumentStyle())
@@ -170,7 +170,7 @@
// Build up the payload as an SDO
- // Get the data factory for the module (it will already have the types loaded for the xsds)
+ // Get the data factory for the module (it will already have the typecreates loaded for the xsds)
DataFactoryPtr dataFactory = externalService->getContainingModule()->getDataFactory();
DataObjectPtr requestDO = dataFactory->create(wsdlOp.getInputTypeUri().c_str(),
wsdlOp.getInputTypeName().c_str());
@@ -250,14 +250,14 @@
}
// Logging start
- axis2_xml_writer_t* xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
- axis2_om_output_t* om_output = axis2_om_output_create( env, xml_writer);
+ axiom_xml_writer_t* xml_writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_FALSE, AXIS2_FALSE, AXIS2_XML_PARSER_TYPE_BUFFER);
+ axiom_output_t* om_output = axiom_output_create( env, xml_writer);
- AXIS2_OM_NODE_SERIALIZE(requestOM, env, om_output);
- axis2_char_t* buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
+ AXIOM_NODE_SERIALIZE(requestOM, env, om_output);
+ axis2_char_t* buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(xml_writer, env);
LOGINFO_1(3, "Sending this OM node in XML : %s \n", buffer);
- AXIS2_OM_OUTPUT_FREE(om_output, env);
- AXIS2_FREE((*env)->allocator, buffer);
+ AXIOM_OUTPUT_FREE(om_output, env);
+ AXIS2_FREE((env)->allocator, buffer);
// Logging end
return requestOM;
@@ -265,22 +265,22 @@
LOGEXIT(1, "Axis2Client::createPayload");
}
-void Axis2Client::setReturn(axis2_om_node_t* ret_node,
+void Axis2Client::setReturn(axiom_node_t* ret_node,
Operation& operation,
const WsdlOperation& wsdlOp,
- axis2_env_t** env)
+ axis2_env_t* env)
{
LOGENTRY(1, "Axis2Client::setReturn");
/* Get the response value from the SOAP message */
// logging start
- axis2_xml_writer_t* writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER);
- axis2_om_output_t* om_output = axis2_om_output_create (env, writer);
- AXIS2_OM_NODE_SERIALIZE (ret_node, env, om_output);
- axis2_char_t* buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(writer, env);
+ axiom_xml_writer_t* writer = axiom_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0, AXIS2_XML_PARSER_TYPE_BUFFER);
+ axiom_output_t* om_output = axiom_output_create (env, writer);
+ AXIOM_NODE_SERIALIZE (ret_node, env, om_output);
+ axis2_char_t* buffer = (axis2_char_t*)AXIOM_XML_WRITER_GET_XML(writer, env);
LOGINFO_1(3,"Received OM node in XML : %s\n", buffer);
- AXIS2_OM_OUTPUT_FREE(om_output, env);
- AXIS2_FREE((*env)->allocator, buffer);
+ AXIOM_OUTPUT_FREE(om_output, env);
+ AXIS2_FREE((env)->allocator, buffer);
// Logging end
Modified: incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.h?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.h (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Axis2Client.h Mon Jun 19 03:19:56 2006
@@ -20,7 +20,7 @@
#include "osoa/sca/export.h"
-#include <axis2_om_node.h>
+#include <axiom.h>
#include <osoa/sca/export.h>
@@ -51,14 +51,14 @@
private:
tuscany::sca::model::ExternalService* externalService;
- axis2_om_node_t* createPayload(Operation& operation,
+ axiom_node_t* createPayload(Operation& operation,
const WsdlOperation& wsdlOp,
- axis2_env_t** env);
+ axis2_env_t* env);
- void setReturn(axis2_om_node_t* returnNode,
+ void setReturn(axiom_node_t* returnNode,
Operation& operation,
const WsdlOperation& wsdlOp,
- axis2_env_t** env);
+ axis2_env_t* env);
};
} // End namespace ws
Modified: incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Makefile.am?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_reference/axis2c/src/Makefile.am Mon Jun 19 03:19:56 2006
@@ -10,16 +10,14 @@
-L${TUSCANY_SDOCPP}/lib -ltuscany_sdo -ltuscany_sdo_axiom -lxml2 -lstdc++ \
-L$(AXIS2C_HOME)/lib \
-laxis2_util \
- -laxis2_om \
+ -laxis2_axiom \
-laxis2_wsdl \
-laxis2_engine \
-laxis2_parser \
- -laxis2_unix \
+ -laxis2_minizip \
-lpthread \
- -laxis2_soap \
-laxis2_http_sender \
- -laxis2_http_receiver \
- -laxis2_attachments
+ -laxis2_http_receiver
INCLUDES = -I$(top_builddir)/runtime/core/src \
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=415278&r1=415277&r2=415278&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 Mon Jun 19 03:19:56 2006
@@ -22,9 +22,7 @@
#include <axis2_array_list.h>
#include <axis2_log_default.h>
#include <axis2_error_default.h>
-#include <axis2_om_text.h>
-#include <axis2_om_node.h>
-#include <axis2_om_element.h>
+#include <axiom.h>
#include <stdio.h>
#include <sdo_axiom.h>
@@ -41,30 +39,30 @@
int AXIS2_CALL
Axis2EntryPointService_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
/*
* This method invokes the right service method
*/
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
Axis2EntryPointService_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
- axis2_om_node_t *node,
+ const axis2_env_t *env,
+ axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx);
int AXIS2_CALL Axis2EntryPointService_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_svc_skeleton_t *
-axis2_Axis2EntryPointService_create(axis2_env_t **env)
+axis2_Axis2EntryPointService_create(axis2_env_t *env)
{
axis2_svc_skeleton_t *svc_skeleton = NULL;
- svc_skeleton = (axis2_svc_skeleton_t *) AXIS2_MALLOC((*env)->allocator,
+ svc_skeleton = (axis2_svc_skeleton_t *) AXIS2_MALLOC((env)->allocator,
sizeof(axis2_svc_skeleton_t));
svc_skeleton->ops = (axis2_svc_skeleton_ops_t *) AXIS2_MALLOC(
- (*env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ (env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
svc_skeleton->func_array = NULL;
@@ -78,7 +76,7 @@
int AXIS2_CALL
Axis2EntryPointService_init(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ axis2_env_t *env)
{
// This method never seems to be called - an old Axis2C artifact?
@@ -88,7 +86,7 @@
int AXIS2_CALL
Axis2EntryPointService_free(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env)
+ axis2_env_t *env)
{
/*if(svc_skeleton->func_array)
{
@@ -98,13 +96,13 @@
if(svc_skeleton->ops)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton->ops);
+ AXIS2_FREE((env)->allocator, svc_skeleton->ops);
svc_skeleton->ops = NULL;
}
if(svc_skeleton)
{
- AXIS2_FREE((*env)->allocator, svc_skeleton);
+ AXIS2_FREE((env)->allocator, svc_skeleton);
svc_skeleton = NULL;
}
return AXIS2_SUCCESS;
@@ -113,32 +111,32 @@
/*
* This method invokes the right service method
*/
-axis2_om_node_t* AXIS2_CALL
+axiom_node_t* AXIS2_CALL
Axis2EntryPointService_invoke(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
- axis2_om_node_t *node,
+ axis2_env_t *env,
+ axiom_node_t *node,
axis2_msg_ctx_t *msg_ctx)
{
- axis2_om_node_t *returnNode = node;
+ axiom_node_t *returnNode = node;
/* Depending on the function name invoke the
* corresponding Axis2Service method
*/
if (node)
{
- if (AXIS2_OM_NODE_GET_NODE_TYPE(node, env) == AXIS2_OM_ELEMENT)
+ if (AXIOM_NODE_GET_NODE_TYPE(node, env) == AXIOM_ELEMENT)
{
- axis2_om_element_t *element = NULL;
- element = (axis2_om_element_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node, env);
+ axiom_element_t *element = NULL;
+ element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
if (element)
{
- axis2_char_t *op_name = AXIS2_OM_ELEMENT_GET_LOCALNAME(element, env);
+ axis2_char_t *op_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
if (op_name)
{
char* systemRoot = Axis2Utils::getAxisServiceParameterValue(env, msg_ctx, "TuscanySystemRoot");
char* fullEntryPointName = Axis2Utils::getAxisServiceParameterValue(env, msg_ctx, "TuscanyEntryPoint");
- AXIS2_LOG_INFO((*env)->log, "Axis2EntryPointService invoke called with system root: %s entrypoint name: %s operation name: %s", systemRoot, fullEntryPointName, op_name);
+ AXIS2_LOG_INFO((env)->log, "Axis2EntryPointService invoke called with system root: %s entrypoint name: %s operation name: %s", systemRoot, fullEntryPointName, op_name);
//LOGINFO_2(4, "Axis2EntryPointService invoke called with system root: %s and entrypoint name: %s", systemRoot, fullEntryPointName);
//LOGINFO_1(4, "Axis2EntryPointService invoke called with operation", op_name);
@@ -149,7 +147,7 @@
AxiomHelper* axiomHelper = AxiomHelper::getHelper();
//char* om_str = NULL;
- //om_str = AXIS2_OM_NODE_TO_STRING(node, env);
+ //om_str = AXIOM_NODE_TO_STRING(node, env);
//if (om_str)
// printf("Axis2EntryPoint Request OM : %s\n", om_str);
@@ -166,7 +164,7 @@
//printf("Axis2EntryPoint outputDataObject printed\n");
if(!outputDataObject)
{
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: Failure whilst invoking EntryPoint");
+ AXIS2_LOG_ERROR((env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: Failure whilst invoking EntryPoint");
//LOGERROR(0, "Axis2EntryPointService_invoke: Failure whilst invoking EntryPoint");
/** TODO: return a SOAP fault here */
return node;
@@ -175,7 +173,7 @@
returnNode = axiomHelper->toAxiomNode(outputDataObject);
//om_str = NULL;
- //om_str = AXIS2_OM_NODE_TO_STRING(returnNode, env);
+ //om_str = AXIOM_NODE_TO_STRING(returnNode, env);
//if (om_str)
// printf("Axis2EntryPoint Response OM : %s\n", om_str);
@@ -188,7 +186,7 @@
}
}
- AXIS2_LOG_ERROR((*env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: invalid OM parameters in request");
+ AXIS2_LOG_ERROR((env)->log, AXIS2_LOG_SI, "Axis2EntryPointService_invoke: invalid OM parameters in request");
//LOGERROR(0, "Axis2Service service ERROR: invalid OM parameters in request\n");
/** TODO: return a SOAP fault here */
@@ -203,7 +201,7 @@
*/
AXIS2_EXPORT int axis2_get_instance(axis2_svc_skeleton **inst,
- axis2_env_t **env)
+ axis2_env_t *env)
{
*inst = axis2_Axis2EntryPointService_create(env);
/*if(NULL != *inst)
@@ -219,7 +217,7 @@
}
AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
- axis2_env_t **env)
+ axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
Modified: incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.cpp Mon Jun 19 03:19:56 2006
@@ -32,7 +32,7 @@
* Get an odd linking error if this method (or the header's it requires) are in
* a different class.
*/
-char* Axis2Utils::getAxisServiceParameterValue(axis2_env_t **env, axis2_msg_ctx_t *msg_ctx, char* parameterName)
+char* Axis2Utils::getAxisServiceParameterValue(axis2_env_t *env, axis2_msg_ctx_t *msg_ctx, char* parameterName)
{
struct axis2_svc *svc = NULL;
struct axis2_op_ctx *op_ctx = NULL;
Modified: incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.h?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.h (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Axis2Utils.h Mon Jun 19 03:19:56 2006
@@ -32,7 +32,7 @@
class Axis2Utils
{
public:
- static char* getAxisServiceParameterValue(axis2_env_t **env, axis2_msg_ctx_t *msg_ctx, char* parameterName);
+ static char* getAxisServiceParameterValue(axis2_env_t *env, axis2_msg_ctx_t *msg_ctx, char* parameterName);
};
} // End namespace ws
} // End namespace sca
Modified: incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Makefile.am?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Makefile.am (original)
+++ incubator/tuscany/cpp/sca/runtime/ws_service/axis2c/src/Makefile.am Mon Jun 19 03:19:56 2006
@@ -11,16 +11,14 @@
-L$(top_builddir)/runtime/core/src -ltuscany_sca -lstdc++ \
-L$(AXIS2C_HOME)/lib \
-laxis2_util \
- -laxis2_om \
+ -laxis2_axiom \
-laxis2_wsdl \
-laxis2_engine \
-laxis2_parser \
- -laxis2_unix \
-lpthread \
- -laxis2_soap \
+ -laxis2_minizip \
-laxis2_http_sender \
- -laxis2_http_receiver \
- -laxis2_attachments
+ -laxis2_http_receiver
INCLUDES = -I$(top_builddir)/runtime/core/src \
Modified: incubator/tuscany/cpp/sca/scatest.sh
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/scatest.sh?rev=415278&r1=415277&r2=415278&view=diff
==============================================================================
--- incubator/tuscany/cpp/sca/scatest.sh (original)
+++ incubator/tuscany/cpp/sca/scatest.sh Mon Jun 19 03:19:56 2006
@@ -19,7 +19,7 @@
export SCA4CPP_HOME="$APFULLDIR"
if [ x$SCA4CPP = x ]; then
-export TUSCANY_SCACPP="$SCA4CPP_HOME"
+export TUSCANY_SCACPP="$SCA4CPP_HOME"/deploy
fi
echo "Using SCA installed at $SCA4CPP_HOME"
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org