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/09/20 22:49:16 UTC
svn commit: r448335 - in
/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws:
Axis2Dispatcher.cpp WSServiceProxy.cpp
Author: jsdelfino
Date: Wed Sep 20 13:49:15 2006
New Revision: 448335
URL: http://svn.apache.org/viewvc?view=rev&rev=448335
Log:
Cleanup print statements in WSServiceProxy and unnecessary code in Axis2Dispatcher
Modified:
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/WSServiceProxy.cpp
Modified: incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp?view=diff&rev=448335&r1=448334&r2=448335
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/extensions/ws/service/axis2c/src/tuscany/sca/ws/Axis2Dispatcher.cpp Wed Sep 20 13:49:15 2006
@@ -75,54 +75,28 @@
axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env)
{
- axis2_endpoint_ref_t *endpoint_ref = NULL;
axis2_svc_t *svc = NULL;
AXIS2_ENV_CHECK(env, NULL);
- endpoint_ref = AXIS2_MSG_CTX_GET_TO(msg_ctx, env);
-
- if (endpoint_ref)
+ axis2_conf_ctx_t *conf_ctx = NULL;
+ conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
+ if (conf_ctx)
{
- axis2_char_t *address = NULL;
-
- address = AXIS2_ENDPOINT_REF_GET_ADDRESS(endpoint_ref, env);
- if (address)
+ axis2_conf_t *conf = NULL;
+ conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
+ if (conf)
{
-
- axis2_char_t **url_tokens = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Checking for TuscanyService using target endpoint address : %s", address);
-
- url_tokens = axis2_parse_request_url_for_svc_and_op(env, address);
-
- if (url_tokens)
- {
- if (url_tokens[0])
- {
- axis2_conf_ctx_t *conf_ctx = NULL;
-
- conf_ctx = AXIS2_MSG_CTX_GET_CONF_CTX(msg_ctx, env);
- if (conf_ctx)
- {
- axis2_conf_t *conf = NULL;
- conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
- if (conf)
- {
- axis2_char_t* service_name = "TuscanyService";
- svc = AXIS2_CONF_GET_SVC(conf, env, service_name);
- if (svc)
- {
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Service found using target endpoint address");
- }
- }
- }
- }
+ axis2_char_t* service_name = "TuscanyService";
+ svc = AXIS2_CONF_GET_SVC(conf, env, service_name);
+ if (svc)
+ {
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "Service found using target endpoint address");
}
}
- }
-
+ }
+
return svc;
}
@@ -132,55 +106,21 @@
const axis2_env_t *env,
axis2_svc_t *svc)
{
- axiom_soap_envelope_t *soap_envelope = NULL;
axis2_op_t *op = NULL;
AXIS2_ENV_CHECK(env, NULL);
- //AXIS2_PARAM_CHECK(env->error, svc, NULL);
- soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(msg_ctx, env);
- if (soap_envelope)
+ axis2_qname_t *op_qname = NULL;
+ axis2_char_t* execute_op_name = "execute";
+ op_qname = axis2_qname_create(env, execute_op_name, NULL, NULL);
+
+ op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, AXIS2_QNAME_GET_LOCALPART(op_qname, env));
+
+ AXIS2_QNAME_FREE(op_qname, env);
+ if (op)
{
- axiom_soap_body_t *soap_body = AXIOM_SOAP_ENVELOPE_GET_BODY(soap_envelope, env);
- if (soap_body)
- {
- axiom_node_t *body_node = AXIOM_SOAP_BODY_GET_BASE_NODE(soap_body, env);
- if (body_node)
- {
- axiom_node_t *body_first_child_node =
- AXIOM_NODE_GET_FIRST_CHILD(body_node, env);
- if (body_first_child_node)
- {
- if (AXIOM_NODE_GET_NODE_TYPE(body_first_child_node, env) == AXIOM_ELEMENT)
- {
- axiom_element_t *element = NULL;
- element = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(body_first_child_node, env);
- if (element)
- {
- axis2_char_t *element_name = AXIOM_ELEMENT_GET_LOCALNAME(element, env);
- if (element_name)
- {
- axis2_qname_t *op_qname = NULL;
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Checking for operation using SOAP message body's first child's local name : %s",
- element_name);
-
- axis2_char_t* execute_op_name = "execute";
- op_qname = axis2_qname_create(env, execute_op_name, NULL, NULL);
-
- op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, AXIS2_QNAME_GET_LOCALPART(op_qname, env));
-
- AXIS2_QNAME_FREE(op_qname, env);
- if (op)
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "Operation found using SOAP message body's first child's local name");
-
- }
- }
- }
- }
- }
- }
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "TuscanyService execute operation found");
}
return op;
}
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=448335&r1=448334&r2=448335
==============================================================================
--- 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 Wed Sep 20 13:49:15 2006
@@ -209,7 +209,7 @@
case Type::DataObjectType:
{
DataObjectPtr dataObjectData = inputDataObject->getDataObject(pl[i]);
- printf("inputDataObject has DataObjectType named %s (#%d)\n", name, dataObjectData);
+ //printf("inputDataObject has DataObjectType named %s (#%d)\n", name, dataObjectData);
if(!dataObjectData)
{
@@ -303,6 +303,7 @@
try
{
+
// Call into the target service wrapper
serviceWrapper->invoke(operation);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org