You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/03/17 08:34:27 UTC
svn commit: r519255 [1/4] - in /webservices/axis2/trunk/c/modules:
core/addr/ core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/
core/transport/http/common/ core/transport/http/receiver/ co...
Author: dinesh
Date: Sat Mar 17 00:34:24 2007
New Revision: 519255
URL: http://svn.apache.org/viewvc?view=rev&rev=519255
Log:
patch applied, thanks Diluka
Modified:
webservices/axis2/trunk/c/modules/core/addr/any_content_type.c
webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
webservices/axis2/trunk/c/modules/core/addr/relates_to.c
webservices/axis2/trunk/c/modules/core/addr/svc_name.c
webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/clientapi/options.c
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
webservices/axis2/trunk/c/modules/core/context/ctx.c
webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
webservices/axis2/trunk/c/modules/core/context/op_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info.c
webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
webservices/axis2/trunk/c/modules/core/description/client_utils.c
webservices/axis2/trunk/c/modules/core/description/desc.c
webservices/axis2/trunk/c/modules/core/description/handler_desc.c
webservices/axis2/trunk/c/modules/core/description/module_desc.c
webservices/axis2/trunk/c/modules/core/description/msg.c
webservices/axis2/trunk/c/modules/core/description/op.c
webservices/axis2/trunk/c/modules/core/description/phase_rule.c
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
webservices/axis2/trunk/c/modules/core/engine/addr_disp.c
webservices/axis2/trunk/c/modules/core/engine/conf.c
webservices/axis2/trunk/c/modules/core/engine/engine.c
webservices/axis2/trunk/c/modules/core/engine/phase.c
webservices/axis2/trunk/c/modules/core/engine/req_uri_disp.c
webservices/axis2/trunk/c/modules/core/engine/soap_action_disp.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_holder.c
webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/modules/core/receivers/raw_xml_in_out_msg_recv.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_header.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_request_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_request.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_simple_response.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_status_line.c
webservices/axis2/trunk/c/modules/core/transport/http/common/http_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_receiver.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_response_writer.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/simple_http_svr_conn.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_client.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/libcurl/axis2_libcurl.c
webservices/axis2/trunk/c/modules/core/transport/http/server/IIS/axis2_iis_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_out_transport_info.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/apache2_worker.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_chunked_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/util/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/util/core_utils.c
webservices/axis2/trunk/c/modules/mod_addr/addr_in_handler.c
webservices/axis2/trunk/c/modules/mod_addr/addr_out_handler.c
Modified: webservices/axis2/trunk/c/modules/core/addr/any_content_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/any_content_type.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/any_content_type.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/any_content_type.c Sat Mar 17 00:34:24 2007
@@ -65,7 +65,7 @@
{
axis2_char_t *name = NULL;
- name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)qname, env);
+ name = axis2_qname_to_string((axis2_qname_t *)qname, env);
axis2_hash_set(any_content_type->value_map, name,
AXIS2_HASH_KEY_STRING, value);
}
@@ -81,7 +81,7 @@
{
axis2_char_t *name = NULL;
- name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)qname, env);
+ name = axis2_qname_to_string((axis2_qname_t *)qname, env);
return axis2_hash_get(any_content_type->value_map, name,
AXIS2_HASH_KEY_STRING);
}
Modified: webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Sat Mar 17 00:34:24 2007
@@ -66,7 +66,7 @@
if (address)
{
- endpoint_ref->address = AXIS2_STRDUP(address, env);
+ endpoint_ref->address = axis2_strdup(address, env);
if (!(endpoint_ref->address))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -96,7 +96,7 @@
AXIS2_FREE(env->allocator, endpoint_ref->address);
}
- endpoint_ref->address = AXIS2_STRDUP(address, env);
+ endpoint_ref->address = axis2_strdup(address, env);
return AXIS2_SUCCESS;
}
@@ -114,7 +114,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
endpoint_ref->interface_qname =
- AXIS2_QNAME_CLONE((axis2_qname_t *)interface_qname, env);
+ axis2_qname_clone((axis2_qname_t *)interface_qname, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Sat Mar 17 00:34:24 2007
@@ -86,7 +86,7 @@
if (action)
{
- msg_info_headers->action = AXIS2_STRDUP(action, env);
+ msg_info_headers->action = axis2_strdup(action, env);
if (!(msg_info_headers->action))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -200,7 +200,7 @@
}
if (action)
{
- msg_info_headers->action = AXIS2_STRDUP(action, env);
+ msg_info_headers->action = axis2_strdup(action, env);
}
return AXIS2_SUCCESS;
}
@@ -227,7 +227,7 @@
if (message_id)
{
- msg_info_headers->message_id = AXIS2_STRDUP(message_id, env);
+ msg_info_headers->message_id = axis2_strdup(message_id, env);
if (!(msg_info_headers->message_id))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/addr/relates_to.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/relates_to.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/relates_to.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/relates_to.c Sat Mar 17 00:34:24 2007
@@ -47,7 +47,7 @@
if (value)
{
- relates_to->value = AXIS2_STRDUP(value, env);
+ relates_to->value = axis2_strdup(value, env);
if (!(relates_to->value))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -58,7 +58,7 @@
if (relationship_type)
{
- relates_to->relationship_type = AXIS2_STRDUP(relationship_type, env);
+ relates_to->relationship_type = axis2_strdup(relationship_type, env);
if (!(relates_to->relationship_type))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -91,7 +91,7 @@
if (value)
{
- relates_to->value = (axis2_char_t *)AXIS2_STRDUP(value, env);
+ relates_to->value = (axis2_char_t *)axis2_strdup(value, env);
if (!(relates_to->value))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -124,7 +124,7 @@
if (relationship_type)
{
relates_to->relationship_type =
- (axis2_char_t *)AXIS2_STRDUP(relationship_type, env);
+ (axis2_char_t *)axis2_strdup(relationship_type, env);
if (!(relates_to->relationship_type))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/addr/svc_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/addr/svc_name.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/svc_name.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/svc_name.c Sat Mar 17 00:34:24 2007
@@ -49,7 +49,7 @@
if (qname)
{
- svc_name->qname = AXIS2_QNAME_CLONE((axis2_qname_t *)qname, env);
+ svc_name->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
if (!(svc_name->qname))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -60,7 +60,7 @@
if (endpoint_name)
{
- svc_name->endpoint_name = AXIS2_STRDUP(endpoint_name, env);
+ svc_name->endpoint_name = axis2_strdup(endpoint_name, env);
if (!(svc_name->endpoint_name))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -88,12 +88,12 @@
if (svc_name->qname)
{
- AXIS2_QNAME_FREE(svc_name->qname, env);
+ axis2_qname_free(svc_name->qname, env);
}
if (qname)
{
- svc_name->qname = AXIS2_QNAME_CLONE((axis2_qname_t *)qname, env);
+ svc_name->qname = axis2_qname_clone((axis2_qname_t *)qname, env);
if (!(svc_name->qname))
return AXIS2_FAILURE;
}
@@ -122,7 +122,7 @@
if (endpoint_name)
{
- svc_name->endpoint_name = AXIS2_STRDUP(endpoint_name, env);
+ svc_name->endpoint_name = axis2_strdup(endpoint_name, env);
if (!(svc_name->endpoint_name))
return AXIS2_FAILURE;
}
@@ -138,7 +138,7 @@
if (svc_name->qname)
{
- AXIS2_QNAME_FREE(svc_name->qname, env);
+ axis2_qname_free(svc_name->qname, env);
}
if (svc_name->endpoint_name)
Modified: webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/callback_recv.c Sat Mar 17 00:34:24 2007
@@ -142,7 +142,7 @@
if (msg_id)
{
- axis2_char_t *mid = AXIS2_STRDUP(msg_id, env);
+ axis2_char_t *mid = axis2_strdup(msg_id, env);
axis2_hash_set(callback_recv->callback_map,
mid, AXIS2_HASH_KEY_STRING, callback);
}
Modified: webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/mep_client.c Sat Mar 17 00:34:24 2007
@@ -75,7 +75,7 @@
mep_client->svc_ctx = svc_ctx;
}
- mep_client->soap_version_uri = AXIS2_STRDUP(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, env);
+ mep_client->soap_version_uri = axis2_strdup(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, env);
if (!(mep_client->soap_version_uri))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -85,7 +85,7 @@
if (mep)
{
- mep_client->mep = AXIS2_STRDUP(mep, env);
+ mep_client->mep = axis2_strdup(mep, env);
if (!(mep_client->mep))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -121,7 +121,7 @@
/* make sure operation's MEP is the same as given MEP */
if (mep_client->mep)
{
- if (AXIS2_STRCMP(mep_client->mep, axis2_op_get_msg_exchange_pattern(op, env)) != 0)
+ if (axis2_strcmp(mep_client->mep, axis2_op_get_msg_exchange_pattern(op, env)) != 0)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MEP_MISMATCH_IN_MEP_CLIENT, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -192,7 +192,7 @@
if (mep_client->soap_version_uri)
{
- if (AXIS2_STRCMP(mep_client->soap_version_uri,
+ if (axis2_strcmp(mep_client->soap_version_uri,
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
soap_version = AXIOM_SOAP11;
else
@@ -287,12 +287,12 @@
AXIS2_ENV_CHECK(env, NULL);
- if (AXIS2_STRCMP(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, mep_client->soap_version_uri) == 0)
+ if (axis2_strcmp(AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI, mep_client->soap_version_uri) == 0)
{
envelope = axiom_soap_envelope_create_with_soap_version_prefix(env, AXIOM_SOAP12, NULL);
}
- if (AXIS2_STRCMP(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, mep_client->soap_version_uri) == 0)
+ if (axis2_strcmp(AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, mep_client->soap_version_uri) == 0)
{
envelope = axiom_soap_envelope_create_with_soap_version_prefix(env, AXIOM_SOAP11, NULL);
}
@@ -346,7 +346,7 @@
if (soap_version_uri)
{
- mep_client->soap_version_uri = AXIS2_STRDUP(soap_version_uri, env);
+ mep_client->soap_version_uri = axis2_strdup(soap_version_uri, env);
if (!(mep_client->soap_version_uri))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -400,7 +400,7 @@
if (wsa_action)
{
- mep_client->wsa_action = AXIS2_STRDUP(wsa_action, env);
+ mep_client->wsa_action = axis2_strdup(wsa_action, env);
if (!(mep_client->wsa_action))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -531,8 +531,8 @@
{
/* handle one way case */
const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
- if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
- AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+ if (axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
return NULL;
}
Modified: webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/op_client.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/op_client.c Sat Mar 17 00:34:24 2007
@@ -199,11 +199,11 @@
AXIS2_DUMP_INPUT_MSG_TRUE,
AXIS2_FALSE);
if (dump_property)
- dump_value = (axis2_char_t *) AXIS2_PROPERTY_GET_VALUE (
+ dump_value = (axis2_char_t *) axis2_property_get_value (
dump_property, env);
}
- if(AXIS2_STRCMP(dump_value, AXIS2_VALUE_TRUE))
+ if(axis2_strcmp(dump_value, AXIS2_VALUE_TRUE))
{
axis2_msg_ctx_free(out_msg_ctx, env);
out_msg_ctx = NULL;
@@ -292,7 +292,7 @@
}
conf_ctx = axis2_svc_ctx_get_conf_ctx(op_client->svc_ctx, env);
-
+
msg_ctx = (axis2_msg_ctx_t *)axis2_op_client_get_msg_ctx(op_client, env,
AXIS2_WSDL_MESSAGE_LABEL_OUT);
@@ -317,7 +317,7 @@
property = AXIS2_OPTIONS_GET_PROPERTY(op_client->options, env,
AXIS2_TARGET_EPR);
if(property)
- to_epr = AXIS2_PROPERTY_GET_VALUE(property, env);
+ to_epr = axis2_property_get_value(property, env);
if(!to_epr)
to_epr = AXIS2_OPTIONS_GET_TO(op_client->options, env);
if (!to_epr)
@@ -408,8 +408,8 @@
if (!response_mc)
{
const axis2_char_t *mep = axis2_op_get_msg_exchange_pattern(op, env);
- if (AXIS2_STRCMP(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
- AXIS2_STRCMP(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
+ if (axis2_strcmp(mep, AXIS2_MEP_URI_OUT_ONLY) == 0 ||
+ axis2_strcmp(mep, AXIS2_MEP_URI_ROBUST_OUT_ONLY) == 0)
{
if (env->error)
return env->error->status_code;
Modified: webservices/axis2/trunk/c/modules/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/options.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Sat Mar 17 00:34:24 2007
@@ -605,7 +605,7 @@
if (soap_version_uri)
{
- options->soap_version_uri = AXIS2_STRDUP(soap_version_uri, env);
+ options->soap_version_uri = axis2_strdup(soap_version_uri, env);
}
return AXIS2_SUCCESS;
@@ -750,7 +750,7 @@
if (property)
{
- AXIS2_PROPERTY_FREE(property, env);
+ axis2_property_free(property, env);
}
}
axis2_hash_free(options->properties, env);
@@ -821,8 +821,8 @@
axis2_property_t *property = axis2_property_create(env);
if (property)
{
- AXIS2_PROPERTY_SET_SCOPE(property, env, AXIS2_SCOPE_REQUEST);
- AXIS2_PROPERTY_SET_VALUE(property, env, AXIS2_STRDUP(AXIS2_VALUE_TRUE, env));
+ axis2_property_set_scope(property, env, AXIS2_SCOPE_REQUEST);
+ axis2_property_set_value(property, env, axis2_strdup(AXIS2_VALUE_TRUE, env));
axis2_options_set_property(options, env, AXIS2_ENABLE_MTOM, property);
}
}
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Sat Mar 17 00:34:24 2007
@@ -382,7 +382,7 @@
{
module = AXIS2_CONF_GET_MODULE(svc_client->conf, env, mod_qname);
- AXIS2_QNAME_FREE(mod_qname, env);
+ axis2_qname_free(mod_qname, env);
mod_qname = NULL;
}
else
@@ -511,7 +511,7 @@
if (qname_free_flag)
{
- AXIS2_QNAME_FREE((axis2_qname_t *) op_qname, env);
+ axis2_qname_free((axis2_qname_t *) op_qname, env);
op_qname = NULL;
}
@@ -565,7 +565,7 @@
if (qname_free_flag)
{
- AXIS2_QNAME_FREE((axis2_qname_t *) op_qname, env);
+ axis2_qname_free((axis2_qname_t *) op_qname, env);
op_qname = NULL;
}
@@ -604,8 +604,8 @@
param = axis2_op_get_param(op, env, AXIS2_SOAP_ACTION);
if (param)
{
- action_uri = (axis2_uri_t *) AXIS2_PARAM_GET_VALUE(param, env);
- action_str = AXIS2_URI_TO_STRING(action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
+ action_uri = (axis2_uri_t *) axis2_param_get_value(param, env);
+ action_str = axis2_uri_to_string(action_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
AXIS2_OPTIONS_SET_ACTION(svc_client->options, env, action_str);
}
}
@@ -730,7 +730,7 @@
if (qname_free_flag)
{
- AXIS2_QNAME_FREE((axis2_qname_t *) op_qname, env);
+ axis2_qname_free((axis2_qname_t *) op_qname, env);
op_qname = NULL;
}
@@ -817,7 +817,7 @@
if (qname_free_flag)
{
- AXIS2_QNAME_FREE((axis2_qname_t *) op_qname, env);
+ axis2_qname_free((axis2_qname_t *) op_qname, env);
op_qname = NULL;
}
@@ -1046,7 +1046,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- AXIS2_QNAME_FREE(tmp_qname, env);
+ axis2_qname_free(tmp_qname, env);
tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_IN_OP, NULL, NULL);
@@ -1056,7 +1056,7 @@
return NULL;
}
op_out_in = axis2_op_create_with_qname(env, tmp_qname);
- AXIS2_QNAME_FREE(tmp_qname, env);
+ axis2_qname_free(tmp_qname, env);
tmp_qname = axis2_qname_create(env, AXIS2_ANON_OUT_ONLY_OP, NULL, NULL);
@@ -1067,7 +1067,7 @@
return NULL;
}
op_out_only = axis2_op_create_with_qname(env, tmp_qname);
- AXIS2_QNAME_FREE(tmp_qname, env);
+ axis2_qname_free(tmp_qname, env);
tmp_qname = axis2_qname_create(env, AXIS2_ANON_ROBUST_OUT_ONLY_OP, NULL, NULL);
@@ -1077,7 +1077,7 @@
return NULL;
}
op_robust_out_only = axis2_op_create_with_qname(env, tmp_qname);
- AXIS2_QNAME_FREE(tmp_qname, env);
+ axis2_qname_free(tmp_qname, env);
if (!op_out_in || !op_out_only || !op_robust_out_only)
{
@@ -1173,7 +1173,7 @@
return AXIS2_FALSE;
}
- if (AXIS2_STRCMP(soap_version_uri,
+ if (axis2_strcmp(soap_version_uri,
AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI) == 0)
soap_version = AXIOM_SOAP11;
else
Modified: webservices/axis2/trunk/c/modules/core/context/conf_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/conf_ctx.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/conf_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/conf_ctx.c Sat Mar 17 00:34:24 2007
@@ -293,7 +293,7 @@
if (path)
{
- conf_ctx->root_dir = AXIS2_STRDUP(path, env);
+ conf_ctx->root_dir = axis2_strdup(path, env);
if (!(conf_ctx->root_dir))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -475,7 +475,7 @@
return NULL;
}
- svc_id = AXIS2_QNAME_GET_LOCALPART(qname, env);
+ svc_id = axis2_qname_get_localpart(qname, env);
if (!svc_id)
{
AXIS2_ERROR_SET(env->error,
Modified: webservices/axis2/trunk/c/modules/core/context/ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/ctx.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/ctx.c Sat Mar 17 00:34:24 2007
@@ -92,11 +92,11 @@
AXIS2_HASH_KEY_STRING);
if (temp_value)
{
- void *temp_value_value = AXIS2_PROPERTY_GET_VALUE (temp_value, env);
- void *value_value = AXIS2_PROPERTY_GET_VALUE (value, env);
+ void *temp_value_value = axis2_property_get_value (temp_value, env);
+ void *value_value = axis2_property_get_value (value, env);
if (temp_value_value != value_value)
{
- AXIS2_PROPERTY_FREE(temp_value, env);
+ axis2_property_free(temp_value, env);
}
}
}
@@ -185,7 +185,7 @@
if (property)
{
- AXIS2_PROPERTY_FREE(property, env);
+ axis2_property_free(property, env);
}
}
axis2_hash_free(ctx->non_persistent_map, env);
@@ -206,7 +206,7 @@
if (property)
{
- AXIS2_PROPERTY_FREE(property, env);
+ axis2_property_free(property, env);
}
}
axis2_hash_free(ctx->persistent_map, env);
@@ -239,7 +239,7 @@
if (property)
{
- AXIS2_PROPERTY_FREE(property, env);
+ axis2_property_free(property, env);
}
}
if (ctx->non_persistent_map != map) /* handle repeated invocation case */
@@ -276,7 +276,7 @@
if (property)
{
- AXIS2_PROPERTY_FREE(property, env);
+ axis2_property_free(property, env);
}
}
axis2_hash_free(ctx->persistent_map, env);
Modified: webservices/axis2/trunk/c/modules/core/context/msg_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/msg_ctx.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Sat Mar 17 00:34:24 2007
@@ -387,7 +387,7 @@
if (msg_ctx->svc_qname)
{
msg_ctx->svc = AXIS2_CONF_GET_SVC(conf, env,
- AXIS2_QNAME_GET_LOCALPART(msg_ctx->svc_qname, env));
+ axis2_qname_get_localpart(msg_ctx->svc_qname, env));
}
if (msg_ctx->op_qname)
@@ -1006,7 +1006,7 @@
if (svc_ctx_id)
{
- msg_ctx->svc_ctx_id = AXIS2_STRDUP(svc_ctx_id, env);
+ msg_ctx->svc_ctx_id = axis2_strdup(svc_ctx_id, env);
if (!(msg_ctx->svc_ctx_id))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -1579,10 +1579,10 @@
AXIS2_ENABLE_REST, AXIS2_FALSE);
if (rest_val)
{
- value = (axis2_char_t *)AXIS2_PROPERTY_GET_VALUE(rest_val, env);
+ value = (axis2_char_t *)axis2_property_get_value(rest_val, env);
if (value)
{
- if (AXIS2_STRCMP(value, AXIS2_VALUE_TRUE) == 0)
+ if (axis2_strcmp(value, AXIS2_VALUE_TRUE) == 0)
axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
}
}
Modified: webservices/axis2/trunk/c/modules/core/context/op_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/op_ctx.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/op_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/op_ctx.c Sat Mar 17 00:34:24 2007
@@ -170,7 +170,7 @@
axis2_svc_t *svc = NULL;
axis2_char_t *svc_name = NULL;
- svc_name = AXIS2_QNAME_GET_LOCALPART(op_ctx->svc_qname, env);
+ svc_name = axis2_qname_get_localpart(op_ctx->svc_qname, env);
if (svc_name)
{
Modified: webservices/axis2/trunk/c/modules/core/context/svc_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_ctx.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_ctx.c Sat Mar 17 00:34:24 2007
@@ -70,7 +70,7 @@
svc_ctx->svc_qname = (axis2_qname_t *)AXIS2_SVC_GET_QNAME(svc, env);
if (svc_ctx->svc_qname)
{
- svc_ctx->svc_id = AXIS2_QNAME_GET_LOCALPART(svc_ctx->svc_qname, env);
+ svc_ctx->svc_id = axis2_qname_get_localpart(svc_ctx->svc_qname, env);
}
}
@@ -135,7 +135,7 @@
if (svc_ctx->svc_qname)
{
- axis2_char_t *svc_name = AXIS2_QNAME_GET_LOCALPART(svc_ctx->svc_qname, env);
+ axis2_char_t *svc_name = axis2_qname_get_localpart(svc_ctx->svc_qname, env);
svc_ctx->svc = AXIS2_CONF_GET_SVC(conf, env, svc_name);
}
@@ -172,7 +172,7 @@
svc_ctx->svc_qname = (axis2_qname_t *)AXIS2_SVC_GET_QNAME(svc, env);
if (svc_ctx->svc_qname)
{
- svc_ctx->svc_id = AXIS2_QNAME_GET_LOCALPART(svc_ctx->
+ svc_ctx->svc_id = axis2_qname_get_localpart(svc_ctx->
svc_qname, env);
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/svc_grp_ctx.c Sat Mar 17 00:34:24 2007
@@ -190,7 +190,7 @@
if (id)
{
- svc_grp_ctx->id = AXIS2_STRDUP(id, env);
+ svc_grp_ctx->id = axis2_strdup(id, env);
}
return AXIS2_SUCCESS;
@@ -231,7 +231,7 @@
axis2_char_t *svc_name = NULL;
svc = (axis2_svc_t*) next_svc;
svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
- svc_name = AXIS2_QNAME_GET_LOCALPART(AXIS2_SVC_GET_QNAME(svc, env), env);
+ svc_name = axis2_qname_get_localpart(AXIS2_SVC_GET_QNAME(svc, env), env);
if (svc_name)
axis2_hash_set(svc_grp_ctx->svc_ctx_map, svc_name, AXIS2_HASH_KEY_STRING, svc_ctx);
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Sat Mar 17 00:34:24 2007
@@ -108,7 +108,7 @@
return NULL;
}
arch_file_data->type = type;
- arch_file_data->name = AXIS2_STRDUP(name, env);
+ arch_file_data->name = axis2_strdup(name, env);
return arch_file_data;
}
@@ -193,7 +193,7 @@
AXIS2_FREE(env->allocator, arch_file_data->msg_recv);
arch_file_data->msg_recv = NULL;
}
- arch_file_data->msg_recv = AXIS2_STRDUP(msg_recv, env);
+ arch_file_data->msg_recv = axis2_strdup(msg_recv, env);
return AXIS2_SUCCESS;
}
@@ -276,7 +276,7 @@
AXIS2_FREE(env->allocator, arch_file_data->module_name);
arch_file_data->module_name = NULL;
}
- arch_file_data->module_name = AXIS2_STRDUP(module_name, env);
+ arch_file_data->module_name = axis2_strdup(module_name, env);
return AXIS2_SUCCESS;
}
@@ -302,7 +302,7 @@
AXIS2_FREE(env->allocator, arch_file_data->module_dll_name);
arch_file_data->module_dll_name = NULL;
}
- arch_file_data->module_dll_name = AXIS2_STRDUP(module_dll_name, env);
+ arch_file_data->module_dll_name = axis2_strdup(module_dll_name, env);
return AXIS2_SUCCESS;
}
@@ -318,7 +318,7 @@
AXIS2_PARAM_CHECK(env->error, svc_desc, AXIS2_FAILURE);
svc_qname = AXIS2_SVC_GET_QNAME(svc_desc, env);
- svc_name = AXIS2_QNAME_TO_STRING((axis2_qname_t *)svc_qname, env);
+ svc_name = axis2_qname_to_string((axis2_qname_t *)svc_qname, env);
if (!arch_file_data->svc_map)
{
arch_file_data->svc_map = axis2_hash_make(env);
Modified: webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Sat Mar 17 00:34:24 2007
@@ -177,7 +177,7 @@
}
}
- if (root_element_name && 0 == AXIS2_STRCMP(AXIS2_SVC_ELEMENT, root_element_name))
+ if (root_element_name && 0 == axis2_strcmp(AXIS2_SVC_ELEMENT, root_element_name))
{
axis2_svc_t *svc = NULL;
axis2_svc_builder_t *svc_builder = NULL;
@@ -195,7 +195,7 @@
svc_qname = axis2_qname_create(env, svc_name, NULL, NULL);
svc = axis2_svc_create_with_qname(env, svc_qname);
status = AXIS2_ARCH_FILE_DATA_ADD_SVC(file_data, env, svc);
- AXIS2_QNAME_FREE(svc_qname, env);
+ axis2_qname_free(svc_qname, env);
if (AXIS2_SUCCESS != status)
{
AXIS2_SVC_FREE(svc, env);
@@ -227,7 +227,7 @@
}
}
- else if (root_element_name && 0 == AXIS2_STRCMP(AXIS2_SVC_GRP_ELEMENT, root_element_name))
+ else if (root_element_name && 0 == axis2_strcmp(AXIS2_SVC_GRP_ELEMENT, root_element_name))
{
axis2_svc_grp_builder_t *grp_builder = NULL;
grp_builder = axis2_svc_grp_builder_create_with_svc_and_dep_engine(env,
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Sat Mar 17 00:34:24 2007
@@ -172,7 +172,7 @@
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
itr = axiom_element_get_children_with_qname(conf_element, env, qparamst,
conf_node);
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env, itr,
axis2_conf_get_param_container(conf_builder->conf, env),
axis2_conf_get_param_container(conf_builder->conf, env));
@@ -180,7 +180,7 @@
qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
msg_recvs = axiom_element_get_children_with_qname(conf_element, env,
qmsgrecv, conf_node);
- AXIS2_QNAME_FREE(qmsgrecv, env);
+ axis2_qname_free(qmsgrecv, env);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(msg_recvs, env))
{
axiom_node_t *msg_recv_node = NULL;
@@ -204,14 +204,14 @@
mep_att = axiom_element_get_attribute(msg_recv_element, env, qmep);
att_value = axiom_attribute_get_value(mep_att, env);
AXIS2_CONF_ADD_MSG_RECV(conf_builder->conf, env, att_value, msg_recv);
- AXIS2_QNAME_FREE(qmep, env);
+ axis2_qname_free(qmep, env);
}
/* processing Dispatching Order */
qdisporder = axis2_qname_create(env, AXIS2_DISPATCH_ORDER, NULL, NULL);
disp_order_element = axiom_element_get_first_child_with_qname(
conf_element, env, qdisporder, conf_node, &disp_order_node);
- AXIS2_QNAME_FREE(qdisporder, env);
+ axis2_qname_free(qdisporder, env);
if (disp_order_element)
{
axis2_conf_builder_process_disp_order(conf_builder, env, disp_order_node);
@@ -233,7 +233,7 @@
qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
module_itr = axiom_element_get_children_with_qname(conf_element, env,
qmodulest, conf_node);
- AXIS2_QNAME_FREE(qmodulest, env);
+ axis2_qname_free(qmodulest, env);
status = axis2_conf_builder_process_module_refs(conf_builder, env, module_itr);
if (AXIS2_SUCCESS != status)
{
@@ -243,21 +243,21 @@
qtransportsender = axis2_qname_create(env, AXIS2_TRANSPORTSENDER, NULL, NULL);
trs_senders = axiom_element_get_children_with_qname(conf_element, env,
qtransportsender, conf_node);
- AXIS2_QNAME_FREE(qtransportsender, env);
+ axis2_qname_free(qtransportsender, env);
axis2_conf_builder_process_transport_senders(conf_builder, env, trs_senders);
/* Proccessing Transport Recivers */
qtransportrecv = axis2_qname_create(env, AXIS2_TRANSPORTRECEIVER, NULL, NULL);
trs_recvs = axiom_element_get_children_with_qname(conf_element, env,
qtransportrecv, conf_node);
- AXIS2_QNAME_FREE(qtransportrecv, env);
+ axis2_qname_free(qtransportrecv, env);
axis2_conf_builder_process_transport_recvs(conf_builder, env, trs_recvs);
/* processing Phase orders */
qphaseorder = axis2_qname_create(env, AXIS2_PHASE_ORDER, NULL, NULL);
phase_orders = axiom_element_get_children_with_qname(conf_element, env,
qphaseorder, conf_node);
- AXIS2_QNAME_FREE(qphaseorder, env);
+ axis2_qname_free(qphaseorder, env);
axis2_conf_builder_process_phase_orders(conf_builder, env, phase_orders);
/* Processing default module versions */
@@ -265,7 +265,7 @@
NULL);
def_mod_versions = axiom_element_get_children_with_qname(conf_element,
env, qdefmodver, conf_node);
- AXIS2_QNAME_FREE(qdefmodver, env);
+ axis2_qname_free(qdefmodver, env);
if (def_mod_versions)
{
status = axis2_conf_builder_process_default_module_versions(conf_builder
@@ -283,11 +283,11 @@
if (param)
{
axis2_char_t *value = NULL;
- value = AXIS2_PARAM_GET_VALUE(param, env);
+ value = axis2_param_get_value(param, env);
if (value)
{
axis2_conf_set_enable_mtom(conf_builder->conf, env,
- (AXIS2_STRCMP(value, AXIS2_VALUE_TRUE) == 0));
+ (axis2_strcmp(value, AXIS2_VALUE_TRUE) == 0));
}
}
@@ -324,7 +324,7 @@
module_ref_att = axiom_element_get_attribute(module_ref_element, env,
qref);
if (qref)
- AXIS2_QNAME_FREE(qref, env);
+ axis2_qname_free(qref, env);
if (module_ref_att)
{
axis2_qname_t *qrefname = NULL;
@@ -337,7 +337,7 @@
axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
env, qrefname);
if (qrefname)
- AXIS2_QNAME_FREE(qrefname, env);
+ axis2_qname_free(qrefname, env);
}
}
return status;
@@ -366,7 +366,7 @@
qdisp = axis2_qname_create(env, AXIS2_DISPATCHER, NULL, NULL);
disps = axiom_element_get_children_with_qname(
disp_order_element, env, qdisp, disp_order_node);
- AXIS2_QNAME_FREE(qdisp, env);
+ axis2_qname_free(qdisp, env);
disp_phase = axis2_phase_create(env, AXIS2_PHASE_DISPATCH);
if (NULL == disp_phase)
{
@@ -396,7 +396,7 @@
axiom_children_qname_iterator_next(disps, env);
class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
disp_att = axiom_element_get_attribute(disp_element, env, class_qname);
- AXIS2_QNAME_FREE(class_qname, env);
+ axis2_qname_free(class_qname, env);
if (!disp_att)
{
qname_itr_has_next = axiom_children_qname_iterator_has_next(disps,
@@ -418,7 +418,7 @@
AXIS2_PHASE_FREE(disp_phase, env);
return AXIS2_FAILURE;
}
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
axis2_dll_desc_free_void_arg);
axis2_class_loader_init(env);
@@ -496,7 +496,7 @@
phase_orders_att = axiom_element_get_attribute(phase_orders_element,
env, qtype);
- AXIS2_QNAME_FREE(qtype, env);
+ axis2_qname_free(qtype, env);
}
if (phase_orders_att)
@@ -516,19 +516,19 @@
}
return AXIS2_SUCCESS;
}
- if (flow_type && 0 == AXIS2_STRCMP(AXIS2_IN_FLOW_START, flow_type))
+ if (flow_type && 0 == axis2_strcmp(AXIS2_IN_FLOW_START, flow_type))
{
AXIS2_PHASES_INFO_SET_IN_PHASES(info, env, phase_list);
}
- else if (flow_type && 0 == AXIS2_STRCMP(AXIS2_IN_FAILTFLOW, flow_type))
+ else if (flow_type && 0 == axis2_strcmp(AXIS2_IN_FAILTFLOW, flow_type))
{
AXIS2_PHASES_INFO_SET_IN_FAULTPHASES(info, env, phase_list);
}
- else if (flow_type && 0 == AXIS2_STRCMP(AXIS2_OUT_FLOW_START, flow_type))
+ else if (flow_type && 0 == axis2_strcmp(AXIS2_OUT_FLOW_START, flow_type))
{
AXIS2_PHASES_INFO_SET_OUT_PHASES(info, env, phase_list);
}
- else if (flow_type && 0 == AXIS2_STRCMP(AXIS2_OUT_FAILTFLOW, flow_type))
+ else if (flow_type && 0 == axis2_strcmp(AXIS2_OUT_FAILTFLOW, flow_type))
{
AXIS2_PHASES_INFO_SET_OUT_FAULTPHASES(info, env, phase_list);
}
@@ -563,7 +563,7 @@
qphase = axis2_qname_create(env, AXIS2_PHASE, NULL, NULL);
phases = axiom_element_get_children_with_qname(phase_orders_element, env,
qphase, phase_orders_node);
- AXIS2_QNAME_FREE(qphase, env);
+ axis2_qname_free(qphase, env);
if (!phases)
{
axis2_array_list_free(phase_list, env);
@@ -601,7 +601,7 @@
axis2_array_list_add(phase_list, env, att_value);
}
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
}
return phase_list;
}
@@ -650,7 +650,7 @@
trs_name = axiom_element_get_attribute(transport_element, env,
qattname);
}
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
if (trs_name)
{
axis2_char_t *name = NULL;
@@ -710,7 +710,7 @@
qdllname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
trs_dll_att = axiom_element_get_attribute(transport_element, env,
qdllname);
- AXIS2_QNAME_FREE(qdllname, env);
+ axis2_qname_free(qdllname, env);
if (NULL == trs_dll_att)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_TRANSPORT_SENDER_ERROR,
@@ -732,17 +732,17 @@
repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(
axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
env);
- temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
- temp_path2 = AXIS2_STRACAT(temp_path, AXIS2_LIB_FOLDER, env);
- temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
- path_qualified_dll_name = AXIS2_STRACAT(temp_path3, dll_name, env);
+ temp_path = axis2_stracat(repos_name, AXIS2_PATH_SEP_STR, env);
+ temp_path2 = axis2_stracat(temp_path, AXIS2_LIB_FOLDER, env);
+ temp_path3 = axis2_stracat(temp_path2, AXIS2_PATH_SEP_STR, env);
+ path_qualified_dll_name = axis2_stracat(temp_path3, dll_name, env);
AXIS2_FREE(env->allocator, temp_path);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
axis2_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
AXIS2_FREE(env->allocator, path_qualified_dll_name);
axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
axis2_dll_desc_free_void_arg);
axis2_class_loader_init(env);
@@ -762,7 +762,7 @@
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
itr = axiom_element_get_children_with_qname(transport_element,
env, qparamst, transport_node);
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env,
itr,
axis2_transport_out_desc_param_container(transport_out, env),
@@ -776,7 +776,7 @@
qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
in_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qinflowst, transport_node, &in_flow_node);
- AXIS2_QNAME_FREE(qinflowst, env);
+ axis2_qname_free(qinflowst, env);
if (in_flow_element)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -787,7 +787,7 @@
qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
out_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qoutflowst, transport_node, &out_flow_node);
- AXIS2_QNAME_FREE(qoutflowst, env);
+ axis2_qname_free(qoutflowst, env);
if (out_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -810,7 +810,7 @@
in_fault_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qinfaultflowst, transport_node,
&in_fault_flow_node);
- AXIS2_QNAME_FREE(qinfaultflowst, env);
+ axis2_qname_free(qinfaultflowst, env);
if (in_fault_flow_element)
{
axis2_transport_out_desc_free(transport_out, env);
@@ -824,7 +824,7 @@
out_fault_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qoutfaultflowst, transport_node,
&out_fault_flow_node);
- AXIS2_QNAME_FREE(qoutfaultflowst, env);
+ axis2_qname_free(qoutfaultflowst, env);
if (out_fault_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -896,7 +896,7 @@
qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
trs_name = axiom_element_get_attribute(transport_element, env,
qattname);
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
if (trs_name)
{
@@ -947,7 +947,7 @@
class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
trs_class_name = axiom_element_get_attribute(transport_element, env,
class_qname);
- AXIS2_QNAME_FREE(class_qname, env);
+ axis2_qname_free(class_qname, env);
if (trs_class_name)
{
@@ -973,10 +973,10 @@
repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(
axis2_desc_builder_get_dep_engine(conf_builder->desc_builder, env),
env);
- temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
- temp_path2 = AXIS2_STRACAT(temp_path, AXIS2_LIB_FOLDER, env);
- temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
- path_qualified_dll_name = AXIS2_STRACAT(temp_path3, dll_name, env);
+ temp_path = axis2_stracat(repos_name, AXIS2_PATH_SEP_STR, env);
+ temp_path2 = axis2_stracat(temp_path, AXIS2_LIB_FOLDER, env);
+ temp_path3 = axis2_stracat(temp_path2, AXIS2_PATH_SEP_STR, env);
+ path_qualified_dll_name = axis2_stracat(temp_path3, dll_name, env);
AXIS2_FREE(env->allocator, temp_path);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
@@ -985,7 +985,7 @@
AXIS2_FREE(env->allocator, path_qualified_dll_name);
axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
axis2_dll_desc_free_void_arg);
axis2_class_loader_init(env);
@@ -1003,7 +1003,7 @@
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
itr = axiom_element_get_children_with_qname(transport_element,
env, qparamst, transport_node);
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
status = AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env,
itr,
axis2_transport_in_desc_param_container(transport_in, env),
@@ -1017,7 +1017,7 @@
qoutflowst = axis2_qname_create(env, AXIS2_OUT_FLOW_START, NULL, NULL);
out_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qoutflowst, transport_node, &out_flow_node);
- AXIS2_QNAME_FREE(qoutflowst, env);
+ axis2_qname_free(qoutflowst, env);
if (out_flow_element)
{
axis2_transport_in_desc_free(transport_in, env);
@@ -1029,7 +1029,7 @@
qinflowst = axis2_qname_create(env, AXIS2_IN_FLOW_START, NULL, NULL);
in_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qinflowst, transport_node, &in_flow_node);
- AXIS2_QNAME_FREE(qinflowst, env);
+ axis2_qname_free(qinflowst, env);
if (in_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -1052,7 +1052,7 @@
in_fault_flow_element = axiom_element_get_first_child_with_qname(
transport_element, env, qinfaultflowst, transport_node,
&in_fault_flow_node);
- AXIS2_QNAME_FREE(qinfaultflowst, env);
+ axis2_qname_free(qinfaultflowst, env);
if (in_fault_flow_element)
{
axis2_flow_t *flow = NULL;
@@ -1091,7 +1091,7 @@
return status;
}
- AXIS2_QNAME_FREE(qoutfaultflowst, env);
+ axis2_qname_free(qoutfaultflowst, env);
}
}
@@ -1127,7 +1127,7 @@
}
name = axiom_element_get_attribute_value(om_element, env,
attribute_qname);
- AXIS2_QNAME_FREE(attribute_qname, env);
+ axis2_qname_free(attribute_qname, env);
attribute_qname = NULL;
if (NULL == name)
{
@@ -1141,7 +1141,7 @@
}
default_version = axiom_element_get_attribute_value(om_element, env,
attribute_qname);
- AXIS2_QNAME_FREE(attribute_qname, env);
+ axis2_qname_free(attribute_qname, env);
attribute_qname = NULL;
if (NULL == default_version)
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Sat Mar 17 00:34:24 2007
@@ -202,7 +202,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, repos_path, NULL);
AXIS2_PARAM_CHECK(env->error, svr_xml_file, NULL);
- if (0 == AXIS2_STRCMP("", repos_path))
+ if (0 == axis2_strcmp("", repos_path))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_REPO_CAN_NOT_BE_NULL,
AXIS2_FAILURE);
@@ -226,7 +226,7 @@
return NULL;
}
- dep_engine->folder_name = AXIS2_STRDUP(repos_path, env);
+ dep_engine->folder_name = axis2_strdup(repos_path, env);
if (NULL == dep_engine->folder_name)
{
axis2_dep_engine_free(dep_engine, env);
@@ -234,7 +234,7 @@
return NULL;
}
- dep_engine->axis2_repos = AXIS2_STRDUP(repos_path, env);
+ dep_engine->axis2_repos = axis2_strdup(repos_path, env);
if (NULL == dep_engine->axis2_repos)
{
axis2_dep_engine_free(dep_engine, env);
@@ -242,8 +242,8 @@
return NULL;
}
- conf_file_l = AXIS2_STRACAT(repos_path, AXIS2_PATH_SEP_STR, env);
- dep_engine->conf_name = AXIS2_STRACAT(conf_file_l, svr_xml_file, env);
+ conf_file_l = axis2_stracat(repos_path, AXIS2_PATH_SEP_STR, env);
+ dep_engine->conf_name = axis2_stracat(conf_file_l, svr_xml_file, env);
AXIS2_FREE(env->allocator, conf_file_l);
if (!dep_engine->conf_name)
{
@@ -345,7 +345,7 @@
qname = axis2_array_list_get(dep_engine->module_list, env, i);
if (qname)
{
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
}
}
axis2_array_list_free(dep_engine->module_list, env);
@@ -388,13 +388,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_qname, AXIS2_FAILURE);
- qname = AXIS2_QNAME_CLONE(module_qname, env);
+ qname = axis2_qname_clone(module_qname, env);
if (!dep_engine->module_list)
{
dep_engine->module_list = axis2_array_list_create(env, 0);
if (!dep_engine->module_list)
{
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
return AXIS2_FAILURE;
}
}
@@ -488,16 +488,16 @@
if (para_hot_dep)
{
- value = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(para_hot_dep, env);
- if (0 == AXIS2_STRCASECMP("false", value))
+ value = (axis2_char_t *) axis2_param_get_value(para_hot_dep, env);
+ if (0 == axis2_strcasecmp("false", value))
{
dep_engine->hot_dep = AXIS2_FALSE;
}
}
if (para_hot_update)
{
- value = (axis2_char_t *) AXIS2_PARAM_GET_VALUE(para_hot_update, env);
- if (0 == AXIS2_STRCASECMP("false", value))
+ value = (axis2_char_t *) axis2_param_get_value(para_hot_update, env);
+ if (0 == axis2_strcasecmp("false", value))
{
dep_engine->hot_update = AXIS2_FALSE;
}
@@ -625,13 +625,13 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, client_home, NULL);
- dep_engine->axis2_repos = AXIS2_STRDUP(client_home, env);
+ dep_engine->axis2_repos = axis2_strdup(client_home, env);
if (!dep_engine->axis2_repos)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- if (client_home && 0 != AXIS2_STRCMP("", client_home))
+ if (client_home && 0 != axis2_strcmp("", client_home))
{
status = axis2_dep_engine_check_client_home(dep_engine, env, client_home);
if (AXIS2_SUCCESS == status)
@@ -641,7 +641,7 @@
}
else
{
- dep_engine->conf_name = AXIS2_STRDUP(AXIS2_CONFIGURATION_RESOURCE,
+ dep_engine->conf_name = axis2_strdup(AXIS2_CONFIGURATION_RESOURCE,
env);
if (!dep_engine->conf_name)
{
@@ -712,18 +712,18 @@
axis2_char_t *path_l = NULL;
axis2_status_t status = AXIS2_FAILURE;
- dep_engine->folder_name = AXIS2_STRDUP(client_home, env);
+ dep_engine->folder_name = axis2_strdup(client_home, env);
if (!dep_engine->folder_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- path_l = AXIS2_STRACAT(client_home, AXIS2_PATH_SEP_STR, env);
- dep_engine->conf_name = AXIS2_STRACAT(path_l, AXIS2_SERVER_XML_FILE, env);
+ path_l = axis2_stracat(client_home, AXIS2_PATH_SEP_STR, env);
+ dep_engine->conf_name = axis2_stracat(path_l, AXIS2_SERVER_XML_FILE, env);
AXIS2_FREE(env->allocator, path_l);
if (!dep_engine->conf_name)
{
- dep_engine->conf_name = AXIS2_STRDUP(AXIS2_CONFIGURATION_RESOURCE, env);
+ dep_engine->conf_name = axis2_strdup(AXIS2_CONFIGURATION_RESOURCE, env);
if (!dep_engine->conf_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CONFIG_NOT_FOUND,
@@ -799,10 +799,10 @@
phase2 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 2);
phase3 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 3);
}
- if ((phase0 && 0 != AXIS2_STRCMP(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
- (phase1 && 0 != AXIS2_STRCMP(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
- (phase2 && 0 != AXIS2_STRCMP(phase2, AXIS2_PHASE_DISPATCH)) ||
- (phase3 && 0 != AXIS2_STRCMP(phase3, AXIS2_PHASE_POST_DISPATCH)))
+ if ((phase0 && 0 != axis2_strcmp(phase0, AXIS2_PHASE_TRANSPORT_IN)) ||
+ (phase1 && 0 != axis2_strcmp(phase1, AXIS2_PHASE_PRE_DISPATCH)) ||
+ (phase2 && 0 != axis2_strcmp(phase2, AXIS2_PHASE_DISPATCH)) ||
+ (phase3 && 0 != axis2_strcmp(phase3, AXIS2_PHASE_POST_DISPATCH)))
{
AXIS2_ERROR_SET(env->error, AXI2_ERROR_INVALID_PHASE, AXIS2_FAILURE);
return AXIS2_SUCCESS;
@@ -981,8 +981,8 @@
timestamp = axis2_file_get_timestamp(module_folder, env);
axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
module_folder_path = axis2_file_get_path(module_folder, env);
- temp_path = AXIS2_STRACAT(module_folder_path, AXIS2_PATH_SEP_STR, env);
- dll_path = AXIS2_STRACAT(temp_path, dll_name, env);
+ temp_path = axis2_stracat(module_folder_path, AXIS2_PATH_SEP_STR, env);
+ dll_path = axis2_stracat(temp_path, dll_name, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"axis2_dep_engine_load_module_dll; dll path is : %s", dll_path);
status = axis2_dll_desc_set_name(dll_desc, env, dll_path);
@@ -999,7 +999,7 @@
axis2_dll_desc_set_type(dll_desc, env, AXIS2_MODULE_DLL);
impl_info_param = axis2_param_create(env, read_in_dll, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env, axis2_dll_desc_free_void_arg);
axis2_class_loader_init(env);
module = (axis2_module_t *) axis2_class_loader_create_dll(env,
@@ -1079,7 +1079,7 @@
axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axis2_class_loader_init(env);
impl_info_param = axis2_param_create(env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
handler = (axis2_handler_t *) axis2_class_loader_create_dll(env,
impl_info_param);
AXIS2_HANDLER_INIT(handler, env, handlermd);
@@ -1111,7 +1111,7 @@
axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axis2_class_loader_init(env);
impl_info_param = axis2_param_create(env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
handler = (axis2_handler_t *) axis2_class_loader_create_dll(env,
impl_info_param);
@@ -1347,7 +1347,7 @@
axis2_char_t *svc_name = NULL;
int len = 0;
- file_name_l = AXIS2_STRDUP(file_name, env);
+ file_name_l = axis2_strdup(file_name, env);
ptr = AXIS2_STRRCHR(file_name_l, AXIS2_PATH_SEP_CHAR);
temp_name = ptr + 1;
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Sat Mar 17 00:34:24 2007
@@ -83,7 +83,7 @@
return NULL;
}
- desc_builder->file_name = AXIS2_STRDUP(file_name, env);
+ desc_builder->file_name = axis2_strdup(file_name, env);
if (!desc_builder->file_name)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -231,7 +231,7 @@
handlers = axiom_element_get_children_with_qname(flow_element, env,
qchild, flow_node);
if (qchild)
- AXIS2_QNAME_FREE(qchild, env);
+ axis2_qname_free(qchild, env);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(handlers , env))
{
@@ -290,7 +290,7 @@
attr_qname);
if (attr_qname)
{
- AXIS2_QNAME_FREE(attr_qname, env);
+ axis2_qname_free(attr_qname, env);
}
if (!name_attrib)
@@ -323,7 +323,7 @@
class_attrib = axiom_element_get_attribute(handler_element, env,
class_qname);
if (class_qname)
- AXIS2_QNAME_FREE(class_qname, env);
+ axis2_qname_free(class_qname, env);
if (NULL == class_attrib)
{
@@ -349,7 +349,7 @@
order_element = axiom_element_get_first_child_with_qname(handler_element,
env, order_qname, handler_node, &order_node);
if (order_qname)
- AXIS2_QNAME_FREE(order_qname, env);
+ axis2_qname_free(order_qname, env);
if (NULL == order_element || NULL == order_node)
{
@@ -385,10 +385,10 @@
axis2_hash_this(index_i, NULL, NULL, &v);
order_attrib = (axiom_attribute_t *) v;
qname = axiom_attribute_get_qname(order_attrib, env);
- name = AXIS2_QNAME_GET_LOCALPART(qname, env);
+ name = axis2_qname_get_localpart(qname, env);
value = axiom_attribute_get_value(order_attrib, env);
- if (0 == AXIS2_STRCMP(AXIS2_AFTER, name))
+ if (0 == axis2_strcmp(AXIS2_AFTER, name))
{
struct axis2_phase_rule *phase_rule = NULL;
@@ -400,7 +400,7 @@
return NULL;
}
}
- if (0 == AXIS2_STRCMP(AXIS2_BEFORE, name))
+ if (0 == axis2_strcmp(AXIS2_BEFORE, name))
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -411,7 +411,7 @@
return NULL;
}
}
- if (0 == AXIS2_STRCMP(AXIS2_PHASE, name))
+ if (0 == axis2_strcmp(AXIS2_PHASE, name))
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -422,13 +422,13 @@
return NULL;
}
}
- if (0 == AXIS2_STRCMP(AXIS2_PHASEFIRST, name))
+ if (0 == axis2_strcmp(AXIS2_PHASEFIRST, name))
{
axis2_char_t *bool_val = NULL;
bool_val = axis2_desc_builder_get_value(desc_builder, env,
value);
- if (0 == AXIS2_STRCMP(bool_val, "true"))
+ if (0 == axis2_strcmp(bool_val, "true"))
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -441,7 +441,7 @@
return NULL;
}
}
- else if (0 == AXIS2_STRCMP(bool_val, "false"))
+ else if (0 == axis2_strcmp(bool_val, "false"))
{
struct axis2_phase_rule *phase_rule = NULL;
phase_rule = axis2_handler_desc_get_rules(handler_desc, env);
@@ -462,7 +462,7 @@
param_qname = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
params = axiom_element_get_children_with_qname(handler_element,
env, param_qname, handler_node);
- AXIS2_QNAME_FREE(param_qname, env);
+ axis2_qname_free(param_qname, env);
status = axis2_desc_builder_process_params(desc_builder, env, params,
axis2_handler_desc_get_param_container(handler_desc, env), parent);
if (AXIS2_SUCCESS != status)
@@ -516,13 +516,13 @@
axis2_hash_this(i, NULL, NULL, &v);
if (!v)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return AXIS2_FAILURE;
}
obj = axis2_generic_obj_create(env);
if (!obj)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -532,10 +532,10 @@
axis2_generic_obj_set_free_func(obj, env,
axiom_attribute_free_void_arg);
attr_qname = axiom_attribute_get_qname(value, env);
- attr_name = AXIS2_QNAME_TO_STRING(attr_qname, env);
+ attr_name = axis2_qname_to_string(attr_qname, env);
axis2_hash_set(attrs, attr_name, AXIS2_HASH_KEY_STRING, obj);
}
- AXIS2_PARAM_SET_ATTRIBUTES(param, env, attrs);
+ axis2_param_set_attributes(param, env, attrs);
}
childs = axiom_element_get_child_elements(param_element, env, param_node);
@@ -544,7 +544,7 @@
axis2_array_list_t *value_list = NULL;
value_list = axis2_array_list_create(env, 0);
- AXIS2_PARAM_SET_VALUE_LIST(param, env, value_list);
+ axis2_param_set_value_list(param, env, value_list);
while (AXIS2_TRUE == AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(childs, env))
{
@@ -557,13 +557,13 @@
element = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
param = axis2_param_create(env, NULL, NULL);
pname = axiom_element_get_localname(element, env);
- status = AXIS2_PARAM_SET_NAME(param, env, pname);
+ status = axis2_param_set_name(param, env, pname);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return status;
}
- AXIS2_PARAM_SET_PARAM_TYPE(param, env, AXIS2_DOM_PARAM);
+ axis2_param_set_param_type(param, env, AXIS2_DOM_PARAM);
set_attrs_and_value(param, env, element, node);
axis2_array_list_add(value_list, env, param);
}
@@ -575,15 +575,15 @@
temp = axiom_element_get_text(
param_element, env, param_node);
- para_test_value = AXIS2_STRDUP(temp, env);
- status = AXIS2_PARAM_SET_VALUE(param, env, para_test_value);
+ para_test_value = axis2_strdup(temp, env);
+ status = axis2_param_set_value(param, env, para_test_value);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
AXIS2_FREE(env->allocator, para_test_value);
return status;
}
- AXIS2_PARAM_SET_PARAM_TYPE(param, env, AXIS2_TEXT_PARAM);
+ axis2_param_set_param_type(param, env, AXIS2_TEXT_PARAM);
}
return AXIS2_SUCCESS;
}
@@ -617,7 +617,7 @@
action_mappings = axiom_element_get_children_with_qname(op_element, env,
qname,op_node);
- AXIS2_QNAME_FREE(qname, env);
+ axis2_qname_free(qname, env);
qname = NULL;
if(!action_mappings)
{
@@ -643,10 +643,10 @@
mapping_element = AXIOM_NODE_GET_DATA_ELEMENT(mapping_node, env);
temp_str = axiom_element_get_text(mapping_element, env,
mapping_node);
- input_action_string = AXIS2_STRTRIM(env, temp_str, NULL);
+ input_action_string = axis2_strtrim(env, temp_str, NULL);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Input action mapping found %s",
input_action_string);
- if(0 != AXIS2_STRCMP("", input_action_string))
+ if(0 != axis2_strcmp("", input_action_string))
{
axis2_array_list_add(mapping_list, env, input_action_string);
}
@@ -659,7 +659,7 @@
child_element = axiom_element_get_first_child_with_qname(mapping_element,
env, qname, mapping_node, &child_node);
temp_str = axiom_element_get_text(child_element, env, child_node);
- output_action_string = AXIS2_STRTRIM(env, temp_str, NULL);
+ output_action_string = axis2_strtrim(env, temp_str, NULL);
if(child_element && output_action_string)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Output action mapping found %s",
@@ -711,7 +711,7 @@
/*status = AXIS2_PARAM_SET_ELEMENT(param, env, param_node);
if(AXIS2_SUCCESS != status)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return status;
}*/
@@ -719,17 +719,17 @@
att_qname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
para_name = axiom_element_get_attribute(param_element, env,
att_qname);
- AXIS2_QNAME_FREE(att_qname, env);
+ axis2_qname_free(att_qname, env);
if (!para_name)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return AXIS2_FAILURE;
}
pname = axiom_attribute_get_value(para_name, env);
- status = AXIS2_PARAM_SET_NAME(param, env, pname);
+ status = axis2_param_set_name(param, env, pname);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return status;
}
@@ -740,44 +740,44 @@
att_locked = axis2_qname_create(env, AXIS2_ATTLOCKED, NULL, NULL);
para_locked = axiom_element_get_attribute(param_element, env,
att_locked);
- AXIS2_QNAME_FREE(att_locked, env);
+ axis2_qname_free(att_locked, env);
if (parent)
{
axis2_char_t *param_name = NULL;
- param_name = AXIS2_PARAM_GET_NAME(param, env);
- parent_para = AXIS2_PARAM_CONTAINER_GET_PARAM(parent, env,
+ param_name = axis2_param_get_name(param, env);
+ parent_para = axis2_param_container_get_param(parent, env,
param_name);
}
if (para_locked)
{
axis2_char_t *locked_value = NULL;
locked_value = axiom_attribute_get_value(para_locked, env);
- if (0 == AXIS2_STRCMP("true", locked_value))
+ if (0 == axis2_strcmp("true", locked_value))
{
axis2_char_t *param_name = NULL;
axis2_bool_t is_param_locked = AXIS2_FALSE;
/*if the parameter is locked at some levle paramer value replace
* by that
*/
- param_name = AXIS2_PARAM_GET_NAME(param, env);
- is_param_locked = AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(parent,
+ param_name = axis2_param_get_name(param, env);
+ is_param_locked = axis2_param_container_is_param_locked(parent,
env, param_name);
if (parent && AXIS2_TRUE == is_param_locked)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_CONFIG_NOT_FOUND, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
else
{
- AXIS2_PARAM_SET_LOCKED(param, env, AXIS2_TRUE);
+ axis2_param_set_locked(param, env, AXIS2_TRUE);
}
}
else
{
- AXIS2_PARAM_SET_LOCKED(param, env, AXIS2_FALSE);
+ axis2_param_set_locked(param, env, AXIS2_FALSE);
}
}
@@ -787,26 +787,26 @@
axis2_char_t *name = NULL;
axis2_bool_t bvalue = AXIS2_FALSE;
- name = AXIS2_PARAM_GET_NAME(param, env);
- bvalue = AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(parent, env, name);
+ name = axis2_param_get_name(param, env);
+ bvalue = axis2_param_container_is_param_locked(parent, env, name);
if (parent_para || AXIS2_FALSE == bvalue)
{
- status = AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env,
+ status = axis2_param_container_add_param(param_container, env,
param);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return status;
}
}
}
else
{
- status = AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env,
+ status = axis2_param_container_add_param(param_container, env,
param);
if (AXIS2_SUCCESS != status)
{
- AXIS2_PARAM_FREE(param, env);
+ axis2_param_free(param, env);
return status;
}
}
@@ -837,7 +837,7 @@
axiom_children_qname_iterator_next(module_refs, env);
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_attrib = axiom_element_get_attribute(moduleref, env, qref);
- AXIS2_QNAME_FREE(qref, env);
+ axis2_qname_free(qref, env);
if (module_ref_attrib)
{
axis2_char_t *ref_name = NULL;
@@ -850,7 +850,7 @@
ref_qname);
if (NULL == module_desc)
{
- AXIS2_QNAME_FREE(ref_qname, env);
+ axis2_qname_free(ref_qname, env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -858,7 +858,7 @@
else
{
status = axis2_op_add_module_qname(op, env, ref_qname);
- AXIS2_QNAME_FREE(ref_qname, env);
+ axis2_qname_free(ref_qname, env);
if (AXIS2_SUCCESS != status)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_MODULE_NOT_FOUND,
@@ -896,7 +896,7 @@
class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
recv_name = axiom_element_get_attribute(recv_element, env, class_qname);
- AXIS2_QNAME_FREE(class_qname, env);
+ axis2_qname_free(class_qname, env);
class_name = axiom_attribute_get_value(recv_name, env);
conf = AXIS2_DEP_ENGINE_GET_AXIS2_CONF(desc_builder->engine, env);
@@ -913,10 +913,10 @@
axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(desc_builder->engine, env);
- temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
- temp_path2 = AXIS2_STRACAT(temp_path, AXIS2_LIB_FOLDER, env);
- temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
- dll_name = AXIS2_STRACAT(temp_path3, msg_recv_dll_name, env);
+ temp_path = axis2_stracat(repos_name, AXIS2_PATH_SEP_STR, env);
+ temp_path2 = axis2_stracat(temp_path, AXIS2_LIB_FOLDER, env);
+ temp_path3 = axis2_stracat(temp_path2, AXIS2_PATH_SEP_STR, env);
+ dll_name = axis2_stracat(temp_path3, msg_recv_dll_name, env);
AXIS2_FREE(env->allocator, temp_path);
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
@@ -924,7 +924,7 @@
AXIS2_FREE(env->allocator, dll_name);
axis2_dll_desc_set_type(dll_desc, env, AXIS2_MSG_RECV_DLL);
impl_info_param = axis2_param_create(env, class_name, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env, axis2_dll_desc_free_void_arg);
/* set the impl_info_param(which contain dll_desc as value) so that
* loaded msg_recv loader lib can be re-used in future
@@ -962,7 +962,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, file_name, NULL);
- file_name_l = AXIS2_STRDUP(file_name, env);
+ file_name_l = axis2_strdup(file_name, env);
if (!file_name_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -970,7 +970,7 @@
}
separator = ".";
- value = AXIS2_STRSTR(file_name_l, separator);
+ value = axis2_strstr(file_name_l, separator);
value[0] = AXIS2_EOLN;
short_name = file_name_l;
@@ -989,13 +989,13 @@
int len = 0;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, short_file_name, NULL);
- file_name_l = AXIS2_STRDUP(short_file_name, env);
+ file_name_l = axis2_strdup(short_file_name, env);
if (!file_name_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- len = AXIS2_STRLEN(AXIS2_LIB_PREFIX);
+ len = axis2_strlen(AXIS2_LIB_PREFIX);
short_name = &file_name_l[len];
return short_name;
@@ -1014,13 +1014,13 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, in, NULL);
- in_l = AXIS2_STRDUP(in, env);
+ in_l = axis2_strdup(in, env);
if (!in_l)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- value = AXIS2_STRSTR(in_l, separator);
+ value = axis2_strstr(in_l, separator);
value = value + 1;
return value;
Modified: webservices/axis2/trunk/c/modules/core/deployment/module_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/module_builder.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Sat Mar 17 00:34:24 2007
@@ -147,13 +147,13 @@
module_name_att = axiom_element_get_attribute(module_element, env,
qattname);
if(qattname)
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
if( module_name_att)
{
axis2_char_t *module_name = NULL;
module_name = axiom_attribute_get_value(module_name_att, env);
- if( module_name && (0 != AXIS2_STRCMP("", module_name)))
+ if( module_name && (0 != axis2_strcmp("", module_name)))
{
axis2_qname_t *qmodule_name = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Populate module %s", module_name);
@@ -161,7 +161,7 @@
qmodule_name = axis2_qname_create(env, module_name, NULL, NULL);
AXIS2_MODULE_DESC_SET_NAME(module_builder->module_desc, env, qmodule_name);
if(qmodule_name)
- AXIS2_QNAME_FREE(qmodule_name, env);
+ axis2_qname_free(qmodule_name, env);
}
else
{
@@ -177,7 +177,7 @@
module_qname = axis2_qname_create(env, module_name, NULL, NULL);
AXIS2_MODULE_DESC_SET_NAME(module_builder->module_desc, env, module_qname);
if(module_qname)
- AXIS2_QNAME_FREE(module_qname, env);
+ axis2_qname_free(module_qname, env);
}
}
else
@@ -196,7 +196,7 @@
axis2_module_desc_set_qname(module_builder->module_desc, env, module_qname);
if (module_qname)
- AXIS2_QNAME_FREE(module_qname, env);
+ axis2_qname_free(module_qname, env);
}
/* Setting Module Dll Name , if it is there */
@@ -204,7 +204,7 @@
qdllname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
module_dll_att = axiom_element_get_attribute(module_element, env, qdllname);
if (qdllname)
- AXIS2_QNAME_FREE(qdllname, env);
+ axis2_qname_free(qdllname, env);
if (module_dll_att)
{
@@ -212,7 +212,7 @@
class_name = axiom_attribute_get_value(module_dll_att, env);
- if (class_name && (0 != AXIS2_STRCMP("", class_name)))
+ if (class_name && (0 != axis2_strcmp("", class_name)))
{
axis2_dep_engine_t *dep_engine =
axis2_desc_builder_get_dep_engine(module_builder->desc_builder, env);
@@ -236,7 +236,7 @@
itr = axiom_element_get_children_with_qname(module_element, env,
qparamst, module_node);
if (qparamst)
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
parent = axis2_module_desc_get_parent(module_builder->module_desc, env);
@@ -251,7 +251,7 @@
in_flow_element = axiom_element_get_first_child_with_qname(module_element,
env, qinflowst, module_node, &in_flow_node);
if (qinflowst)
- AXIS2_QNAME_FREE(qinflowst, env);
+ axis2_qname_free(qinflowst, env);
if (in_flow_element && NULL != in_flow_node)
{
@@ -275,7 +275,7 @@
out_flow_element = axiom_element_get_first_child_with_qname(module_element,
env, qoutflowst, module_node, &out_flow_node);
if (qoutflowst)
- AXIS2_QNAME_FREE(qoutflowst, env);
+ axis2_qname_free(qoutflowst, env);
if (out_flow_element && NULL != out_flow_node)
{
@@ -298,7 +298,7 @@
in_fault_flow_element = axiom_element_get_first_child_with_qname(module_element,
env, qinfaultflow, module_node, &in_fault_flow_node);
if (qinfaultflow)
- AXIS2_QNAME_FREE(qinfaultflow, env);
+ axis2_qname_free(qinfaultflow, env);
if (in_fault_flow_element && NULL != in_fault_flow_node)
{
@@ -321,7 +321,7 @@
out_fault_flow_element = axiom_element_get_first_child_with_qname(module_element,
env, qoutfaultflow, module_node, &out_fault_flow_node);
if (qoutfaultflow)
- AXIS2_QNAME_FREE(qoutfaultflow, env);
+ axis2_qname_free(qoutfaultflow, env);
if (out_fault_flow_element && NULL != out_fault_flow_node)
{
@@ -345,7 +345,7 @@
op_itr = axiom_element_get_children_with_qname(module_element, env,
qopst, module_node);
if (qopst)
- AXIS2_QNAME_FREE(qopst, env);
+ axis2_qname_free(qopst, env);
ops = axis2_module_builder_process_ops(module_builder, env, op_itr);
size = axis2_array_list_size(ops, env);
for (i = 0; i < size; i++)
@@ -402,7 +402,7 @@
qattname = axis2_qname_create(env, AXIS2_ATTNAME, NULL, NULL);
op_name_att = axiom_element_get_attribute(op_element, env, qattname);
if (qattname)
- AXIS2_QNAME_FREE(qattname, env);
+ axis2_qname_free(qattname, env);
if (NULL == op_name_att)
{
@@ -413,7 +413,7 @@
qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
if (qmep)
- AXIS2_QNAME_FREE(qmep, env);
+ axis2_qname_free(qmep, env);
if (op_mep_att)
{
@@ -436,14 +436,14 @@
qopname = axis2_qname_create(env, op_name, NULL, NULL);
axis2_op_set_qname(op_desc, env, qopname);
if (qopname)
- AXIS2_QNAME_FREE(qopname, env);
+ axis2_qname_free(qopname, env);
/* Operation parameters */
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
params = axiom_element_get_children_with_qname(op_element, env,
qparamst, op_node);
if (qparamst)
- AXIS2_QNAME_FREE(qparamst, env);
+ axis2_qname_free(qparamst, env);
AXIS2_DESC_BUILDER_PROCESS_PARAMS(module_builder->desc_builder, env,
params,
@@ -460,7 +460,7 @@
recv_element = axiom_element_get_first_child_with_qname(op_element,
env, qmsgrecv, op_node, &recv_node);
if (qmsgrecv)
- AXIS2_QNAME_FREE(qmsgrecv, env);
+ axis2_qname_free(qmsgrecv, env);
if (recv_element && NULL != recv_node)
{
axis2_msg_recv_t *msg_recv = NULL;
@@ -482,7 +482,7 @@
modules = axiom_element_get_children_with_qname(op_element, env,
qmodulest, op_node);
if (qmodulest)
- AXIS2_QNAME_FREE(qmodulest, env);
+ axis2_qname_free(qmodulest, env);
AXIS2_DESC_BUILDER_PROCESS_OP_MODULE_REFS(module_builder->desc_builder,
env, modules, op_desc);
/* setting Operation phase */
Modified: webservices/axis2/trunk/c/modules/core/deployment/phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/phases_info.c?view=diff&rev=519255&r1=519254&r2=519255
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Sat Mar 17 00:34:24 2007
@@ -318,10 +318,10 @@
{
phase_name = (axis2_char_t *) axis2_array_list_get(
phases_info->in_phases, env, i);
- if (0 == AXIS2_STRCMP(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
- 0 == AXIS2_STRCMP(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
- 0 == AXIS2_STRCMP(AXIS2_PHASE_DISPATCH, phase_name) ||
- 0 == AXIS2_STRCMP(AXIS2_PHASE_POST_DISPATCH, phase_name))
+ if (0 == axis2_strcmp(AXIS2_PHASE_TRANSPORT_IN, phase_name) ||
+ 0 == axis2_strcmp(AXIS2_PHASE_PRE_DISPATCH, phase_name) ||
+ 0 == axis2_strcmp(AXIS2_PHASE_DISPATCH, phase_name) ||
+ 0 == axis2_strcmp(AXIS2_PHASE_POST_DISPATCH, phase_name))
{
/* Do nothing */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org