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 sa...@apache.org on 2006/05/31 17:54:39 UTC
svn commit: r410566 [18/49] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
axiom/test/unit/om/ include/ modules/...
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?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_file_data.c Wed May 31 08:54:07 2006
@@ -50,91 +50,91 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_free (axis2_arch_file_data_t *arch_file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_msg_recv(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_msg_recv(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *msg_recv);
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_svc_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
int AXIS2_CALL
axis2_arch_file_data_get_type(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_file_t *AXIS2_CALL
axis2_arch_file_data_get_file(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_module_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_module_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_name);
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_module_dll_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_module_dll_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_dll_name);
axis2_status_t AXIS2_CALL
axis2_arch_file_data_add_svc(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_t *svc_desc);
struct axis2_svc *AXIS2_CALL
axis2_arch_file_data_get_svc(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *svc_name);
axis2_hash_t *AXIS2_CALL
axis2_arch_file_data_get_svc_map(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *AXIS2_CALL
axis2_arch_file_data_get_deployable_svcs(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_deployable_svcs(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *deployable_svcs);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_arch_file_data_t *)
-axis2_arch_file_data_create(axis2_env_t **env)
+axis2_arch_file_data_create(const axis2_env_t *env)
{
axis2_arch_file_data_impl_t *arch_file_data_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- arch_file_data_impl = (axis2_arch_file_data_impl_t *) AXIS2_MALLOC((*env)->
+ arch_file_data_impl = (axis2_arch_file_data_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_arch_file_data_impl_t));
if(NULL == arch_file_data_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -152,16 +152,16 @@
if(!arch_file_data_impl->deployable_svcs)
{
axis2_arch_file_data_free(&(arch_file_data_impl->arch_file_data), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
arch_file_data_impl->arch_file_data.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_arch_file_data_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_arch_file_data_ops_t));
if(NULL == arch_file_data_impl->arch_file_data.ops)
{
axis2_arch_file_data_free(&(arch_file_data_impl->arch_file_data), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -201,7 +201,7 @@
}
AXIS2_DECLARE(axis2_arch_file_data_t *)
-axis2_arch_file_data_create_with_type_and_file(axis2_env_t **env,
+axis2_arch_file_data_create_with_type_and_file(const axis2_env_t *env,
int type,
axis2_file_t *file)
{
@@ -218,7 +218,7 @@
}
AXIS2_DECLARE(axis2_arch_file_data_t *)
-axis2_arch_file_data_create_with_type_and_name(axis2_env_t **env,
+axis2_arch_file_data_create_with_type_and_name(const axis2_env_t *env,
int type,
axis2_char_t *name)
{
@@ -238,7 +238,7 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_free (axis2_arch_file_data_t *arch_file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
@@ -253,22 +253,22 @@
}
if(file_data_impl->msg_recv)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->msg_recv);
+ AXIS2_FREE(env->allocator, file_data_impl->msg_recv);
file_data_impl->msg_recv = NULL;
}
if(file_data_impl->module_name)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->module_name);
+ AXIS2_FREE(env->allocator, file_data_impl->module_name);
file_data_impl->module_name = NULL;
}
if(file_data_impl->module_dll_name)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->module_dll_name);
+ AXIS2_FREE(env->allocator, file_data_impl->module_dll_name);
file_data_impl->module_dll_name = NULL;
}
if(file_data_impl->name)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->name);
+ AXIS2_FREE(env->allocator, file_data_impl->name);
file_data_impl->name = NULL;
}
@@ -301,13 +301,13 @@
if(NULL != arch_file_data->ops)
{
- AXIS2_FREE((*env)->allocator, arch_file_data->ops);
+ AXIS2_FREE(env->allocator, arch_file_data->ops);
arch_file_data->ops = NULL;
}
if(file_data_impl)
{
- AXIS2_FREE((*env)->allocator, file_data_impl);
+ AXIS2_FREE(env->allocator, file_data_impl);
file_data_impl = NULL;
}
@@ -316,7 +316,7 @@
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_msg_recv(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(file_data)->msg_recv;
@@ -324,17 +324,17 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_msg_recv(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *msg_recv)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, msg_recv, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, msg_recv, AXIS2_FAILURE);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
if(file_data_impl->msg_recv)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->msg_recv);
+ AXIS2_FREE(env->allocator, file_data_impl->msg_recv);
file_data_impl->msg_recv = NULL;
}
file_data_impl->msg_recv = AXIS2_STRDUP(msg_recv, env);
@@ -343,7 +343,7 @@
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
@@ -355,7 +355,7 @@
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_svc_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
axis2_char_t *svc_name = NULL;
@@ -377,7 +377,7 @@
int AXIS2_CALL
axis2_arch_file_data_get_type(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
return AXIS2_INTF_TO_IMPL(file_data)->type;
@@ -385,7 +385,7 @@
axis2_file_t *AXIS2_CALL
axis2_arch_file_data_get_file(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(file_data)->file;
@@ -393,7 +393,7 @@
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_module_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
axis2_char_t *module_name = NULL;
@@ -414,17 +414,17 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_module_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_name)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_name, AXIS2_FAILURE);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
if(file_data_impl->module_name)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->module_name);
+ AXIS2_FREE(env->allocator, file_data_impl->module_name);
file_data_impl->module_name = NULL;
}
file_data_impl->module_name = AXIS2_STRDUP(module_name, env);
@@ -433,7 +433,7 @@
axis2_char_t *AXIS2_CALL
axis2_arch_file_data_get_module_dll_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
@@ -445,17 +445,17 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_module_dll_name(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_dll_name)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_dll_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_dll_name, AXIS2_FAILURE);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
if(file_data_impl->module_dll_name)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->module_dll_name);
+ AXIS2_FREE(env->allocator, file_data_impl->module_dll_name);
file_data_impl->module_dll_name = NULL;
}
file_data_impl->module_dll_name = AXIS2_STRDUP(module_dll_name, env);
@@ -464,14 +464,14 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_add_svc(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_t *svc_desc)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
axis2_qname_t *svc_qname = NULL;
axis2_char_t *svc_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_desc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_desc, AXIS2_FAILURE);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
@@ -482,7 +482,7 @@
file_data_impl->svc_map = axis2_hash_make(env);
if(!file_data_impl->svc_map)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
}
@@ -493,14 +493,14 @@
struct axis2_svc *AXIS2_CALL
axis2_arch_file_data_get_svc(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *svc_name)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
axis2_svc_t *svc = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_name, AXIS2_FAILURE);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
if(file_data_impl->svc_map)
@@ -517,7 +517,7 @@
axis2_hash_t *AXIS2_CALL
axis2_arch_file_data_get_svc_map(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(file_data)->svc_map;
@@ -525,7 +525,7 @@
axis2_array_list_t *AXIS2_CALL
axis2_arch_file_data_get_deployable_svcs(axis2_arch_file_data_t *file_data,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(file_data)->deployable_svcs;
@@ -533,16 +533,16 @@
axis2_status_t AXIS2_CALL
axis2_arch_file_data_set_deployable_svcs(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *deployable_svcs)
{
axis2_arch_file_data_impl_t *file_data_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, deployable_svcs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, deployable_svcs, AXIS2_FAILURE);
file_data_impl = AXIS2_INTF_TO_IMPL(file_data);
if(file_data_impl->deployable_svcs)
{
- AXIS2_FREE((*env)->allocator, file_data_impl->deployable_svcs);
+ AXIS2_FREE(env->allocator, file_data_impl->deployable_svcs);
file_data_impl->deployable_svcs = NULL;
}
file_data_impl->deployable_svcs = deployable_svcs;
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?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/arch_reader.c Wed May 31 08:54:07 2006
@@ -39,54 +39,54 @@
axis2_status_t AXIS2_CALL
axis2_arch_reader_free (axis2_arch_reader_t *arch_reader,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_svc *AXIS2_CALL
axis2_arch_reader_create_svc(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_arch_file_data *file);
axis2_status_t AXIS2_CALL
axis2_arch_reader_process_svc_grp(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_path,
struct axis2_dep_engine *dep_engine,
axis2_svc_grp_t *svc_grp);
axis2_status_t AXIS2_CALL
axis2_arch_reader_build_svc_grp(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_path,
struct axis2_dep_engine *dep_engine,
struct axis2_svc_grp *svc_grp);
axis2_status_t AXIS2_CALL
axis2_arch_reader_read_module_arch(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_path,
struct axis2_dep_engine *dep_engine,
axis2_module_desc_t *module);
axis2_file_t *AXIS2_CALL
axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_name);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_arch_reader_t *)
-axis2_arch_reader_create (axis2_env_t **env)
+axis2_arch_reader_create (const axis2_env_t *env)
{
axis2_arch_reader_impl_t *arch_reader_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- arch_reader_impl = (axis2_arch_reader_impl_t *) AXIS2_MALLOC((*env)->
+ arch_reader_impl = (axis2_arch_reader_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_arch_reader_impl_t));
if(NULL == arch_reader_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -94,11 +94,11 @@
arch_reader_impl->arch_reader.ops = NULL;
arch_reader_impl->arch_reader.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_arch_reader_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_arch_reader_ops_t));
if(NULL == arch_reader_impl->arch_reader.ops)
{
axis2_arch_reader_free(&(arch_reader_impl->arch_reader), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -120,7 +120,7 @@
axis2_status_t AXIS2_CALL
axis2_arch_reader_free (axis2_arch_reader_t *arch_reader,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_arch_reader_impl_t *arch_reader_impl = NULL;
@@ -128,7 +128,7 @@
arch_reader_impl = AXIS2_INTF_TO_IMPL(arch_reader);
if(NULL != arch_reader->ops)
- AXIS2_FREE((*env)->allocator, arch_reader->ops);
+ AXIS2_FREE(env->allocator, arch_reader->ops);
if(arch_reader_impl->desc_builder)
{
@@ -138,7 +138,7 @@
if(arch_reader_impl)
{
- AXIS2_FREE((*env)->allocator, arch_reader_impl);
+ AXIS2_FREE(env->allocator, arch_reader_impl);
arch_reader_impl = NULL;
}
@@ -147,7 +147,7 @@
struct axis2_svc *AXIS2_CALL
axis2_arch_reader_create_svc(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_arch_file_data *file)
{
struct axis2_svc *svc = NULL;
@@ -303,7 +303,7 @@
axis2_status_t AXIS2_CALL
axis2_arch_reader_process_svc_grp(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_svc_grp_t *svc_grp)
@@ -318,9 +318,9 @@
axis2_char_t *svc_folder = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, dep_engine, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_grp, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, file_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, dep_engine, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
repos_path = AXIS2_DEP_ENGINE_GET_REPOS_PATH(dep_engine, env);
temp_path = AXIS2_STRACAT(repos_path, AXIS2_PATH_SEP_STR, env);
@@ -329,14 +329,14 @@
svc_container_path = AXIS2_STRACAT(temp_path3, file_name, env);
svc_folder = AXIS2_STRACAT(svc_container_path, AXIS2_PATH_SEP_STR, env);
svcs_xml = AXIS2_STRACAT(svc_folder, AXIS2_SVC_XML, env);
- AXIS2_FREE((*env)->allocator, temp_path);
- AXIS2_FREE((*env)->allocator, temp_path2);
- AXIS2_FREE((*env)->allocator, temp_path3);
- AXIS2_FREE((*env)->allocator, svc_container_path);
- AXIS2_FREE((*env)->allocator, svc_folder);
+ AXIS2_FREE(env->allocator, temp_path);
+ AXIS2_FREE(env->allocator, temp_path2);
+ AXIS2_FREE(env->allocator, temp_path3);
+ AXIS2_FREE(env->allocator, svc_container_path);
+ AXIS2_FREE(env->allocator, svc_folder);
if(!svcs_xml)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
status = axis2_file_handler_access(svcs_xml, AXIS2_F_OK);
@@ -356,17 +356,17 @@
AXIS2_SVC_GRP_SET_NAME(svc_grp, env, svc_name);
} else
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_SERVICE_XML_NOT_FOUND,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SERVICE_XML_NOT_FOUND,
AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
- AXIS2_FREE((*env)->allocator, svcs_xml);
+ AXIS2_FREE(env->allocator, svcs_xml);
return status;
}
axis2_status_t AXIS2_CALL
axis2_arch_reader_build_svc_grp(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *svc_xml,
axis2_dep_engine_t *dep_engine,
axis2_svc_grp_t *svc_grp)
@@ -378,9 +378,9 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_xml, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, dep_engine, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, svc_grp, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_xml, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, dep_engine, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, svc_grp, AXIS2_FAILURE);
arch_reader_impl = AXIS2_INTF_TO_IMPL(arch_reader);
if(arch_reader_impl->desc_builder)
@@ -431,7 +431,7 @@
AXIS2_SVC_BUILDER_FREE(svc_builder, env);
if(AXIS2_SUCCESS != status)
{
- AXIS2_LOG_INFO((*env)->log, AXIS2_LOG_SI, "populating service is not successful");
+ AXIS2_LOG_INFO(env->log, AXIS2_LOG_SI, "populating service is not successful");
return AXIS2_FAILURE;
}
@@ -461,7 +461,7 @@
axis2_status_t AXIS2_CALL
axis2_arch_reader_read_module_arch(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name,
axis2_dep_engine_t *dep_engine,
axis2_module_desc_t *module_desc)
@@ -477,9 +477,9 @@
axis2_char_t *module_folder = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, file_name, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, dep_engine, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_desc, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, file_name, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, dep_engine, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_desc, AXIS2_FAILURE);
arch_reader_impl = AXIS2_INTF_TO_IMPL(arch_reader);
repos_path = AXIS2_DEP_ENGINE_GET_REPOS_PATH(dep_engine, env);
@@ -489,14 +489,14 @@
module_container_path = AXIS2_STRACAT(temp_path3, file_name, env);
module_folder = AXIS2_STRACAT(module_container_path, AXIS2_PATH_SEP_STR, env);
module_xml = AXIS2_STRACAT(module_folder, AXIS2_MODULE_XML, env);
- AXIS2_FREE((*env)->allocator, temp_path);
- AXIS2_FREE((*env)->allocator, temp_path2);
- AXIS2_FREE((*env)->allocator, temp_path3);
- AXIS2_FREE((*env)->allocator, module_container_path);
- AXIS2_FREE((*env)->allocator, module_folder);
+ AXIS2_FREE(env->allocator, temp_path);
+ AXIS2_FREE(env->allocator, temp_path2);
+ AXIS2_FREE(env->allocator, temp_path3);
+ AXIS2_FREE(env->allocator, module_container_path);
+ AXIS2_FREE(env->allocator, module_folder);
if(!module_xml)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
status = axis2_file_handler_access(module_xml, AXIS2_F_OK);
@@ -512,17 +512,17 @@
}
else
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_MODULE_XML_NOT_FOUND_FOR_THE_MODULE, AXIS2_FAILURE);
status = AXIS2_FAILURE;
}
- AXIS2_FREE((*env)->allocator, module_xml);
+ AXIS2_FREE(env->allocator, module_xml);
return status;
}
axis2_file_t *AXIS2_CALL
axis2_arch_reader_create_module_arch(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_name)
{
axis2_file_t *file = NULL;
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?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- 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 Wed May 31 08:54:07 2006
@@ -59,15 +59,15 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_arch_file_data_t *arch_file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
get_msg_recv)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_msg_recv)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *msg_recv);
/**
@@ -75,62 +75,62 @@
*/
axis2_char_t *(AXIS2_CALL *
get_name)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* @return the service name. if contained file is not null this is the
* file name. else this is the name property
*/
axis2_char_t *(AXIS2_CALL *
get_svc_name)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
int (AXIS2_CALL *
get_type)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_file_t *(AXIS2_CALL *
get_file)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
get_module_name)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_module_name)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_name);
axis2_char_t *(AXIS2_CALL *
get_module_dll_name)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_module_dll_name)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_dll_name);
axis2_status_t (AXIS2_CALL *
add_svc)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_svc *svc_desc);
struct axis2_svc *(AXIS2_CALL *
get_svc)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *svc_name);
axis2_hash_t *(AXIS2_CALL *
get_svc_map)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_array_list_t *(AXIS2_CALL *
get_deployable_svcs)(axis2_arch_file_data_t *file_data,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_deployable_svcs) (axis2_arch_file_data_t *file_data,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_array_list_t *deployable_svcs);
@@ -149,7 +149,7 @@
* @return pointer to newly created arch file data
*/
AXIS2_DECLARE(axis2_arch_file_data_t *)
-axis2_arch_file_data_create(axis2_env_t **env);
+axis2_arch_file_data_create(const axis2_env_t *env);
/**
* Creates arch file data struct
@@ -158,7 +158,7 @@
* @return pointer to newly created arch file data
*/
AXIS2_DECLARE(axis2_arch_file_data_t *)
-axis2_arch_file_data_create_with_type_and_file(axis2_env_t **env,
+axis2_arch_file_data_create_with_type_and_file(const axis2_env_t *env,
int type,
axis2_file_t *file);
@@ -169,7 +169,7 @@
* @return pointer to newly created arch file data
*/
AXIS2_DECLARE(axis2_arch_file_data_t *)
-axis2_arch_file_data_create_with_type_and_name(axis2_env_t **env,
+axis2_arch_file_data_create_with_type_and_name(const axis2_env_t *env,
int type,
axis2_char_t *name);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_arch_reader.h Wed May 31 08:54:07 2006
@@ -64,7 +64,7 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
@@ -76,7 +76,7 @@
*/
struct axis2_svc *(AXIS2_CALL *
create_svc) (axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_arch_file_data *file);
/**
@@ -87,28 +87,28 @@
*/
axis2_status_t (AXIS2_CALL *
process_svc_grp) (axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_svc_grp_t *svc_grp);
axis2_status_t (AXIS2_CALL *
build_svc_grp) (axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_path,
struct axis2_dep_engine *dep_engine,
struct axis2_svc_grp *svc_grp);
axis2_status_t (AXIS2_CALL *
read_module_arch) (axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_path,
struct axis2_dep_engine *dep_engine,
axis2_module_desc_t *module);
axis2_file_t *(AXIS2_CALL *
create_module_arch)(axis2_arch_reader_t *arch_reader,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *module_name);
};
@@ -126,7 +126,7 @@
* @return pointer to newly created arch reader
*/
AXIS2_DECLARE(axis2_arch_reader_t *)
-axis2_arch_reader_create (axis2_env_t **env);
+axis2_arch_reader_create (const axis2_env_t *env);
/*************************** Function macros **********************************/
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_builder.h Wed May 31 08:54:07 2006
@@ -59,18 +59,18 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
populate_conf) (axis2_conf_builder_t *conf_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* To get the list og modules that is requird to be engage globally
*/
axis2_status_t (AXIS2_CALL *
process_module_refs) (axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs);
@@ -91,7 +91,7 @@
* @return pointer to newly created conf builder
*/
AXIS2_DECLARE(axis2_conf_builder_t *)
-axis2_conf_builder_create (axis2_env_t **env);
+axis2_conf_builder_create (const axis2_env_t *env);
/**
* Creates conf builder struct
@@ -102,7 +102,7 @@
*/
AXIS2_DECLARE(axis2_conf_builder_t *)
-axis2_conf_builder_create_with_file_and_dep_engine_and_conf (axis2_env_t **env,
+axis2_conf_builder_create_with_file_and_dep_engine_and_conf (const axis2_env_t *env,
axis2_char_t *file,
struct axis2_dep_engine *dep_engine,
axis2_conf_t *conf);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_init.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_init.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_init.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_conf_init.h Wed May 31 08:54:07 2006
@@ -45,7 +45,7 @@
* @param repo_name repository name
* @return pointer to an instance of configuration context properly initialized
*/
-AXIS2_DECLARE(axis2_conf_ctx_t*) build_conf_ctx (axis2_env_t **env,
+AXIS2_DECLARE(axis2_conf_ctx_t*) build_conf_ctx (const axis2_env_t *env,
axis2_char_t *repo_name);
/**
* Builds the Configuration for the Client
@@ -53,7 +53,7 @@
* @param axis2_home. axis2 home for client.
* @return pointer to an instance of configuration context properly initialized
*/
-AXIS2_DECLARE(axis2_conf_ctx_t*) build_client_conf_ctx(axis2_env_t **env,
+AXIS2_DECLARE(axis2_conf_ctx_t*) build_client_conf_ctx(const axis2_env_t *env,
axis2_char_t *axis2_home);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_dep_engine.h Wed May 31 08:54:07 2006
@@ -62,7 +62,7 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
@@ -73,24 +73,24 @@
*/
axis2_status_t (AXIS2_CALL *
add_module) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *module_qname);
struct axis2_module_desc *(AXIS2_CALL *
get_module) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_qname_t *module_name);
struct axis2_arch_file_data *(AXIS2_CALL *
get_current_file_item) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* @param file
*/
axis2_status_t (AXIS2_CALL *
add_ws_to_deploy) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_arch_file_data *file);
/**
@@ -98,12 +98,12 @@
*/
axis2_status_t (AXIS2_CALL *
add_ws_to_undeploy) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_ws_info *file);
struct axis2_phases_info *(AXIS2_CALL *
get_phases_info) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* tio get ER
@@ -112,40 +112,40 @@
*/
struct axis2_conf *(AXIS2_CALL *
get_axis_conf) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_conf *(AXIS2_CALL *
load) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
struct axis2_conf *(AXIS2_CALL *
load_client) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *client_home);
void * (AXIS2_CALL *
get_handler_dll) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *dll_name);
axis2_status_t (AXIS2_CALL *
do_deploy) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
undeploy) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_bool_t (AXIS2_CALL *
is_hot_update) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_phases_info) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_phases_info *phases_info);
/**
@@ -161,7 +161,7 @@
*/
struct axis2_svc *(AXIS2_CALL *
build_svc) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_svc *svc,
axis2_char_t *file_name);
@@ -174,22 +174,22 @@
struct axis2_module_desc *(AXIS2_CALL *
build_module) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *module_archive,
struct axis2_conf *conf);
axis2_char_t *(AXIS2_CALL *
get_repos_path) (axis2_dep_engine_t *dep_engine,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_current_file_item)(axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_arch_file_data *file_data);
axis2_status_t (AXIS2_CALL *
set_arch_reader)(axis2_dep_engine_t *dep_engine,
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_arch_reader *arch_reader);
};
@@ -208,7 +208,7 @@
* @return pointer to newly created deployment engine
*/
AXIS2_DECLARE(axis2_dep_engine_t *)
- axis2_dep_engine_create (axis2_env_t **env);
+ axis2_dep_engine_create (const axis2_env_t *env);
/**
* Creates description builder struct
@@ -220,7 +220,7 @@
*/
AXIS2_DECLARE(axis2_dep_engine_t *)
axis2_dep_engine_create_with_repos_name (
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *repos_path);
/**
* Creates deployment engine struct
@@ -230,7 +230,7 @@
*/
AXIS2_DECLARE(axis2_dep_engine_t *)
axis2_dep_engine_create_with_repos_name_and_svr_xml_file (
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *repos_path,
axis2_char_t *svr_xml_file);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h Wed May 31 08:54:07 2006
@@ -74,7 +74,7 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_desc_builder_t *desc_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* This will creat OMElemnt for a given descrition document (axis2.xml ,
@@ -84,7 +84,7 @@
*/
axis2_om_node_t *(AXIS2_CALL *
build_OM) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
@@ -94,7 +94,7 @@
*/
axis2_flow_t *(AXIS2_CALL *
process_flow) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_element_t *flow_element,
axis2_param_container_t *parent,
axis2_om_node_t *node);
@@ -106,7 +106,7 @@
*/
axis2_handler_desc_t *(AXIS2_CALL *
process_handler) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *handler_element,
axis2_param_container_t *parent);
@@ -118,7 +118,7 @@
*/
axis2_status_t (AXIS2_CALL *
process_params) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *params,
axis2_param_container_t *param_container,
axis2_param_container_t *parent );
@@ -126,18 +126,18 @@
axis2_status_t (AXIS2_CALL *
process_op_module_refs) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs,
axis2_op_t *op);
axis2_msg_recv_t *(AXIS2_CALL *
load_msg_recv) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_element_t *recv_element);
axis2_msg_recv_t *(AXIS2_CALL *
load_default_msg_recv) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* This method is used to retrive service name form the arechive file name
@@ -148,12 +148,12 @@
*/
axis2_char_t *(AXIS2_CALL *
get_short_file_name) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
axis2_char_t *(AXIS2_CALL *
get_file_name_without_prefix) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *short_file_name);
/**
@@ -164,7 +164,7 @@
*/
axis2_char_t *(AXIS2_CALL *
get_value) (axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *in);
@@ -186,7 +186,7 @@
* @return pointer to newly created description builder
*/
AXIS2_DECLARE(axis2_desc_builder_t *)
-axis2_desc_builder_create (axis2_env_t **env);
+axis2_desc_builder_create (const axis2_env_t *env);
/**
* Creates description builder struct
@@ -195,7 +195,7 @@
*/
AXIS2_DECLARE(axis2_desc_builder_t *)
axis2_desc_builder_create_with_dep_engine (
- axis2_env_t **env,
+ const axis2_env_t *env,
struct axis2_dep_engine *engine);
/**
* Creates description builder struct
@@ -205,7 +205,7 @@
*/
AXIS2_DECLARE(axis2_desc_builder_t *)
axis2_desc_builder_create_with_file_and_dep_engine (
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *engine);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_module_builder.h Wed May 31 08:54:07 2006
@@ -56,11 +56,11 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_module_builder_t *module_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
populate_module) (axis2_module_builder_t *module_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
};
@@ -78,7 +78,7 @@
* @return pointer to newly created module builder
*/
AXIS2_DECLARE(axis2_module_builder_t *)
-axis2_module_builder_create (axis2_env_t **env);
+axis2_module_builder_create (const axis2_env_t *env);
/**
* Creates module builder struct
@@ -88,7 +88,7 @@
* @return pointer to newly created module builder
*/
AXIS2_DECLARE(axis2_module_builder_t *)
-axis2_module_builder_create_with_file_and_dep_engine_and_module (axis2_env_t **env,
+axis2_module_builder_create_with_file_and_dep_engine_and_module (const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_module_desc_t *module);
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?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_repos_listener.h Wed May 31 08:54:07 2006
@@ -57,7 +57,7 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_repos_listener_t *repos_listener,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* this method ask serachWS to serch for the folder to caheck
@@ -65,7 +65,7 @@
*/
axis2_status_t (AXIS2_CALL *
check_modules) (axis2_repos_listener_t *listener,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* this method ask serachWS to serch for the folder to caheck
@@ -73,14 +73,14 @@
*/
axis2_status_t (AXIS2_CALL *
check_svcs) (axis2_repos_listener_t *listener,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* call to update method of WSInfoList object
*/
axis2_status_t (AXIS2_CALL *
update) (axis2_repos_listener_t *listener,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* First it call to initalize method of WSInfoList to initilizat that.
@@ -90,14 +90,14 @@
*/
axis2_status_t (AXIS2_CALL *
init) (axis2_repos_listener_t *listener,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* this is the actual method that is call from scheduler
*/
axis2_status_t (AXIS2_CALL *
start_listen) (axis2_repos_listener_t *listener,
- axis2_env_t **env);
+ const axis2_env_t *env);
};
@@ -114,7 +114,7 @@
* @return pointer to newly created deployment engine
*/
AXIS2_DECLARE(axis2_repos_listener_t *)
-axis2_repos_listener_create (axis2_env_t **env);
+axis2_repos_listener_create (const axis2_env_t *env);
/**
* @param folder_name this is the axis2 deployment root directory(repository path)
@@ -122,7 +122,7 @@
* @return pointer to newly created deployment engine
*/
AXIS2_DECLARE(axis2_repos_listener_t *)
-axis2_repos_listener_create_with_folder_name_and_dep_engine(axis2_env_t **env,
+axis2_repos_listener_create_with_folder_name_and_dep_engine(const axis2_env_t *env,
axis2_char_t *folder_name,
struct axis2_dep_engine *dep_engine);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_builder.h Wed May 31 08:54:07 2006
@@ -57,20 +57,20 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_svc_builder_t *svc_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* top most method that is used to populate service from corresponding OM
*/
axis2_status_t (AXIS2_CALL *
populate_svc) (axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *svc_node);
axis2_status_t (AXIS2_CALL *
process_svc_module_conf) (axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_confs,
axis2_param_container_t *parent,
axis2_svc_t *svc);
@@ -81,7 +81,7 @@
*/
axis2_status_t (AXIS2_CALL *
process_module_refs) (axis2_svc_builder_t *svc_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs);
@@ -101,7 +101,7 @@
* @return pointer to newly created service builder
*/
AXIS2_DECLARE(axis2_svc_builder_t *)
-axis2_svc_builder_create (axis2_env_t **env);
+axis2_svc_builder_create (const axis2_env_t *env);
/**
* Creates svc builder struct
@@ -111,7 +111,7 @@
* @return pointer to newly created service builder
*/
AXIS2_DECLARE(axis2_svc_builder_t *)
-axis2_svc_builder_create_with_file_and_dep_engine_and_svc (axis2_env_t **env,
+axis2_svc_builder_create_with_file_and_dep_engine_and_svc (const axis2_env_t *env,
axis2_char_t *file_name,
struct axis2_dep_engine *dep_engine,
axis2_svc_t *svc);
@@ -123,7 +123,7 @@
* @return pointer to newly created service builder
*/
AXIS2_DECLARE(axis2_svc_builder_t *)
-axis2_svc_builder_create_with_dep_engine_and_svc (axis2_env_t **env,
+axis2_svc_builder_create_with_dep_engine_and_svc (const axis2_env_t *env,
struct axis2_dep_engine *dep_engine,
axis2_svc_t *svc);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_svc_grp_builder.h Wed May 31 08:54:07 2006
@@ -55,11 +55,11 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_svc_grp_builder_t *svc_grp_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
populate_svc_grp) (axis2_svc_grp_builder_t *grp_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_svc_grp_t *svc_grp);
/**
@@ -68,7 +68,7 @@
*/
axis2_status_t (AXIS2_CALL *
process_module_refs) (axis2_svc_grp_builder_t *grp_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs ,
axis2_svc_grp_t *svc_grp);
@@ -88,7 +88,7 @@
* @return pointer to newly created service group builder
*/
AXIS2_DECLARE(axis2_svc_grp_builder_t *)
-axis2_svc_grp_builder_create (axis2_env_t **env);
+axis2_svc_grp_builder_create (const axis2_env_t *env);
/**
* Creates svc_grp builder struct
@@ -97,7 +97,7 @@
* @return pointer to newly created service group builder
*/
AXIS2_DECLARE(axis2_svc_grp_builder_t *)
-axis2_svc_grp_builder_create_with_svc_and_dep_engine (axis2_env_t **env,
+axis2_svc_grp_builder_create_with_svc_and_dep_engine (const axis2_env_t *env,
axis2_om_node_t *svc,
axis2_dep_engine_t *dep_engine);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info.h Wed May 31 08:54:07 2006
@@ -56,29 +56,29 @@
*/
axis2_status_t (AXIS2_CALL *
free)(axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_char_t *(AXIS2_CALL *
get_file_name) (axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_file_name) (axis2_ws_info_t *ws_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
long (AXIS2_CALL *
get_last_modified_date) (axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
set_last_modified_date) (axis2_ws_info_t *ws_info,
- axis2_env_t **env,
+ const axis2_env_t *env,
long last_modified_date);
int (AXIS2_CALL *
get_type) (axis2_ws_info_t *ws_info,
- axis2_env_t **env);
+ const axis2_env_t *env);
@@ -98,13 +98,13 @@
* @return pointer to newly created ws info
*/
AXIS2_DECLARE(axis2_ws_info_t *)
-axis2_ws_info_create_with_file_name_and_last_modified_date (axis2_env_t **env,
+axis2_ws_info_create_with_file_name_and_last_modified_date (const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date);
AXIS2_DECLARE(axis2_ws_info_t *)
axis2_ws_info_create_with_file_name_and_last_modified_date_and_type (
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name,
long last_modified_date,
int type);
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_ws_info_list.h Wed May 31 08:54:07 2006
@@ -62,14 +62,14 @@
*/
axis2_status_t (AXIS2_CALL *
free) (axis2_ws_info_list_t *ws_info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* This method is used to initialize the vector
*/
axis2_status_t (AXIS2_CALL *
init) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
* First it check whether the file is already available in the
@@ -87,7 +87,7 @@
*/
axis2_status_t (AXIS2_CALL *
add_ws_info_item) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *file,
int type);
@@ -99,7 +99,7 @@
*/
axis2_ws_info_t *(AXIS2_CALL *
get_file_item) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
/**
@@ -111,7 +111,7 @@
*/
axis2_bool_t (AXIS2_CALL *
is_modified) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_file_t *file,
struct axis2_ws_info *ws_info);
@@ -122,7 +122,7 @@
*/
axis2_bool_t (AXIS2_CALL *
is_file_exist) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_char_t *file_name);
/**
@@ -134,7 +134,7 @@
*/
axis2_status_t (AXIS2_CALL *
check_for_undeploy) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
/**
@@ -142,7 +142,7 @@
*/
axis2_status_t (AXIS2_CALL *
update) (axis2_ws_info_list_t *info_list,
- axis2_env_t **env);
+ const axis2_env_t *env);
};
@@ -160,7 +160,7 @@
* @return pointer to newly created ws info list
*/
AXIS2_DECLARE(axis2_ws_info_list_t *)
-axis2_ws_info_list_create_with_dep_engine (axis2_env_t **env,
+axis2_ws_info_list_create_with_dep_engine (const axis2_env_t *env,
struct axis2_dep_engine *dep_engine);
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?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Wed May 31 08:54:07 2006
@@ -39,60 +39,60 @@
axis2_status_t AXIS2_CALL
axis2_conf_builder_free (axis2_conf_builder_t *conf_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_builder_populate_conf(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env);
+ const axis2_env_t *env);
axis2_status_t AXIS2_CALL
axis2_conf_builder_process_module_refs(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs);
static axis2_status_t
axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *disp_order);
static axis2_status_t
axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *phase_orders);
static axis2_array_list_t *
axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *phase_orders);
static axis2_status_t
axis2_conf_builder_process_transport_senders(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *trs_senders);
static axis2_status_t
axis2_conf_builder_process_transport_recvs(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *trs_recvs);
axis2_status_t AXIS2_CALL
axis2_conf_builder_process_default_module_versions(
axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_versions);
/************************** End of function prototypes ************************/
AXIS2_DECLARE(axis2_conf_builder_t *)
-axis2_conf_builder_create (axis2_env_t **env)
+axis2_conf_builder_create (const axis2_env_t *env)
{
axis2_conf_builder_impl_t *conf_builder_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- conf_builder_impl = (axis2_conf_builder_impl_t *) AXIS2_MALLOC((*env)->
+ conf_builder_impl = (axis2_conf_builder_impl_t *) AXIS2_MALLOC(env->
allocator, sizeof(axis2_conf_builder_impl_t));
if(NULL == conf_builder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -100,11 +100,11 @@
conf_builder_impl->conf_builder.ops = NULL;
conf_builder_impl->conf_builder.ops =
- AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_conf_builder_ops_t));
+ AXIS2_MALLOC (env->allocator, sizeof(axis2_conf_builder_ops_t));
if(NULL == conf_builder_impl->conf_builder.ops)
{
axis2_conf_builder_free(&(conf_builder_impl->conf_builder), env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -118,7 +118,7 @@
}
AXIS2_DECLARE(axis2_conf_builder_t *)
-axis2_conf_builder_create_with_file_and_dep_engine_and_conf (axis2_env_t **env,
+axis2_conf_builder_create_with_file_and_dep_engine_and_conf (const axis2_env_t *env,
axis2_char_t *file,
axis2_dep_engine_t *engine,
axis2_conf_t *conf)
@@ -131,7 +131,7 @@
env);
if(NULL == builder_impl)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
builder_impl->conf_builder.desc_builder =
@@ -145,7 +145,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_builder_free (axis2_conf_builder_t *conf_builder,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_conf_builder_impl_t *conf_builder_impl = NULL;
@@ -161,13 +161,13 @@
if(NULL != conf_builder->ops)
{
- AXIS2_FREE((*env)->allocator, conf_builder->ops);
+ AXIS2_FREE(env->allocator, conf_builder->ops);
conf_builder->ops = NULL;
}
if(conf_builder_impl)
{
- AXIS2_FREE((*env)->allocator, conf_builder_impl);
+ AXIS2_FREE(env->allocator, conf_builder_impl);
conf_builder_impl = NULL;
}
@@ -176,7 +176,7 @@
axis2_status_t AXIS2_CALL
axis2_conf_builder_populate_conf(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env)
+ const axis2_env_t *env)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_qname_t *qparamst = NULL;
@@ -326,14 +326,14 @@
axis2_status_t AXIS2_CALL
axis2_conf_builder_process_module_refs(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_refs)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_refs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_refs, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
while (AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs,
@@ -362,7 +362,7 @@
axis2_char_t *ref_name = NULL;
ref_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "module %s found in axis2.xml", ref_name);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "module %s found in axis2.xml", ref_name);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
status = AXIS2_DEP_ENGINE_ADD_MODULE(conf_builder->desc_builder->
engine, env, qrefname);
@@ -375,7 +375,7 @@
static axis2_status_t
axis2_conf_builder_process_disp_order(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *disp_order_node)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
@@ -389,7 +389,7 @@
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, disp_order_node, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, disp_order_node, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
disp_order_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(
@@ -470,7 +470,7 @@
if(AXIS2_TRUE != found_disp)
{
AXIS2_PHASE_FREE(disp_phase, env);
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_DISPATCHER_FOUND,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_DISPATCHER_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -496,14 +496,14 @@
*/
static axis2_status_t
axis2_conf_builder_process_phase_orders(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *phase_orders)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_phases_info_t *info = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, phase_orders, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, phase_orders, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
info = AXIS2_DEP_ENGINE_GET_PHASES_INFO(conf_builder->desc_builder->engine,
@@ -543,7 +543,7 @@
if(!phase_list)
{
axis2_status_t status_code = AXIS2_FAILURE;
- status_code = AXIS2_ERROR_GET_STATUS_CODE((*env)->error);
+ status_code = AXIS2_ERROR_GET_STATUS_CODE(env->error);
if(AXIS2_SUCCESS != status_code)
{
return status_code;
@@ -573,7 +573,7 @@
static axis2_array_list_t *
axis2_conf_builder_get_phase_list(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_node_t *phase_orders_node)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
@@ -583,14 +583,14 @@
axis2_om_element_t *phase_orders_element;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, phase_orders_node, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, phase_orders_node, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
phase_orders_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(phase_orders_node,
env);
if(!phase_orders_element)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DATA_ELEMENT_IS_NULL,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_DATA_ELEMENT_IS_NULL,
AXIS2_FAILURE);
return NULL;
}
@@ -643,14 +643,14 @@
static axis2_status_t
axis2_conf_builder_process_transport_senders(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *trs_senders)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, trs_senders, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, trs_senders, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
while (AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(trs_senders,
@@ -734,7 +734,7 @@
AXIS2_QNAME_FREE(qdllname, env);
if(NULL == trs_dll_att)
{
- AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_TRANSPORT_SENDER_ERROR,
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_TRANSPORT_SENDER_ERROR,
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -756,11 +756,11 @@
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_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_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);
impl_info_param->ops->value_free = axis2_dll_desc_free_void_arg;
@@ -798,7 +798,7 @@
if(NULL != in_flow_element)
{
AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INFLOW_NOT_ALLOWED_IN_TRS_OUT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -831,7 +831,7 @@
if(NULL != in_fault_flow_element)
{
AXIS2_TRANSPORT_OUT_DESC_FREE(transport_out, env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_INFLOW_NOT_ALLOWED_IN_TRS_OUT, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -873,14 +873,14 @@
static axis2_status_t
axis2_conf_builder_process_transport_recvs(axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *trs_recvs)
{
axis2_conf_builder_impl_t *builder_impl = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, trs_recvs, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, trs_recvs, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
while (AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(trs_recvs,
@@ -979,12 +979,12 @@
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_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_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);
@@ -1021,7 +1021,7 @@
if(NULL != out_flow_element)
{
AXIS2_TRANSPORT_IN_DESC_FREE(transport_in, env);
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_OUTFLOW_NOT_ALLOWED_IN_TRS_IN, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -1075,7 +1075,7 @@
&out_fault_flow_node);
if(NULL != out_fault_flow_element)
{
- AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_OUTFLOW_NOT_ALLOWED_IN_TRS_IN, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
@@ -1099,11 +1099,11 @@
axis2_status_t AXIS2_CALL
axis2_conf_builder_process_default_module_versions(
axis2_conf_builder_t *conf_builder,
- axis2_env_t **env,
+ const axis2_env_t *env,
axis2_om_children_qname_iterator_t *module_versions)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, module_versions, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, module_versions, AXIS2_FAILURE);
while (AXIS2_OM_CHILDREN_ITERATOR_HAS_NEXT(module_versions, env))
{
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_init.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/conf_init.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_init.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_init.c Wed May 31 08:54:07 2006
@@ -18,13 +18,13 @@
#include <axis2_transport_sender.h>
#include <axis2_transport_receiver.h>
-axis2_status_t AXIS2_CALL axis2_init_modules(axis2_env_t **env,
+axis2_status_t AXIS2_CALL axis2_init_modules(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
-axis2_status_t AXIS2_CALL axis2_init_transports(axis2_env_t **env,
+axis2_status_t AXIS2_CALL axis2_init_transports(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx);
AXIS2_DECLARE(axis2_conf_ctx_t*)
-build_conf_ctx (axis2_env_t **env,
+build_conf_ctx (const axis2_env_t *env,
axis2_char_t *repo_name)
{
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -65,7 +65,7 @@
return conf_ctx;
}
- axis2_conf_ctx_t* AXIS2_CALL build_client_conf_ctx(axis2_env_t **env,
+ axis2_conf_ctx_t* AXIS2_CALL build_client_conf_ctx(const axis2_env_t *env,
axis2_char_t *axis2_home)
{
axis2_conf_ctx_t *conf_ctx = NULL;
@@ -110,14 +110,14 @@
return conf_ctx;
}
-axis2_status_t AXIS2_CALL axis2_init_modules(axis2_env_t **env,
+axis2_status_t AXIS2_CALL axis2_init_modules(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
axis2_conf_t *conf = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, conf_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
@@ -149,14 +149,14 @@
return status;
}
-axis2_status_t AXIS2_CALL axis2_init_transports(axis2_env_t **env,
+axis2_status_t AXIS2_CALL axis2_init_transports(const axis2_env_t *env,
axis2_conf_ctx_t *conf_ctx)
{
axis2_conf_t *conf = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, conf_ctx, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error, conf_ctx, AXIS2_FAILURE);
conf = AXIS2_CONF_CTX_GET_CONF(conf_ctx, env);
if (conf)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org