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 da...@apache.org on 2005/12/23 05:10:37 UTC
svn commit: r358697 [2/2] - in /webservices/axis2/trunk/c: ./ include/
modules/core/clientapi/src/ modules/core/deployment/src/
modules/core/description/src/ modules/core/engine/src/
modules/core/receivers/ modules/core/receivers/src/ modules/platforms...
Added: webservices/axis2/trunk/c/modules/core/description/src/dll_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/dll_desc.c?rev=358697&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/dll_desc.c (added)
+++ webservices/axis2/trunk/c/modules/core/description/src/dll_desc.c Thu Dec 22 20:09:59 2005
@@ -0,0 +1,340 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <axis2_dll_desc.h>
+
+/**
+ * @brief DLL Description struct impl
+ * Axis2 DLL Description impl
+ */
+typedef struct axis2_dll_desc_impl
+{
+ axis2_dll_desc_t dll_desc;
+
+ axis2_char_t *dll_name;
+ axis2_dll_type_t dll_type;
+ int load_options;
+ AXIS2_DLHANDLER dl_handler;
+ CREATE_FUNCT create_funct;
+ DELETE_FUNCT delete_funct;
+
+
+} axis2_dll_desc_impl_t;
+
+#define AXIS2_INTF_TO_IMPL(dll_desc) ((axis2_dll_desc_impl_t *) dll_desc)
+
+/*************************** Function headers *********************************/
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_free (axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ axis2_char_t *name);
+
+axis2_char_t *AXIS2_CALL
+axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_type (axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ axis2_dll_type_t type);
+
+axis2_dll_type_t AXIS2_CALL
+axis2_dll_desc_get_type (axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ int options);
+
+int AXIS2_CALL
+axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ AXIS2_DLHANDLER dl_handler);
+
+AXIS2_DLHANDLER AXIS2_CALL
+axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ CREATE_FUNCT funct);
+
+CREATE_FUNCT AXIS2_CALL
+axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ DELETE_FUNCT funct);
+
+DELETE_FUNCT AXIS2_CALL
+axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env);
+
+/************************* End of function headers ****************************/
+
+axis2_dll_desc_t * AXIS2_CALL
+axis2_dll_desc_create (axis2_env_t **env)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+
+ dll_desc_impl = (axis2_dll_desc_impl_t *) AXIS2_MALLOC ((*env)->allocator
+ , sizeof (axis2_dll_desc_impl_t));
+
+ if(NULL == dll_desc_impl)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ dll_desc_impl->dll_name = NULL;
+ dll_desc_impl->dl_handler = NULL;
+ dll_desc_impl->dll_desc.ops = NULL;
+
+ dll_desc_impl->dll_desc.ops = (axis2_dll_desc_ops_t *) AXIS2_MALLOC(
+ (*env)->allocator, sizeof(axis2_dll_desc_ops_t));
+
+ if(NULL == dll_desc_impl->dll_desc.ops)
+ {
+ axis2_dll_desc_free(&(dll_desc_impl->dll_desc), env);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ dll_desc_impl->dll_desc.ops->free = axis2_dll_desc_free;
+ dll_desc_impl->dll_desc.ops->get_name = axis2_dll_desc_get_name;
+ dll_desc_impl->dll_desc.ops->set_name = axis2_dll_desc_set_name;
+ dll_desc_impl->dll_desc.ops->get_load_options = axis2_dll_desc_get_load_options;
+ dll_desc_impl->dll_desc.ops->set_load_options = axis2_dll_desc_set_load_options;
+ dll_desc_impl->dll_desc.ops->get_dl_handler = axis2_dll_desc_get_dl_handler;
+ dll_desc_impl->dll_desc.ops->set_dl_handler = axis2_dll_desc_set_dl_handler;
+ dll_desc_impl->dll_desc.ops->get_create_funct = axis2_dll_desc_get_create_funct;
+ dll_desc_impl->dll_desc.ops->set_create_funct = axis2_dll_desc_set_create_funct;
+ dll_desc_impl->dll_desc.ops->get_delete_funct = axis2_dll_desc_get_delete_funct;
+ dll_desc_impl->dll_desc.ops->set_delete_funct = axis2_dll_desc_set_delete_funct;
+ dll_desc_impl->dll_desc.ops->set_type = axis2_dll_desc_set_type;
+ dll_desc_impl->dll_desc.ops->get_type = axis2_dll_desc_get_type;
+
+ return &(dll_desc_impl->dll_desc);
+}
+
+/******************************************************************************/
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_free (axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+ if(NULL != dll_desc->ops)
+ {
+ AXIS2_FREE((*env)->allocator, dll_desc->ops);
+ dll_desc->ops = NULL;
+ }
+
+ if(dll_desc_impl->dll_name)
+ {
+ AXIS2_FREE((*env)->allocator, dll_desc_impl->dll_name);
+ dll_desc_impl->dll_name = NULL;
+ }
+
+ if(dll_desc_impl->dl_handler)
+ {
+ AXIS2_FREE((*env)->allocator, dll_desc_impl->dl_handler);
+ dll_desc_impl->dl_handler = NULL;
+ }
+
+ if(dll_desc_impl)
+ {
+ AXIS2_FREE((*env)->allocator, dll_desc_impl);
+ dll_desc_impl = NULL;
+ }
+
+ return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_name(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ axis2_char_t *name)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, name, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+ if(dll_desc_impl->dll_name)
+ {
+ AXIS2_FREE((*env)->allocator, dll_desc_impl->dll_name);
+ dll_desc_impl->dll_name = NULL;
+ }
+ dll_desc_impl->dll_name = name;
+ return AXIS2_SUCCESS;
+}
+
+axis2_char_t *AXIS2_CALL
+axis2_dll_desc_get_name(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, NULL);
+ return AXIS2_INTF_TO_IMPL(dll_desc)->dll_name;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_load_options(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ int options)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+
+ dll_desc_impl->load_options = options;
+ return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_type (axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ axis2_dll_type_t type)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+
+ dll_desc_impl->dll_type = type;
+ return AXIS2_SUCCESS;
+}
+
+axis2_dll_type_t AXIS2_CALL
+axis2_dll_desc_get_type (axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+ return AXIS2_INTF_TO_IMPL(dll_desc)->dll_type;
+}
+
+int AXIS2_CALL
+axis2_dll_desc_get_load_options(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+ return AXIS2_INTF_TO_IMPL(dll_desc)->load_options;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_dl_handler(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ AXIS2_DLHANDLER dl_handler)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK((*env)->error, dl_handler, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+ if(dll_desc_impl->dl_handler)
+ {
+ AXIS2_FREE((*env)->allocator, dll_desc_impl->dl_handler);
+ dll_desc_impl->dl_handler = NULL;
+ }
+ dll_desc_impl->dl_handler = dl_handler;
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_DLHANDLER AXIS2_CALL
+axis2_dll_desc_get_dl_handler(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, NULL);
+ return AXIS2_INTF_TO_IMPL(dll_desc)->dl_handler;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_create_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ CREATE_FUNCT funct)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+
+ dll_desc_impl->create_funct = funct;
+ return AXIS2_SUCCESS;
+}
+
+CREATE_FUNCT AXIS2_CALL
+axis2_dll_desc_get_create_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, NULL);
+ return AXIS2_INTF_TO_IMPL(dll_desc)->create_funct;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_dll_desc_set_delete_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env,
+ DELETE_FUNCT funct)
+{
+ axis2_dll_desc_impl_t *dll_desc_impl = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, AXIS2_FAILURE);
+
+ dll_desc_impl = AXIS2_INTF_TO_IMPL(dll_desc);
+
+
+ dll_desc_impl->delete_funct = funct;
+ return AXIS2_SUCCESS;
+}
+
+DELETE_FUNCT AXIS2_CALL
+axis2_dll_desc_get_delete_funct(axis2_dll_desc_t *dll_desc,
+ axis2_env_t **env)
+{
+ AXIS2_FUNC_PARAM_CHECK(dll_desc, env, NULL);
+ return AXIS2_INTF_TO_IMPL(dll_desc)->delete_funct;
+}
Modified: webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/handler_desc.c Thu Dec 22 20:09:59 2005
@@ -23,8 +23,7 @@
{
/** handler description */
axis2_handler_desc_t handler_desc;
- /** param container */
- axis2_param_container_t *param_container;
+
/** name */
axis2_qname_t *qname;
/** phase rules */
@@ -34,7 +33,8 @@
/** class qname */
axis2_char_t *class_name;
/** parent param container */
- axis2_param_container_t *parent_param_container;
+ axis2_param_container_t *parent;
+
} axis2_handler_desc_impl_t;
/** Interface to implementation conversion macro */
@@ -68,7 +68,7 @@
axis2_env_t **env);
axis2_status_t AXIS2_CALL axis2_handler_desc_set_parent(struct axis2_handler_desc *handler_desc,
axis2_env_t **env,
- axis2_param_container_t * parent_param_container);
+ axis2_param_container_t * parent);
axis2_status_t AXIS2_CALL axis2_handler_desc_free (struct axis2_handler_desc *handler_desc,
axis2_env_t **env);
@@ -85,15 +85,15 @@
return NULL;
}
- handler_desc_impl->param_container = NULL;
+ handler_desc_impl->handler_desc.param_container = NULL;
handler_desc_impl->qname = NULL;
handler_desc_impl->rules = NULL;
handler_desc_impl->handler = NULL;
handler_desc_impl->class_name = NULL;
- handler_desc_impl->parent_param_container = NULL;
+ handler_desc_impl->parent = NULL;
- handler_desc_impl->param_container = axis2_param_container_create(env);
- if (!handler_desc_impl->param_container)
+ handler_desc_impl->handler_desc.param_container = axis2_param_container_create(env);
+ if (!handler_desc_impl->handler_desc.param_container)
{
/** error is already set by last param container create */
axis2_handler_desc_free(&(handler_desc_impl->handler_desc), env);
@@ -200,7 +200,7 @@
handler_desc_impl = AXIS2_INTF_TO_IMPL(handler_desc);
- return AXIS2_PARAM_CONTAINER_GET_PARAM(handler_desc_impl->param_container, env, name);
+ return AXIS2_PARAM_CONTAINER_GET_PARAM(handler_desc->param_container, env, name);
}
axis2_status_t AXIS2_CALL axis2_handler_desc_add_param(struct axis2_handler_desc *handler_desc,
@@ -212,13 +212,13 @@
handler_desc_impl = AXIS2_INTF_TO_IMPL(handler_desc);
- if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->parent_param_container, env, AXIS2_PARAM_GET_NAME(param, env)) )
+ if (AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->parent, env, AXIS2_PARAM_GET_NAME(param, env)) )
{
AXIS2_ERROR_SET((*env)->error,AXIS2_ERROR_PARAMETER_LOCKED_CANNOT_OVERRIDE , AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return AXIS2_PARAM_CONTAINER_ADD_PARAM(handler_desc_impl->param_container, env, param);
+ return AXIS2_PARAM_CONTAINER_ADD_PARAM(handler_desc->param_container, env, param);
}
axis2_array_list_t* AXIS2_CALL axis2_handler_desc_get_params(struct axis2_handler_desc *handler_desc,
@@ -230,7 +230,7 @@
handler_desc_impl = AXIS2_INTF_TO_IMPL(handler_desc);
- return AXIS2_PARAM_CONTAINER_GET_PARAMS(handler_desc_impl->param_container, env);
+ return AXIS2_PARAM_CONTAINER_GET_PARAMS(handler_desc->param_container, env);
}
axis2_bool_t AXIS2_CALL axis2_handler_desc_is_param_locked(struct axis2_handler_desc *handler_desc,
@@ -242,11 +242,11 @@
handler_desc_impl = AXIS2_INTF_TO_IMPL(handler_desc);
- /* see if it is locked in parent_param_container */
- if( AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->parent_param_container, env, param_name) )
+ /* see if it is locked in parent */
+ if( AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->parent, env, param_name) )
return AXIS2_TRUE;
- return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc_impl->param_container, env, param_name);
+ return AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(handler_desc->param_container, env, param_name);
}
axis2_handler_t* AXIS2_CALL axis2_handler_desc_get_handler(struct axis2_handler_desc *handler_desc,
@@ -317,15 +317,15 @@
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(handler_desc, env, NULL);
- return AXIS2_INTF_TO_IMPL(handler_desc)->parent_param_container;
+ return AXIS2_INTF_TO_IMPL(handler_desc)->parent;
}
axis2_status_t AXIS2_CALL axis2_handler_desc_set_parent(struct axis2_handler_desc *handler_desc,
axis2_env_t **env,
- axis2_param_container_t * parent_param_container)
+ axis2_param_container_t * parent)
{
AXIS2_FUNC_PARAM_CHECK(handler_desc, env, AXIS2_FAILURE);
- AXIS2_INTF_TO_IMPL(handler_desc)->parent_param_container = parent_param_container; /* shallow copy, because the parent_param_container lives somewhere else*/
+ AXIS2_INTF_TO_IMPL(handler_desc)->parent = parent; /* shallow copy, because the parent lives somewhere else*/
return AXIS2_SUCCESS;
}
@@ -344,10 +344,11 @@
handler_desc_impl->handler_desc.ops = NULL;
}
- if (handler_desc_impl->param_container)
+ if (handler_desc_impl->handler_desc.param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(handler_desc_impl->param_container, env);
- handler_desc_impl->param_container = NULL;
+ AXIS2_PARAM_CONTAINER_FREE(handler_desc_impl->handler_desc.
+ param_container, env);
+ handler_desc_impl->handler_desc.param_container = NULL;
}
/** the following block should be uncomented when clone is used in the code
Modified: webservices/axis2/trunk/c/modules/core/description/src/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/src/svc.c?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/src/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/src/svc.c Thu Dec 22 20:09:59 2005
@@ -921,7 +921,8 @@
for(j = 0; j < size; j++)
{
param = (struct axis2_param *) AXIS2_ARRAY_LIST_GET(params, env, j);
- if(0 == AXIS2_STRCMP( AXIS2_PARAM_GET_NAME(param, env), WSA_ACTION))
+ if(0 == AXIS2_STRCMP( AXIS2_PARAM_GET_NAME(param, env),
+ AXIS2_WSA_ACTION))
{
status = axis2_svc_add_mapping(svc, env,
(axis2_char_t *) AXIS2_PARAM_GET_VALUE(param, env), axis2_opt);
Modified: webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/Makefile.am Thu Dec 22 20:09:59 2005
@@ -2,7 +2,6 @@
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_engine_la_SOURCES = handler.c \
- msg_recv.c \
conf.c \
phase.c \
disp_checker.c \
Modified: webservices/axis2/trunk/c/modules/core/engine/src/engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/engine.c?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/engine.c Thu Dec 22 20:09:59 2005
@@ -297,7 +297,7 @@
{
/* invoke the Message Receivers */
axis2_msg_recv_t *receiver = AXIS2_OP_GET_MSG_RECEIVER(op, env);
- AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx);
+ AXIS2_MSG_RECV_RECEIVE(receiver, env, msg_ctx, NULL);
}
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/engine/src/phase.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/engine/src/phase.c?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/engine/src/phase.c (original)
+++ webservices/axis2/trunk/c/modules/core/engine/src/phase.c Thu Dec 22 20:09:59 2005
@@ -326,19 +326,19 @@
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_BEFORE_AFTER_HANDLERS_SAME, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- return AXIS2_BOTH_BEFORE_AFTER;
+ return AXIS2_PHASE_BOTH_BEFORE_AFTER;
}
else if (before)
{
- return AXIS2_BEFORE;
+ return AXIS2_PHASE_BEFORE;
}
else if (after)
{
- return AXIS2_AFTER;
+ return AXIS2_PHASE_AFTER;
}
else
{
- return AXIS2_ANYWHERE;
+ return AXIS2_PHASE_ANYWHERE;
}
}
@@ -358,7 +358,7 @@
}
else
{
- if (_axis2_phase_get_before_after(handler, env) != AXIS2_ANYWHERE)
+ if (_axis2_phase_get_before_after(handler, env) != AXIS2_PHASE_ANYWHERE)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_PHASE_FIRST_HANDLER, AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -386,7 +386,7 @@
}
else
{
- if (_axis2_phase_get_before_after(handler, env) != AXIS2_ANYWHERE)
+ if (_axis2_phase_get_before_after(handler, env) != AXIS2_PHASE_ANYWHERE)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_PHASE_LAST_HANDLER, AXIS2_FAILURE);
return AXIS2_FAILURE;
Added: webservices/axis2/trunk/c/modules/core/receivers/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/Makefile.am?rev=358697&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/Makefile.am (added)
+++ webservices/axis2/trunk/c/modules/core/receivers/Makefile.am Thu Dec 22 20:09:59 2005
@@ -0,0 +1 @@
+SUBDIRS = src
Added: webservices/axis2/trunk/c/modules/core/receivers/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/src/Makefile.am?rev=358697&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/src/Makefile.am (added)
+++ webservices/axis2/trunk/c/modules/core/receivers/src/Makefile.am Thu Dec 22 20:09:59 2005
@@ -0,0 +1,14 @@
+lib_LTLIBRARIES = libaxis2_receivers.la
+AM_CPPFLAGS = $(CPPFLAGS)
+
+libaxis2_receivers_la_SOURCES = msg_recv.c
+
+libaxis2_receivers_la_LIBADD = $(LDFLAGS)
+INCLUDES = -I${CUTEST_HOME}/include \
+ -I$(top_builddir)/modules/xml/guththila/src \
+ -I$(top_builddir)/include \
+ -I$(top_builddir)/modules/util/src \
+ -I$(top_builddir)/modules/core/description/src \
+ -I$(top_builddir)/modules/wsdl/src \
+ -I$(top_builddir)/modules/core/transport \
+ -I$(top_builddir)/modules/platforms
Added: webservices/axis2/trunk/c/modules/platforms/axis2_platform_auto_sense.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/axis2_platform_auto_sense.h?rev=358697&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/axis2_platform_auto_sense.h (added)
+++ webservices/axis2/trunk/c/modules/platforms/axis2_platform_auto_sense.h Thu Dec 22 20:09:59 2005
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef AXIS2_PLATFORM_AUTOSENSE_H
+#define AXIS2_PLATFORM_AUTOSENSE_H
+
+/**
+ * @file axis2_platform_auto_sense.h
+ * @brief axis2 platform auto sense
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/** @defgroup axis2_platform_auto_sense
+ * @ingroup axis2_platforms
+ * @{
+ */
+
+#if defined( WIN32 )
+ #include <windows/axis2_windows.h>
+#elif defined ( __OS400__ )
+ #include <os400/axis2_os400.h>
+#elif defined ( AIX )
+ #include <aix/aix.h>
+#elif defined ( HPUX )
+ #include <hp-ux/axis2_ht-ux.h>
+#else
+ #include <unix/axis2_unix.h>
+#endif
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AXIS2_PLATFORM_AUTOSENSE_H */
Added: webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h?rev=358697&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h (added)
+++ webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h Thu Dec 22 20:09:59 2005
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#ifndef AXIS2_UNIX_H
+#define AXIS2_UNIX_H
+
+/**
+ * @file axis2_unix.h
+ * @brief axis2 unix platform specific interface
+ */
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+/** @defgroup axis2_unix Platform Specific
+ * @ingroup axis2_platforms_unix
+ * @{
+ */
+
+/***************************************************************
+ * Default paths to shared library/DLLs and files
+ ***************************************************************
+ */
+
+#define AXIS2_PLATFORM_DEFAULT_DEPLOY_PATH ""
+
+#define AXIS2_PLATFORM_XMLPARSER_PATH "libaxis2_parser.so"
+#define AXIS2_PLATFORM_TRANSPORTHTTP_PATH "libhttp_transport.so"
+#define AXIS2_PLATFORM_CHANNEL_PATH "libhttp_channel.so"
+#define AXIS2_PLATFORM_SSLCHANNEL_PATH "Unknown"
+
+#define AXIS2_PLATFORM_LOG_PATH "/usr/local/axis2/log/axis2_log"
+#define AXIS2_PLATFORM_CLIENTLOG_PATH "/usr/local/axis2/log/axis2_client_log"
+#define AXIS2_PLATFORM_CONFIG_PATH "/etc/axiscpp.conf"
+#define AXIS2_PLATFORM_SECUREINFO ""
+
+/*****************************************************************
+ * Library loading and procedure resolution
+ ****************************************************************/
+#ifdef USE_LTDL
+ #include <ltdl.h>
+ #define AXIS2_DLHandler lt_dlhandle
+
+ #define AXIS2_PLATFORM_LOADLIBINIT lt_dlinit
+ #define AXIS2_PLATFORM_LOADLIB(_lib) lt_dlopen(_lib)
+ #define AXIS2_PLATFORM_UNLOADLIB lt_dlclose
+ #define AXIS2_PLATFORM_GETPROCADDR lt_dlsym
+ #define AXIS2_PLATFORM_LOADLIBEXIT lt_dlexit
+ #define AXIS2_PLATFORM_LOADLIB_ERROR lt_dlerror()
+#else
+ #include <dlfcn.h>
+ #define AXIS2_DLHANDLER void*
+
+ #define AXIS2_PLATFORM_LOADLIBINIT()
+ #define AXIS2_PLATFORM_LOADLIB(_lib) dlopen(_lib, RTLD_LAZY)
+
+ #define AXIS2_PLATFORM_UNLOADLIB dlclose
+ #define AXIS2_PLATFORM_GETPROCADDR dlsym
+ #define AXIS2_PLATFORM_LOADLIBEXIT()
+ #define AXIS2_PLATFORM_LOADLIB_ERROR dlerror()
+
+#endif
+
+/***************************************************************
+ * National Language Support
+ ****************************************************************/
+
+/* STRTOASC is to translate single byte 'native' character representation to ASCII */
+/* ASCTOSTR is to translate single byte ascii representation to 'native' character */
+/* CANNOT be used with constants */
+#define AXIS2_PLATFORM_STRTOASC( x ) ( x )
+#define AXIS2_PLATFORM_ASCTOSTR( x ) ( x )
+
+/***************************************************************
+ * Miscellaneous
+****************************************************************/
+#include <sys/time.h>
+#include <sys/timeb.h>
+#include <unistd.h>
+#include <errno.h>
+#define AXIS2_PLATFORM_SLEEP(x) sleep(0);
+
+/**
+ * Get the last error code from the system.
+ * Please ensure that this is a thread safe implementation
+ * and that it returns a long
+ * @return long the lsat error message for this thread
+ */
+/*#define AXIS2_GETLASTERROR errno; */
+
+/**
+ * From the last error number get a sensible std::string representing it
+ * @param errorNumber the error Number you are trying to get a message for
+ * @return the error message. NOTE: The caller is responsible for deleting the returned string
+ */
+
+/*#define AXIS2_PLATFORM_GET_ERROR_MESSAGE(errorNumber) new string(strerror(errorNumber));*/
+
+/**
+ * Platform specific method to obtain current thread ID
+ */
+#include <pthread.h>
+#define AXIS2_PLATFORM_GET_THREAD_ID pthread_self()
+
+/**
+ * Platform specific method to obtain current time in milli seconds
+ */
+#define AXIS2_PLATFORM_GET_TIME_IN_MILLIS ftime
+#define AXIS2_PLATFORM_TIMEB timeb
+
+/**
+ * type to be used for 64bit integers
+ */
+#define AXIS2_LONGLONG long long
+#define AXIS2_LONGLONGVALUE(value) value##LL
+#define AXIS2_UNSIGNED_LONGLONGVALUE(value) value##ULL
+
+/**
+ * Format string to be used in printf for 64bit integers
+ */
+#define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER "%lld"
+#define AXIS2_PRINTF_LONGLONG_FORMAT_SPECIFIER_CHARS "lld"
+#define AXIS2_PRINTF_UNSIGNED_LONGLONG_FORMAT_SPECIFIER "%llu"
+#define AXIS2_PRINTF_UNSIGNED_LONGLONG_FORMAT_SPECIFIER_CHARS "llu"
+
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* AXIS2_UNIX_H */
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.am?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.am Thu Dec 22 20:09:59 2005
@@ -14,5 +14,10 @@
utils.c
libaxis2_util_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include \
- -I$(top_builddir)/modules/util/src
+INCLUDES = -I$(top_builddir)/include \
+ -I${CUTEST_HOME}/include \
+ -I$(top_builddir)/modules/util/src \
+ -I$(top_builddir)/modules/core/transport \
+ -I$(top_builddir)/modules/core/description/src \
+ -I$(top_builddir)/modules/wsdl/src \
+ -I$(top_builddir)/modules/platforms
Added: webservices/axis2/trunk/c/modules/util/src/class_loader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/class_loader.c?rev=358697&view=auto
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/class_loader.c (added)
+++ webservices/axis2/trunk/c/modules/util/src/class_loader.c Thu Dec 22 20:09:59 2005
@@ -0,0 +1,181 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <axis2_class_loader.h>
+#include <axis2_msg_recv.h>
+
+axis2_status_t AXIS2_CALL
+axis2_class_loader_load_lib (axis2_env_t **env,
+ axis2_dll_desc_t *dll_desc);
+
+axis2_status_t AXIS2_CALL
+axis2_class_loader_unload_lib (axis2_env_t **env,
+ axis2_dll_desc_t *dll_desc);
+
+
+axis2_status_t AXIS2_CALL
+axis2_class_loader_init(axis2_env_t **env)
+{
+ AXIS2_PLATFORM_LOADLIBINIT();
+ return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_class_loader_delete_dll (axis2_env_t **env,
+ axis2_dll_desc_t *dll_desc)
+{
+ axis2_class_loader_unload_lib(env, dll_desc);
+ AXIS2_PLATFORM_LOADLIBEXIT()
+ return AXIS2_SUCCESS;
+}
+
+void *AXIS2_CALL
+axis2_class_loader_create_dll (axis2_env_t **env,
+ axis2_param_t *impl_info_param)
+{
+ void *svc_skeli = NULL; /* axis2_svc_skeleton */
+ void *msg_recv = NULL; /* axis2_msg_recv */
+ void *handler = NULL; /* axis2_handler */
+ CREATE_FUNCT create_funct = NULL;
+ axis2_dll_desc_t *dll_desc = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
+ axis2_dll_type_t dll_type = AXIS2_SVC_DLL;
+
+ dll_desc = AXIS2_PARAM_GET_VALUE(impl_info_param, env);
+ if(!dll_desc)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DLL_CREATE_FAILED,
+ AXIS2_FAILURE);
+ return NULL;
+ }
+ status = axis2_class_loader_load_lib(env, dll_desc);
+ if (AXIS2_SUCCESS == status)
+ {
+ CREATE_FUNCT create_funct = NULL;
+ DELETE_FUNCT delete_funct = NULL;
+ AXIS2_DLHANDLER dl_handler = NULL;
+
+ dl_handler = AXIS2_DLL_DESC_GET_DL_HANDLER(dll_desc, env);
+
+ create_funct = (CREATE_FUNCT) AXIS2_PLATFORM_GETPROCADDR(dl_handler,
+ AXIS2_CREATE_FUNCTION);
+ status = AXIS2_DLL_DESC_SET_CREATE_FUNCT(dll_desc, env, create_funct);
+ if(AXIS2_FAILURE == status)
+ {
+ axis2_class_loader_unload_lib(env, dll_desc);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DLL_CREATE_FAILED,
+ AXIS2_FAILURE);
+ return NULL;
+ }
+
+ delete_funct = (DELETE_FUNCT) AXIS2_PLATFORM_GETPROCADDR(dl_handler,
+ AXIS2_DELETE_FUNCTION);
+
+ status = AXIS2_DLL_DESC_SET_CREATE_FUNCT(dll_desc, env, create_funct);
+ if(AXIS2_FAILURE == status)
+ {
+ axis2_class_loader_unload_lib(env, dll_desc);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DLL_CREATE_FAILED,
+ AXIS2_FAILURE);
+ return NULL;
+ }
+ }
+ else
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DLL_CREATE_FAILED,
+ AXIS2_FAILURE);
+ return NULL;
+ }
+
+ create_funct = AXIS2_DLL_DESC_GET_CREATE_FUNCT(dll_desc, env);
+
+ dll_type = AXIS2_DLL_DESC_GET_TYPE(dll_desc, env);
+ if(AXIS2_SVC_DLL == dll_type)
+ {
+ create_funct(&svc_skeli);
+ if(NULL == svc_skeli)
+ {
+ AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_SVC_SKELETON_CREATION_FAILED,AXIS2_FAILURE);
+ return NULL;
+ }
+ return svc_skeli;
+ }
+ if(AXIS2_HANDLER_DLL == dll_type)
+ {
+ create_funct(&handler);
+ if(NULL == handler)
+ {
+ AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_HANDLER_CREATION_FAILED,AXIS2_FAILURE);
+ return NULL;
+ }
+ return handler;
+ }
+ if(AXIS2_MSG_RECV_DLL == dll_type)
+ {
+ create_funct(&msg_recv);
+ if(NULL == msg_recv)
+ {
+ AXIS2_ERROR_SET((*env)->error,
+ AXIS2_ERROR_MSG_RECV_CREATION_FAILED,AXIS2_FAILURE);
+ return NULL;
+ }
+ return msg_recv;
+ }
+
+ return NULL;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_class_loader_load_lib (axis2_env_t **env,
+ axis2_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);
+ dl_handler = AXIS2_PLATFORM_LOADLIB(dll_name);
+ if(NULL == dl_handler)
+ {
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DLL_LOADING_FAILED,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+ status = AXIS2_DLL_DESC_SET_DL_HANDLER(dll_desc, env, dl_handler);
+
+ if(AXIS2_FAILURE == status)
+ {
+ AXIS2_FREE((*env)->allocator, dl_handler);
+ AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_DLL_LOADING_FAILED,
+ AXIS2_FAILURE);
+ return AXIS2_FAILURE;
+ }
+
+ return AXIS2_SUCCESS;
+}
+
+axis2_status_t AXIS2_CALL
+axis2_class_loader_unload_lib (axis2_env_t **env,
+ axis2_dll_desc_t *dll_desc)
+{
+ AXIS2_DLHANDLER dl_handler = AXIS2_DLL_DESC_GET_DL_HANDLER(dll_desc, env);
+
+ AXIS2_PLATFORM_UNLOADLIB(dl_handler);
+
+ return AXIS2_SUCCESS;
+}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am?rev=358697&r1=358696&r2=358697&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am Thu Dec 22 20:09:59 2005
@@ -10,7 +10,7 @@
axis2_om_doctype.c \
axis2_om_namespace.c \
axis2_om_processing_instruction.c \
- axis2_om_stax_builder.c \
+ axis2_om_stax_builder.c \
axis2_om_children_iterator.c \
axis2_om_children_qname_iterator.c \
axis2_om_child_element_iterator.c \