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 da...@apache.org on 2006/02/06 12:24:14 UTC
svn commit: r375252 - in /webservices/axis2/trunk/c/modules/core/deployment:
desc_builder.c repos_listener.c
Author: damitha
Date: Mon Feb 6 03:24:09 2006
New Revision: 375252
URL: http://svn.apache.org/viewcvs?rev=375252&view=rev
Log:
In process of making the module load working
Modified:
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?rev=375252&r1=375251&r2=375252&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Mon Feb 6 03:24:09 2006
@@ -739,41 +739,42 @@
axis2_status_t AXIS2_CALL
axis2_desc_builder_process_op_module_refs(axis2_desc_builder_t *desc_builder,
- axis2_env_t **env,
- struct axis2_om_children_qname_iterator *module_refs,
- struct axis2_op *op)
+ axis2_env_t **env,
+ axis2_om_children_qname_iterator_t *module_refs,
+ axis2_op_t *op)
{
axis2_desc_builder_impl_t *desc_builder_impl = NULL;
- struct axis2_om_element *moduleref = NULL;
- struct axis2_om_attribute *module_ref_attrib = NULL;
- axis2_qname_t *ref = NULL;
+ axis2_om_element_t *moduleref = NULL;
+ axis2_om_attribute_t *module_ref_attrib = NULL;
+ axis2_qname_t *qref = NULL;
axis2_status_t status = AXIS2_FAILURE;
AXIS2_FUNC_PARAM_CHECK(desc_builder, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, module_refs, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, op, AXIS2_FAILURE);
-
desc_builder_impl = AXIS2_INTF_TO_IMPL(desc_builder);
while(AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(module_refs,
env))
{
- moduleref = (struct axis2_om_element *)
+ moduleref = (axis2_om_element_t *)
AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(module_refs, env);
- ref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
- module_ref_attrib = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(moduleref, env, ref);
+ qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
+ module_ref_attrib = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(moduleref, env, qref);
+ AXIS2_QNAME_FREE(qref, env);
if(NULL != module_ref_attrib)
{
axis2_char_t *ref_name = NULL;
axis2_qname_t *ref_qname = NULL;
+ axis2_module_desc_t *module_desc = NULL;
ref_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(module_ref_attrib, env);
ref_qname = axis2_qname_create(env, ref_name, NULL, NULL);
- if( NULL == AXIS2_DEP_ENGINE_GET_MODULE(desc_builder->engine, env,
- ref_qname))
+ module_desc = AXIS2_DEP_ENGINE_GET_MODULE(desc_builder->engine, env,
+ ref_qname);
+ if(NULL == module_desc)
{
AXIS2_QNAME_FREE(ref_qname, env);
- AXIS2_QNAME_FREE(ref, env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
@@ -781,10 +782,9 @@
else
{
status = AXIS2_OP_ADD_MODULE(op, env, ref_qname);
- if(AXIS2_FAILURE == status)
+ AXIS2_QNAME_FREE(ref_qname, env);
+ if(AXIS2_SUCCESS != status)
{
- AXIS2_QNAME_FREE(ref_qname, env);
- AXIS2_QNAME_FREE(ref, env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_MODULE_NOT_FOUND,
AXIS2_FAILURE);
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c?rev=375252&r1=375251&r2=375252&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/repos_listener.c Mon Feb 6 03:24:09 2006
@@ -240,6 +240,7 @@
AXIS2_FUNC_PARAM_CHECK(listener, env, AXIS2_FAILURE);
listener_impl = AXIS2_INTF_TO_IMPL(listener);
+
temp_path = AXIS2_STRACAT(listener_impl->folder_name, AXIS2_PATH_SEP_STR,
env);
svc_path = AXIS2_STRACAT(temp_path, AXIS2_SVC_PATH, env);