You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pi...@apache.org on 2007/03/30 18:03:16 UTC
svn commit: r524148 - in /webservices/axis2/trunk/c: include/
modules/core/deployment/ modules/core/receivers/ test/core/deployment/
tools/codegen/include/ tools/codegen/src/schema/compiler/
tools/codegen/src/util/ tools/codegen/src/wsdl/ tools/codegen...
Author: pini
Date: Fri Mar 30 09:03:14 2007
New Revision: 524148
URL: http://svn.apache.org/viewvc?view=rev&rev=524148
Log:
Fixing jira issue 292
Added:
webservices/axis2/trunk/c/util/include/axutil_dll_desc.h
- copied, changed from r524104, webservices/axis2/trunk/c/util/include/axis2_dll_desc.h
Removed:
webservices/axis2/trunk/c/util/include/axis2_dll_desc.h
Modified:
webservices/axis2/trunk/c/include/axis2_util.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/tools/codegen/include/w2c_class_loader.h
webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h
webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c
webservices/axis2/trunk/c/util/include/axutil_class_loader.h
webservices/axis2/trunk/c/util/src/class_loader.c
webservices/axis2/trunk/c/util/src/dll_desc.c
Modified: webservices/axis2/trunk/c/include/axis2_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_util.h?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_util.h (original)
+++ webservices/axis2/trunk/c/include/axis2_util.h Fri Mar 30 09:03:14 2007
@@ -22,7 +22,7 @@
#include <axutil_array_list.h>
#include <axutil_class_loader.h>
#include <axutil_dir_handler.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#include <axis2_env.h>
#include <axis2_error.h>
#include <axis2_file.h>
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?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h Fri Mar 30 09:03:14 2007
@@ -43,7 +43,7 @@
#include <axis2_op.h>
#include <axiom_children_with_specific_attribute_iterator.h>
#include <axis2_phase.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#ifdef __cplusplus
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=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Fri Mar 30 09:03:14 2007
@@ -380,7 +380,7 @@
axis2_char_t *dll_name = NULL;
axis2_qname_t *class_qname = NULL;
axis2_disp_t *disp_dll = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_handler_desc_t *handler_desc = NULL;
axis2_handler_t *handler = NULL;
@@ -398,14 +398,14 @@
continue;
}
class_name = axiom_attribute_get_value(disp_att, env);
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
dll_name =
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
+ axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
/* TODO
* set full dll path here instead of dll lib name only */
- axis2_dll_desc_set_name(dll_desc, env, dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
+ axutil_dll_desc_set_name(dll_desc, env, dll_name);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
impl_info_param = axis2_param_create(env, class_name, NULL);
if (!impl_info_param)
{
@@ -414,7 +414,7 @@
}
axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
- axis2_dll_desc_free_void_arg);
+ axutil_dll_desc_free_void_arg);
axutil_class_loader_init(env);
disp_dll = (axis2_disp_t *) axutil_class_loader_create_dll(env,
impl_info_param);
@@ -662,7 +662,7 @@
axiom_node_t *in_fault_flow_node = NULL;
axiom_element_t *out_fault_flow_element = NULL;
axiom_node_t *out_fault_flow_node = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
void *transport_sender = NULL;
axis2_char_t *path_qualified_dll_name = NULL;
@@ -726,9 +726,9 @@
axis2_transport_out_desc_free(transport_out, env);
return AXIS2_FAILURE;
}
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
dll_name =
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
+ axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
repos_name = axis2_dep_engine_get_repos_path(
@@ -741,12 +741,12 @@
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);
+ axutil_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
AXIS2_FREE(env->allocator, path_qualified_dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
- axis2_dll_desc_free_void_arg);
+ axutil_dll_desc_free_void_arg);
axutil_class_loader_init(env);
transport_sender = axutil_class_loader_create_dll(env, impl_info_param);
axis2_transport_out_desc_add_param(transport_out, env,
@@ -971,7 +971,7 @@
{
axis2_char_t *class_name = NULL;
axis2_char_t *dll_name = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_transport_receiver_t *recv = NULL;
axis2_status_t stat = AXIS2_FAILURE;
@@ -983,9 +983,9 @@
class_name = axiom_attribute_get_value(trs_class_name, env);
impl_info_param = axis2_param_create(env, class_name, NULL);
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
dll_name =
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc,
+ axutil_dll_desc_create_platform_specific_dll_name(dll_desc,
env, class_name);
repos_name = axis2_dep_engine_get_repos_path(
@@ -999,13 +999,13 @@
AXIS2_FREE(env->allocator, temp_path2);
AXIS2_FREE(env->allocator, temp_path3);
- axis2_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
+ axutil_dll_desc_set_name(dll_desc, env, path_qualified_dll_name);
AXIS2_FREE(env->allocator, path_qualified_dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
- axis2_dll_desc_free_void_arg);
+ axutil_dll_desc_free_void_arg);
axutil_class_loader_init(env);
recv = (axis2_transport_receiver_t *)
axutil_class_loader_create_dll(env, impl_info_param);
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=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Fri Mar 30 09:03:14 2007
@@ -19,7 +19,7 @@
#include <axutil_array_list.h>
#include <axis2_deployment.h>
#include <axis2_file_handler.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#include <axis2_flow.h>
#include <axis2_arch_reader.h>
#include <axis2_module_builder.h>
@@ -1023,7 +1023,7 @@
{
axis2_char_t *read_in_dll = NULL;
axis2_module_t *module = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_file_t *module_folder = NULL;
AXIS2_TIME_T timestamp = 0;
@@ -1038,22 +1038,22 @@
read_in_dll =
axis2_arch_file_data_get_module_dll_name(dep_engine->curr_file, env);
- dll_desc = axis2_dll_desc_create(env);
- dll_name = axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
+ dll_desc = axutil_dll_desc_create(env);
+ dll_name = axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
read_in_dll);
module_folder = axis2_arch_file_data_get_file(dep_engine->curr_file, env);
timestamp = axis2_file_get_timestamp(module_folder, env);
- axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
+ axutil_dll_desc_set_timestamp(dll_desc, env, timestamp);
module_folder_path = axis2_file_get_path(module_folder, env);
temp_path = axis2_stracat(env, module_folder_path, AXIS2_PATH_SEP_STR);
dll_path = axis2_stracat(env, temp_path, dll_name);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"axis2_dep_engine_load_module_dll; dll path is : %s", dll_path);
- status = axis2_dll_desc_set_name(dll_desc, env, dll_path);
+ status = axutil_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
- axis2_dll_desc_free(dll_desc, env);
+ axutil_dll_desc_free(dll_desc, env);
return AXIS2_FAILURE;
}
/* free all temp vars */
@@ -1062,10 +1062,10 @@
AXIS2_FREE(env->allocator, dll_path);
dll_path = NULL;
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_MODULE_DLL);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_MODULE_DLL);
impl_info_param = axis2_param_create(env, read_in_dll, NULL);
axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env, axis2_dll_desc_free_void_arg);
+ axis2_param_set_value_free(impl_info_param, env, axutil_dll_desc_free_void_arg);
axutil_class_loader_init(env);
module = (axis2_module_t *) axutil_class_loader_create_dll(env,
impl_info_param);
@@ -1115,7 +1115,7 @@
const axis2_env_t *env,
axis2_char_t *class_name)
{
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_handler_t *handler = NULL;
axis2_char_t *dll_name = NULL;
@@ -1123,13 +1123,13 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, class_name, NULL);
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
dll_name =
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
+ axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
/* TODO set fill dll path here instead of dll lib name only */
- axis2_dll_desc_set_name(dll_desc, env, dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
+ axutil_dll_desc_set_name(dll_desc, env, dll_name);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_HANDLER_DLL);
axutil_class_loader_init(env);
impl_info_param = axis2_param_create(env, NULL, NULL);
axis2_param_set_value(impl_info_param, env, dll_desc);
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=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Fri Mar 30 09:03:14 2007
@@ -863,7 +863,7 @@
axis2_msg_recv_t *msg_recv = NULL;
axis2_qname_t *class_qname = NULL;
axis2_param_t *impl_info_param = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_char_t *repos_name = NULL;
axis2_char_t *dll_name = NULL;
axis2_char_t *temp_path = NULL;
@@ -889,9 +889,9 @@
if (!impl_info_param)
{
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
msg_recv_dll_name =
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
+ axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
repos_name = axis2_dep_engine_get_repos_path(desc_builder->engine, env);
temp_path = axis2_stracat(env, repos_name, AXIS2_PATH_SEP_STR);
@@ -901,12 +901,12 @@
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, dll_name);
+ axutil_dll_desc_set_name(dll_desc, env, dll_name);
AXIS2_FREE(env->allocator, dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_MSG_RECV_DLL);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_MSG_RECV_DLL);
impl_info_param = axis2_param_create(env, class_name, NULL);
axis2_param_set_value(impl_info_param, env, dll_desc);
- axis2_param_set_value_free(impl_info_param, env, axis2_dll_desc_free_void_arg);
+ axis2_param_set_value_free(impl_info_param, env, axutil_dll_desc_free_void_arg);
/* set the impl_info_param(which contain dll_desc as value) so that
* loaded msg_recv loader lib can be re-used in future
*/
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=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c Fri Mar 30 09:03:14 2007
@@ -166,7 +166,7 @@
axis2_char_t *svc_name = NULL;
axis2_char_t *class_name = NULL;
axis2_char_t *svc_dll_name = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_arch_file_data_t *arch_file_data = NULL;
axis2_file_t *svc_folder = NULL;
@@ -238,7 +238,7 @@
/* create dll_desc and set it in a parameter. then set that param in param
* container taken from svc
*/
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
impl_info_param =
axis2_param_container_get_param(
axis2_svc_get_param_container(svc_builder->svc, env),
@@ -246,39 +246,39 @@
AXIS2_SERVICE_CLASS);
if (!impl_info_param)
{
- axis2_dll_desc_free(dll_desc, env);
+ axutil_dll_desc_free(dll_desc, env);
return AXIS2_FAILURE;
}
class_name = axis2_param_get_value(impl_info_param, env);
svc_dll_name =
- axis2_dll_desc_create_platform_specific_dll_name(dll_desc, env,
+ axutil_dll_desc_create_platform_specific_dll_name(dll_desc, env,
class_name);
arch_file_data = axis2_dep_engine_get_current_file_item(
axis2_desc_builder_get_dep_engine(svc_builder->desc_builder, env),
env);
svc_folder = axis2_arch_file_data_get_file(arch_file_data, env);
timestamp = axis2_file_get_timestamp(svc_folder, env);
- axis2_dll_desc_set_timestamp(dll_desc, env, timestamp);
+ axutil_dll_desc_set_timestamp(dll_desc, env, timestamp);
svc_folder_path = axis2_file_get_path(svc_folder, env);
dll_path = axis2_strcat(env, svc_folder_path, AXIS2_PATH_SEP_STR,
svc_dll_name, NULL);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "dll path is : %s", dll_path);
- status = axis2_dll_desc_set_name(dll_desc, env, dll_path);
+ status = axutil_dll_desc_set_name(dll_desc, env, dll_path);
if (AXIS2_SUCCESS != status)
{
- axis2_dll_desc_free(dll_desc, env);
+ axutil_dll_desc_free(dll_desc, env);
return status;
}
AXIS2_FREE(env->allocator, dll_path);
dll_path = NULL;
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_SVC_DLL);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_SVC_DLL);
status = axis2_param_set_value(impl_info_param, env, dll_desc);
axis2_param_set_value_free(impl_info_param, env,
- axis2_dll_desc_free_void_arg);
+ axutil_dll_desc_free_void_arg);
if (AXIS2_SUCCESS != status)
{
- axis2_dll_desc_free(dll_desc, env);
+ axutil_dll_desc_free(dll_desc, env);
return status;
}
/* end of my logic */
Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Fri Mar 30 09:03:14 2007
@@ -223,7 +223,7 @@
axis2_param_t *impl_info_param = NULL;
axis2_param_t *scope_param = NULL;
axis2_char_t *param_value = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Fri Mar 30 09:03:14 2007
@@ -132,7 +132,7 @@
int axis2_test_transport_receiver_load()
{
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_char_t *dll_name = NULL;
axis2_transport_receiver_t *transport_recv = NULL;
axis2_param_t *impl_info_param = NULL;
@@ -143,13 +143,13 @@
printf("testing axis2_transport_recv load\n");
printf("******************************************\n");
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
dll_name = axis2_stracat(env, axis2c_home, "/lib/libaxis2_http_receiver.so");
printf("transport receiver name:%s\n", dll_name);
- axis2_dll_desc_set_name(dll_desc, env, dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
+ axutil_dll_desc_set_name(dll_desc, env, dll_name);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_RECV_DLL);
impl_info_param = axis2_param_create(env, NULL, NULL);
axis2_param_set_value(impl_info_param, env, dll_desc);
axutil_class_loader_init(env);
@@ -164,7 +164,7 @@
int axis2_test_transport_sender_load()
{
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_char_t *dll_name = NULL;
axis2_transport_sender_t *transport_sender = NULL;
axis2_param_t *impl_info_param = NULL;
@@ -177,13 +177,13 @@
printf("******************************************\n");
msg_ctx = (axis2_msg_ctx_t *) AXIS2_MALLOC(env->allocator, 5);
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
dll_name = axis2_stracat(env, axis2c_home, "/lib/libaxis2_http_sender.so");
printf("transport sender name:%s\n", dll_name);
- axis2_dll_desc_set_name(dll_desc, env, dll_name);
- axis2_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
+ axutil_dll_desc_set_name(dll_desc, env, dll_name);
+ axutil_dll_desc_set_type(dll_desc, env, AXIS2_TRANSPORT_SENDER_DLL);
impl_info_param = axis2_param_create(env, NULL, NULL);
axis2_param_set_value(impl_info_param, env, dll_desc);
axutil_class_loader_init(env);
Modified: webservices/axis2/trunk/c/tools/codegen/include/w2c_class_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/include/w2c_class_loader.h?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/include/w2c_class_loader.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/include/w2c_class_loader.h Fri Mar 30 09:03:14 2007
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <axis2_utils.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#ifdef __cplusplus
extern "C"
@@ -55,7 +55,7 @@
(const axis2_env_t *env,
axis2_char_t *class_name,
axis2_char_t *inter_path,
- axis2_dll_desc_t **pdll_desc);
+ axutil_dll_desc_t **pdll_desc);
/**
* free the loaded class.
@@ -66,7 +66,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
w2c_class_loader_free_loaded_class(
const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc);
+ axutil_dll_desc_t *dll_desc);
/** @} */
Modified: webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/schema/compiler/schema_property_loader.c Fri Mar 30 09:03:14 2007
@@ -432,7 +432,7 @@
int index = 0;
axis2_char_t *language = NULL;
w2c_schema_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
prop_hash = axis2_properties_get_all( obj_impl-> prop_set, env);
language = obj_impl-> language;
Modified: webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/util/class_loader.c Fri Mar 30 09:03:14 2007
@@ -25,10 +25,10 @@
(const axis2_env_t *env,
char *class_name,
axis2_char_t *inter_path,
- axis2_dll_desc_t **pdll_desc)
+ axutil_dll_desc_t **pdll_desc)
{
axis2_char_t *dll_name = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_param_t *impl_info_param = NULL;
axis2_char_t *file_path = NULL;
void *obj = NULL;
@@ -38,11 +38,11 @@
file_path = getenv("AXIS2C_HOME");
file_path = axis2_strdup(env, file_path);
- dll_desc = axis2_dll_desc_create(env);
+ dll_desc = axutil_dll_desc_create(env);
*pdll_desc = dll_desc;
dll_name=
- axis2_dll_desc_create_platform_specific_dll_name(
+ axutil_dll_desc_create_platform_specific_dll_name(
dll_desc, env, class_name );
if ( ! dll_name )
{
@@ -52,8 +52,8 @@
file_path = w2c_string_add_string(file_path, inter_path, env );
file_path = w2c_string_add_string(file_path, dll_name, env );
- axis2_dll_desc_set_name(dll_desc, env, file_path);
- axis2_dll_desc_set_type(dll_desc, env, -1); /* not a standard type */
+ axutil_dll_desc_set_name(dll_desc, env, file_path);
+ axutil_dll_desc_set_type(dll_desc, env, -1); /* not a standard type */
impl_info_param = axis2_param_create(env, NULL, NULL);
axis2_param_set_value(impl_info_param, env, dll_desc);
@@ -68,13 +68,13 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
w2c_class_loader_free_loaded_class(
const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc )
+ axutil_dll_desc_t *dll_desc )
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, dll_desc, AXIS2_FAILURE);
axutil_class_loader_delete_dll(env, dll_desc);
- /*axis2_dll_desc_free ( dll_desc, env );*/
+ /*axutil_dll_desc_free ( dll_desc, env );*/
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/c_emitter.c Fri Mar 30 09:03:14 2007
@@ -262,7 +262,7 @@
{
axiom_node_t *root = NULL;
w2c_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -285,7 +285,7 @@
{
axiom_node_t *root = NULL;
w2c_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -308,7 +308,7 @@
{
axiom_node_t *root = NULL;
w2c_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -331,7 +331,7 @@
{
axiom_node_t *root = NULL;
w2c_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -354,7 +354,7 @@
{
axiom_node_t *root = NULL;
w2c_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -377,7 +377,7 @@
{
axiom_node_t *root = NULL;
w2c_writer_t *writer = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/emitter/w2c_emitter_protected.h Fri Mar 30 09:03:14 2007
@@ -23,7 +23,7 @@
#include <w2c_config_property_loader.h>
#include <axiom_document.h>
#include <w2c_writer.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#include <w2c_class_loader.h>
#include <w2c_messages.h>
#include <woden_reader.h>
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/engine.c Fri Mar 30 09:03:14 2007
@@ -30,7 +30,7 @@
#include <w2c_messages.h>
#include <stdio.h>
#include <w2c_class_loader.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
/**
* @brief
@@ -206,7 +206,7 @@
axis2_char_t *output_lang = NULL;
axis2_bool_t all_flag = AXIS2_FALSE;
axis2_bool_t only_flag = AXIS2_FALSE;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -282,7 +282,7 @@
size = axutil_array_list_size( engine_impl-> pre_extensions, env);
for (i = 0; i < size ; i++)
{
- dll_desc = (axis2_dll_desc_t*)
+ dll_desc = (axutil_dll_desc_t*)
axutil_array_list_get( engine_impl-> pre_extensions_dll_desc, env, i);
/*w2c_class_loader_free_loaded_class(env, dll_desc);*/
}
@@ -292,7 +292,7 @@
size = axutil_array_list_size( engine_impl-> post_extensions, env);
for (i = 0; i < size ; i++)
{
- dll_desc = (axis2_dll_desc_t*)
+ dll_desc = (axutil_dll_desc_t*)
axutil_array_list_get( engine_impl-> post_extensions_dll_desc, env, i);
/*w2c_class_loader_free_loaded_class(env, dll_desc);*/
}
@@ -309,7 +309,7 @@
w2c_config_property_loader_t *prop_loader = NULL;
axis2_char_t *class_name = NULL;
w2c_extension_t *ext = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
int size = 0;
int i = 0;
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c Fri Mar 30 09:03:14 2007
@@ -49,7 +49,7 @@
w2c_cmdline_option_parser_t* parser = NULL;
axis2_hash_t* hash = NULL;
w2c_engine_configuration_t* conf = NULL;
- axis2_dll_desc_t* dll_desc = NULL;
+ axutil_dll_desc_t* dll_desc = NULL;
int input_size = 0;
Modified: webservices/axis2/trunk/c/util/include/axutil_class_loader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_class_loader.h?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/util/include/axutil_class_loader.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_class_loader.h Fri Mar 30 09:03:14 2007
@@ -27,7 +27,7 @@
#include <axis2_qname.h>
#include <axis2_error.h>
#include <axis2_utils.h>
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#include <axis2_param.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axutil_class_loader_delete_dll (const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc);
+ axutil_dll_desc_t *dll_desc);
AXIS2_EXTERN void * AXIS2_CALL
axutil_class_loader_create_dll (const axis2_env_t *env,
Copied: webservices/axis2/trunk/c/util/include/axutil_dll_desc.h (from r524104, webservices/axis2/trunk/c/util/include/axis2_dll_desc.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axutil_dll_desc.h?view=diff&rev=524148&p1=webservices/axis2/trunk/c/util/include/axis2_dll_desc.h&r1=524104&p2=webservices/axis2/trunk/c/util/include/axutil_dll_desc.h&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_dll_desc.h (original)
+++ webservices/axis2/trunk/c/util/include/axutil_dll_desc.h Fri Mar 30 09:03:14 2007
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-#ifndef AXIS2_DLL_DESC_H
-#define AXIS2_DLL_DESC_H
+#ifndef AXUTIL_DLL_DESC_H
+#define AXUTIL_DLL_DESC_H
/**
- * @file axis2_dll_desc.h
+ * @file axutil_dll_desc.h
* @brief Axis2 dll_desc interface
*/
@@ -35,12 +35,12 @@
#endif
/**
- * @defgroup axis2_dll_desc DLL description
+ * @defgroup axutil_dll_desc DLL description
* @ingroup axis2_util
* @{
*/
- typedef struct axis2_dll_desc axis2_dll_desc_t;
+ typedef struct axutil_dll_desc axutil_dll_desc_t;
typedef int(*CREATE_FUNCT)(void **inst, const axis2_env_t *env);
@@ -68,22 +68,22 @@
* creates dll_desc struct
* @param qname qname, can be NULL
*/
- AXIS2_EXTERN axis2_dll_desc_t* AXIS2_CALL
- axis2_dll_desc_create(const axis2_env_t *env);
+ AXIS2_EXTERN axutil_dll_desc_t* AXIS2_CALL
+ axutil_dll_desc_create(const axis2_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
- axis2_dll_desc_free_void_arg(void *dll_desc,
+ axutil_dll_desc_free_void_arg(void *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
- axis2_dll_desc_free(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_free(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
/**
* Set path qualified platform specific dll name
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_name(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
axis2_char_t *name);
@@ -91,71 +91,71 @@
* Return the path qualified platform specific dll name
*/
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
- axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_name(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_type(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_type(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
axis2_dll_type_t type);
AXIS2_EXTERN axis2_dll_type_t AXIS2_CALL
- axis2_dll_desc_get_type(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_type(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_load_options(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
int options);
AXIS2_EXTERN int AXIS2_CALL
- axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_load_options(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_dl_handler(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
AXIS2_DLHANDLER dl_handler);
AXIS2_EXTERN AXIS2_DLHANDLER AXIS2_CALL
- axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_dl_handler(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_create_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
CREATE_FUNCT funct);
AXIS2_EXTERN CREATE_FUNCT AXIS2_CALL
- axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_create_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_delete_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
DELETE_FUNCT funct);
AXIS2_EXTERN DELETE_FUNCT AXIS2_CALL
- axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_delete_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_timestamp(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_timestamp(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
AXIS2_TIME_T timestamp);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_dll_desc_set_error_code(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_set_error_code(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
axis2_error_codes_t error_code);
AXIS2_EXTERN axis2_error_codes_t AXIS2_CALL
- axis2_dll_desc_get_error_code(
- axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_error_code(
+ axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
- axis2_dll_desc_get_timestamp(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_get_timestamp(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env);
/**
* This function will accept the library name without any platform
@@ -167,7 +167,7 @@
* @return platform specific dll name
*/
AXIS2_EXTERN axis2_char_t * AXIS2_CALL
- axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
+ axutil_dll_desc_create_platform_specific_dll_name(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
const axis2_char_t *class_name);
Modified: webservices/axis2/trunk/c/util/src/class_loader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/class_loader.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/util/src/class_loader.c (original)
+++ webservices/axis2/trunk/c/util/src/class_loader.c Fri Mar 30 09:03:14 2007
@@ -19,11 +19,11 @@
axis2_status_t
axutil_class_loader_load_lib(const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc);
+ axutil_dll_desc_t *dll_desc);
axis2_status_t
axutil_class_loader_unload_lib(const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc);
+ axutil_dll_desc_t *dll_desc);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
@@ -35,7 +35,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axutil_class_loader_delete_dll(const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc)
+ axutil_dll_desc_t *dll_desc)
{
if (!dll_desc)
{
@@ -56,7 +56,7 @@
CREATE_FUNCT create_funct = NULL;
DELETE_FUNCT delete_funct = NULL;
AXIS2_DLHANDLER dl_handler = NULL;
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
axis2_status_t status = AXIS2_FAILURE;
axis2_error_codes_t error_code = AXIS2_ERROR_NONE;
@@ -67,7 +67,7 @@
AXIS2_FAILURE);
return NULL;
}
- dl_handler = axis2_dll_desc_get_dl_handler(dll_desc, env);
+ dl_handler = axutil_dll_desc_get_dl_handler(dll_desc, env);
if (! dl_handler)
{
status = axutil_class_loader_load_lib(env, dll_desc);
@@ -77,7 +77,7 @@
AXIS2_FAILURE);
return NULL;
}
- dl_handler = axis2_dll_desc_get_dl_handler(dll_desc, env);
+ dl_handler = axutil_dll_desc_get_dl_handler(dll_desc, env);
if (!dl_handler)
{
return NULL;
@@ -89,7 +89,7 @@
{
return NULL;
}
- status = axis2_dll_desc_set_create_funct(dll_desc, env, create_funct);
+ status = axutil_dll_desc_set_create_funct(dll_desc, env, create_funct);
if (AXIS2_FAILURE == status)
{
axutil_class_loader_unload_lib(env, dll_desc);
@@ -104,7 +104,7 @@
{
return NULL;
}
- status = axis2_dll_desc_set_delete_funct(dll_desc, env, delete_funct);
+ status = axutil_dll_desc_set_delete_funct(dll_desc, env, delete_funct);
if (AXIS2_FAILURE == status)
{
axutil_class_loader_unload_lib(env, dll_desc);
@@ -113,14 +113,14 @@
return NULL;
}
}
- create_funct = axis2_dll_desc_get_create_funct(dll_desc, env);
+ create_funct = axutil_dll_desc_get_create_funct(dll_desc, env);
if (!create_funct)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_STATE_DLL_DESC,
AXIS2_FAILURE);
return NULL;
}
- error_code = axis2_dll_desc_get_error_code(dll_desc, env) ;
+ error_code = axutil_dll_desc_get_error_code(dll_desc, env) ;
create_funct(&obj, env);
if (! obj)
@@ -139,13 +139,13 @@
axis2_status_t
axutil_class_loader_load_lib(const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc)
+ axutil_dll_desc_t *dll_desc)
{
axis2_char_t *dll_name = NULL;
AXIS2_DLHANDLER dl_handler = NULL;
axis2_status_t status = AXIS2_FAILURE;
- dll_name = axis2_dll_desc_get_name(dll_desc, env);
+ dll_name = axutil_dll_desc_get_name(dll_desc, env);
dl_handler = AXIS2_PLATFORM_LOADLIB(dll_name);
if (! dl_handler)
{
@@ -153,7 +153,7 @@
AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- status = axis2_dll_desc_set_dl_handler(dll_desc, env, dl_handler);
+ status = axutil_dll_desc_set_dl_handler(dll_desc, env, dl_handler);
if (AXIS2_SUCCESS != status)
{
@@ -169,9 +169,9 @@
axis2_status_t
axutil_class_loader_unload_lib(const axis2_env_t *env,
- axis2_dll_desc_t *dll_desc)
+ axutil_dll_desc_t *dll_desc)
{
- AXIS2_DLHANDLER dl_handler = axis2_dll_desc_get_dl_handler(dll_desc, env);
+ AXIS2_DLHANDLER dl_handler = axutil_dll_desc_get_dl_handler(dll_desc, env);
if (dl_handler)
{
AXIS2_PLATFORM_UNLOADLIB(dl_handler);
Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?view=diff&rev=524148&r1=524147&r2=524148
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Fri Mar 30 09:03:14 2007
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-#include <axis2_dll_desc.h>
+#include <axutil_dll_desc.h>
#include <axutil_class_loader.h>
-struct axis2_dll_desc
+struct axutil_dll_desc
{
axis2_char_t *dll_name;
axis2_char_t *path_qualified_dll_name;
@@ -33,15 +33,15 @@
};
-AXIS2_EXTERN axis2_dll_desc_t * AXIS2_CALL
-axis2_dll_desc_create(const axis2_env_t *env)
+AXIS2_EXTERN axutil_dll_desc_t * AXIS2_CALL
+axutil_dll_desc_create(const axis2_env_t *env)
{
- axis2_dll_desc_t *dll_desc = NULL;
+ axutil_dll_desc_t *dll_desc = NULL;
AXIS2_ENV_CHECK(env, NULL);
- dll_desc = (axis2_dll_desc_t *) AXIS2_MALLOC(env->allocator
- , sizeof(axis2_dll_desc_t));
+ dll_desc = (axutil_dll_desc_t *) AXIS2_MALLOC(env->allocator
+ , sizeof(axutil_dll_desc_t));
if (!dll_desc)
{
@@ -63,7 +63,7 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_dll_desc_free(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_free(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -91,19 +91,19 @@
}
AXIS2_EXTERN void AXIS2_CALL
-axis2_dll_desc_free_void_arg(void *dll_desc,
+axutil_dll_desc_free_void_arg(void *dll_desc,
const axis2_env_t *env)
{
- axis2_dll_desc_t *dll_desc_l = NULL;
+ axutil_dll_desc_t *dll_desc_l = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- dll_desc_l = (axis2_dll_desc_t *) dll_desc;
- axis2_dll_desc_free(dll_desc_l, env);
+ dll_desc_l = (axutil_dll_desc_t *) dll_desc;
+ axutil_dll_desc_free(dll_desc_l, env);
return;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_name(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
axis2_char_t *name)
{
@@ -124,14 +124,14 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_name(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->path_qualified_dll_name;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_load_options(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
int options)
{
@@ -142,7 +142,7 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_type(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_type(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
axis2_dll_type_t type)
{
@@ -153,21 +153,21 @@
}
AXIS2_EXTERN axis2_dll_type_t AXIS2_CALL
-axis2_dll_desc_get_type(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_type(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->dll_type;
}
AXIS2_EXTERN int AXIS2_CALL
-axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_load_options(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->load_options;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_dl_handler(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
AXIS2_DLHANDLER dl_handler)
{
@@ -183,14 +183,14 @@
}
AXIS2_EXTERN AXIS2_DLHANDLER AXIS2_CALL
-axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_dl_handler(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->dl_handler;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_create_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
CREATE_FUNCT funct)
{
@@ -200,14 +200,14 @@
}
AXIS2_EXTERN CREATE_FUNCT AXIS2_CALL
-axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_create_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->create_funct;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_delete_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
DELETE_FUNCT funct)
{
@@ -218,14 +218,14 @@
}
AXIS2_EXTERN DELETE_FUNCT AXIS2_CALL
-axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_delete_funct(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->delete_funct;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_timestamp(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_timestamp(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
AXIS2_TIME_T timestamp)
{
@@ -235,15 +235,15 @@
}
AXIS2_EXTERN AXIS2_TIME_T AXIS2_CALL
-axis2_dll_desc_get_timestamp(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_timestamp(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->timestamp;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_dll_desc_set_error_code(
- axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_set_error_code(
+ axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
axis2_error_codes_t error_code)
{
@@ -255,15 +255,15 @@
}
AXIS2_EXTERN axis2_error_codes_t AXIS2_CALL
-axis2_dll_desc_get_error_code(
- axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_get_error_code(
+ axutil_dll_desc_t *dll_desc,
const axis2_env_t *env)
{
return dll_desc->error_code;
}
AXIS2_EXTERN axis2_char_t* AXIS2_CALL
-axis2_dll_desc_create_platform_specific_dll_name(axis2_dll_desc_t *dll_desc,
+axutil_dll_desc_create_platform_specific_dll_name(axutil_dll_desc_t *dll_desc,
const axis2_env_t *env,
const axis2_char_t *class_name)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org