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/01/16 03:42:51 UTC
svn commit: r369317 - in /webservices/axis2/trunk/c: ./ include/
modules/core/deployment/ modules/core/description/ modules/util/
modules/wsdl/ modules/xml/om/ test/core/clientapi/ test/core/deployment/
test/core/engine/ test/server/calculator/ test/xm...
Author: damitha
Date: Sun Jan 15 18:42:16 2006
New Revision: 369317
URL: http://svn.apache.org/viewcvs?rev=369317&view=rev
Log:
*Fixed the problem of searching hash by qname.
*Now message recievers are loading. Still seg faults when
configuring transport senders. This can be fixed by
properly configureing axis2.xml for receivers
Modified:
webservices/axis2/trunk/c/build.sh
webservices/axis2/trunk/c/include/axis2_dep_engine.h
webservices/axis2/trunk/c/include/axis2_dll_desc.h
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_msg_recv.h
webservices/axis2/trunk/c/include/axis2_wsdl_svc.h
webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.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/description/dll_desc.c
webservices/axis2/trunk/c/modules/core/description/param.c
webservices/axis2/trunk/c/modules/core/description/param_container.c
webservices/axis2/trunk/c/modules/util/class_loader.c
webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c
webservices/axis2/trunk/c/modules/xml/om/om_element.c
webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
webservices/axis2/trunk/c/test/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/core/deployment/axis2.xml
webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
webservices/axis2/trunk/c/test/core/engine/test_engine.c
webservices/axis2/trunk/c/test/server/calculator/calc_skeleton.c
webservices/axis2/trunk/c/test/xml/om/test_om.c
Modified: webservices/axis2/trunk/c/build.sh
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/build.sh?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/build.sh (original)
+++ webservices/axis2/trunk/c/build.sh Sun Jan 15 18:42:16 2006
@@ -1,7 +1,7 @@
#!/bin/bash
./autogen.sh
-AXIS2C_HOME=`pwd`
-./configure --prefix=${AXIS2C_HOME}/install
+#AXIS2C_HOME=`pwd`
+./configure --prefix=${AXIS2C_HOME}
make
make install
cp install/lib/libaxis2_libxml2.so install/lib/libaxis2_parser.so
Modified: webservices/axis2/trunk/c/include/axis2_dep_engine.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_dep_engine.h?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_dep_engine.h (original)
+++ webservices/axis2/trunk/c/include/axis2_dep_engine.h Sun Jan 15 18:42:16 2006
@@ -176,7 +176,11 @@
build_module) (axis2_dep_engine_t *dep_engine,
axis2_env_t **env,
axis2_file_t *module_archive,
- axis2_conf_t *conf);
+ axis2_conf_t *conf);
+
+ axis2_char_t *(AXIS2_CALL *
+ get_repos_path) (axis2_dep_engine_t *dep_engine,
+ axis2_env_t **env);
};
@@ -282,7 +286,9 @@
#define AXIS2_DEP_ENGINE_BUILD_MODULE(dep_engine, env, module_archive, conf) \
((dep_engine)->ops->build_module (dep_engine, env, module_archive, conf))
-
+
+#define AXIS2_DEP_ENGINE_GET_REPOS_PATH(dep_engine, env) \
+ ((dep_engine)->ops->get_repos_path (dep_engine, env))
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/include/axis2_dll_desc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_dll_desc.h?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_dll_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_dll_desc.h Sun Jan 15 18:42:16 2006
@@ -45,9 +45,9 @@
typedef struct axis2_dll_desc_ops axis2_dll_desc_ops_t;
-typedef int (*CREATE_FUNCT) (void **inst);
+typedef int (*CREATE_FUNCT) (void **inst, axis2_env_t **env);
-typedef int (*DELETE_FUNCT) (void *inst);
+typedef int (*DELETE_FUNCT) (void *inst, axis2_env_t **env);
typedef enum axis2_dll_type
{
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Sun Jan 15 18:42:16 2006
@@ -419,6 +419,10 @@
AXIS2_ERROR_NULL_OM_OUTPUT,
/* We got a NULL strem in the response body */
AXIS2_ERROR_NULL_STREAM_IN_RESPONSE_BODY,
+ AXIS2_ERROR_OM_ELEMENT_MISMATCH,
+ AXIS2_ERROR_OM_ELEMENT_INVALID_STATE,
+ AXIS2_ERROR_RPC_NEED_MATCHING_CHILD,
+ AXIS2_ERROR_UNKNOWN_STYLE,
/** The following has to be the last error value all the time.
All other error codes should appear above this.
Modified: webservices/axis2/trunk/c/include/axis2_msg_recv.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_recv.h?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_recv.h Sun Jan 15 18:42:16 2006
@@ -17,19 +17,11 @@
#ifndef AXIS2_MSG_RECV_H
#define AXIS2_MSG_RECV_H
-
/**
* @file axis2_msg_recv.h
* @brief axis Message Receiver interface
*/
-#include <axis2_core.h>
-#include <axis2_param.h>
-#include <axis2_msg_ctx.h>
-#include <axis2_op_ctx.h>
-#include <axis2.h>
-#include <axis2_svc_skeleton.h>
-
#ifdef __cplusplus
extern "C"
{
@@ -39,7 +31,16 @@
* @ingroup axis2_core_engine
* @{
*/
-
+
+#include <axis2_defines.h>
+#include <axis2.h>
+#include <axis2_svc_skeleton.h>
+#include <axis2_msg_ctx.h>
+#include <axis2_op_ctx.h>
+
+#define AXIS2_SUCCESS 1
+#define AXIS2_FAILURE 0
+
struct axis2_msg_ctx;
typedef struct axis2_msg_recv axis2_msg_recv_t;
typedef struct axis2_msg_recv_ops axis2_msg_recv_ops_t;
@@ -54,23 +55,26 @@
* Deallocate memory
* @return status code
*/
- axis2_status_t (AXIS2_CALL *free) (axis2_msg_recv_t *msg_recv,
- axis2_env_t **env);
+ axis2_status_t (AXIS2_CALL *
+ free) (axis2_msg_recv_t *msg_recv,
+ axis2_env_t **env);
- axis2_status_t (AXIS2_CALL *receive) (axis2_msg_recv_t *msg_recv,
- axis2_env_t **env,
- struct axis2_msg_ctx *msg_ctx);
- axis2_status_t (AXIS2_CALL *invoke_in_business_logic) (axis2_msg_recv_t *msg_recv,
+ axis2_status_t (AXIS2_CALL *
+ receive) (axis2_msg_recv_t *msg_recv,
+ axis2_env_t **env,
+ struct axis2_msg_ctx *in_msg_ctx);
+
+ axis2_status_t (AXIS2_CALL *
+ invoke_in_business_logic) (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
struct axis2_msg_ctx *in_msg_ctx);
- axis2_status_t (AXIS2_CALL *invoke_in_out_business_logic) (axis2_msg_recv_t *msg_recv,
+ axis2_status_t (AXIS2_CALL *
+ invoke_in_out_business_logic) (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
struct axis2_msg_ctx *in_msg_ctx,
struct axis2_msg_ctx *out_msg_ctx);
- axis2_status_t (AXIS2_CALL *set_in_only)(axis2_msg_recv_t *msg_recv,
- axis2_env_t **env,
- axis2_bool_t in_only);
-
+
+
/**
* Method makeNewServiceObject
*
@@ -78,10 +82,10 @@
* @return
*/
axis2_svc_skeleton_t * (AXIS2_CALL *
- make_new_svc_obj) (void *msg_recv,
+ make_new_svc_obj) (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
struct axis2_msg_ctx *msg_ctx);
-
+
/**
* Method getTheImplementationObject
*
@@ -89,7 +93,7 @@
* @return
*/
axis2_svc_skeleton_t * (AXIS2_CALL *
- get_impl_obj) (void *msg_recv,
+ get_impl_obj) (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
struct axis2_msg_ctx *msg_ctx);
@@ -97,10 +101,11 @@
set_scope) (axis2_msg_recv_t *msg_recv,
axis2_env_t **env,
axis2_char_t *scope);
-
+
+
axis2_char_t * (AXIS2_CALL *
get_scope) (axis2_msg_recv_t *msg_recv,
- axis2_env_t **env);
+ axis2_env_t **env);
};
/**
@@ -113,7 +118,7 @@
};
AXIS2_DECLARE(axis2_msg_recv_t *)
-axis2_msg_recv_create (axis2_env_t **env);
+axis2_msg_recv_create ();
/************************** Start of function macros **************************/
@@ -122,18 +127,15 @@
#define AXIS2_MSG_RECV_RECEIVE(msg_recv, env, msg_ctx) \
((msg_recv)->ops->receive (msg_recv, env, msg_ctx))
-#define AXIS2_MSG_RECV_SET_IN_ONLY(msg_recv, env, in_only) \
- ((msg_recv)->ops->set_in_only(msg_recv, env, in_only))
-
#define AXIS2_MSG_RECV_INVOKE_IN_BUSINESS_LOGIC(msg_recv, env, in_msg_ctx) \
- ((msg_recv)->ops->invoke_in_business_logic(msg_recv, env, in_msg_ctx))
+ ((msg_recv)->ops->invoke_in_business_logic(msg_recv, env, in_msg_ctx))
#define AXIS2_MSG_RECV_INVOKE_IN_OUT_BUSINESS_LOGIC(msg_recv, env, in_msg_ctx, \
out_msg_ctx) ((msg_recv)->ops->invoke_in_out_business_logic(msg_recv, \
env, in_msg_ctx, out_msg_ctx))
#define AXIS2_MSG_RECV_MAKE_NEW_SVC_OBJ(msg_recv, env, msg_ctx) \
- ((msg_recv)->ops->make_new_svc_obj(msg_recv, env, msg_ctx))
+ ((msg_recv)->ops->make_new_svc_obj(msg_recv, env, msg_ctx))
#define AXIS2_MSG_RECV_GET_IMPL_OBJ(msg_recv, env, msg_ctx) \
((msg_recv)->ops->get_impl_obj(msg_recv, env, msg_ctx))
@@ -142,7 +144,7 @@
((msg_recv)->ops->set_scope(msg_recv, env, scope))
#define AXIS2_MSG_RECV_GET_SCOPE(msg_recv, env) \
- ((msg_recv)->ops->get_scope(msg_recv, env))
+ ((msg_recv)->ops->get_scope(msg_recv, env))
/************************** End of function macros ****************************/
Modified: webservices/axis2/trunk/c/include/axis2_wsdl_svc.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_wsdl_svc.h?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_wsdl_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_wsdl_svc.h Sun Jan 15 18:42:16 2006
@@ -50,9 +50,9 @@
typedef struct axis2_wsdl_svc_ops axis2_wsdl_svc_ops_t;
typedef struct axis2_wsdl_svc axis2_wsdl_svc_t;
-#define STYLE_RPC "rpc"
-#define STYLE_DOC "doc"
-#define STYLE_MSG "msg"
+#define AXIS2_STYLE_RPC "rpc"
+#define AXIS2_STYLE_DOC "doc"
+#define AXIS2_STYLE_MSG "msg"
/**
* @brief Wsdl Service ops struct
* Encapsulator struct for ops of axis2_wsdl_service
Modified: webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/axis2_deployment.h Sun Jan 15 18:42:16 2006
@@ -120,6 +120,10 @@
#define AXIS2_SVC_GRP_ELEMENT "serviceGroup"
#define AXIS2_SERVER_XML_FILE "axis2.xml"
+
+#define AXIS2_MODULE_FOLDER "modules"
+#define AXIS2_SERVICE_FOLDER "services"
+#define AXIS2_LIB_FOLDER "lib"
/*********************************** Constants*********************************/
Modified: webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/conf_builder.c Sun Jan 15 18:42:16 2006
@@ -183,6 +183,7 @@
axis2_om_node_t *conf_node = NULL;
axis2_om_element_t *disp_order_element = NULL;
axis2_om_node_t *disp_order_node = NULL;
+ axis2_status_t status = AXIS2_FAILURE;
AXIS2_FUNC_PARAM_CHECK(conf_builder, env, AXIS2_FAILURE);
builder_impl = AXIS2_INTF_TO_IMPL(conf_builder);
@@ -194,14 +195,14 @@
qparamst = axis2_qname_create(env, AXIS2_PARAMETERST, NULL, NULL);
itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env, qparamst,
conf_node);
- printf("came32\n");
+ AXIS2_QNAME_FREE(qparamst, env);
AXIS2_DESC_BUILDER_PROCESS_PARAMS(conf_builder->desc_builder, env, itr,
builder_impl->conf->param_container, builder_impl->conf->param_container);
- printf("came33\n");
/* process MessageReciver */
qmsgrecv = axis2_qname_create(env, AXIS2_MESSAGERECEIVER, NULL, NULL);
msg_recvs = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
qmsgrecv, conf_node);
+ AXIS2_QNAME_FREE(qmsgrecv, env);
while(AXIS2_TRUE == AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(msg_recvs, env))
{
axis2_om_node_t *msg_recv_node = NULL;
@@ -213,12 +214,19 @@
msg_recv_node = (axis2_om_node_t *)
AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(msg_recvs, env);
+ msg_recv_element = (axis2_om_element_t *)
+ AXIS2_OM_NODE_GET_DATA_ELEMENT(msg_recv_node, env);
msg_recv = AXIS2_DESC_BUILDER_LOAD_MSG_RECV(conf_builder->desc_builder,
env, msg_recv_element);
+ if(!msg_recv)
+ {
+ return AXIS2_FAILURE;
+ }
+ qmep = axis2_qname_create(env, AXIS2_MEP, NULL, NULL);
mep_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(msg_recv_element, env, qmep);
att_value = AXIS2_OM_ATTRIBUTE_GET_VALUE(mep_att, env);
+ printf("att_value:%s\n", att_value);
AXIS2_CONF_ADD_MSG_RECV(builder_impl->conf, env, att_value, msg_recv);
-
AXIS2_QNAME_FREE(qmep, env);
}
@@ -226,33 +234,38 @@
qdisporder = axis2_qname_create(env, AXIS2_DISPATCH_ORDER, NULL, NULL);
disp_order_element = AXIS2_OM_ELEMENT_GET_FIRST_CHILD_WITH_QNAME(
conf_element, env, qdisporder, conf_node, &disp_order_node);
- if(NULL != disp_order_node && NULL != disp_order_element)
+ AXIS2_QNAME_FREE(qdisporder, env);
+ if(NULL != disp_order_element)
{
- axis2_conf_builder_process_disp_order(conf_builder, env,
- disp_order_node);
+ axis2_conf_builder_process_disp_order(conf_builder, env, disp_order_node);
/*log.info("found the custom disptaching order and continue with that order");*/
} else
{
- AXIS2_CONF_SET_DEFAULT_DISPATCHERS(builder_impl->conf, env);
+ status = AXIS2_CONF_SET_DEFAULT_DISPATCHERS(builder_impl->conf, env);
+ if(AXIS2_SUCCESS != status)
+ {
+ return AXIS2_FAILURE;
+ }
/*log.info("no custom diaptching order found continue with default dispatcing order");*/
}
-
/* Process Module refs */
qmodulest = axis2_qname_create(env, AXIS2_MODULEST, NULL, NULL);
module_itr = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
qmodulest, conf_node);
+ AXIS2_QNAME_FREE(qmodulest, env);
axis2_conf_builder_process_module_refs(conf_builder, env, module_itr);
-
/* Proccessing Transport Sennders */
qtransportsender = axis2_qname_create(env, AXIS2_TRANSPORTSENDER, NULL, NULL);
trs_senders = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
qtransportsender, conf_node);
+ AXIS2_QNAME_FREE(qtransportsender, env);
axis2_conf_builder_process_transport_senders(conf_builder, env, trs_senders);
/* Proccessing Transport Recivers */
qtransportrecv = axis2_qname_create(env, AXIS2_TRANSPORTRECEIVER, NULL, NULL);
trs_recvs = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
qtransportrecv, conf_node);
+ AXIS2_QNAME_FREE(qtransportrecv, env);
axis2_conf_builder_process_transport_recvs(conf_builder, env, trs_recvs);
/* Process Observers */
@@ -263,6 +276,7 @@
qphaseorder = axis2_qname_create(env, AXIS2_PHASE_ORDER, NULL, NULL);
phase_orders = AXIS2_OM_ELEMENT_GET_CHILDREN_WITH_QNAME(conf_element, env,
qphaseorder, conf_node);
+ AXIS2_QNAME_FREE(qphaseorder, env);
axis2_conf_builder_process_phase_orders(conf_builder, env, phase_orders);
/* processing Axis Storages */
@@ -273,14 +287,6 @@
Iterator moduleConfigs = config_element.getChildrenWithName(new QName(AXIS2_MODULECONFIG));
processModuleConfig(moduleConfigs,axisConfiguration,axisConfiguration);
*/
-
- AXIS2_QNAME_FREE(qparamst, env);
- AXIS2_QNAME_FREE(qmsgrecv, env);
- AXIS2_QNAME_FREE(qdisporder, env);
- AXIS2_QNAME_FREE(qmodulest, env);
- AXIS2_QNAME_FREE(qtransportsender, env);
- AXIS2_QNAME_FREE(qtransportrecv, env);
- AXIS2_QNAME_FREE(qphaseorder, env);
return AXIS2_SUCCESS;
}
@@ -304,26 +310,24 @@
axis2_qname_t *qrefname = NULL;
axis2_char_t *ref_name = NULL;
axis2_om_attribute_t *module_ref_att = NULL;
-
module_ref_node = (axis2_om_node_t *)
AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(module_refs, env);
module_ref_element = AXIS2_OM_NODE_GET_DATA_ELEMENT(module_ref_node, env);
qref = axis2_qname_create(env, AXIS2_REF, NULL, NULL);
module_ref_att = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(module_ref_element, env,
qref);
-
+ if (qref)
+ AXIS2_QNAME_FREE(qref, env);
if (module_ref_att)
{
ref_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(module_ref_att, env);
+ printf("ref_name:%s\n", ref_name);
qrefname = axis2_qname_create(env, ref_name, NULL, NULL);
AXIS2_DEP_ENGINE_ADD_MODULE(conf_builder->desc_builder->engine, env,
qrefname);
+ if (qrefname)
+ AXIS2_QNAME_FREE(qrefname, env);
}
-
- if (qref)
- AXIS2_QNAME_FREE(qref, env);
- if (qrefname)
- AXIS2_QNAME_FREE(qrefname, env);
}
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Sun Jan 15 18:42:16 2006
@@ -264,6 +264,10 @@
axis2_env_t **env,
axis2_file_t *module_archive,
axis2_conf_t *conf);
+
+axis2_char_t *AXIS2_CALL
+axis2_dep_engine_get_repos_path(axis2_dep_engine_t *dep_engine,
+ axis2_env_t **env);
/************************* End of function headers ****************************/
@@ -341,6 +345,7 @@
axis2_dep_engine_set_phases_info;
engine_impl->dep_engine.ops->build_svc = axis2_dep_engine_build_svc;
engine_impl->dep_engine.ops->build_module = axis2_dep_engine_build_module;
+ engine_impl->dep_engine.ops->get_repos_path = axis2_dep_engine_get_repos_path;
return &(engine_impl->dep_engine);
}
@@ -470,6 +475,17 @@
}
if(engine_impl->module_list)
{
+ int size = 0;
+ int i = 0;
+
+ size = AXIS2_ARRAY_LIST_SIZE(engine_impl->module_list, env);
+ for(i = 0; i < size; i++)
+ {
+ axis2_qname_t *qname = NULL;
+ qname = AXIS2_ARRAY_LIST_GET(engine_impl->module_list, env, i);
+ AXIS2_QNAME_FREE(qname, env);
+ qname = NULL;
+ }
AXIS2_ARRAY_LIST_FREE(engine_impl->module_list, env);
engine_impl->module_list = NULL;
}
@@ -505,11 +521,21 @@
axis2_env_t **env,
axis2_qname_t *module_qname)
{
+ axis2_qname_t *qname = NULL;
+ axis2_dep_engine_impl_t *engine_impl = NULL;
+
AXIS2_FUNC_PARAM_CHECK(dep_engine, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, module_qname, AXIS2_FAILURE);
+ engine_impl = AXIS2_INTF_TO_IMPL(dep_engine);
- return AXIS2_ARRAY_LIST_ADD(AXIS2_INTF_TO_IMPL(dep_engine)->module_list,
- env, module_qname);
+ qname = AXIS2_QNAME_CLONE(module_qname, env);
+ if(!engine_impl->module_list)
+ {
+ engine_impl->module_list = axis2_array_list_create(env, 20);
+ if(!engine_impl->module_list)
+ return AXIS2_FAILURE;
+ }
+ return AXIS2_ARRAY_LIST_ADD(engine_impl->module_list, env, qname);
}
struct axis2_module_desc *AXIS2_CALL
@@ -1527,6 +1553,12 @@
return module;
}
+axis2_char_t *AXIS2_CALL
+axis2_dep_engine_get_repos_path(axis2_dep_engine_t *dep_engine,
+ axis2_env_t **env)
+{
+ return AXIS2_INTF_TO_IMPL(dep_engine)->folder_name;
+}
/* public AxisService deployService(ClassLoader classLoder, InputStream serviceStream, String servieName) throws DeploymentException {
AxisService service = null;
try {
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=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Sun Jan 15 18:42:16 2006
@@ -630,7 +630,6 @@
AXIS2_QNAME_FREE(att_qname, env);
if(!para_name)
{
- printf("para_name is null\n");
AXIS2_PARAM_FREE(param, env);
return AXIS2_FAILURE;
}
@@ -676,12 +675,10 @@
{
parent_para = AXIS2_PARAM_CONTAINER_GET_PARAM(parent, env,
AXIS2_PARAM_GET_NAME(param, env));
-
}
if(NULL != para_locked)
{
axis2_char_t *locked_value = NULL;
-
locked_value = AXIS2_OM_ATTRIBUTE_GET_VALUE(para_locked, env);
if(0 == AXIS2_STRCMP("true", locked_value))
{
@@ -707,11 +704,14 @@
AXIS2_PARAM_SET_LOCKED(param, env, AXIS2_FALSE);
}
}
+
if(NULL != parent)
{
- if(NULL != parent_para || AXIS2_FALSE ==
- AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(parent, env,
- AXIS2_PARAM_GET_NAME(param, env)))
+ axis2_char_t *name = NULL;
+ axis2_bool_t bvalue = AXIS2_FALSE;
+ name = AXIS2_PARAM_GET_NAME(param, env);
+ bvalue = AXIS2_PARAM_CONTAINER_IS_PARAM_LOCKED(parent, env, name);
+ if(NULL != parent_para || AXIS2_FALSE == bvalue)
{
status = AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env,
param);
@@ -720,7 +720,7 @@
else
{
status = AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container, env,
- param);
+ param);
}
}
return AXIS2_SUCCESS;
@@ -790,26 +790,41 @@
axis2_env_t **env,
struct axis2_om_element *recv_element)
{
- struct axis2_om_attribute *recv_name = NULL;
+ axis2_om_attribute_t *recv_name = NULL;
axis2_char_t *class_name = NULL;
axis2_msg_recv_t *msg_recv = NULL;
axis2_qname_t *class_qname = NULL;
axis2_param_t *impl_info_param = NULL;
struct axis2_dll_desc *dll_desc = NULL;
-
+ axis2_char_t *repos_name = NULL;
+ axis2_char_t *dll_name = NULL;
+ axis2_char_t *temp_path = NULL;
+ axis2_char_t *temp_path2 = NULL;
+ axis2_char_t *temp_path3 = NULL;
+
+ AXIS2_FUNC_PARAM_CHECK(desc_builder, env, NULL);
+ AXIS2_PARAM_CHECK((*env)->error, recv_element, NULL);
class_qname = axis2_qname_create(env, AXIS2_CLASSNAME, NULL, NULL);
recv_name = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(recv_element, env, class_qname);
class_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(recv_name, env);
dll_desc = axis2_dll_desc_create(env);
- AXIS2_DLL_DESC_SET_NAME(dll_desc, env, class_name);
+ repos_name = AXIS2_DEP_ENGINE_GET_REPOS_PATH(desc_builder->engine, env);
+ printf("repos_name:%s\n", repos_name);
+ temp_path = AXIS2_STRACAT(repos_name, AXIS2_PATH_SEP_STR, env);
+ temp_path2 = AXIS2_STRACAT(temp_path, AXIS2_LIB_FOLDER, env);
+ temp_path3 = AXIS2_STRACAT(temp_path2, AXIS2_PATH_SEP_STR, env);
+ dll_name = AXIS2_STRACAT(temp_path3, class_name, env);
+ 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);
+ AXIS2_FREE((*env)->allocator, dll_name);
AXIS2_DLL_DESC_SET_TYPE(dll_desc, env, AXIS2_MSG_RECV_DLL);
axis2_class_loader_init(env);
impl_info_param = axis2_param_create(env, NULL, NULL);
-
- AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
+ AXIS2_PARAM_SET_VALUE(impl_info_param, env, dll_desc);
msg_recv = (axis2_msg_recv_t *) axis2_class_loader_create_dll(env,
impl_info_param);
-
return msg_recv;
}
Modified: webservices/axis2/trunk/c/modules/core/description/dll_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/dll_desc.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/dll_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/dll_desc.c Sun Jan 15 18:42:16 2006
@@ -206,7 +206,11 @@
AXIS2_FREE((*env)->allocator, dll_desc_impl->dll_name);
dll_desc_impl->dll_name = NULL;
}
- dll_desc_impl->dll_name = name;
+ dll_desc_impl->dll_name = AXIS2_STRDUP(name, env);
+ if(!dll_desc_impl->dll_name)
+ {
+ return AXIS2_FAILURE;
+ }
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/modules/core/description/param.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/param.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/param.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/param.c Sun Jan 15 18:42:16 2006
@@ -180,8 +180,9 @@
axis2_param_is_locked(axis2_param_t *param,
axis2_env_t **env)
{
+ printf("came22\n");
AXIS2_FUNC_PARAM_CHECK(param, env, AXIS2_FAILURE);
-
+ printf("came23\n");
return AXIS2_INTF_TO_IMPL(param)->locked;
}
Modified: webservices/axis2/trunk/c/modules/core/description/param_container.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/param_container.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/param_container.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/param_container.c Sun Jan 15 18:42:16 2006
@@ -150,6 +150,7 @@
axis2_param_t *param)
{
axis2_param_container_impl_t *param_container_impl = NULL;
+ axis2_char_t *param_name = NULL;
AXIS2_FUNC_PARAM_CHECK(param_container, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, param, AXIS2_FAILURE);
@@ -160,11 +161,13 @@
{
param_container_impl->params = axis2_hash_make (env);
if(!param_container_impl->params)
+ {
return AXIS2_FAILURE;
- }
+ }
+ }
+ param_name = AXIS2_PARAM_GET_NAME(param, env);
axis2_hash_set (AXIS2_INTF_TO_IMPL(param_container)->params
- , AXIS2_PARAM_GET_NAME(param, env)
- , AXIS2_HASH_KEY_STRING, param);
+ , param_name, AXIS2_HASH_KEY_STRING, param);
return AXIS2_SUCCESS;
@@ -188,7 +191,9 @@
axis2_param_container_impl_t *param_container_impl = NULL;
axis2_hash_index_t *index_i = 0;
axis2_status_t status = AXIS2_FAILURE;
- /* create an array list with the initial default capacity */
+ /* create an array list with the initial default capacity
+ * Caller of this method should free this array list
+ */
axis2_array_list_t *array_list_l = axis2_array_list_create(env, 20);
void *value = NULL;
@@ -216,11 +221,16 @@
axis2_env_t **env,
const axis2_char_t *param_name)
{
+ axis2_param_t *param = NULL;
+
AXIS2_FUNC_PARAM_CHECK(param_container, env, AXIS2_FAILURE);
-
- axis2_param_t *param = (axis2_param_t *)
- (axis2_hash_get (AXIS2_INTF_TO_IMPL(param_container)->params
- , param_name, AXIS2_HASH_KEY_STRING));
-
+
+ param = (axis2_param_t *)(axis2_hash_get (AXIS2_INTF_TO_IMPL(
+ param_container)->params, param_name, AXIS2_HASH_KEY_STRING));
+ if(!param)
+ {
+ /* In this case we consider param is not locked */
+ return AXIS2_FALSE;
+ }
return AXIS2_PARAM_IS_LOCKED(param, env);
}
Modified: webservices/axis2/trunk/c/modules/util/class_loader.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/class_loader.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/class_loader.c (original)
+++ webservices/axis2/trunk/c/modules/util/class_loader.c Sun Jan 15 18:42:16 2006
@@ -70,7 +70,6 @@
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);
@@ -85,7 +84,7 @@
delete_funct = (DELETE_FUNCT) AXIS2_PLATFORM_GETPROCADDR(dl_handler,
AXIS2_DELETE_FUNCTION);
- status = AXIS2_DLL_DESC_SET_CREATE_FUNCT(dll_desc, env, create_funct);
+ status = AXIS2_DLL_DESC_SET_DELETE_FUNCT(dll_desc, env, delete_funct);
if(AXIS2_FAILURE == status)
{
axis2_class_loader_unload_lib(env, dll_desc);
@@ -106,7 +105,7 @@
dll_type = AXIS2_DLL_DESC_GET_TYPE(dll_desc, env);
if(AXIS2_SVC_DLL == dll_type)
{
- create_funct(&svc_skeli);
+ create_funct(&svc_skeli, env);
if(NULL == svc_skeli)
{
AXIS2_ERROR_SET((*env)->error,
@@ -117,7 +116,7 @@
}
if(AXIS2_HANDLER_DLL == dll_type)
{
- create_funct(&handler);
+ create_funct(&handler, env);
if(NULL == handler)
{
AXIS2_ERROR_SET((*env)->error,
@@ -128,7 +127,7 @@
}
if(AXIS2_MODULE_DLL == dll_type)
{
- create_funct(&module);
+ create_funct(&module, env);
if(NULL == module)
{
AXIS2_ERROR_SET((*env)->error,
@@ -139,9 +138,11 @@
}
if(AXIS2_MSG_RECV_DLL == dll_type)
{
- create_funct(&msg_recv);
+ create_funct(&msg_recv, env);
+ printf("message receiver loaded successfully\n");
if(NULL == msg_recv)
{
+ printf("msg_recv is null\n");
AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_MSG_RECV_CREATION_FAILED,AXIS2_FAILURE);
return NULL;
@@ -161,6 +162,7 @@
axis2_status_t status = AXIS2_FAILURE;
dll_name = AXIS2_DLL_DESC_GET_NAME(dll_desc, env);
+ printf("dll_name:%s\n", dll_name);
dl_handler = AXIS2_PLATFORM_LOADLIB(dll_name);
if(NULL == dl_handler)
{
Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_op.c Sun Jan 15 18:42:16 2006
@@ -188,7 +188,7 @@
wsdl_op_impl->output_msg = NULL;
wsdl_op_impl->safety = AXIS2_FALSE;
- wsdl_op_impl->style = AXIS2_STRDUP(STYLE_DOC, env);
+ wsdl_op_impl->style = AXIS2_STRDUP(AXIS2_STYLE_DOC, env);
wsdl_op_impl->in_faults = axis2_linked_list_create(env);
if(NULL == wsdl_op_impl->in_faults)
Modified: webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_children_qname_iterator.c Sun Jan 15 18:42:16 2006
@@ -109,7 +109,7 @@
}
iterator_impl->current_child = current_child;
- iterator_impl->given_qname = given_qname;
+ iterator_impl->given_qname = AXIS2_QNAME_CLONE(given_qname, env);
iterator_impl->iterator.ops->free_fn =
axis2_om_children_qname_iterator_free;
@@ -133,6 +133,12 @@
if(iterator->ops)
AXIS2_FREE((*env)->allocator, iterator->ops);
+
+ if(iterator_impl->given_qname)
+ {
+ AXIS2_QNAME_FREE(iterator_impl->given_qname, env);
+ iterator_impl->given_qname = NULL;
+ }
AXIS2_FREE((*env)->allocator, iterator_impl);
return AXIS2_SUCCESS;
}
@@ -264,4 +270,3 @@
return lparts_match && uris_match;
}
-
Modified: webservices/axis2/trunk/c/modules/xml/om/om_element.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_element.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_element.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_element.c Sun Jan 15 18:42:16 2006
@@ -611,9 +611,12 @@
qname = AXIS2_OM_ATTRIBUTE_GET_QNAME(attribute, env);
if (qname)
+ {
+ axis2_char_t *name = AXIS2_QNAME_TO_STRING(qname, env);
axis2_hash_set (om_element_impl->attributes,
- qname, sizeof (axis2_qname_t),
+ name, AXIS2_HASH_KEY_STRING,
attribute);
+ }
return ((qname) ? AXIS2_SUCCESS : AXIS2_FAILURE);
}
@@ -623,6 +626,9 @@
axis2_env_t **env,
axis2_qname_t *qname)
{
+ axis2_char_t *name = NULL;
+ axis2_om_attribute_t *attr = NULL;
+
AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
if (!qname)
@@ -632,10 +638,11 @@
AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
return NULL;
}
-
- return (axis2_om_attribute_t*)
- (axis2_hash_get(AXIS2_INTF_TO_IMPL(om_element)->attributes, qname,
- sizeof (axis2_qname_t)));
+ name = AXIS2_QNAME_TO_STRING(qname, env);
+ attr = (axis2_om_attribute_t*) (axis2_hash_get(AXIS2_INTF_TO_IMPL(
+ om_element)->attributes, name, AXIS2_HASH_KEY_STRING));
+ AXIS2_FREE((*env)->allocator, name);
+ return attr;
}
axis2_status_t AXIS2_CALL
@@ -950,6 +957,7 @@
AXIS2_FUNC_PARAM_CHECK(om_element, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_node, NULL);
AXIS2_PARAM_CHECK((*env)->error, element_qname, NULL);
+
return axis2_om_children_qname_iterator_create(env,
AXIS2_OM_NODE_GET_FIRST_CHILD(element_node, env),
element_qname);
@@ -972,7 +980,6 @@
children_iterator = axis2_om_children_qname_iterator_create(env,
AXIS2_OM_NODE_GET_FIRST_CHILD(element_node, env),
element_qname);
-
if(AXIS2_OM_CHILDREN_QNAME_ITERATOR_HAS_NEXT(children_iterator, env))
{
om_node = AXIS2_OM_CHILDREN_QNAME_ITERATOR_NEXT(children_iterator, env);
@@ -1159,5 +1166,3 @@
}
else return NULL;
}
-
-
Modified: webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/clientapi/Makefile.am?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Sun Jan 15 18:42:16 2006
@@ -5,10 +5,11 @@
test_clientapi_SOURCES = test_clientapi.c
-test_clientapi_LDADD = -L$(top_builddir)/install/lib \
+test_clientapi_LDADD = -L$(AXIS2C_HOME)/lib \
-laxis2_description \
-laxis2_context \
-laxis2_util \
+ -laxis2_core_util \
-laxis2_deployment \
-laxis2_om \
-laxis2_engine \
Modified: webservices/axis2/trunk/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/Makefile.am?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Sun Jan 15 18:42:16 2006
@@ -4,7 +4,7 @@
AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
test_deployment_SOURCES = test_deployment.c
-test_deployment_LDADD = -L$(top_builddir)/install/lib \
+test_deployment_LDADD = -L$(AXIS2C_INSTALL)/lib \
-laxis2_util \
-laxis2_context \
-laxis2_description \
Modified: webservices/axis2/trunk/c/test/core/deployment/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/axis2.xml?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/axis2.xml (original)
+++ webservices/axis2/trunk/c/test/core/deployment/axis2.xml Sun Jan 15 18:42:16 2006
@@ -41,7 +41,7 @@
<!-- Message Receivers -->
<!-- ================================================= -->
<!-- This is the Deafult Message Receiver for the Request Response style Operations -->
- <!--messageReceiver mep="INOUT" class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/-->
+ <messageReceiver mep="INOUT" class="axis2_raw_xml_in_out_msg_recv">
<!-- ================================================= -->
<!-- Transport Ins -->
Modified: webservices/axis2/trunk/c/test/core/deployment/test_deployment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/deployment/test_deployment.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Sun Jan 15 18:42:16 2006
@@ -19,7 +19,7 @@
axis2_env_t *env = axis2_env_create (allocator);
dep_engine = axis2_dep_engine_create_with_repos_name(&env,
- ".");
+ "/home/damitha/programs/axis2c");
if(!dep_engine)
{
printf("dep engine is not created \n");
@@ -43,8 +43,49 @@
return 0;
}
+int axis2_test_engine_conf_builder_populate_conf()
+{
+ axis2_status_t status = AXIS2_FAILURE;
+ axis2_conf_t *conf = NULL;
+ axis2_conf_builder_t *builder = NULL;
+ axis2_char_t *conf_name = NULL;
+ axis2_dep_engine_t *dep_engine = NULL;
+ axis2_char_t *axis2c_home = NULL;
+
+ printf("testing conf_builder_populate_conf method \n");
+
+ axis2_allocator_t *allocator = axis2_allocator_init (NULL);
+ axis2_env_t *env = axis2_env_create (allocator);
+ conf = axis2_conf_create(&env);
+ axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
+
+ dep_engine = axis2_dep_engine_create_with_repos_name(&env,
+ axis2c_home);
+
+ conf_name = AXIS2_STRACAT (axis2c_home, "/axis2.xml", &env);
+ builder = axis2_conf_builder_create_with_file_and_dep_engine_and_conf(&env,
+ conf_name, dep_engine, conf);
+ if(!builder)
+ {
+ printf("conf builder is not created \n");
+ return -1;
+ }
+ status = AXIS2_CONF_BUILDER_POPULATE_CONF(builder, &env);
+ if(AXIS2_SUCCESS != status)
+ {
+ printf("Populate conf is not successfule. Test failed \n");
+ }
+ else
+ {
+ printf("conf is populated. Test is a success \n");
+ }
+ AXIS2_FREE(env->allocator, conf_name);
+ return 0;
+}
+
int main()
{
- axis2_test_dep_engine_load();
- return 0;
+ /*axis2_test_dep_engine_load(); */
+ axis2_test_engine_conf_builder_populate_conf();
+ return 0;
}
Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/core/engine/test_engine.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Sun Jan 15 18:42:16 2006
@@ -93,47 +93,10 @@
return 0;
}
-int axis2_test_engine_conf_builder_populate_conf()
-{
- axis2_status_t status = AXIS2_FAILURE;
- axis2_conf_t *conf = NULL;
- axis2_conf_builder_t *builder = NULL;
- axis2_char_t *conf_name = NULL;
- axis2_dep_engine_t *dep_engine = NULL;
-
- printf("testing conf_builder_populate_conf method \n");
-
- axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
- conf = axis2_conf_create(&env);
- dep_engine = axis2_dep_engine_create_with_repos_name(&env,
- "/home/damitha/programs/axis2c");
-
- conf_name = AXIS2_STRDUP("/home/damitha/programs/axis2c/axis2.xml", &env);
-
- builder = axis2_conf_builder_create_with_file_and_dep_engine_and_conf(&env,
- conf_name, dep_engine, conf);
- if(!builder)
- {
- printf("conf builder is not created \n");
- return -1;
- }
- status = AXIS2_CONF_BUILDER_POPULATE_CONF(builder, &env);
- if(AXIS2_SUCCESS != status)
- {
- printf("Populate conf is not successfule. Test failed \n");
- }
- else
- {
- printf("conf is populated. Test is a success \n");
- }
- return 0;
-}
int main()
{
axis2_test_engine_send();
axis2_test_engine_receive();
- axis2_test_engine_conf_builder_populate_conf();
return 0;
}
Modified: webservices/axis2/trunk/c/test/server/calculator/calc_skeleton.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/server/calculator/calc_skeleton.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/server/calculator/calc_skeleton.c (original)
+++ webservices/axis2/trunk/c/test/server/calculator/calc_skeleton.c Sun Jan 15 18:42:16 2006
@@ -44,6 +44,11 @@
return AXIS2_SUCCESS;
}
+axis2_array_list_t *
+axis2_svc_skeleton_get_function_array()
+{
+}
+
int
calc_free(axis2_svc_skeleton_t *svc_skeleton)
{
@@ -82,36 +87,36 @@
return node;
}
-axis2_om_node_t *calc_on_fault(axis2_svc_skeleton_t *svc_skeleton,
- axis2_env_t **env,
- axis2_om_node_t *node)
-{
-}
-
/**
* Following block distinguish the exposed part of the dll.
*/
extern "C" {
-int axis2_get_instance(struct axis2_svc_skeleton **inst)
+int axis2_get_instance(struct axis2_svc_skeleton **inst,
+ axis2_env_t **env)
{
axis2_status_t status = AXIS2_FAILURE;
- *inst = axis2_svc_skeleton_create();
+ /**inst = axis2_svc_skeleton_create(env);
if(NULL != *inst)
{
status = *inst->init();
+ }*/
+ if(!(*inst))
+ {
+ return AXIS2_FAILURE;
}
- return status;
+ return AXIS2_SUCCESS;
}
-int axis2_remove_instance(axis2_svc_skeleton *inst)
+int axis2_remove_instance(axis2_svc_skeleton_t *inst,
+ axis2_env_t **env)
{
axis2_status_t status = AXIS2_FAILURE;
if (inst)
{
- status = AXIS2_SVC_SKELETON_FREE(inst);
+ status = AXIS2_SVC_SKELETON_FREE(inst, env);
}
return status;
}
Modified: webservices/axis2/trunk/c/test/xml/om/test_om.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/xml/om/test_om.c?rev=369317&r1=369316&r2=369317&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/xml/om/test_om.c (original)
+++ webservices/axis2/trunk/c/test/xml/om/test_om.c Sun Jan 15 18:42:16 2006
@@ -124,7 +124,27 @@
case AXIS2_OM_ELEMENT:
ele2 =(axis2_om_element_t*) AXIS2_OM_NODE_GET_DATA_ELEMENT(node2, &environment);
if(ele2 && AXIS2_OM_ELEMENT_GET_LOCALNAME(ele2,&environment))
+ {
+ if(0 == AXIS2_STRCMP("messageReceiver", AXIS2_OM_ELEMENT_GET_LOCALNAME(ele2, &environment)))
+ {
+ axis2_char_t *class_name = NULL;
+ axis2_qname_t *class_qname = NULL;
+ axis2_om_attribute_t *recv_name = NULL;
+
+ printf("messageReceiver***********************\n");
+ class_qname = axis2_qname_create(&environment, "class", NULL, NULL);
+ printf("came1\n");
+ recv_name = AXIS2_OM_ELEMENT_GET_ATTRIBUTE(ele2, &environment, class_qname);
+ if(!recv_name)
+ {
+ printf("attribute is null\n");
+ }
+ class_name = AXIS2_OM_ATTRIBUTE_GET_VALUE(recv_name, &environment);
+ printf("class name:%s\n", class_name);
+ return 0;
+ }
printf("\n localname %s\n" , AXIS2_OM_ELEMENT_GET_LOCALNAME(ele2,&environment));
+ }
break;
case AXIS2_OM_TEXT: