You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2007/03/30 15:19:59 UTC
svn commit: r524073 [2/10] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/src/util/ include/ modules/core/addr/
modules/core/clientapi/ modules/core/context/ modules/...
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/endpoint_ref.c Fri Mar 30 06:19:43 2007
@@ -17,7 +17,7 @@
#include <axis2_endpoint_ref.h>
#include <axis2_string.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
struct axis2_endpoint_ref
{
@@ -26,15 +26,15 @@
/** interface qname */
axis2_qname_t *interface_qname;
/** reference parameters */
- axis2_array_list_t *ref_param_list;
+ axutil_array_list_t *ref_param_list;
/** meta data */
- axis2_array_list_t *metadata_list;
+ axutil_array_list_t *metadata_list;
/** reference parameter attribute list */
- axis2_array_list_t *ref_attribute_list;
+ axutil_array_list_t *ref_attribute_list;
/** meta data attribute list */
- axis2_array_list_t *meta_attribute_list;
+ axutil_array_list_t *meta_attribute_list;
/** extensible element list */
- axis2_array_list_t *extension_list;
+ axutil_array_list_t *extension_list;
/** service name */
axis2_svc_name_t *svc_name;
};
@@ -161,27 +161,27 @@
if (endpoint_ref->ref_param_list)
{
- axis2_array_list_free(endpoint_ref->ref_param_list, env);
+ axutil_array_list_free(endpoint_ref->ref_param_list, env);
}
if (endpoint_ref->metadata_list)
{
- axis2_array_list_free(endpoint_ref->metadata_list, env);
+ axutil_array_list_free(endpoint_ref->metadata_list, env);
}
if (endpoint_ref->ref_attribute_list)
{
- axis2_array_list_free(endpoint_ref->ref_attribute_list, env);
+ axutil_array_list_free(endpoint_ref->ref_attribute_list, env);
}
if (endpoint_ref->meta_attribute_list)
{
- axis2_array_list_free(endpoint_ref->meta_attribute_list, env);
+ axutil_array_list_free(endpoint_ref->meta_attribute_list, env);
}
if (endpoint_ref->extension_list)
{
- axis2_array_list_free(endpoint_ref->extension_list, env);
+ axutil_array_list_free(endpoint_ref->extension_list, env);
}
@@ -190,14 +190,14 @@
return;
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_endpoint_ref_get_ref_param_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
return endpoint_ref->ref_param_list;
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_endpoint_ref_get_metadata_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
@@ -213,7 +213,7 @@
if (!(endpoint_ref->ref_param_list))
{
- endpoint_ref->ref_param_list = axis2_array_list_create(env, 0);
+ endpoint_ref->ref_param_list = axutil_array_list_create(env, 0);
if (!(endpoint_ref->ref_param_list))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -223,7 +223,7 @@
if (endpoint_ref->ref_param_list && ref_param_node)
{
- return axis2_array_list_add(endpoint_ref->ref_param_list, env,
+ return axutil_array_list_add(endpoint_ref->ref_param_list, env,
ref_param_node);
}
@@ -239,7 +239,7 @@
if (!(endpoint_ref->metadata_list))
{
- endpoint_ref->metadata_list = axis2_array_list_create(env, 0);
+ endpoint_ref->metadata_list = axutil_array_list_create(env, 0);
if (!(endpoint_ref->metadata_list))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -249,7 +249,7 @@
if (endpoint_ref->metadata_list && meta_data_node)
{
- return axis2_array_list_add(endpoint_ref->metadata_list, env,
+ return axutil_array_list_add(endpoint_ref->metadata_list, env,
meta_data_node);
}
@@ -257,21 +257,21 @@
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_endpoint_ref_get_ref_attribute_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
return endpoint_ref->ref_attribute_list;
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_endpoint_ref_get_metadata_attribute_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
return endpoint_ref->meta_attribute_list;
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_endpoint_ref_get_extension_list(const axis2_endpoint_ref_t *endpoint_ref,
const axis2_env_t *env)
{
@@ -287,7 +287,7 @@
if (!(endpoint_ref->ref_attribute_list))
{
- endpoint_ref->ref_attribute_list = axis2_array_list_create(env, 0);
+ endpoint_ref->ref_attribute_list = axutil_array_list_create(env, 0);
if (!(endpoint_ref->ref_attribute_list))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -297,7 +297,7 @@
if (endpoint_ref->ref_attribute_list && attr)
{
- return axis2_array_list_add(endpoint_ref->ref_attribute_list, env,
+ return axutil_array_list_add(endpoint_ref->ref_attribute_list, env,
attr);
}
@@ -313,7 +313,7 @@
if (!(endpoint_ref->meta_attribute_list))
{
- endpoint_ref->meta_attribute_list = axis2_array_list_create(env, 0);
+ endpoint_ref->meta_attribute_list = axutil_array_list_create(env, 0);
if (!(endpoint_ref->meta_attribute_list))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -323,7 +323,7 @@
if (endpoint_ref->meta_attribute_list && attr)
{
- return axis2_array_list_add(endpoint_ref->meta_attribute_list, env, attr);
+ return axutil_array_list_add(endpoint_ref->meta_attribute_list, env, attr);
}
return AXIS2_FAILURE;
@@ -338,7 +338,7 @@
if (!(endpoint_ref->extension_list))
{
- endpoint_ref->extension_list = axis2_array_list_create(env, 0);
+ endpoint_ref->extension_list = axutil_array_list_create(env, 0);
if (!(endpoint_ref->extension_list))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -348,7 +348,7 @@
if (endpoint_ref->extension_list && extension_node)
{
- return axis2_array_list_add(endpoint_ref->extension_list, env,
+ return axutil_array_list_add(endpoint_ref->extension_list, env,
extension_node);
}
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c (original)
+++ webservices/axis2/trunk/c/modules/core/addr/msg_info_headers.c Fri Mar 30 06:19:43 2007
@@ -45,7 +45,7 @@
/** message Id */
axis2_char_t *message_id;
/** reference parameters */
- axis2_array_list_t *ref_params;
+ axutil_array_list_t *ref_params;
};
AXIS2_EXTERN axis2_msg_info_headers_t *AXIS2_CALL
@@ -255,7 +255,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_msg_info_headers_get_all_ref_params(const axis2_msg_info_headers_t *msg_info_headers,
const axis2_env_t *env)
{
@@ -271,14 +271,14 @@
if (!(msg_info_headers->ref_params))
{
- msg_info_headers->ref_params = axis2_array_list_create(env, 10);
+ msg_info_headers->ref_params = axutil_array_list_create(env, 10);
if (!(msg_info_headers->ref_params))
return AXIS2_FAILURE;
}
if (ref_param)
{
- return axis2_array_list_add(msg_info_headers->ref_params, env, ref_param);
+ return axutil_array_list_add(msg_info_headers->ref_params, env, ref_param);
}
return AXIS2_SUCCESS;
@@ -315,7 +315,7 @@
if (msg_info_headers->ref_params)
{
- axis2_array_list_free(msg_info_headers->ref_params, env);
+ axutil_array_list_free(msg_info_headers->ref_params, env);
}
if (msg_info_headers->action)
{
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/options.c Fri Mar 30 06:19:43 2007
@@ -21,7 +21,7 @@
#include <axis2_hash.h>
#include <axiom_soap_const.h>
#include <axis2_msg_info_headers.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
struct axis2_options
{
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Fri Mar 30 06:19:43 2007
@@ -26,7 +26,7 @@
#include <axiom_soap_header.h>
#include <axis2_listener_manager.h>
#include <axis2_module_desc.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_options.h>
#include <axis2_conf_init.h>
#include <platforms/axis2_platform_auto_sense.h>
@@ -46,7 +46,7 @@
axis2_options_t *override_options;
- axis2_array_list_t *headers;
+ axutil_array_list_t *headers;
/** for receiving the async messages */
axis2_callback_recv_t *callback_recv;
@@ -441,14 +441,14 @@
if (!svc_client->headers)
{
- svc_client->headers = axis2_array_list_create(env, 0);
+ svc_client->headers = axutil_array_list_create(env, 0);
if (!svc_client->headers)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
- axis2_array_list_add(svc_client->headers, env, header);
+ axutil_array_list_add(svc_client->headers, env, header);
return AXIS2_SUCCESS;
}
@@ -465,12 +465,12 @@
return AXIS2_FAILURE;
}
- size = axis2_array_list_size(svc_client->headers, env);
+ size = axutil_array_list_size(svc_client->headers, env);
for (i = 0; i < size; i++)
{
axiom_node_t *node = NULL;
- node = axis2_array_list_get(svc_client->headers, env, i);
+ node = axutil_array_list_get(svc_client->headers, env, i);
if (node)
{
@@ -1214,11 +1214,11 @@
{
int size = 0;
int i = 0;
- size = axis2_array_list_size(svc_client->headers, env);
+ size = axutil_array_list_size(svc_client->headers, env);
for (i = 0; i < size; i++)
{
axiom_node_t *node = NULL;
- node = axis2_array_list_get(svc_client->headers, env, i);
+ node = axutil_array_list_get(svc_client->headers, env, i);
if (node)
{
AXIOM_NODE_ADD_CHILD(header_node, env, node);
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/msg_ctx.c (original)
+++ webservices/axis2/trunk/c/modules/core/context/msg_ctx.c Fri Mar 30 06:19:43 2007
@@ -110,7 +110,7 @@
/* To keep track of the direction */
int flow;
/** The chain of Handlers/Phases for processing this message */
- axis2_array_list_t *execution_chain;
+ axutil_array_list_t *execution_chain;
/** Index into the execution chain of the currently executing handler */
int current_handler_index;
/** Index of the paused handler */
@@ -1623,7 +1623,7 @@
axis2_msg_ctx_set_execution_chain(
axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env,
- axis2_array_list_t *execution_chain)
+ axutil_array_list_t *execution_chain)
{
msg_ctx->execution_chain = execution_chain;
msg_ctx->current_handler_index = -1;
@@ -1632,7 +1632,7 @@
return AXIS2_SUCCESS;
}
-axis2_array_list_t *AXIS2_CALL
+axutil_array_list_t *AXIS2_CALL
axis2_msg_ctx_get_execution_chain(
const axis2_msg_ctx_t *msg_ctx,
const axis2_env_t *env)
@@ -1651,7 +1651,7 @@
if (msg_ctx->execution_chain)
{
axis2_handler_t *handler = (axis2_handler_t *)
- axis2_array_list_get(msg_ctx->execution_chain,
+ axutil_array_list_get(msg_ctx->execution_chain,
env, index);
if (handler)
{
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Fri Mar 30 06:19:43 2007
@@ -33,7 +33,7 @@
* temporarily store in this table
*/
axis2_hash_t *svc_map;
- axis2_array_list_t *deployable_svcs;
+ axutil_array_list_t *deployable_svcs;
};
@@ -63,7 +63,7 @@
arch_file_data->svc_map = NULL;
arch_file_data->deployable_svcs = NULL;
- arch_file_data->deployable_svcs = axis2_array_list_create(env, 0);
+ arch_file_data->deployable_svcs = axutil_array_list_create(env, 0);
if (!arch_file_data->deployable_svcs)
{
axis2_arch_file_data_free(arch_file_data, env);
@@ -157,7 +157,7 @@
}
if (arch_file_data->deployable_svcs)
{
- axis2_array_list_free(arch_file_data->deployable_svcs, env);
+ axutil_array_list_free(arch_file_data->deployable_svcs, env);
}
if (arch_file_data)
@@ -348,7 +348,7 @@
return arch_file_data->svc_map;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_arch_file_data_get_deployable_svcs(const axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env)
{
@@ -358,7 +358,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_deployable_svcs(axis2_arch_file_data_t *arch_file_data,
const axis2_env_t *env,
- axis2_array_list_t *deployable_svcs)
+ axutil_array_list_t *deployable_svcs)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, deployable_svcs, AXIS2_FAILURE);
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Fri Mar 30 06:19:43 2007
@@ -168,7 +168,7 @@
axis2_svc_t *svc = NULL;
axis2_svc_builder_t *svc_builder = NULL;
axis2_arch_file_data_t *file_data = NULL;
- axis2_array_list_t *dep_svcs = NULL;
+ axutil_array_list_t *dep_svcs = NULL;
axis2_char_t *svc_name = NULL;
file_data = axis2_dep_engine_get_current_file_item(dep_engine, env);
@@ -206,7 +206,7 @@
{
return AXIS2_FAILURE;
}
- status = axis2_array_list_add(dep_svcs, env, svc);
+ status = axutil_array_list_add(dep_svcs, env, svc);
if (AXIS2_SUCCESS != status)
{
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_file_data.h Fri Mar 30 06:19:43 2007
@@ -30,7 +30,7 @@
#include <axutil_allocator.h>
#include <axis2_qname.h>
#include <axis2_conf.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_dir_handler.h>
#include <axis2_file.h>
@@ -176,7 +176,7 @@
* @param file_data pointer to arch_file_data
* @param env pointer to environment struct
*/
- AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_arch_file_data_get_deployable_svcs(const axis2_arch_file_data_t *file_data,
const axis2_env_t *env);
@@ -189,7 +189,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_deployable_svcs(axis2_arch_file_data_t *file_data,
const axis2_env_t *env,
- axis2_array_list_t *deployable_svcs);
+ axutil_array_list_t *deployable_svcs);
/**
* Creates arch file data struct
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h Fri Mar 30 06:19:43 2007
@@ -29,7 +29,7 @@
#include <axis2_env.h>
#include <axutil_allocator.h>
#include <axis2_qname.h>
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include "axis2_ws_info_list.h"
#include "axis2_dep_engine.h"
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Fri Mar 30 06:19:43 2007
@@ -40,7 +40,7 @@
const axis2_env_t *env,
axiom_children_qname_iterator_t *phase_orders);
-static axis2_array_list_t *
+static axutil_array_list_t *
axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
axiom_node_t *phase_orders_node);
@@ -474,7 +474,7 @@
axiom_attribute_t *phase_orders_att = NULL;
axis2_qname_t *qtype = NULL;
axis2_char_t *flow_type = NULL;
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
phase_orders_node = (axiom_node_t *) axiom_children_qname_iterator_next(
phase_orders, env);
@@ -529,12 +529,12 @@
}
-static axis2_array_list_t *
+static axutil_array_list_t *
axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
const axis2_env_t *env,
axiom_node_t *phase_orders_node)
{
- axis2_array_list_t *phase_list = NULL;
+ axutil_array_list_t *phase_list = NULL;
axiom_children_qname_iterator_t *phases = NULL;
axis2_qname_t *qphase = NULL;
axiom_element_t *phase_orders_element;
@@ -550,14 +550,14 @@
AXIS2_FAILURE);
return NULL;
}
- phase_list = axis2_array_list_create(env, 0);
+ phase_list = axutil_array_list_create(env, 0);
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);
if (!phases)
{
- axis2_array_list_free(phase_list, env);
+ axutil_array_list_free(phase_list, env);
return NULL;
}
@@ -589,7 +589,7 @@
}
if (att_value)
{
- axis2_array_list_add(phase_list, env, att_value);
+ axutil_array_list_add(phase_list, env, att_value);
}
axis2_qname_free(qattname, env);
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Mar 30 06:19:43 2007
@@ -16,7 +16,7 @@
*/
#include "axis2_dep_engine.h"
-#include <axis2_array_list.h>
+#include <axutil_array_list.h>
#include <axis2_deployment.h>
#include <axis2_file_handler.h>
#include <axis2_dll_desc.h>
@@ -50,12 +50,12 @@
/**
* This will store all the web Services to deploy
*/
- axis2_array_list_t *ws_to_deploy;
+ axutil_array_list_t *ws_to_deploy;
/**
* this will store all the web Services to undeploy
*/
- axis2_array_list_t *ws_to_undeploy;
+ axutil_array_list_t *ws_to_undeploy;
axis2_phases_info_t *phases_info; /* to store phases list in axis2.xml */
/**
@@ -72,15 +72,15 @@
* To store the module specified in the server.xml at the document parsing
* time
*/
- axis2_array_list_t *module_list;
+ axutil_array_list_t *module_list;
axis2_repos_listener_t *repos_listener; /*Added this here to help with freeing
memory allocated for this - Samisa*/
axis2_conf_builder_t *conf_builder;
axis2_svc_builder_t *svc_builder;
- axis2_array_list_t *desc_builders;
- axis2_array_list_t *module_builders;
- axis2_array_list_t *svc_builders;
- axis2_array_list_t *svc_grp_builders;
+ axutil_array_list_t *desc_builders;
+ axutil_array_list_t *module_builders;
+ axutil_array_list_t *svc_builders;
+ axutil_array_list_t *svc_grp_builders;
};
static axis2_status_t
@@ -159,17 +159,17 @@
dep_engine->svc_builders = NULL;
dep_engine->svc_grp_builders = NULL;
- dep_engine->ws_to_deploy = axis2_array_list_create(env, 0);
+ dep_engine->ws_to_deploy = axutil_array_list_create(env, 0);
if (!(dep_engine->ws_to_deploy))
{
axis2_dep_engine_free(dep_engine, env);
return NULL;
}
- dep_engine->desc_builders = axis2_array_list_create(env, 0);
- dep_engine->module_builders = axis2_array_list_create(env, 0);
- dep_engine->svc_builders = axis2_array_list_create(env, 0);
- dep_engine->svc_grp_builders = axis2_array_list_create(env, 0);
+ dep_engine->desc_builders = axutil_array_list_create(env, 0);
+ dep_engine->module_builders = axutil_array_list_create(env, 0);
+ dep_engine->svc_builders = axutil_array_list_create(env, 0);
+ dep_engine->svc_grp_builders = axutil_array_list_create(env, 0);
dep_engine->phases_info = axis2_phases_info_create(env);
if (!(dep_engine->phases_info))
@@ -309,16 +309,16 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(dep_engine->ws_to_deploy, env);
+ size = axutil_array_list_size(dep_engine->ws_to_deploy, env);
for (i = 0; i < size; i++)
{
axis2_arch_file_data_t *file_data = NULL;
file_data = (axis2_arch_file_data_t *)
- axis2_array_list_get(dep_engine->ws_to_deploy, env, i);
+ axutil_array_list_get(dep_engine->ws_to_deploy, env, i);
axis2_arch_file_data_free(file_data, env);
}
- axis2_array_list_free(dep_engine->ws_to_deploy, env);
+ axutil_array_list_free(dep_engine->ws_to_deploy, env);
dep_engine->ws_to_deploy = NULL;
}
@@ -327,16 +327,16 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(dep_engine->desc_builders, env);
+ size = axutil_array_list_size(dep_engine->desc_builders, env);
for (i = 0; i < size; i++)
{
axis2_desc_builder_t *desc_builder = NULL;
desc_builder = (axis2_desc_builder_t *)
- axis2_array_list_get(dep_engine->desc_builders, env, i);
+ axutil_array_list_get(dep_engine->desc_builders, env, i);
axis2_desc_builder_free(desc_builder, env);
}
- axis2_array_list_free(dep_engine->desc_builders, env);
+ axutil_array_list_free(dep_engine->desc_builders, env);
}
if (dep_engine->module_builders)
@@ -344,16 +344,16 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(dep_engine->module_builders, env);
+ size = axutil_array_list_size(dep_engine->module_builders, env);
for (i = 0; i < size; i++)
{
axis2_module_builder_t *module_builder = NULL;
module_builder = (axis2_module_builder_t *)
- axis2_array_list_get(dep_engine->module_builders, env, i);
+ axutil_array_list_get(dep_engine->module_builders, env, i);
axis2_module_builder_free(module_builder, env);
}
- axis2_array_list_free(dep_engine->module_builders, env);
+ axutil_array_list_free(dep_engine->module_builders, env);
}
if (dep_engine->svc_builders)
@@ -361,16 +361,16 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(dep_engine->svc_builders, env);
+ size = axutil_array_list_size(dep_engine->svc_builders, env);
for (i = 0; i < size; i++)
{
axis2_svc_builder_t *svc_builder = NULL;
svc_builder = (axis2_svc_builder_t *)
- axis2_array_list_get(dep_engine->svc_builders, env, i);
+ axutil_array_list_get(dep_engine->svc_builders, env, i);
axis2_svc_builder_free(svc_builder, env);
}
- axis2_array_list_free(dep_engine->svc_builders, env);
+ axutil_array_list_free(dep_engine->svc_builders, env);
}
if (dep_engine->svc_grp_builders)
@@ -378,16 +378,16 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(dep_engine->svc_grp_builders, env);
+ size = axutil_array_list_size(dep_engine->svc_grp_builders, env);
for (i = 0; i < size; i++)
{
axis2_svc_grp_builder_t *svc_grp_builder = NULL;
svc_grp_builder = (axis2_svc_grp_builder_t *)
- axis2_array_list_get(dep_engine->svc_grp_builders, env, i);
+ axutil_array_list_get(dep_engine->svc_grp_builders, env, i);
axis2_svc_grp_builder_free(svc_grp_builder, env);
}
- axis2_array_list_free(dep_engine->svc_grp_builders, env);
+ axutil_array_list_free(dep_engine->svc_grp_builders, env);
}
if (dep_engine->ws_to_undeploy)
@@ -395,17 +395,17 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(dep_engine->ws_to_undeploy, env);
+ size = axutil_array_list_size(dep_engine->ws_to_undeploy, env);
for (i = 0; i < size; i++)
{
axis2_arch_file_data_t *file_data = NULL;
file_data = (axis2_arch_file_data_t *)
- axis2_array_list_get(dep_engine->ws_to_undeploy, env, i);
+ axutil_array_list_get(dep_engine->ws_to_undeploy, env, i);
axis2_arch_file_data_free(file_data, env);
}
- axis2_array_list_free(dep_engine->ws_to_undeploy, env);
+ axutil_array_list_free(dep_engine->ws_to_undeploy, env);
dep_engine->ws_to_undeploy = NULL;
}
if (dep_engine->module_list)
@@ -413,18 +413,18 @@
int size = 0;
int i = 0;
- size = axis2_array_list_size(dep_engine->module_list, env);
+ size = axutil_array_list_size(dep_engine->module_list, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
- qname = axis2_array_list_get(dep_engine->module_list, env, i);
+ qname = axutil_array_list_get(dep_engine->module_list, env, i);
if (qname)
{
axis2_qname_free(qname, env);
}
}
- axis2_array_list_free(dep_engine->module_list, env);
+ axutil_array_list_free(dep_engine->module_list, env);
}
if (dep_engine->folder_name)
{
@@ -466,14 +466,14 @@
qname = axis2_qname_clone(module_qname, env);
if (!dep_engine->module_list)
{
- dep_engine->module_list = axis2_array_list_create(env, 0);
+ dep_engine->module_list = axutil_array_list_create(env, 0);
if (!dep_engine->module_list)
{
axis2_qname_free(qname, env);
return AXIS2_FAILURE;
}
}
- return axis2_array_list_add(dep_engine->module_list, env, qname);
+ return axutil_array_list_add(dep_engine->module_list, env, qname);
}
struct axis2_module_desc *AXIS2_CALL
@@ -501,7 +501,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
- return axis2_array_list_add(dep_engine->ws_to_deploy, env, file);
+ return axutil_array_list_add(dep_engine->ws_to_deploy, env, file);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -513,9 +513,9 @@
AXIS2_PARAM_CHECK(env->error, file, AXIS2_FAILURE);
if (!(dep_engine->ws_to_undeploy))
{
- dep_engine->ws_to_undeploy = axis2_array_list_create(env, 0);
+ dep_engine->ws_to_undeploy = axutil_array_list_create(env, 0);
}
- return axis2_array_list_add(dep_engine->ws_to_undeploy, env, file);
+ return axutil_array_list_add(dep_engine->ws_to_undeploy, env, file);
}
AXIS2_EXTERN axis2_phases_info_t *AXIS2_CALL
@@ -574,8 +574,8 @@
const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
- axis2_array_list_t *out_fault_phases = NULL;
- axis2_array_list_t *new_out_fault_phases = NULL;
+ axutil_array_list_t *out_fault_phases = NULL;
+ axutil_array_list_t *new_out_fault_phases = NULL;
AXIS2_ENV_CHECK(env, NULL);
if (! dep_engine->conf_name)
@@ -654,7 +654,7 @@
new_out_fault_phases = axis2_phases_info_copy_flow(env, out_fault_phases);
if (out_fault_phases)
{
- axis2_array_list_free(out_fault_phases, env);
+ axutil_array_list_free(out_fault_phases, env);
}
axis2_conf_set_out_fault_phases(dep_engine->conf, env, new_out_fault_phases);
if (AXIS2_SUCCESS != status)
@@ -820,13 +820,13 @@
/* there are no modules */
return AXIS2_SUCCESS;
}
- size = axis2_array_list_size(dep_engine->module_list, env);
+ size = axutil_array_list_size(dep_engine->module_list, env);
for (i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
qname = (axis2_qname_t *)
- axis2_array_list_get(dep_engine->module_list, env, i);
+ axutil_array_list_get(dep_engine->module_list, env, i);
if (qname && dep_engine->conf)
{
status = axis2_conf_engage_module(dep_engine->conf, env, qname);
@@ -843,7 +843,7 @@
axis2_dep_engine_validate_system_predefined_phases(axis2_dep_engine_t *dep_engine,
const axis2_env_t *env)
{
- axis2_array_list_t *in_phases = NULL;
+ axutil_array_list_t *in_phases = NULL;
axis2_char_t *phase0 = NULL;
axis2_char_t *phase1 = NULL;
axis2_char_t *phase2 = NULL;
@@ -855,10 +855,10 @@
/* TODO condition checking should be otherway since null value can occur */
if (in_phases)
{
- phase0 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 0);
- phase1 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 1);
- phase2 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 2);
- phase3 = (axis2_char_t *) axis2_array_list_get(in_phases, env, 3);
+ phase0 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 0);
+ phase1 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 1);
+ phase2 = (axis2_char_t *) axutil_array_list_get(in_phases, env, 2);
+ phase3 = (axis2_char_t *) axutil_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)) ||
@@ -877,7 +877,7 @@
const axis2_env_t *env,
axis2_svc_grp_t *svc_metadata)
{
- axis2_array_list_t *svcs = NULL;
+ axutil_array_list_t *svcs = NULL;
int sizei = 0;
int i = 0;
@@ -888,22 +888,22 @@
env);
if (svcs)
{
- sizei = axis2_array_list_size(svcs, env);
+ sizei = axutil_array_list_size(svcs, env);
}
for (i = 0; i < sizei; i++)
{
axis2_svc_t *svc = NULL;
axis2_file_t *file = NULL;
- axis2_array_list_t *grp_modules = NULL;
- axis2_array_list_t *list = NULL;
+ axutil_array_list_t *grp_modules = NULL;
+ axutil_array_list_t *list = NULL;
int sizej = 0;
int j = 0;
axis2_hash_t *ops = NULL;
axis2_hash_index_t *index_i = NULL;
axis2_char_t *file_name = NULL;
- svc = (axis2_svc_t *) axis2_array_list_get(svcs, env, i);
+ svc = (axis2_svc_t *) axutil_array_list_get(svcs, env, i);
/*axis2_dep_engine_load_svc_props(dep_engine, env, svc);*/
file = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
@@ -914,14 +914,14 @@
grp_modules = axis2_svc_grp_get_all_module_qnames(svc_metadata, env);
if (grp_modules)
{
- sizej = axis2_array_list_size(grp_modules, env);
+ sizej = axutil_array_list_size(grp_modules, env);
}
for (j = 0; j < sizej; j++)
{
axis2_module_desc_t *module_desc = NULL;
axis2_qname_t *qmodulename = NULL;
- qmodulename = (axis2_qname_t *) axis2_array_list_get(grp_modules,
+ qmodulename = (axis2_qname_t *) axutil_array_list_get(grp_modules,
env, j);
module_desc = axis2_conf_get_module(dep_engine->conf, env,
qmodulename);
@@ -941,13 +941,13 @@
/* modules from <service> */
list = axis2_svc_get_all_module_qnames(svc, env);
- sizej = axis2_array_list_size(list, env);
+ sizej = axutil_array_list_size(list, env);
for (j = 0; j < sizej; j++)
{
axis2_module_desc_t *module_desc = NULL;
axis2_qname_t *qmodulename = NULL;
- qmodulename = (axis2_qname_t *) axis2_array_list_get(list,
+ qmodulename = (axis2_qname_t *) axutil_array_list_get(list,
env, j);
module_desc = axis2_conf_get_module(dep_engine->conf, env,
qmodulename);
@@ -976,7 +976,7 @@
{
void *v = NULL;
axis2_op_t *op_desc = NULL;
- axis2_array_list_t *modules = NULL;
+ axutil_array_list_t *modules = NULL;
int sizek = 0;
int k = 0;
@@ -986,14 +986,14 @@
modules = axis2_op_get_all_module_qnames(op_desc, env);
if (modules)
{
- sizek = axis2_array_list_size(modules, env);
+ sizek = axutil_array_list_size(modules, env);
}
for (k = 0; k < sizek; k++)
{
axis2_qname_t *module_qname = NULL;
axis2_module_desc_t *module = NULL;
- module_qname = (axis2_qname_t *) axis2_array_list_get(modules,
+ module_qname = (axis2_qname_t *) axutil_array_list_get(modules,
env, k);
module = axis2_conf_get_module(dep_engine->conf, env,
module_qname);
@@ -1211,7 +1211,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- size = axis2_array_list_size(dep_engine->ws_to_deploy, env);
+ size = axutil_array_list_size(dep_engine->ws_to_deploy, env);
if (size > 0)
{
@@ -1225,7 +1225,7 @@
axis2_arch_reader_t *arch_reader = NULL;
dep_engine->curr_file = (axis2_arch_file_data_t *)
- axis2_array_list_get(dep_engine->ws_to_deploy, env, i);
+ axutil_array_list_get(dep_engine->ws_to_deploy, env, i);
type = axis2_arch_file_data_get_type(dep_engine->curr_file, env);
switch (type)
@@ -1310,7 +1310,7 @@
axis2_char_t *svc_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- size = axis2_array_list_size(dep_engine->ws_to_undeploy, env);
+ size = axutil_array_list_size(dep_engine->ws_to_undeploy, env);
if (size > 0)
{
@@ -1322,7 +1322,7 @@
axis2_hash_t *faulty_svcs = NULL;
ws_info = (axis2_ws_info_t *)
- axis2_array_list_get(dep_engine->ws_to_undeploy, env, i);
+ axutil_array_list_get(dep_engine->ws_to_undeploy, env, i);
type = axis2_ws_info_get_type(ws_info, env);
if (type == AXIS2_SVC)
{
@@ -1339,7 +1339,7 @@
}
}
- axis2_array_list_free(dep_engine->ws_to_undeploy, env);
+ axutil_array_list_free(dep_engine->ws_to_undeploy, env);
return AXIS2_SUCCESS;
}
@@ -1553,7 +1553,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, module_builder, AXIS2_FAILURE);
- return axis2_array_list_add(dep_engine->module_builders, env, module_builder);
+ return axutil_array_list_add(dep_engine->module_builders, env, module_builder);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -1565,7 +1565,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_builder, AXIS2_FAILURE);
- return axis2_array_list_add(dep_engine->svc_builders, env, svc_builder);
+ return axutil_array_list_add(dep_engine->svc_builders, env, svc_builder);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -1577,7 +1577,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, svc_grp_builder, AXIS2_FAILURE);
- return axis2_array_list_add(dep_engine->svc_grp_builders, env, svc_grp_builder);
+ return axutil_array_list_add(dep_engine->svc_grp_builders, env, svc_grp_builder);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -1588,5 +1588,5 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, desc_builder, AXIS2_FAILURE);
- return axis2_array_list_add(dep_engine->desc_builders, env, desc_builder);
+ return axutil_array_list_add(dep_engine->desc_builders, env, desc_builder);
}
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Fri Mar 30 06:19:43 2007
@@ -535,9 +535,9 @@
childs = axiom_element_get_child_elements(param_element, env, param_node);
if (childs)
{
- axis2_array_list_t *value_list = NULL;
+ axutil_array_list_t *value_list = NULL;
- value_list = axis2_array_list_create(env, 0);
+ value_list = axutil_array_list_create(env, 0);
axis2_param_set_value_list(param, env, value_list);
while (AXIS2_TRUE == AXIOM_CHILD_ELEMENT_ITERATOR_HAS_NEXT(childs, env))
@@ -559,7 +559,7 @@
}
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);
+ axutil_array_list_add(value_list, env, param);
}
}
else
@@ -599,7 +599,7 @@
axiom_element_t *op_element = NULL;
axis2_qname_t *qname = NULL;
axiom_children_qname_iterator_t *action_mappings = NULL;
- axis2_array_list_t *mapping_list = axis2_array_list_create(env, 0);
+ axutil_array_list_t *mapping_list = axutil_array_list_create(env, 0);
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
@@ -618,7 +618,7 @@
{
if (mapping_list)
{
- axis2_array_list_free(mapping_list, env);
+ axutil_array_list_free(mapping_list, env);
mapping_list = NULL;
}
return AXIS2_SUCCESS;
@@ -643,7 +643,7 @@
input_action_string);
if(0 != axis2_strcmp("", input_action_string))
{
- axis2_array_list_add(mapping_list, env, input_action_string);
+ axutil_array_list_add(mapping_list, env, input_action_string);
}
else
{
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/module_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/module_builder.c Fri Mar 30 06:19:43 2007
@@ -24,7 +24,7 @@
struct axis2_desc_builder *desc_builder;
};
-static axis2_array_list_t *AXIS2_CALL
+static axutil_array_list_t *AXIS2_CALL
axis2_module_builder_process_ops(axis2_module_builder_t *module_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *op_itr);
@@ -121,7 +121,7 @@
axiom_element_t *out_fault_flow_element = NULL;
axiom_node_t *out_fault_flow_node = NULL;
axis2_conf_t *parent = NULL;
- axis2_array_list_t *ops = NULL;
+ axutil_array_list_t *ops = NULL;
axis2_param_container_t *parent_container = NULL;
int size = 0;
int i = 0;
@@ -321,32 +321,32 @@
axis2_qname_free(qopst, env);
}
ops = axis2_module_builder_process_ops(module_builder, env, op_itr);
- size = axis2_array_list_size(ops, env);
+ size = axutil_array_list_size(ops, env);
for (i = 0; i < size; i++)
{
axis2_op_t *op_desc = NULL;
- op_desc = (axis2_op_t *) axis2_array_list_get(ops, env, i);
+ op_desc = (axis2_op_t *) axutil_array_list_get(ops, env, i);
axis2_module_desc_add_op(module_builder->module_desc, env, op_desc);
}
- axis2_array_list_free(ops, env);
+ axutil_array_list_free(ops, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"axis2_module_builder_populate_module end");
return AXIS2_SUCCESS;
}
-static axis2_array_list_t *AXIS2_CALL
+static axutil_array_list_t *AXIS2_CALL
axis2_module_builder_process_ops(axis2_module_builder_t *module_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *op_itr)
{
- axis2_array_list_t *ops = NULL;
+ axutil_array_list_t *ops = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, op_itr, NULL);
- ops = axis2_array_list_create(env, 0);
+ ops = axutil_array_list_create(env, 0);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(op_itr, env))
{
axiom_element_t *op_element = NULL;
@@ -476,7 +476,7 @@
axis2_phases_info_set_op_phases(info, env, op_desc);
/* adding operation */
- axis2_array_list_add(ops, env, op_desc);
+ axutil_array_list_add(ops, env, op_desc);
}
return ops;
}
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=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/phases_info.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/phases_info.c Fri Mar 30 06:19:43 2007
@@ -19,10 +19,10 @@
struct axis2_phases_info
{
- axis2_array_list_t *in_phases;
- axis2_array_list_t *out_phases;
- axis2_array_list_t *in_faultphases;
- axis2_array_list_t *out_faultphases;
+ axutil_array_list_t *in_phases;
+ axutil_array_list_t *out_phases;
+ axutil_array_list_t *in_faultphases;
+ axutil_array_list_t *out_faultphases;
axis2_hash_t *op_in_phases;
axis2_hash_t *op_out_phases;
axis2_hash_t *op_in_faultphases;
@@ -65,22 +65,22 @@
if (phases_info->in_phases)
{
- axis2_array_list_free(phases_info->in_phases, env);
+ axutil_array_list_free(phases_info->in_phases, env);
}
if (phases_info->out_phases)
{
- axis2_array_list_free(phases_info->out_phases, env);
+ axutil_array_list_free(phases_info->out_phases, env);
}
if (phases_info->in_faultphases)
{
- axis2_array_list_free(phases_info->in_faultphases, env);
+ axutil_array_list_free(phases_info->in_faultphases, env);
}
if (phases_info->out_faultphases)
{
- axis2_array_list_free(phases_info->out_faultphases, env);
+ axutil_array_list_free(phases_info->out_faultphases, env);
}
if (phases_info->op_in_phases)
{
@@ -166,14 +166,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_phases_info_set_in_phases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
- axis2_array_list_t *in_phases)
+ axutil_array_list_t *in_phases)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, in_phases, AXIS2_FAILURE);
if (phases_info->in_phases)
{
- axis2_array_list_free(phases_info->in_phases, env);
+ axutil_array_list_free(phases_info->in_phases, env);
}
phases_info->in_phases = in_phases;
@@ -183,14 +183,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_phases_info_set_out_phases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
- axis2_array_list_t *out_phases)
+ axutil_array_list_t *out_phases)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_phases, AXIS2_FAILURE);
if (phases_info->out_phases)
{
- axis2_array_list_free(phases_info->out_phases, env);
+ axutil_array_list_free(phases_info->out_phases, env);
phases_info->out_phases = NULL;
}
phases_info->out_phases = out_phases;
@@ -200,14 +200,14 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_phases_info_set_in_faultphases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
- axis2_array_list_t *in_faultphases)
+ axutil_array_list_t *in_faultphases)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, in_faultphases, AXIS2_FAILURE);
if (phases_info->in_faultphases)
{
- axis2_array_list_free(phases_info->in_faultphases, env);
+ axutil_array_list_free(phases_info->in_faultphases, env);
phases_info->in_faultphases = NULL;
}
phases_info->in_faultphases = in_faultphases;
@@ -217,21 +217,21 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_phases_info_set_out_faultphases(axis2_phases_info_t *phases_info,
const axis2_env_t *env,
- axis2_array_list_t *out_faultphases)
+ axutil_array_list_t *out_faultphases)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, out_faultphases, AXIS2_FAILURE);
if (phases_info->out_faultphases)
{
- axis2_array_list_free(phases_info->out_faultphases, env);
+ axutil_array_list_free(phases_info->out_faultphases, env);
phases_info->out_faultphases = NULL;
}
phases_info->out_faultphases = out_faultphases;
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_in_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
@@ -240,28 +240,28 @@
return phases_info->in_phases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_out_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
return phases_info->out_phases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_in_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
return phases_info->in_faultphases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_out_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
return phases_info->out_faultphases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_op_in_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
@@ -269,12 +269,12 @@
int i = 0;
int size = 0;
axis2_char_t *phase_name = NULL;
- axis2_array_list_t *op_in_phases = NULL;
+ axutil_array_list_t *op_in_phases = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
- op_in_phases = axis2_array_list_create(env, 0);
+ op_in_phases = axutil_array_list_create(env, 0);
if (!op_in_phases)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -285,11 +285,11 @@
{
return op_in_phases;
}
- size = axis2_array_list_size(phases_info->in_phases, env);
+ size = axutil_array_list_size(phases_info->in_phases, env);
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *)
- axis2_array_list_get(phases_info->in_phases, env, i);
+ axutil_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) ||
@@ -307,7 +307,7 @@
axis2_hash_set(phases_info->op_in_phases, phase_name,
AXIS2_HASH_KEY_STRING, phase);
}
- status = axis2_array_list_add(op_in_phases, env, phase);
+ status = axutil_array_list_add(op_in_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -315,14 +315,14 @@
axis2_phase_free(phase, env);
phase = NULL;
- size = axis2_array_list_size(op_in_phases, env);
+ size = axutil_array_list_size(op_in_phases, env);
for (i = 0; i < size; i++)
{
- phase = axis2_array_list_get(op_in_phases, env, i);
+ phase = axutil_array_list_get(op_in_phases, env, i);
axis2_phase_free(phase, env);
phase = NULL;
}
- axis2_array_list_free(op_in_phases, env);
+ axutil_array_list_free(op_in_phases, env);
op_in_phases = NULL;
return NULL;
}
@@ -331,7 +331,7 @@
return op_in_phases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_op_out_phases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
@@ -339,16 +339,16 @@
int i = 0;
int size = 0;
axis2_char_t *phase_name = NULL;
- axis2_array_list_t *op_out_phases = NULL;
+ axutil_array_list_t *op_out_phases = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, NULL);
if (phases_info->out_phases)
{
- size = axis2_array_list_size(phases_info->out_phases, env);
+ size = axutil_array_list_size(phases_info->out_phases, env);
}
- op_out_phases = axis2_array_list_create(env, 0);
+ op_out_phases = axutil_array_list_create(env, 0);
if (!op_out_phases)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -356,7 +356,7 @@
}
for (i = 0; i < size; i++)
{
- phase_name = (axis2_char_t *) axis2_array_list_get(phases_info->
+ phase_name = (axis2_char_t *) axutil_array_list_get(phases_info->
out_phases, env, i);
phase = axis2_hash_get(phases_info->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING);
@@ -366,7 +366,7 @@
axis2_hash_set(phases_info->op_out_phases, phase_name,
AXIS2_HASH_KEY_STRING, phase);
}
- status = axis2_array_list_add(op_out_phases, env, phase);
+ status = axutil_array_list_add(op_out_phases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -374,14 +374,14 @@
axis2_phase_free(phase, env);
phase = NULL;
- size = axis2_array_list_size(op_out_phases, env);
+ size = axutil_array_list_size(op_out_phases, env);
for (i = 0; i < size; i++)
{
- phase = axis2_array_list_get(op_out_phases, env, i);
+ phase = axutil_array_list_get(op_out_phases, env, i);
axis2_phase_free(phase, env);
phase = NULL;
}
- axis2_array_list_free(op_out_phases, env);
+ axutil_array_list_free(op_out_phases, env);
op_out_phases = NULL;
return NULL;
}
@@ -389,7 +389,7 @@
return op_out_phases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_op_in_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
@@ -397,7 +397,7 @@
int size = 0;
axis2_status_t status = AXIS2_FAILURE;
axis2_char_t *phase_name = NULL;
- axis2_array_list_t *op_in_faultphases = NULL;
+ axutil_array_list_t *op_in_faultphases = NULL;
struct axis2_phase *phase = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -406,12 +406,12 @@
{
return NULL;
}
- size = axis2_array_list_size(phases_info->in_faultphases, env);
+ size = axutil_array_list_size(phases_info->in_faultphases, env);
if (0 == size)
{
return NULL;
}
- op_in_faultphases = axis2_array_list_create(env, 0);
+ op_in_faultphases = axutil_array_list_create(env, 0);
if (!op_in_faultphases)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -420,7 +420,7 @@
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *)
- axis2_array_list_get(phases_info->in_faultphases, env, i);
+ axutil_array_list_get(phases_info->in_faultphases, env, i);
phase = axis2_hash_get(phases_info->op_in_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
@@ -429,7 +429,7 @@
axis2_hash_set(phases_info->op_in_faultphases,
phase_name, AXIS2_HASH_KEY_STRING, phase);
}
- status = axis2_array_list_add(op_in_faultphases, env, phase);
+ status = axutil_array_list_add(op_in_faultphases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -437,14 +437,14 @@
axis2_phase_free(phase, env);
phase = NULL;
- size = axis2_array_list_size(op_in_faultphases, env);
+ size = axutil_array_list_size(op_in_faultphases, env);
for (i = 0; i < size; i++)
{
- phase = axis2_array_list_get(op_in_faultphases, env, i);
+ phase = axutil_array_list_get(op_in_faultphases, env, i);
axis2_phase_free(phase, env);
phase = NULL;
}
- axis2_array_list_free(op_in_faultphases, env);
+ axutil_array_list_free(op_in_faultphases, env);
op_in_faultphases = NULL;
return NULL;
@@ -453,7 +453,7 @@
return op_in_faultphases;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_get_op_out_faultphases(const axis2_phases_info_t *phases_info,
const axis2_env_t *env)
{
@@ -461,7 +461,7 @@
int size = 0;
axis2_status_t status = AXIS2_FAILURE;
axis2_char_t *phase_name = NULL;
- axis2_array_list_t *op_out_faultphases = NULL;
+ axutil_array_list_t *op_out_faultphases = NULL;
struct axis2_phase *phase = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -470,13 +470,13 @@
{
return NULL;
}
- size = axis2_array_list_size(phases_info->out_faultphases, env);
+ size = axutil_array_list_size(phases_info->out_faultphases, env);
if (0 == size)
{
return NULL;
}
- op_out_faultphases = axis2_array_list_create(env, 0);
+ op_out_faultphases = axutil_array_list_create(env, 0);
if (!op_out_faultphases)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -485,7 +485,7 @@
for (i = 0; i < size; i++)
{
phase_name = (axis2_char_t *)
- axis2_array_list_get(phases_info->out_faultphases, env, i);
+ axutil_array_list_get(phases_info->out_faultphases, env, i);
phase = axis2_hash_get(phases_info->op_out_faultphases, phase_name,
AXIS2_HASH_KEY_STRING);
if(!phase)
@@ -494,7 +494,7 @@
axis2_hash_set(phases_info->op_out_faultphases,
phase_name, AXIS2_HASH_KEY_STRING, phase);
}
- status = axis2_array_list_add(op_out_faultphases, env, phase);
+ status = axutil_array_list_add(op_out_faultphases, env, phase);
if (AXIS2_SUCCESS != status)
{
int i = 0;
@@ -502,14 +502,14 @@
axis2_phase_free(phase, env);
phase = NULL;
- size = axis2_array_list_size(op_out_faultphases, env);
+ size = axutil_array_list_size(op_out_faultphases, env);
for (i = 0; i < size; i++)
{
- phase = axis2_array_list_get(op_out_faultphases, env, i);
+ phase = axutil_array_list_get(op_out_faultphases, env, i);
axis2_phase_free(phase, env);
phase = NULL;
}
- axis2_array_list_free(op_out_faultphases, env);
+ axutil_array_list_free(op_out_faultphases, env);
op_out_faultphases = NULL;
return NULL;
@@ -524,10 +524,10 @@
axis2_op_t *op_desc)
{
axis2_status_t status = AXIS2_FAILURE;
- axis2_array_list_t *op_in_phases = NULL;
- axis2_array_list_t *op_out_phases = NULL;
- axis2_array_list_t *op_in_faultphases = NULL;
- axis2_array_list_t *op_out_faultphases = NULL;
+ axutil_array_list_t *op_in_phases = NULL;
+ axutil_array_list_t *op_out_phases = NULL;
+ axutil_array_list_t *op_in_faultphases = NULL;
+ axutil_array_list_t *op_out_faultphases = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, op_desc, AXIS2_FAILURE);
@@ -568,19 +568,19 @@
return status;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_phases_info_copy_flow(const axis2_env_t *env,
- const axis2_array_list_t *flow_to_copy)
+ const axutil_array_list_t *flow_to_copy)
{
int size = 0, i = 0;
- axis2_array_list_t *new_flow = NULL;
+ axutil_array_list_t *new_flow = NULL;
if(flow_to_copy)
{
- size = axis2_array_list_size((axis2_array_list_t *) flow_to_copy, env);
+ size = axutil_array_list_size((axutil_array_list_t *) flow_to_copy, env);
}
if(size > 0)
{
- new_flow = axis2_array_list_create(env, 0);
+ new_flow = axutil_array_list_create(env, 0);
if(!new_flow)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -589,9 +589,9 @@
}
for(i = 0; i < size; i++)
{
- void *item = axis2_array_list_get((axis2_array_list_t *) flow_to_copy,
+ void *item = axutil_array_list_get((axutil_array_list_t *) flow_to_copy,
env, i);
- axis2_array_list_add(new_flow, env, item);
+ axutil_array_list_add(new_flow, env, item);
}
return new_flow;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Fri Mar 30 06:19:43 2007
@@ -220,7 +220,7 @@
{
int size = 0;
int i = 0;
- axis2_array_list_t *current_info_list = NULL;
+ axutil_array_list_t *current_info_list = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -240,11 +240,11 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "No %s in the folder.", folder_name);
return AXIS2_SUCCESS;
}
- size = axis2_array_list_size(current_info_list, env);
+ size = axutil_array_list_size(current_info_list, env);
for (i = 0; i < size; i++) /* loop until empty */
{
axis2_file_t *file = NULL;
- file = axis2_array_list_get(current_info_list, env, i);
+ file = axutil_array_list_get(current_info_list, env, i);
status = axis2_ws_info_list_add_ws_info_item(repos_listener->info_list, env,
file, type);
if (AXIS2_SUCCESS != status)
@@ -252,15 +252,15 @@
int size_j = 0;
int j = 0;
- size_j = axis2_array_list_size(current_info_list, env);
+ size_j = axutil_array_list_size(current_info_list, env);
for (j = 0; j < size_j; j++)
{
axis2_file_t *del_file = NULL;
- del_file = axis2_array_list_get(current_info_list, env, j);
+ del_file = axutil_array_list_get(current_info_list, env, j);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(current_info_list, env);
+ axutil_array_list_free(current_info_list, env);
current_info_list = NULL;
return status;
}
@@ -270,10 +270,10 @@
{
axis2_file_t *del_file = NULL;
- del_file = axis2_array_list_get(current_info_list, env, i);
+ del_file = axutil_array_list_get(current_info_list, env, i);
axis2_file_free(del_file, env);
}
- axis2_array_list_free(current_info_list, env);
+ axutil_array_list_free(current_info_list, env);
current_info_list = NULL;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Mar 30 06:19:43 2007
@@ -26,7 +26,7 @@
struct axis2_desc_builder *desc_builder;
};
-static axis2_array_list_t *
+static axutil_array_list_t *
axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *op_itr);
@@ -162,7 +162,7 @@
axiom_node_t *out_faultflow_node = NULL;
axiom_element_t *out_faultflow_element = NULL;
axiom_attribute_t *name_attr = NULL;
- axis2_array_list_t *ops = NULL;
+ axutil_array_list_t *ops = NULL;
axis2_char_t *svc_name = NULL;
axis2_char_t *class_name = NULL;
axis2_char_t *svc_dll_name = NULL;
@@ -328,25 +328,25 @@
ops = axis2_svc_builder_process_ops(svc_builder, env, operation_itr);
if (ops)
{
- size = axis2_array_list_size(ops, env);
+ size = axutil_array_list_size(ops, env);
}
for (i = 0; i < size; i++)
{
axis2_op_t *op_desc = NULL;
- axis2_array_list_t *params = NULL;
+ axutil_array_list_t *params = NULL;
int j = 0;
int sizej = 0;
- op_desc = (axis2_op_t *) axis2_array_list_get(ops, env, i);
+ op_desc = (axis2_op_t *) axutil_array_list_get(ops, env, i);
params = axis2_op_get_all_params(op_desc, env);
/* Adding wsa-mapping into service */
- sizej = axis2_array_list_size(params, env);
+ sizej = axutil_array_list_size(params, env);
for (j = 0; j < sizej; j++)
{
axis2_param_t *param = NULL;
axis2_char_t *param_name = NULL;
- param = axis2_array_list_get(params, env, j);
+ param = axutil_array_list_get(params, env, j);
param_name = axis2_param_get_name(param, env);
if (0 == axis2_strcmp(param_name, AXIS2_WSA_MAPPING))
{
@@ -358,21 +358,21 @@
}
axis2_svc_add_op(svc_builder->svc, env, op_desc);
}
- axis2_array_list_free(ops, env);
+ axutil_array_list_free(ops, env);
return AXIS2_SUCCESS;
}
-static axis2_array_list_t *
+static axutil_array_list_t *
axis2_svc_builder_process_ops(axis2_svc_builder_t *svc_builder,
const axis2_env_t *env,
axiom_children_qname_iterator_t *op_itr)
{
- axis2_array_list_t *ops = NULL;
+ axutil_array_list_t *ops = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, op_itr, NULL);
- ops = axis2_array_list_create(env, 0);
+ ops = axutil_array_list_create(env, 0);
while (AXIS2_TRUE == axiom_children_qname_iterator_has_next(op_itr, env))
{
axiom_element_t *op_element = NULL;
@@ -491,7 +491,7 @@
}
/* adding operation */
- status = axis2_array_list_add(ops, env, op_desc);
+ status = axutil_array_list_add(ops, env, op_desc);
}
return ops;
Modified: webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_grp_builder.c Fri Mar 30 06:19:43 2007
@@ -177,7 +177,7 @@
{
axis2_svc_t *axis_svc = NULL;
axis2_arch_file_data_t *file_data = NULL;
- axis2_array_list_t *deployable_svcs = NULL;
+ axutil_array_list_t *deployable_svcs = NULL;
axis2_svc_builder_t *svc_builder = NULL;
file_data = axis2_dep_engine_get_current_file_item(
@@ -198,7 +198,7 @@
deployable_svcs = axis2_arch_file_data_get_deployable_svcs(file_data,
env);
- axis2_array_list_add(deployable_svcs, env, axis_svc);
+ axutil_array_list_add(deployable_svcs, env, axis_svc);
axis2_svc_set_parent(axis_svc, env, svc_grp);
svc_builder = axis2_svc_builder_create_with_dep_engine_and_svc(env,
axis2_desc_builder_get_dep_engine(svc_grp_builder->desc_builder, env),
Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Fri Mar 30 06:19:43 2007
@@ -24,11 +24,11 @@
/**
* This is to store all the jar files in a specified folder (WEB_INF)
*/
- axis2_array_list_t *ws_info_list;
+ axutil_array_list_t *ws_info_list;
/**
* All the curently updated jars
*/
- axis2_array_list_t *current_info_lists;
+ axutil_array_list_t *current_info_lists;
/**
* Referance to DeploymentEngine to make update
@@ -60,7 +60,7 @@
ws_info_list->deployer = dep_engine;
- ws_info_list->ws_info_list = axis2_array_list_create(env, 0);
+ ws_info_list->ws_info_list = axutil_array_list_create(env, 0);
if (!(ws_info_list->ws_info_list))
{
axis2_ws_info_list_free(ws_info_list, env);
@@ -68,7 +68,7 @@
return NULL;
}
- ws_info_list->current_info_lists = axis2_array_list_create(env, 0);
+ ws_info_list->current_info_lists = axutil_array_list_create(env, 0);
if (!(ws_info_list->current_info_lists))
{
axis2_ws_info_list_free(ws_info_list, env);
@@ -90,16 +90,16 @@
int list_size = 0;
int i = 0;
- list_size = axis2_array_list_size(ws_info_list->current_info_lists, env);
+ list_size = axutil_array_list_size(ws_info_list->current_info_lists, env);
for (i = 0; i < list_size; i++)
{
axis2_char_t *file_name = NULL;
file_name = (axis2_char_t *)
- axis2_array_list_get(ws_info_list->current_info_lists, env, i);
+ axutil_array_list_get(ws_info_list->current_info_lists, env, i);
AXIS2_FREE(env->allocator, file_name);
}
- axis2_array_list_free(ws_info_list->current_info_lists, env);
+ axutil_array_list_free(ws_info_list->current_info_lists, env);
}
if (ws_info_list->ws_info_list)
@@ -107,16 +107,16 @@
int list_size = 0;
int i = 0;
- list_size = axis2_array_list_size(ws_info_list->ws_info_list, env);
+ list_size = axutil_array_list_size(ws_info_list->ws_info_list, env);
for (i = 0; i < list_size; i++)
{
axis2_ws_info_t *ws_info = NULL;
- ws_info = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
+ ws_info = (axis2_ws_info_t *) axutil_array_list_get(ws_info_list->
ws_info_list, env, i);
axis2_ws_info_free(ws_info, env);
}
- axis2_array_list_free(ws_info_list->ws_info_list, env);
+ axutil_array_list_free(ws_info_list->ws_info_list, env);
}
if (ws_info_list)
@@ -136,7 +136,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- size = axis2_array_list_size(ws_info_list->ws_info_list, env);
+ size = axutil_array_list_size(ws_info_list->ws_info_list, env);
if (AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE(env->error))
{
@@ -148,7 +148,7 @@
axis2_ws_info_t *ws_info = NULL;
ws_info = (axis2_ws_info_t *)
- axis2_array_list_get(ws_info_list->ws_info_list, env, i);
+ axutil_array_list_get(ws_info_list->ws_info_list, env, i);
axis2_ws_info_free(ws_info, env);
}
return AXIS2_SUCCESS;
@@ -189,7 +189,7 @@
last_modified_date = axis2_file_get_timestamp(file, env);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_SVC);
- status = axis2_array_list_add(ws_info_list->ws_info_list, env, ws_info);
+ status = axutil_array_list_add(ws_info_list->ws_info_list, env, ws_info);
if (AXIS2_SUCCESS != status)
{
@@ -222,7 +222,7 @@
last_modified_date = axis2_file_get_timestamp(file, env);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date_and_type(
env, info_list_name, last_modified_date, AXIS2_MODULE);
- status = axis2_array_list_add(ws_info_list->ws_info_list, env, ws_info);
+ status = axutil_array_list_add(ws_info_list->ws_info_list, env, ws_info);
if (AXIS2_SUCCESS != status)
{
@@ -243,7 +243,7 @@
}
}
- return axis2_array_list_add(ws_info_list->current_info_lists, env,
+ return axutil_array_list_add(ws_info_list->current_info_lists, env,
info_list_name);
}
@@ -257,13 +257,13 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, file_name, NULL);
- size = axis2_array_list_size(ws_info_list->ws_info_list, env);
+ size = axutil_array_list_size(ws_info_list->ws_info_list, env);
for (i = 0; i < size; i++)
{
axis2_ws_info_t *ws_info = NULL;
axis2_char_t *file_name_l = NULL;
- ws_info = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
+ ws_info = (axis2_ws_info_t *) axutil_array_list_get(ws_info_list->
ws_info_list, env, i);
file_name_l = axis2_ws_info_get_file_name(ws_info, env);
@@ -309,18 +309,18 @@
const axis2_env_t *env)
{
int list_size = 0;
- axis2_array_list_t *temp_list = NULL;
+ axutil_array_list_t *temp_list = NULL;
int i = 0;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
/* create temp list*/
- temp_list = axis2_array_list_create(env, 0);
+ temp_list = axutil_array_list_create(env, 0);
if (!temp_list)
{
return AXIS2_FAILURE;
}
- list_size = axis2_array_list_size(ws_info_list->ws_info_list, env);
+ list_size = axutil_array_list_size(ws_info_list->ws_info_list, env);
for (i = 0; i < list_size; i++)
{
@@ -330,16 +330,16 @@
axis2_bool_t exist = AXIS2_FALSE;
int j = 0;
- file_item = (axis2_ws_info_t *) axis2_array_list_get(ws_info_list->
+ file_item = (axis2_ws_info_t *) axutil_array_list_get(ws_info_list->
ws_info_list, env, i);
file_item_name = axis2_ws_info_get_file_name(file_item, env);
- current_lists_size = axis2_array_list_size(ws_info_list->current_info_lists,
+ current_lists_size = axutil_array_list_size(ws_info_list->current_info_lists,
env);
for (j = 0; j < current_lists_size; j++)
{
axis2_char_t *file_name = NULL;
- file_name = (axis2_char_t *) axis2_array_list_get(ws_info_list->
+ file_name = (axis2_char_t *) axutil_array_list_get(ws_info_list->
current_info_lists, env, j);
if (0 == axis2_strcmp(file_name, file_item_name))
{
@@ -355,7 +355,7 @@
last_modified_date = axis2_ws_info_get_last_modified_date(file_item,
env);
- axis2_array_list_add(temp_list, env, file_item);
+ axutil_array_list_add(temp_list, env, file_item);
ws_info = axis2_ws_info_create_with_file_name_and_last_modified_date(
env, file_item_name, last_modified_date);
/* this is to be undeployed */
@@ -365,18 +365,18 @@
}
- list_size = axis2_array_list_size(temp_list, env);
+ list_size = axutil_array_list_size(temp_list, env);
for (i = 0; i < list_size; i++)
{
axis2_ws_info_t *file_item = NULL;
int index = 0;
- file_item = (axis2_ws_info_t*) axis2_array_list_get(temp_list, env, i);
- index = axis2_array_list_index_of(ws_info_list->ws_info_list, env,
+ file_item = (axis2_ws_info_t*) axutil_array_list_get(temp_list, env, i);
+ index = axutil_array_list_index_of(ws_info_list->ws_info_list, env,
file_item);
- axis2_array_list_remove(ws_info_list->ws_info_list, env, index);
+ axutil_array_list_remove(ws_info_list->ws_info_list, env, index);
}
- axis2_array_list_free(temp_list, env);
+ axutil_array_list_free(temp_list, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/desc.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/desc.c Fri Mar 30 06:19:43 2007
@@ -124,7 +124,7 @@
param_name);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_desc_get_all_params(const axis2_desc_t *desc,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/description/flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/flow.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/flow.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/flow.c Fri Mar 30 06:19:43 2007
@@ -19,7 +19,7 @@
struct axis2_flow
{
- axis2_array_list_t *list;
+ axutil_array_list_t *list;
};
AXIS2_EXTERN axis2_flow_t *AXIS2_CALL
@@ -39,7 +39,7 @@
flow->list = NULL;
- flow->list = axis2_array_list_create(env, 20);
+ flow->list = axutil_array_list_create(env, 20);
if (!(flow->list))
{
axis2_flow_free(flow, env);
@@ -61,16 +61,16 @@
int i = 0;
int size = 0;
- size = axis2_array_list_size(flow->list, env);
+ size = axutil_array_list_size(flow->list, env);
for (i = 0; i < size; i++)
{
axis2_handler_desc_t *handler_desc = NULL;
handler_desc =
- (axis2_handler_desc_t *) axis2_array_list_get(flow->list, env, i);
+ (axis2_handler_desc_t *) axutil_array_list_get(flow->list, env, i);
axis2_handler_desc_free(handler_desc, env);
}
- axis2_array_list_free(flow->list, env);
+ axutil_array_list_free(flow->list, env);
}
if (flow)
@@ -103,7 +103,7 @@
if (!flow->list)
{
- flow->list = axis2_array_list_create(env, 0);
+ flow->list = axutil_array_list_create(env, 0);
if (!flow->list)
{
axis2_flow_free(flow, env);
@@ -111,7 +111,7 @@
return AXIS2_FAILURE;
}
}
- return axis2_array_list_add(flow->list, env, handler);
+ return axutil_array_list_add(flow->list, env, handler);
}
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
@@ -119,13 +119,13 @@
const axis2_env_t *env,
const int index)
{
- return axis2_array_list_get(flow->list, env, index);
+ return axutil_array_list_get(flow->list, env, index);
}
AXIS2_EXTERN int AXIS2_CALL
axis2_flow_get_handler_count(const axis2_flow_t *flow,
const axis2_env_t *env)
{
- return axis2_array_list_size(flow->list, env);
+ return axutil_array_list_size(flow->list, env);
}
Modified: webservices/axis2/trunk/c/modules/core/description/handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/handler_desc.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/handler_desc.c Fri Mar 30 06:19:43 2007
@@ -169,7 +169,7 @@
env, param);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_handler_desc_get_all_params(const axis2_handler_desc_t *handler_desc,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/description/module_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/module_desc.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/module_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/module_desc.c Fri Mar 30 06:19:43 2007
@@ -375,7 +375,7 @@
return axis2_param_container_get_param(module_desc->params, env, name);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_module_desc_get_all_params(const axis2_module_desc_t *module_desc,
const axis2_env_t *env)
{
Modified: webservices/axis2/trunk/c/modules/core/description/msg.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/msg.c?view=diff&rev=524073&r1=524072&r2=524073
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/msg.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/msg.c Fri Mar 30 06:19:43 2007
@@ -23,7 +23,7 @@
/** parent operation */
axis2_op_t *parent;
/** list of phases that represent the flow */
- axis2_array_list_t *flow;
+ axutil_array_list_t *flow;
/** name of the message */
axis2_char_t *name;
/** XML schema element qname */
@@ -64,7 +64,7 @@
return NULL;
}
- msg->flow = axis2_array_list_create(env, 0);
+ msg->flow = axutil_array_list_create(env, 0);
if (!msg->flow)
{
axis2_msg_free(msg, env);
@@ -82,7 +82,7 @@
if (msg->flow)
{
- axis2_array_list_free(msg->flow, env);
+ axutil_array_list_free(msg->flow, env);
}
if (msg->name)
@@ -151,7 +151,7 @@
return axis2_param_container_get_param(msg->param_container, env, param_name);
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_msg_get_all_params(const axis2_msg_t *msg,
const axis2_env_t *env)
{
@@ -177,7 +177,7 @@
return msg->parent;
}
-AXIS2_EXTERN axis2_array_list_t *AXIS2_CALL
+AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
axis2_msg_get_flow(const axis2_msg_t *msg,
const axis2_env_t *env)
{
@@ -216,12 +216,12 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_msg_set_flow(axis2_msg_t *msg,
const axis2_env_t *env,
- axis2_array_list_t *flow)
+ axutil_array_list_t *flow)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (msg->flow)
{
- axis2_array_list_free(msg->flow, env);
+ axutil_array_list_free(msg->flow, env);
msg->flow = NULL;
}
if (flow)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org