You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/05/31 17:54:39 UTC
svn commit: r410566 [33/49] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
axiom/test/unit/om/ include/ modules/...
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_rest.c Wed May 31 08:54:07 2006
@@ -21,7 +21,7 @@
int main(int argc, char** argv)
{
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
axis2_options_t *options = NULL;
@@ -46,13 +46,13 @@
printf ("Using endpoint : %s\n", address);
/* Create EPR with given address */
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
/* Setup options */
- options = axis2_options_create(&env);
- AXIS2_OPTIONS_SET_TO(options, &env, endpoint_ref);
+ options = axis2_options_create(env);
+ AXIS2_OPTIONS_SET_TO(options, env, endpoint_ref);
/* Enable REST at the client side */
- AXIS2_OPTIONS_SET_PROPERTY(options, &env, AXIS2_ENABLE_REST,
+ AXIS2_OPTIONS_SET_PROPERTY(options, env, AXIS2_ENABLE_REST,
AXIS2_VALUE_TRUE);
/* Set up deploy folder. It is from the deploy folder, the configuration is picked up
* using the axis2.xml file.
@@ -66,7 +66,7 @@
client_home = "../../deploy";
/* Create service client */
- svc_client = axis2_svc_client_create(&env, client_home);
+ svc_client = axis2_svc_client_create(env, client_home);
if (!svc_client)
{
printf("Error creating service client\n");
@@ -76,18 +76,18 @@
}
/* Set service client options */
- AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, &env, options);
+ AXIS2_SVC_CLIENT_SET_OPTIONS(svc_client, env, options);
/* Build the SOAP request message payload using OM API.*/
- payload = build_om_payload_for_echo_svc(&env);
+ payload = build_om_payload_for_echo_svc(env);
/* Send request */
- ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, &env, payload);
+ ret_node = AXIS2_SVC_CLIENT_SEND_RECEIVE(svc_client, env, payload);
if(ret_node)
{
axis2_char_t *om_str = NULL;
- om_str = AXIS2_OM_NODE_TO_STRING(ret_node, &env);
+ om_str = AXIS2_OM_NODE_TO_STRING(ret_node, env);
if (om_str)
printf("\nReceived OM : %s\n", om_str);
printf("\necho client invoke SUCCESSFUL!\n");
@@ -102,12 +102,12 @@
if (svc_client)
{
- AXIS2_SVC_CLIENT_FREE(svc_client, &env);
+ AXIS2_SVC_CLIENT_FREE(svc_client, env);
svc_client = NULL;
}
if (endpoint_ref)
{
- AXIS2_ENDPOINT_REF_FREE(endpoint_ref, &env);
+ AXIS2_ENDPOINT_REF_FREE(endpoint_ref, env);
endpoint_ref = NULL;
}
return 0;
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.c Wed May 31 08:54:07 2006
@@ -18,7 +18,7 @@
/* build SOAP request message content using OM */
axis2_om_node_t *
-build_om_payload_for_echo_svc(axis2_env_t **env)
+build_om_payload_for_echo_svc(const axis2_env_t *env)
{
axis2_om_node_t *echo_om_node = NULL;
axis2_om_element_t* echo_om_ele = NULL;
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/echo_util.h Wed May 31 08:54:07 2006
@@ -21,6 +21,6 @@
#include <axis2_om.h>
axis2_om_node_t *
-build_om_payload_for_echo_svc(axis2_env_t **env);
+build_om_payload_for_echo_svc(const axis2_env_t *env);
#endif
Modified: webservices/axis2/trunk/c/test/core/addr/test_addr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/addr/test_addr.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/test_addr.c (original)
+++ webservices/axis2/trunk/c/test/core/addr/test_addr.c Wed May 31 08:54:07 2006
@@ -14,15 +14,15 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_msg_info_headers_t *axis2_msg_info_headers = NULL;
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
axis2_char_t *action = "test action";
axis2_char_t *get_action = NULL;
- to = axis2_endpoint_ref_create(&env, "to");
- from = axis2_endpoint_ref_create(&env, "from");
- reply_to = axis2_endpoint_ref_create(&env, "reply to");
- fault_to = axis2_endpoint_ref_create(&env, "fault to");
+ to = axis2_endpoint_ref_create(env, "to");
+ from = axis2_endpoint_ref_create(env, "from");
+ reply_to = axis2_endpoint_ref_create(env, "reply to");
+ fault_to = axis2_endpoint_ref_create(env, "fault to");
- axis2_msg_info_headers = axis2_msg_info_headers_create(&env, NULL, action);
+ axis2_msg_info_headers = axis2_msg_info_headers_create(env, NULL, action);
if (axis2_msg_info_headers)
printf("SUCCESS axis2_msg_info_headers_create\n");
else
@@ -31,7 +31,7 @@
return -1;
}
- status = AXIS2_MSG_INFO_HEADERS_SET_TO(axis2_msg_info_headers, &env, to);
+ status = AXIS2_MSG_INFO_HEADERS_SET_TO(axis2_msg_info_headers, env, to);
if(status == AXIS2_SUCCESS)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_SET_TO\n");
@@ -41,7 +41,7 @@
return -1;
}
- axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_TO(axis2_msg_info_headers, &env);
+ axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_TO(axis2_msg_info_headers, env);
if (axis2_endpoint_ref)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_GET_TO\n");
@@ -52,7 +52,7 @@
}
status = AXIS2_FAILURE;
- status = AXIS2_MSG_INFO_HEADERS_SET_FROM(axis2_msg_info_headers, &env, from);
+ status = AXIS2_MSG_INFO_HEADERS_SET_FROM(axis2_msg_info_headers, env, from);
if(status)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_SET_FROM\n");
@@ -63,7 +63,7 @@
}
axis2_endpoint_ref = NULL;
- axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_FROM(axis2_msg_info_headers, &env);
+ axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_FROM(axis2_msg_info_headers, env);
if(axis2_endpoint_ref)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_GET_FROM\n");
@@ -76,7 +76,7 @@
axis2_endpoint_ref = NULL;
- axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO(axis2_msg_info_headers, &env);
+ axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO(axis2_msg_info_headers, env);
if(status)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_GET_REPLY_TO\n");
@@ -87,7 +87,7 @@
}
status = AXIS2_FAILURE;
- status = AXIS2_MSG_INFO_HEADERS_SET_REPLY_TO(axis2_msg_info_headers, &env, reply_to);
+ status = AXIS2_MSG_INFO_HEADERS_SET_REPLY_TO(axis2_msg_info_headers, env, reply_to);
if(status)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_SET_REPLY_TO\n");
@@ -98,7 +98,7 @@
}
status = AXIS2_FAILURE;
- status = AXIS2_MSG_INFO_HEADERS_SET_FAULT_TO(axis2_msg_info_headers, &env, fault_to);
+ status = AXIS2_MSG_INFO_HEADERS_SET_FAULT_TO(axis2_msg_info_headers, env, fault_to);
if(status)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_SET_FAULT_TO\n");
else
@@ -108,7 +108,7 @@
}
axis2_endpoint_ref = NULL;
- axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO(axis2_msg_info_headers, &env);
+ axis2_endpoint_ref = AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO(axis2_msg_info_headers, env);
if(axis2_endpoint_ref)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_GET_FAULT_TO\n");
else
@@ -118,7 +118,7 @@
}
- get_action = AXIS2_MSG_INFO_HEADERS_GET_ACTION(axis2_msg_info_headers, &env);
+ get_action = AXIS2_MSG_INFO_HEADERS_GET_ACTION(axis2_msg_info_headers, env);
if(get_action)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_GET_ACTION\n");
else
@@ -128,7 +128,7 @@
}
status = AXIS2_FAILURE;
- status = AXIS2_MSG_INFO_HEADERS_SET_ACTION(axis2_msg_info_headers, &env, action);
+ status = AXIS2_MSG_INFO_HEADERS_SET_ACTION(axis2_msg_info_headers, env, action);
if(status)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_SET_ACTION\n");
else
@@ -138,7 +138,7 @@
status = AXIS2_FAILURE;
- status = AXIS2_MSG_INFO_HEADERS_FREE(axis2_msg_info_headers, &env);
+ status = AXIS2_MSG_INFO_HEADERS_FREE(axis2_msg_info_headers, env);
if (status)
printf("SUCCESS AXIS2_MSG_INFO_HEADERS_FREE\n");
else
Modified: webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/test_clientapi.c Wed May 31 08:54:07 2006
@@ -29,40 +29,40 @@
axis2_char_t *axis2c_home;
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- conf = axis2_conf_create(&env);
- conf_ctx = axis2_conf_ctx_create(&env, conf);
+ conf = axis2_conf_create(env);
+ conf_ctx = axis2_conf_ctx_create(env, conf);
- op = axis2_op_create(&env);
+ op = axis2_op_create(env);
- qname = axis2_qname_create(&env, "name1", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, qname);
+ qname = axis2_qname_create(env, "name1", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, qname);
- svc_grp = axis2_svc_grp_create(&env);
- svc_grp_ctx = axis2_svc_grp_ctx_create(&env, svc_grp, conf_ctx);
+ svc_grp = axis2_svc_grp_create(env);
+ svc_grp_ctx = axis2_svc_grp_ctx_create(env, svc_grp, conf_ctx);
- svc_ctx = axis2_svc_ctx_create(&env, svc, svc_grp_ctx);
+ svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
- call = axis2_call_create(&env, svc_ctx, axis2c_home);
+ call = axis2_call_create(env, svc_ctx, axis2c_home);
- msg_ctx = axis2_msg_ctx_create(&env, conf_ctx, NULL, NULL);
+ msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
- msg_ctx_res = AXIS2_CALL_INVOKE_BLOCKING(call, &env, op, msg_ctx);
+ msg_ctx_res = AXIS2_CALL_INVOKE_BLOCKING(call, env, op, msg_ctx);
if (msg_ctx_res)
printf("axis2_test_call_invoke_blocking SUCCESS\n");
else
printf("axis2_test_call_invoke_blocking FAILURE\n");
- AXIS2_CALL_FREE(call, &env);
- AXIS2_MSG_CTX_FREE(msg_ctx, &env);
- AXIS2_QNAME_FREE(qname, &env);
- AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, &env);
- AXIS2_SVC_CTX_FREE(svc_ctx, &env);
- AXIS2_SVC_FREE(svc, &env);
- AXIS2_OP_FREE(op, &env);
+ AXIS2_CALL_FREE(call, env);
+ AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ AXIS2_QNAME_FREE(qname, env);
+ AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
+ AXIS2_SVC_CTX_FREE(svc_ctx, env);
+ AXIS2_SVC_FREE(svc, env);
+ AXIS2_OP_FREE(op, env);
}
Modified: webservices/axis2/trunk/c/test/core/context/test_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/test_context.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/test_context.c (original)
+++ webservices/axis2/trunk/c/test/core/context/test_context.c Wed May 31 08:54:07 2006
@@ -28,34 +28,34 @@
axis2_status_t status = AXIS2_FAILURE;
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- conf = axis2_conf_create(&env);
+ conf = axis2_conf_create(env);
- op = axis2_op_create(&env);
+ op = axis2_op_create(env);
- conf_ctx = axis2_conf_ctx_create(&env, conf);
+ conf_ctx = axis2_conf_ctx_create(env, conf);
- svc_grp1 = axis2_svc_grp_create(&env);
- svc_grp2 = axis2_svc_grp_create(&env);
+ svc_grp1 = axis2_svc_grp_create(env);
+ svc_grp2 = axis2_svc_grp_create(env);
- svc_grp_ctx1 = axis2_svc_grp_ctx_create(&env, svc_grp1, conf_ctx);
- svc_grp_ctx2 = axis2_svc_grp_ctx_create(&env, svc_grp2, conf_ctx);
+ svc_grp_ctx1 = axis2_svc_grp_ctx_create(env, svc_grp1, conf_ctx);
+ svc_grp_ctx2 = axis2_svc_grp_ctx_create(env, svc_grp2, conf_ctx);
- qname1 = axis2_qname_create(&env, "name1", NULL, NULL);
- qname2 = axis2_qname_create(&env, "name2", NULL, NULL);
+ qname1 = axis2_qname_create(env, "name1", NULL, NULL);
+ qname2 = axis2_qname_create(env, "name2", NULL, NULL);
- svc1 = axis2_svc_create_with_qname(&env, qname1);
- svc2 = axis2_svc_create_with_qname(&env, qname2);
+ svc1 = axis2_svc_create_with_qname(env, qname1);
+ svc2 = axis2_svc_create_with_qname(env, qname2);
- svc_ctx1 = axis2_svc_ctx_create(&env, svc1, svc_grp_ctx1);
- svc_ctx2 = axis2_svc_ctx_create(&env, svc2, svc_grp_ctx2);
+ svc_ctx1 = axis2_svc_ctx_create(env, svc1, svc_grp_ctx1);
+ svc_ctx2 = axis2_svc_ctx_create(env, svc2, svc_grp_ctx2);
- op = axis2_op_create(&env);
- op_ctx1 = axis2_op_ctx_create(&env, op, svc_ctx1);
- op_ctx2 = axis2_op_ctx_create(&env, op, svc_ctx2);
+ op = axis2_op_create(env);
+ op_ctx1 = axis2_op_ctx_create(env, op, svc_ctx1);
+ op_ctx2 = axis2_op_ctx_create(env, op, svc_ctx2);
- op_ctx_map = AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, &env);
+ op_ctx_map = AXIS2_CONF_CTX_GET_OP_CTX_MAP(conf_ctx, env);
if (op_ctx_map)
{
@@ -63,7 +63,7 @@
axis2_hash_set(op_ctx_map, "op_ctx2", AXIS2_HASH_KEY_STRING, op_ctx2);
}
- svc_ctx_map = AXIS2_CONF_CTX_GET_SVC_CTX_MAP(conf_ctx, &env);
+ svc_ctx_map = AXIS2_CONF_CTX_GET_SVC_CTX_MAP(conf_ctx, env);
if (svc_ctx_map)
{
@@ -71,7 +71,7 @@
axis2_hash_set(svc_ctx_map, "svc_ctx2", AXIS2_HASH_KEY_STRING, svc_ctx2);
}
- svc_grp_ctx_map = AXIS2_CONF_CTX_GET_SVC_GRP_CTX_MAP(conf_ctx, &env);
+ svc_grp_ctx_map = AXIS2_CONF_CTX_GET_SVC_GRP_CTX_MAP(conf_ctx, env);
if (svc_grp_ctx_map)
{
@@ -79,7 +79,7 @@
axis2_hash_set(svc_ctx_map, "svc_grp_ctx2", AXIS2_HASH_KEY_STRING, svc_grp_ctx2);
}
- status = AXIS2_CONF_CTX_INIT(conf_ctx, &env, conf);
+ status = AXIS2_CONF_CTX_INIT(conf_ctx, env, conf);
if (status != AXIS2_SUCCESS)
{
@@ -88,7 +88,7 @@
else
printf("SUCCESS\n");
- AXIS2_CONF_CTX_FREE(conf_ctx, &env);
+ AXIS2_CONF_CTX_FREE(conf_ctx, env);
}
int main()
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?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/test_deployment.c (original)
+++ webservices/axis2/trunk/c/test/core/deployment/test_deployment.c Wed May 31 08:54:07 2006
@@ -14,7 +14,7 @@
#include <axis2_transport_receiver.h>
#include <axis2_core_utils.h>
-axis2_env_t *env = NULL;
+const axis2_env_t *env = NULL;
int axis2_test_dep_engine_load()
{
@@ -30,22 +30,22 @@
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dep_engine = axis2_dep_engine_create_with_repos_name(&env,
+ dep_engine = axis2_dep_engine_create_with_repos_name(env,
axis2c_home);
if(!dep_engine)
{
printf("dep engine is not created \n");
return -1;
}
- conf = AXIS2_DEP_ENGINE_LOAD(dep_engine, &env);
- AXIS2_CONF_SET_DEP_ENGINE(conf, &env, dep_engine);
+ conf = AXIS2_DEP_ENGINE_LOAD(dep_engine, env);
+ AXIS2_CONF_SET_DEP_ENGINE(conf, env, dep_engine);
if (!conf)
{
printf("conf is NULL\n)");
return -1;
}
- svc_map = AXIS2_CONF_GET_SVCS(conf, &env);
+ svc_map = AXIS2_CONF_GET_SVCS(conf, env);
if (svc_map)
printf("svc_map count = %d\n", axis2_hash_count(svc_map));
else
@@ -55,8 +55,8 @@
{
axis2_hash_index_t *hi = NULL;
void *service = NULL;
- for (hi = axis2_hash_first (svc_map, &env);
- NULL != hi; hi = axis2_hash_next (&env, hi))
+ for (hi = axis2_hash_first (svc_map, env);
+ NULL != hi; hi = axis2_hash_next (env, hi))
{
axis2_hash_t *ops= NULL;
axis2_svc_t *svc = NULL;
@@ -64,12 +64,12 @@
axis2_hash_this(hi, NULL, NULL, &service);
svc = (axis2_svc_t *) service;
- impl_info_param = AXIS2_SVC_GET_PARAM(svc, &env, AXIS2_SERVICE_CLASS);
+ impl_info_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SERVICE_CLASS);
if(!impl_info_param)
{
printf("imple_info_param is null\n");
}
- ops = AXIS2_SVC_GET_OPS(svc, &env);
+ ops = AXIS2_SVC_GET_OPS(svc, env);
if(ops)
{
printf("ops count = %d\n", axis2_hash_count(ops));
@@ -78,7 +78,7 @@
void *op = NULL;
axis2_char_t *oname = NULL;
- for(hi2 = axis2_hash_first(ops, &env); hi2; hi2 = axis2_hash_next(&env, hi2))
+ for(hi2 = axis2_hash_first(ops, env); hi2; hi2 = axis2_hash_next(env, hi2))
{
if (!hi2)
break;
@@ -86,8 +86,8 @@
if (op)
{
axis2_qname_t *qname = NULL;
- qname = AXIS2_OP_GET_QNAME((axis2_op_t *)op, &env);
- oname = AXIS2_QNAME_GET_LOCALPART(qname, &env);
+ qname = AXIS2_OP_GET_QNAME((axis2_op_t *)op, env);
+ oname = AXIS2_QNAME_GET_LOCALPART(qname, env);
printf("op name = %s\n", oname);
}
}
@@ -99,7 +99,7 @@
in_phases =
AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(
- conf, &env);
+ conf, env);
if(!in_phases)
{
printf("in phases up to and including post dispatch is NULL\n");
@@ -108,7 +108,7 @@
{
printf("dep engine load is successfull\n");
}
- AXIS2_CONF_FREE(conf, &env);
+ AXIS2_CONF_FREE(conf, env);
return 0;
}
@@ -126,19 +126,19 @@
printf("testing axis2_transport_recv load\n");
printf("******************************************\n");
- dll_desc = axis2_dll_desc_create(&env);
+ dll_desc = axis2_dll_desc_create(env);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dll_name = AXIS2_STRACAT (axis2c_home, "/lib/libaxis2_http_receiver.so", &env);
+ dll_name = AXIS2_STRACAT (axis2c_home, "/lib/libaxis2_http_receiver.so", env);
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);
- impl_info_param = axis2_param_create(&env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, &env, dll_desc);
- axis2_class_loader_init(&env);
- transport_recv = (axis2_transport_receiver_t *) axis2_class_loader_create_dll(&env,
+ AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
+ AXIS2_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);
+ axis2_class_loader_init(env);
+ transport_recv = (axis2_transport_receiver_t *) axis2_class_loader_create_dll(env,
impl_info_param);
- is_running = AXIS2_TRANSPORT_RECEIVER_IS_RUNNING(transport_recv, &env);
+ is_running = AXIS2_TRANSPORT_RECEIVER_IS_RUNNING(transport_recv, env);
printf("is_running:%d\n", is_running);
AXIS2_FREE(env->allocator, dll_name);
printf("transport receiver load test successful\n");
@@ -160,20 +160,20 @@
printf("******************************************\n");
msg_ctx = (axis2_msg_ctx_t *) AXIS2_MALLOC(env->allocator, 5);
- dll_desc = axis2_dll_desc_create(&env);
+ dll_desc = axis2_dll_desc_create(env);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dll_name = AXIS2_STRACAT (axis2c_home, "/lib/libaxis2_http_sender.so", &env);
+ dll_name = AXIS2_STRACAT (axis2c_home, "/lib/libaxis2_http_sender.so", env);
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);
- impl_info_param = axis2_param_create(&env, NULL, NULL);
- AXIS2_PARAM_SET_VALUE(impl_info_param, &env, dll_desc);
- axis2_class_loader_init(&env);
- transport_sender = (axis2_transport_sender_t *) axis2_class_loader_create_dll(&env,
+ AXIS2_DLL_DESC_SET_NAME(dll_desc, env, dll_name);
+ AXIS2_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);
+ axis2_class_loader_init(env);
+ transport_sender = (axis2_transport_sender_t *) axis2_class_loader_create_dll(env,
impl_info_param);
- status = AXIS2_TRANSPORT_SENDER_CLEANUP(transport_sender, &env, msg_ctx);
+ status = AXIS2_TRANSPORT_SENDER_CLEANUP(transport_sender, env, msg_ctx);
printf("clean status:%d\n", status);
AXIS2_FREE(env->allocator, dll_name);
printf("transport sender load test successful\n");
@@ -206,82 +206,82 @@
printf("******************************************\n");
- axis_conf = axis2_conf_create(&env);
- mod_qname1 = axis2_qname_create(&env, "module1", NULL, NULL);
- module1 = axis2_module_desc_create_with_qname(&env, mod_qname1);
- AXIS2_CONF_ADD_MODULE(axis_conf, &env, module1);
-
- mod_qname2 = axis2_qname_create(&env, "module2-0.90", NULL, NULL);
- module2 = axis2_module_desc_create_with_qname(&env, mod_qname2);
- AXIS2_CONF_ADD_MODULE(axis_conf, &env, module2);
-
- mod_qname3 = axis2_qname_create(&env, "module2-0.92", NULL, NULL);
- module3 = axis2_module_desc_create_with_qname(&env, mod_qname3);
- AXIS2_CONF_ADD_MODULE(axis_conf, &env, module3);
-
- mod_qname4 = axis2_qname_create(&env, "module2-0.91", NULL, NULL);
- module4 = axis2_module_desc_create_with_qname(&env, mod_qname4);
- AXIS2_CONF_ADD_MODULE(axis_conf, &env, module4);
-
- mod_qname5 = axis2_qname_create(&env, "test_module-1.92", NULL, NULL);
- module5 = axis2_module_desc_create_with_qname(&env, mod_qname5);
- AXIS2_CONF_ADD_MODULE(axis_conf, &env, module5);
-
- axis2_core_utils_calculate_default_module_version(&env, AXIS2_CONF_GET_MODULES(
- axis_conf, &env), axis_conf);
- def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, &env, "module1");
+ axis_conf = axis2_conf_create(env);
+ mod_qname1 = axis2_qname_create(env, "module1", NULL, NULL);
+ module1 = axis2_module_desc_create_with_qname(env, mod_qname1);
+ AXIS2_CONF_ADD_MODULE(axis_conf, env, module1);
+
+ mod_qname2 = axis2_qname_create(env, "module2-0.90", NULL, NULL);
+ module2 = axis2_module_desc_create_with_qname(env, mod_qname2);
+ AXIS2_CONF_ADD_MODULE(axis_conf, env, module2);
+
+ mod_qname3 = axis2_qname_create(env, "module2-0.92", NULL, NULL);
+ module3 = axis2_module_desc_create_with_qname(env, mod_qname3);
+ AXIS2_CONF_ADD_MODULE(axis_conf, env, module3);
+
+ mod_qname4 = axis2_qname_create(env, "module2-0.91", NULL, NULL);
+ module4 = axis2_module_desc_create_with_qname(env, mod_qname4);
+ AXIS2_CONF_ADD_MODULE(axis_conf, env, module4);
+
+ mod_qname5 = axis2_qname_create(env, "test_module-1.92", NULL, NULL);
+ module5 = axis2_module_desc_create_with_qname(env, mod_qname5);
+ AXIS2_CONF_ADD_MODULE(axis_conf, env, module5);
+
+ axis2_core_utils_calculate_default_module_version(env, AXIS2_CONF_GET_MODULES(
+ axis_conf, env), axis_conf);
+ def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, env, "module1");
if(def_mod != module1)
{
printf("axis2_default_module_version (module1) .. FAILED\n");
return AXIS2_FAILURE;
}
- def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, &env, "module2");
+ def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, env, "module2");
if(def_mod != module3)
{
printf("axis2_default_module_version (module2) .. FAILED\n");
return AXIS2_FAILURE;
}
- def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, &env, "test_module");
+ def_mod = AXIS2_CONF_GET_DEFAULT_MODULE(axis_conf, env, "test_module");
if(def_mod != module5)
{
printf("axis2_default_module_version (test_module) .. FAILED\n");
return AXIS2_FAILURE;
}
- engage_qname = axis2_qname_create(&env, "module2", NULL, NULL);
- AXIS2_CONF_ENGAGE_MODULE(axis_conf, &env, engage_qname);
- AXIS2_QNAME_FREE(engage_qname, &env);
+ engage_qname = axis2_qname_create(env, "module2", NULL, NULL);
+ AXIS2_CONF_ENGAGE_MODULE(axis_conf, env, engage_qname);
+ AXIS2_QNAME_FREE(engage_qname, env);
engage_qname = NULL;
- engage_qname = axis2_qname_create(&env, "module1", NULL, NULL);
- AXIS2_CONF_ENGAGE_MODULE(axis_conf, &env, engage_qname);
- AXIS2_QNAME_FREE(engage_qname, &env);
+ engage_qname = axis2_qname_create(env, "module1", NULL, NULL);
+ AXIS2_CONF_ENGAGE_MODULE(axis_conf, env, engage_qname);
+ AXIS2_QNAME_FREE(engage_qname, env);
engage_qname = NULL;
- AXIS2_CONF_ENGAGE_MODULE_WITH_VERSION(axis_conf, &env, "test_module", "1.92");
+ AXIS2_CONF_ENGAGE_MODULE_WITH_VERSION(axis_conf, env, "test_module", "1.92");
- engaged_modules = AXIS2_CONF_GET_ENGAGED_MODULES(axis_conf, &env);
+ engaged_modules = AXIS2_CONF_GET_ENGAGED_MODULES(axis_conf, env);
if(NULL != engaged_modules)
{
int list_size = 0;
int i = 0;
- list_size = AXIS2_ARRAY_LIST_SIZE(engaged_modules, &env);
+ list_size = AXIS2_ARRAY_LIST_SIZE(engaged_modules, env);
for(i = 0; i < list_size; i++)
{
axis2_qname_t *engaged_mod_qname = NULL;
- engaged_mod_qname = AXIS2_ARRAY_LIST_GET(engaged_modules, &env, i);
+ engaged_mod_qname = AXIS2_ARRAY_LIST_GET(engaged_modules, env, i);
if(0 == AXIS2_STRCMP("module2-0.92",
- AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, &env)))
+ AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, env)))
{
found1 = AXIS2_TRUE;
}
if(0 == AXIS2_STRCMP("module1",
- AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, &env)))
+ AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, env)))
{
found2 = AXIS2_TRUE;
}
if(0 == AXIS2_STRCMP("test_module-1.92",
- AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, &env)))
+ AXIS2_QNAME_GET_LOCALPART(engaged_mod_qname, env)))
{
found3 = AXIS2_TRUE;
}
@@ -304,7 +304,7 @@
return AXIS2_FAILURE;
}
printf("axis2_default_module_version .. SUCCESS\n");
- AXIS2_CONF_FREE(axis_conf, &env);
+ AXIS2_CONF_FREE(axis_conf, env);
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/test/core/description/test_description.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/test_description.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/test_description.c (original)
+++ webservices/axis2/trunk/c/test/core/description/test_description.c Wed May 31 08:54:07 2006
@@ -5,7 +5,7 @@
#include <axis2_env.h>
#include <axis2_allocator.h>
-struct axis2_module_desc *create_module_desc(axis2_env_t **env);
+struct axis2_module_desc *create_module_desc(const axis2_env_t *env);
int axis2_test_op_engage_module()
{
@@ -18,20 +18,20 @@
printf("******************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
- axis2_op_t *op = axis2_op_create(&env);
+ const axis2_env_t *env = axis2_env_create (allocator);
+ axis2_op_t *op = axis2_op_create(env);
- moduleref = axis2_module_desc_create(&env);
+ moduleref = axis2_module_desc_create(env);
- status = AXIS2_OP_ENGAGE_MODULE(op, &env, moduleref);
+ status = AXIS2_OP_ENGAGE_MODULE(op, env, moduleref);
moduleref = NULL;
if(status != AXIS2_SUCCESS )
{
- AXIS2_OP_FREE(op, &env);
+ AXIS2_OP_FREE(op, env);
printf("ERROR %d\n", status);
}
- AXIS2_OP_FREE(op, &env);
+ AXIS2_OP_FREE(op, env);
axis2_env_free(env);
return 0;
}
@@ -51,12 +51,12 @@
printf("******************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
- qname = axis2_qname_create(&env, "name1", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, qname);
- module_desc = axis2_module_desc_create(&env);
- axis2_config = axis2_conf_create(&env);
- status = AXIS2_SVC_ADD_MODULE_OPS(svc, &env, module_desc, axis2_config);
+ const axis2_env_t *env = axis2_env_create (allocator);
+ qname = axis2_qname_create(env, "name1", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, qname);
+ module_desc = axis2_module_desc_create(env);
+ axis2_config = axis2_conf_create(env);
+ status = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc, axis2_config);
if(status != AXIS2_SUCCESS)
{
printf("axis2_test_description_add_module_ops ERROR %d\n", status);
@@ -64,10 +64,10 @@
else
printf("axis2_test_add_module_ops SUCCESS\n");
- AXIS2_SVC_FREE(svc, &env);
- AXIS2_QNAME_FREE(qname, &env);
- AXIS2_MODULE_DESC_FREE(module_desc, &env);
- AXIS2_CONF_FREE(axis2_config, &env);
+ AXIS2_SVC_FREE(svc, env);
+ AXIS2_QNAME_FREE(qname, env);
+ AXIS2_MODULE_DESC_FREE(module_desc, env);
+ AXIS2_CONF_FREE(axis2_config, env);
return 0;
}
@@ -86,13 +86,13 @@
printf("******************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
- qname = axis2_qname_create(&env, "name1", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, qname);
- moduleref = axis2_module_desc_create(&env);
- axis2_config = axis2_conf_create(&env);
+ const axis2_env_t *env = axis2_env_create (allocator);
+ qname = axis2_qname_create(env, "name1", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, qname);
+ moduleref = axis2_module_desc_create(env);
+ axis2_config = axis2_conf_create(env);
- status = AXIS2_SVC_ENGAGE_MODULE(svc, &env, moduleref, axis2_config);
+ status = AXIS2_SVC_ENGAGE_MODULE(svc, env, moduleref, axis2_config);
moduleref = NULL;
if(status != AXIS2_SUCCESS)
{
@@ -101,9 +101,9 @@
else
printf("axis2_test_svc_engage_module SUCCESS\n");
- AXIS2_SVC_FREE(svc, &env);
- AXIS2_QNAME_FREE(qname, &env);
- AXIS2_CONF_FREE(axis2_config, &env);
+ AXIS2_SVC_FREE(svc, env);
+ AXIS2_QNAME_FREE(qname, env);
+ AXIS2_CONF_FREE(axis2_config, env);
return 0;
}
@@ -122,19 +122,19 @@
printf("******************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
- qname = axis2_qname_create(&env, "op1", NULL, NULL);
- op = axis2_op_create_with_qname(&env, qname);
- qname = axis2_qname_create(&env, "svc1", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, qname);
+ const axis2_env_t *env = axis2_env_create (allocator);
+ qname = axis2_qname_create(env, "op1", NULL, NULL);
+ op = axis2_op_create_with_qname(env, qname);
+ qname = axis2_qname_create(env, "svc1", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, qname);
- status = AXIS2_SVC_ADD_OP(svc, &env, op);
+ status = AXIS2_SVC_ADD_OP(svc, env, op);
- qname = axis2_qname_create(&env, "op2", NULL, NULL);
- op = axis2_op_create_with_qname(&env, qname);
- status = AXIS2_SVC_ADD_OP(svc, &env, op);
+ qname = axis2_qname_create(env, "op2", NULL, NULL);
+ op = axis2_op_create_with_qname(env, qname);
+ status = AXIS2_SVC_ADD_OP(svc, env, op);
- ops = AXIS2_SVC_GET_OPS(svc, &env);
+ ops = AXIS2_SVC_GET_OPS(svc, env);
if (ops)
printf("SUCCESS AXIS2_SVC_GET_OPS\n");
@@ -153,18 +153,18 @@
axis2_char_t *oname = NULL;
int count = 0;
- for(hi2 = axis2_hash_first(ops, &env); hi2; hi2 = axis2_hash_next(&env, hi2))
+ for(hi2 = axis2_hash_first(ops, env); hi2; hi2 = axis2_hash_next(env, hi2))
{
printf ("count = %d \n", count++);
- AXIS2_SVC_GET_OPS(svc, &env);
+ AXIS2_SVC_GET_OPS(svc, env);
if (!(hi2))
break;
axis2_hash_this(hi2, NULL, NULL, &op2);
if (op2)
{
axis2_qname_t *qname = NULL;
- qname = AXIS2_OP_GET_QNAME((axis2_op_t *)op2, &env);
- oname = AXIS2_QNAME_GET_LOCALPART(qname, &env);
+ qname = AXIS2_OP_GET_QNAME((axis2_op_t *)op2, env);
+ oname = AXIS2_QNAME_GET_LOCALPART(qname, env);
printf("op name = %s\n", oname);
}
}
Modified: webservices/axis2/trunk/c/test/core/engine/test_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/test_engine.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/test_engine.c (original)
+++ webservices/axis2/trunk/c/test/core/engine/test_engine.c Wed May 31 08:54:07 2006
@@ -9,9 +9,9 @@
{
axis2_status_t status = AXIS2_FAILURE;
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
struct axis2_conf *conf = NULL;
- conf = axis2_conf_create(&env);
+ conf = axis2_conf_create(env);
struct axis2_conf_ctx *conf_ctx;
struct axis2_msg_ctx *msg_ctx;
@@ -23,26 +23,26 @@
struct axis2_svc_grp_ctx *svc_grp_ctx;
struct axis2_qname *qname;
- conf_ctx = axis2_conf_ctx_create(&env, conf);
+ conf_ctx = axis2_conf_ctx_create(env, conf);
- svc_grp = axis2_svc_grp_create(&env);
- svc_grp_ctx = axis2_svc_grp_ctx_create(&env, svc_grp, conf_ctx);
+ svc_grp = axis2_svc_grp_create(env);
+ svc_grp_ctx = axis2_svc_grp_ctx_create(env, svc_grp, conf_ctx);
- qname = axis2_qname_create(&env, "name1", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, qname);
- svc_ctx = axis2_svc_ctx_create(&env, svc, svc_grp_ctx);
+ qname = axis2_qname_create(env, "name1", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, qname);
+ svc_ctx = axis2_svc_ctx_create(env, svc, svc_grp_ctx);
- op = axis2_op_create(&env);
- op_ctx = axis2_op_ctx_create(&env, op, svc_ctx);
+ op = axis2_op_create(env);
+ op_ctx = axis2_op_ctx_create(env, op, svc_ctx);
- msg_ctx = axis2_msg_ctx_create(&env, conf_ctx, NULL, NULL);
+ msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
- AXIS2_MSG_CTX_SET_CONF_CTX(msg_ctx, &env, conf_ctx);
- AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, &env, op_ctx);
- AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, &env, svc_ctx);
+ AXIS2_MSG_CTX_SET_CONF_CTX(msg_ctx, env, conf_ctx);
+ AXIS2_MSG_CTX_SET_OP_CTX(msg_ctx, env, op_ctx);
+ AXIS2_MSG_CTX_SET_SVC_CTX(msg_ctx, env, svc_ctx);
- axis2_engine_t *engine = axis2_engine_create(&env, conf_ctx);
- status = AXIS2_ENGINE_SEND(engine, &env, msg_ctx);
+ axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
+ status = AXIS2_ENGINE_SEND(engine, env, msg_ctx);
if(status != AXIS2_SUCCESS )
{
printf("axis2_test_engine_send ERROR %d\n", status);
@@ -50,15 +50,15 @@
else
printf("axis2_test_engine_send SUCCESS\n");
- AXIS2_CONF_CTX_FREE(conf_ctx, &env);
- AXIS2_MSG_CTX_FREE(msg_ctx, &env);
- AXIS2_QNAME_FREE(qname, &env);
- AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, &env);
- AXIS2_SVC_CTX_FREE(svc_ctx, &env);
- AXIS2_SVC_FREE(svc, &env);
- AXIS2_OP_CTX_FREE(op_ctx, &env);
- AXIS2_OP_FREE(op, &env);
- AXIS2_ENGINE_FREE(engine, &env);
+ AXIS2_CONF_CTX_FREE(conf_ctx, env);
+ AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ AXIS2_QNAME_FREE(qname, env);
+ AXIS2_SVC_GRP_CTX_FREE(svc_grp_ctx, env);
+ AXIS2_SVC_CTX_FREE(svc_ctx, env);
+ AXIS2_SVC_FREE(svc, env);
+ AXIS2_OP_CTX_FREE(op_ctx, env);
+ AXIS2_OP_FREE(op, env);
+ AXIS2_ENGINE_FREE(engine, env);
return 0;
}
@@ -66,28 +66,28 @@
{
axis2_status_t status = AXIS2_FAILURE;
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
axis2_conf_t *conf = NULL;
- conf = axis2_conf_create(&env);
+ conf = axis2_conf_create(env);
struct axis2_conf_ctx *conf_ctx;
struct axis2_msg_ctx *msg_ctx;
- conf_ctx = axis2_conf_ctx_create(&env, conf);
+ conf_ctx = axis2_conf_ctx_create(env, conf);
- msg_ctx = axis2_msg_ctx_create(&env, conf_ctx, NULL, NULL);
+ msg_ctx = axis2_msg_ctx_create(env, conf_ctx, NULL, NULL);
- axis2_engine_t *engine = axis2_engine_create(&env, conf_ctx);
+ axis2_engine_t *engine = axis2_engine_create(env, conf_ctx);
- status = AXIS2_ENGINE_RECEIVE(engine, &env, msg_ctx);
+ status = AXIS2_ENGINE_RECEIVE(engine, env, msg_ctx);
if(status != AXIS2_SUCCESS )
{
printf("axis2_test_engine_receive ERROR %d\n", status);
}
else
printf("axis2_test_engine_receive SUCCESS\n");
- AXIS2_CONF_CTX_FREE(conf_ctx, &env);
- AXIS2_MSG_CTX_FREE(msg_ctx, &env);
- AXIS2_ENGINE_FREE(engine, &env);
+ AXIS2_CONF_CTX_FREE(conf_ctx, env);
+ AXIS2_MSG_CTX_FREE(msg_ctx, env);
+ AXIS2_ENGINE_FREE(engine, env);
return 0;
}
Modified: webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/test_http_transport.c Wed May 31 08:54:07 2006
@@ -35,40 +35,40 @@
return env;
}
-void test_http_request_line(axis2_env_t *env)
+void test_http_request_line(const axis2_env_t *env)
{
char *request_line_str = "POST http://ws.apache.org/axis2/c/services/test_svc/test_op?x=1 HTTP/1.1\r\n";
axis2_http_request_line_t *request_line;
printf("Starting http_request_line tests\n");
- request_line = axis2_http_request_line_parse_line(&env, request_line_str);
+ request_line = axis2_http_request_line_parse_line(env, request_line_str);
printf("Method: %s|URI: %s|HTTP Version: %s|\n", AXIS2_HTTP_REQUEST_LINE_GET_METHOD
- (request_line, &env), AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, &env),
- AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(request_line, &env));
- AXIS2_HTTP_REQUEST_LINE_FREE(request_line, &env);
+ (request_line, env), AXIS2_HTTP_REQUEST_LINE_GET_URI(request_line, env),
+ AXIS2_HTTP_REQUEST_LINE_GET_HTTP_VERSION(request_line, env));
+ AXIS2_HTTP_REQUEST_LINE_FREE(request_line, env);
printf("Finished http_request_line tests ..........\n\n");
}
-void test_http_status_line(axis2_env_t *env)
+void test_http_status_line(const axis2_env_t *env)
{
char *status_line_str = "HTTP/1.1 202 Accepted\r\n";
axis2_http_status_line_t *status_line;
printf("Starting http_status_line tests\n");
- status_line = axis2_http_status_line_create(&env, status_line_str);
+ status_line = axis2_http_status_line_create(env, status_line_str);
printf("Staus Line starts with HTTP ? :%d\n",
- AXIS2_HTTP_STATUS_LINE_STARTS_WITH_HTTP(status_line, &env));
+ AXIS2_HTTP_STATUS_LINE_STARTS_WITH_HTTP(status_line, env));
printf("HTTP Version :%s|Status Code:%d|Reason Phrase:%s|\n",
- AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(status_line, &env),
- AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, &env),
- AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(status_line, &env));
- printf("to_string :%s\n", AXIS2_HTTP_STATUS_LINE_TO_STRING(status_line, &env));
- AXIS2_HTTP_STATUS_LINE_FREE(status_line, &env);
+ AXIS2_HTTP_STATUS_LINE_GET_HTTP_VERSION(status_line, env),
+ AXIS2_HTTP_STATUS_LINE_GET_STATUS_CODE(status_line, env),
+ AXIS2_HTTP_STATUS_LINE_GET_REASON_PHRASE(status_line, env));
+ printf("to_string :%s\n", AXIS2_HTTP_STATUS_LINE_TO_STRING(status_line, env));
+ AXIS2_HTTP_STATUS_LINE_FREE(status_line, env);
printf("Finished http_status_line tests ..........\n\n");
}
-void test_http_header(axis2_env_t *env)
+void test_http_header(const axis2_env_t *env)
{
char *header_name = "Content-Type";
char *header_value = "text/xml";
@@ -77,23 +77,23 @@
axis2_char_t *external_form = NULL;
printf("Starting http_header tests\n");
- http_header = axis2_http_header_create(&env, header_name, header_value);
- external_form = AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(http_header, &env);
+ http_header = axis2_http_header_create(env, header_name, header_value);
+ external_form = AXIS2_HTTP_HEADER_TO_EXTERNAL_FORM(http_header, env);
printf("Heder Name :%s|Header Value:%s|External Form:%s\n",
- AXIS2_HTTP_HEADER_GET_NAME(http_header, &env),
- AXIS2_HTTP_HEADER_GET_VALUE(http_header, &env),
+ AXIS2_HTTP_HEADER_GET_NAME(http_header, env),
+ AXIS2_HTTP_HEADER_GET_VALUE(http_header, env),
external_form);
AXIS2_FREE(env->allocator, external_form);
- AXIS2_HTTP_HEADER_FREE(http_header, &env);
+ AXIS2_HTTP_HEADER_FREE(http_header, env);
- http_header = axis2_http_header_create_by_str(&env, str_header);
+ http_header = axis2_http_header_create_by_str(env, str_header);
printf("Finished http_header tests ..........\n\n");
}
-void test_url(axis2_env_t *env)
+void test_url(const axis2_env_t *env)
{
axis2_char_t *str_url = "http://ws.apache.org/axis2/";
- axis2_url_t *url = axis2_url_parse_string(&env, str_url);
+ axis2_url_t *url = axis2_url_parse_string(env, str_url);
if(NULL == url)
{
printf("URL is NULL\n");
@@ -101,13 +101,13 @@
}
printf("Starting URL Test ....\n");
printf("Parsed URL : \n Protocol :%s|\n Server :%s|\n Port :%d|\n Path : %s|\n",
- AXIS2_URL_GET_PROTOCOL(url, &env), AXIS2_URL_GET_SERVER(url, &env),
- AXIS2_URL_GET_PORT(url, &env), AXIS2_URL_GET_PATH(url, &env));
+ AXIS2_URL_GET_PROTOCOL(url, env), AXIS2_URL_GET_SERVER(url, env),
+ AXIS2_URL_GET_PORT(url, env), AXIS2_URL_GET_PATH(url, env));
printf("End of URL Test ... \n");
- AXIS2_URL_FREE(url, &env);
+ AXIS2_URL_FREE(url, env);
}
-void test_http_client(axis2_env_t *env)
+void test_http_client(const axis2_env_t *env)
{
axis2_http_client_t *client = NULL;
axis2_http_simple_request_t *request = NULL;
@@ -121,51 +121,51 @@
int body_bytes_len = 0;
printf("Starting http_client tests\n");
- request_line = axis2_http_request_line_create(&env, "GET",
+ request_line = axis2_http_request_line_create(env, "GET",
"/axis2/services", "HTTP/1.0");
- request_body = axis2_stream_create_basic(&env);
- request = axis2_http_simple_request_create(&env, request_line,
+ request_body = axis2_stream_create_basic(env);
+ request = axis2_http_simple_request_create(env, request_line,
NULL, 0, NULL);
- url = axis2_url_create(&env, "http", "localhost", 80,
+ url = axis2_url_create(env, "http", "localhost", 80,
NULL);
- header = axis2_http_header_create(&env,"Host", AXIS2_URL_GET_SERVER(url, &env));
- AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, &env, header);
- client = axis2_http_client_create(&env, url);
+ header = axis2_http_header_create(env,"Host", AXIS2_URL_GET_SERVER(url, env));
+ AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
+ client = axis2_http_client_create(env, url);
- status = AXIS2_HTTP_CLIENT_SEND(client, &env, request);
+ status = AXIS2_HTTP_CLIENT_SEND(client, env, request);
if(status < 0)
{
printf("Test FAILED .........Can't send the request. Status :%d\n", status);
return;
}
- status = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, &env);
+ status = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, env);
if(status < 0)
{
printf("Test FAILED ......... Can't recieve. Status: %d\n", status);
return;
}
- response = AXIS2_HTTP_CLIENT_GET_RESPONSE(client, &env);
+ response = AXIS2_HTTP_CLIENT_GET_RESPONSE(client, env);
if(NULL == response)
{
printf("Test Failed : NULL response");
return;
}
printf("Content Type :%s\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(
- response, &env));
+ response, env));
printf("Content Length :%d\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(
- response, &env));
+ response, env));
printf("Status code :%d\n", status);
- body_bytes_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, &env, &body_bytes);
+ body_bytes_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, env, &body_bytes);
printf("body :%s\n", body_bytes);
- AXIS2_HTTP_CLIENT_FREE(client, &env);
- AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, &env);
- AXIS2_STREAM_FREE(request_body, &env);
+ AXIS2_HTTP_CLIENT_FREE(client, env);
+ AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, env);
+ AXIS2_STREAM_FREE(request_body, env);
AXIS2_FREE(env->allocator, body_bytes);
printf("Finished http_client tests ..........\n\n");
}
-void test_https_client(axis2_env_t *env)
+void test_https_client(const axis2_env_t *env)
{
#ifndef AXIS2_SSL_ENABLED
return;
@@ -182,50 +182,50 @@
int body_bytes_len = 0;
printf("Starting https_client tests\n");
- request_line = axis2_http_request_line_create(&env, "GET",
+ request_line = axis2_http_request_line_create(env, "GET",
"/", "HTTP/1.0");
- request_body = axis2_stream_create_basic(&env);
- request = axis2_http_simple_request_create(&env, request_line,
+ request_body = axis2_stream_create_basic(env);
+ request = axis2_http_simple_request_create(env, request_line,
NULL, 0, NULL);
- url = axis2_url_create(&env, "https", "localhost", 443,
+ url = axis2_url_create(env, "https", "localhost", 443,
NULL);
/* Add an ssl certificate variable */
setenv("AXIS2_SSL_CA_FILE", "cert.pem", 1);
- header = axis2_http_header_create(&env,"Host", AXIS2_URL_GET_SERVER(url, &env));
- AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, &env, header);
- client = axis2_http_client_create(&env, url);
+ header = axis2_http_header_create(env,"Host", AXIS2_URL_GET_SERVER(url, env));
+ AXIS2_HTTP_SIMPLE_REQUEST_ADD_HEADER(request, env, header);
+ client = axis2_http_client_create(env, url);
/* if you weant to test the proxy uncomment following */
- AXIS2_HTTP_CLIENT_SET_PROXY(client, &env, "127.0.0.1", 8080);
+ AXIS2_HTTP_CLIENT_SET_PROXY(client, env, "127.0.0.1", 8080);
- status = AXIS2_HTTP_CLIENT_SEND(client, &env, request);
+ status = AXIS2_HTTP_CLIENT_SEND(client, env, request);
if(status < 0)
{
printf("Test FAILED .........Can't send the request. Status :%d\n", status);
return;
}
- status = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, &env);
+ status = AXIS2_HTTP_CLIENT_RECIEVE_HEADER(client, env);
if(status < 0)
{
printf("Test FAILED ......... Can't recieve. Status: %d\n", status);
return;
}
- response = AXIS2_HTTP_CLIENT_GET_RESPONSE(client, &env);
+ response = AXIS2_HTTP_CLIENT_GET_RESPONSE(client, env);
if(NULL == response)
{
printf("Test Failed : NULL response");
return;
}
printf("Content Type :%s\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_TYPE(
- response, &env));
+ response, env));
printf("Content Length :%d\n", AXIS2_HTTP_SIMPLE_RESPONSE_GET_CONTENT_LENGTH(
- response, &env));
+ response, env));
printf("Status code :%d\n", status);
- body_bytes_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, &env, &body_bytes);
+ body_bytes_len = AXIS2_HTTP_SIMPLE_RESPONSE_GET_BODY_BYTES(response, env, &body_bytes);
- AXIS2_HTTP_CLIENT_FREE(client, &env);
- AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, &env);
- AXIS2_STREAM_FREE(request_body, &env);
+ AXIS2_HTTP_CLIENT_FREE(client, env);
+ AXIS2_HTTP_SIMPLE_REQUEST_FREE(request, env);
+ AXIS2_STREAM_FREE(request_body, env);
AXIS2_FREE(env->allocator, body_bytes);
printf("Finished https_client tests ..........\n\n");
#endif
@@ -233,7 +233,7 @@
int main(void)
{
- axis2_env_t *env = test_init();
+ const axis2_env_t *env = test_init();
test_http_request_line(env);
test_http_status_line(env);
test_http_header(env);
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/round1_client.c Wed May 31 08:54:07 2006
@@ -41,20 +41,20 @@
#include <ctype.h>
#include <string.h>
-axis2_om_node_t *build_soap_body_content (axis2_env_t ** env,
+axis2_om_node_t *build_soap_body_content (const axis2_env_t *env,
axis2_char_t * echo_operation,
axis2_char_t * echo_type,
axis2_char_t * word_to_echo,
axis2_om_node_t * body_node);
-void print_invalid_om (axis2_env_t ** env, axis2_om_node_t * ret_node);
+void print_invalid_om (const axis2_env_t *env, axis2_om_node_t * ret_node);
int
main (int argc, char **argv)
{
axis2_om_node_t *node = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_error_t *error = NULL;
axis2_log_t *log = NULL;
axis2_allocator_t *allocator = NULL;
@@ -117,23 +117,23 @@
/* create call without passing svc_ctx_t struct */
- call = axis2_call_create (&env, NULL, client_home);
- mep_client = AXIS2_CALL_GET_BASE (call, &env);
+ call = axis2_call_create (env, NULL, client_home);
+ mep_client = AXIS2_CALL_GET_BASE (call, env);
/* prepare SOAP envelope */
env_ns =
- axis2_om_namespace_create (&env,
+ axis2_om_namespace_create (env,
AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI,
"soap");
- soap_envelope = axis2_soap_envelope_create (&env, env_ns);
- soap_body = axis2_soap_body_create_with_parent (&env, soap_envelope);
- body_node = AXIS2_SOAP_BODY_GET_BASE_NODE (soap_body, &env);
- build_soap_body_content (&env, echo_operation, echo_type, word_to_echo,
+ soap_envelope = axis2_soap_envelope_create (env, env_ns);
+ soap_body = axis2_soap_body_create_with_parent (env, soap_envelope);
+ body_node = AXIS2_SOAP_BODY_GET_BASE_NODE (soap_body, env);
+ build_soap_body_content (env, echo_operation, echo_type, word_to_echo,
body_node);
- /*print_invalid_om(&env, body_node); */
+ /*print_invalid_om(env, body_node); */
- msg_ctx = AXIS2_MEP_CLIENT_PREPARE_SOAP_ENVELOPE (mep_client, &env, node);
+ msg_ctx = AXIS2_MEP_CLIENT_PREPARE_SOAP_ENVELOPE (mep_client, env, node);
if (!msg_ctx)
{
printf("ERROR: Could not prepare message context. ");
@@ -141,33 +141,33 @@
return -1;
}
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE (msg_ctx, &env, soap_envelope);
- endpoint_ref = axis2_endpoint_ref_create (&env, address);
- AXIS2_CALL_SET_TO (call, &env, endpoint_ref);
+ AXIS2_MSG_CTX_SET_SOAP_ENVELOPE (msg_ctx, env, soap_envelope);
+ endpoint_ref = axis2_endpoint_ref_create (env, address);
+ AXIS2_CALL_SET_TO (call, env, endpoint_ref);
conf =
AXIS2_CONF_CTX_GET_CONF (AXIS2_SVC_CTX_GET_CONF_CTX
(AXIS2_MEP_CLIENT_GET_SVC_CTX
- (mep_client, &env), &env), &env);
- svc = AXIS2_CONF_GET_SVC (conf, &env, "echo");
+ (mep_client, env), env), env);
+ svc = AXIS2_CONF_GET_SVC (conf, env, "echo");
/*if (svc)
{
- op = AXIS2_SVC_GET_OP_WITH_NAME(svc, &env, "echoString");
+ op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, "echoString");
if (op)
{
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, &env, AXIS2_MEP_URI_OUT_IN);
+ AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
}
}
else */
{
axis2_qname_t *op_qname = NULL;
axis2_qname_t *svc_qname =
- axis2_qname_create (&env, "echo", NULL, NULL);
- svc = axis2_svc_create_with_qname (&env, svc_qname);
- op_qname = axis2_qname_create (&env, operation, NULL, NULL);
- op = axis2_op_create_with_qname (&env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN (op, &env, AXIS2_MEP_URI_OUT_IN);
- AXIS2_SVC_ADD_OP (svc, &env, op);
- AXIS2_CONF_ADD_SVC (conf, &env, svc);
+ axis2_qname_create (env, "echo", NULL, NULL);
+ svc = axis2_svc_create_with_qname (env, svc_qname);
+ op_qname = axis2_qname_create (env, operation, NULL, NULL);
+ op = axis2_op_create_with_qname (env, op_qname);
+ AXIS2_OP_SET_MSG_EXCHANGE_PATTERN (op, env, AXIS2_MEP_URI_OUT_IN);
+ AXIS2_SVC_ADD_OP (svc, env, op);
+ AXIS2_CONF_ADD_SVC (conf, env, svc);
}
if (!op)
@@ -175,35 +175,35 @@
printf ("ERROR: echo_operation not present in service\n");
return -1;
}
- response_ctx = AXIS2_CALL_INVOKE_BLOCKING (call, &env, op, msg_ctx);
+ response_ctx = AXIS2_CALL_INVOKE_BLOCKING (call, env, op, msg_ctx);
if (response_ctx)
{
axis2_soap_envelope_t *soap_envelope =
- AXIS2_MSG_CTX_GET_SOAP_ENVELOPE (response_ctx, &env);
- ret_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE (soap_envelope, &env);
+ AXIS2_MSG_CTX_GET_SOAP_ENVELOPE (response_ctx, env);
+ ret_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE (soap_envelope, env);
}
if (ret_node)
{
- print_invalid_om (&env, ret_node);
- if (AXIS2_OM_NODE_GET_NODE_TYPE (ret_node, &env) == AXIS2_OM_ELEMENT)
+ print_invalid_om (env, ret_node);
+ if (AXIS2_OM_NODE_GET_NODE_TYPE (ret_node, env) == AXIS2_OM_ELEMENT)
{
axis2_char_t *result = NULL;
axis2_om_element_t *result_ele = NULL;
axis2_om_node_t *ret_node1 = NULL;
axis2_char_t echo_response_buff[32];
- ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node, &env); /*Body */
+ ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node, env); /*Body */
if (!ret_node1)
{
- print_invalid_om (&env, ret_node);
+ print_invalid_om (env, ret_node);
return AXIS2_FAILURE;
}
- ret_node = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node1, &env); /*GetTypeResponse */
+ ret_node = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node1, env); /*GetTypeResponse */
if (!ret_node)
{
- print_invalid_om (&env, ret_node1);
+ print_invalid_om (env, ret_node1);
return AXIS2_FAILURE;
}
/*see if we have got a fault */
@@ -211,25 +211,25 @@
sprintf (echo_response_buff, "echo%sResponse", echo_operation);
result_ele =
(axis2_om_element_t *)
- AXIS2_OM_NODE_GET_DATA_ELEMENT (ret_node, &env);
+ AXIS2_OM_NODE_GET_DATA_ELEMENT (ret_node, env);
if (AXIS2_STRCMP
- (AXIS2_OM_ELEMENT_GET_LOCALNAME (result_ele, &env),
+ (AXIS2_OM_ELEMENT_GET_LOCALNAME (result_ele, env),
echo_response_buff) != 0)
{
- print_invalid_om (&env, ret_node1);
+ print_invalid_om (env, ret_node1);
return AXIS2_FAILURE;
}
- ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node, &env); /*return */
+ ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD (ret_node, env); /*return */
if (!ret_node1)
{
- print_invalid_om (&env, ret_node);
+ print_invalid_om (env, ret_node);
return AXIS2_FAILURE;
}
result_ele =
(axis2_om_element_t *)
- AXIS2_OM_NODE_GET_DATA_ELEMENT (ret_node1, &env);
- result = AXIS2_OM_ELEMENT_GET_TEXT (result_ele, &env, ret_node1);
+ AXIS2_OM_NODE_GET_DATA_ELEMENT (ret_node1, env);
+ result = AXIS2_OM_ELEMENT_GET_TEXT (result_ele, env, ret_node1);
if (!strcmp (word_to_echo, result))
{
printf ("\nSUCCESS\n\n");
@@ -257,13 +257,13 @@
/*if (node)
{
- AXIS2_OM_NODE_FREE_TREE(node, &env);
+ AXIS2_OM_NODE_FREE_TREE(node, env);
} */
return status;
}
axis2_om_node_t *
-build_soap_body_content (axis2_env_t ** env, axis2_char_t * echo_operation,
+build_soap_body_content (const axis2_env_t *env, axis2_char_t * echo_operation,
axis2_char_t * echo_type,
axis2_char_t * word_to_echo,
axis2_om_node_t * body_node)
@@ -358,7 +358,7 @@
AXIS2_OM_NODE_SERIALIZE (echo_om_node, env, om_output);
buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML (xml_writer, env);
- AXIS2_LOG_DEBUG ((*env)->log, AXIS2_LOG_SI,
+ AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI,
"\nSending OM node in XML : %s \n", buffer);
writer = axis2_xml_writer_create_for_memory (env, NULL, AXIS2_TRUE, 0,
@@ -371,7 +371,7 @@
}
void
-print_invalid_om (axis2_env_t ** env, axis2_om_node_t * ret_node)
+print_invalid_om (const axis2_env_t *env, axis2_om_node_t * ret_node)
{
axis2_xml_writer_t *writer = NULL;
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/round2_client.c Wed May 31 08:54:07 2006
@@ -42,16 +42,16 @@
#include <ctype.h>
axis2_om_node_t *
-build_soap_body_content(axis2_env_t **env, axis2_char_t *echo_operation,
+build_soap_body_content(const axis2_env_t *env, axis2_char_t *echo_operation,
axis2_char_t *word_to_echo, axis2_om_node_t *body_node);
-void print_invalid_om(axis2_env_t **env, axis2_om_node_t *ret_node);
+void print_invalid_om(const axis2_env_t *env, axis2_om_node_t *ret_node);
int main(int argc, char** argv)
{
axis2_om_node_t *node = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_error_t *error = NULL;
axis2_log_t *log = NULL;
axis2_allocator_t *allocator = NULL;
@@ -109,17 +109,17 @@
/* create call without passing svc_ctx_t struct */
- call = axis2_call_create(&env, NULL, client_home);
- mep_client = AXIS2_CALL_GET_BASE(call, &env);
+ call = axis2_call_create(env, NULL, client_home);
+ mep_client = AXIS2_CALL_GET_BASE(call, env);
/* prepare SOAP envelope */
- env_ns = axis2_om_namespace_create(&env, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, "soap");
- soap_envelope = axis2_soap_envelope_create(&env, env_ns);
- soap_body = axis2_soap_body_create_with_parent(&env, soap_envelope);
- body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, &env);
- build_soap_body_content(&env, echo_operation, word_to_echo, body_node);
+ env_ns = axis2_om_namespace_create(env, AXIS2_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI, "soap");
+ soap_envelope = axis2_soap_envelope_create(env, env_ns);
+ soap_body = axis2_soap_body_create_with_parent(env, soap_envelope);
+ body_node = AXIS2_SOAP_BODY_GET_BASE_NODE(soap_body, env);
+ build_soap_body_content(env, echo_operation, word_to_echo, body_node);
- msg_ctx = AXIS2_MEP_CLIENT_PREPARE_SOAP_ENVELOPE(mep_client, &env, node);
+ msg_ctx = AXIS2_MEP_CLIENT_PREPARE_SOAP_ENVELOPE(mep_client, env, node);
if (!msg_ctx)
{
printf("ERROR: Could not prepare message context. ");
@@ -127,33 +127,33 @@
return -1;
}
- AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, &env, soap_envelope);
- endpoint_ref = axis2_endpoint_ref_create(&env, address);
- AXIS2_CALL_SET_TO(call, &env, endpoint_ref);
+ AXIS2_MSG_CTX_SET_SOAP_ENVELOPE(msg_ctx, env, soap_envelope);
+ endpoint_ref = axis2_endpoint_ref_create(env, address);
+ AXIS2_CALL_SET_TO(call, env, endpoint_ref);
conf = AXIS2_CONF_CTX_GET_CONF(
AXIS2_SVC_CTX_GET_CONF_CTX(
- AXIS2_MEP_CLIENT_GET_SVC_CTX(mep_client, &env),
- &env),
- &env);
- svc = AXIS2_CONF_GET_SVC(conf, &env, "simpletest");
+ AXIS2_MEP_CLIENT_GET_SVC_CTX(mep_client, env),
+ env),
+ env);
+ svc = AXIS2_CONF_GET_SVC(conf, env, "simpletest");
if (svc)
{
- op = AXIS2_SVC_GET_OP_WITH_NAME(svc, &env, "simpletest");
+ op = AXIS2_SVC_GET_OP_WITH_NAME(svc, env, "simpletest");
if (op)
{
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, &env, AXIS2_MEP_URI_OUT_IN);
+ AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
}
}
else
{
axis2_qname_t *op_qname = NULL;
- axis2_qname_t *svc_qname = axis2_qname_create(&env, "simpletest", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, svc_qname);
- op_qname = axis2_qname_create(&env, operation , NULL, NULL);
- op = axis2_op_create_with_qname(&env, op_qname);
- AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, &env, AXIS2_MEP_URI_OUT_IN);
- AXIS2_SVC_ADD_OP(svc, &env, op);
- AXIS2_CONF_ADD_SVC(conf, &env, svc);
+ axis2_qname_t *svc_qname = axis2_qname_create(env, "simpletest", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, svc_qname);
+ op_qname = axis2_qname_create(env, operation , NULL, NULL);
+ op = axis2_op_create_with_qname(env, op_qname);
+ AXIS2_OP_SET_MSG_EXCHANGE_PATTERN(op, env, AXIS2_MEP_URI_OUT_IN);
+ AXIS2_SVC_ADD_OP(svc, env, op);
+ AXIS2_CONF_ADD_SVC(conf, env, svc);
}
if (!op)
@@ -161,54 +161,54 @@
printf("ERROR: echo_operation not present in service\n");
return -1;
}
- response_ctx = AXIS2_CALL_INVOKE_BLOCKING(call, &env, op, msg_ctx);
+ response_ctx = AXIS2_CALL_INVOKE_BLOCKING(call, env, op, msg_ctx);
if (response_ctx)
{
- axis2_soap_envelope_t *soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(response_ctx, &env);
- ret_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, &env);
+ axis2_soap_envelope_t *soap_envelope = AXIS2_MSG_CTX_GET_SOAP_ENVELOPE(response_ctx, env);
+ ret_node = AXIS2_SOAP_ENVELOPE_GET_BASE_NODE(soap_envelope, env);
}
if(ret_node)
{
- if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, &env) == AXIS2_OM_ELEMENT)
+ if (AXIS2_OM_NODE_GET_NODE_TYPE(ret_node, env) == AXIS2_OM_ELEMENT)
{
axis2_char_t *result = NULL;
axis2_om_element_t *result_ele = NULL;
axis2_om_node_t *ret_node1 = NULL;
axis2_char_t echo_response_buff[32];
- ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, &env); /*Body*/
+ ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, env); /*Body*/
if (!ret_node1)
{
- print_invalid_om(&env, ret_node);
+ print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
- ret_node = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node1, &env); /*GetTypeResponse*/
+ ret_node = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node1, env); /*GetTypeResponse*/
if (!ret_node)
{
- print_invalid_om(&env, ret_node1);
+ print_invalid_om(env, ret_node1);
return AXIS2_FAILURE;
}
/*see if we have got a fault*/
sprintf (echo_response_buff, "echo%sResponse", echo_operation);
- result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, &env);
- if (AXIS2_STRCMP(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, &env), echo_response_buff) != 0 )
+ result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node, env);
+ if (AXIS2_STRCMP(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, env), echo_response_buff) != 0 )
{
- print_invalid_om(&env, ret_node1);
+ print_invalid_om(env, ret_node1);
return AXIS2_FAILURE;
}
- ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, &env); /*return*/
+ ret_node1 = AXIS2_OM_NODE_GET_FIRST_CHILD(ret_node, env); /*return*/
if (!ret_node1)
{
- print_invalid_om(&env, ret_node);
+ print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
- result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node1, &env);
- /*printf(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, &env)); */
- result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, &env, ret_node1);
+ result_ele = (axis2_om_element_t*)AXIS2_OM_NODE_GET_DATA_ELEMENT(ret_node1, env);
+ /*printf(AXIS2_OM_ELEMENT_GET_LOCALNAME(result_ele, env)); */
+ result = AXIS2_OM_ELEMENT_GET_TEXT(result_ele, env, ret_node1);
if (!strcmp( word_to_echo, result ) )
{
printf("Success\n");
@@ -221,7 +221,7 @@
}
else
{
- print_invalid_om(&env, ret_node);
+ print_invalid_om(env, ret_node);
return AXIS2_FAILURE;
}
}
@@ -237,7 +237,7 @@
}
axis2_om_node_t *
-build_soap_body_content(axis2_env_t **env, axis2_char_t *echo_operation,
+build_soap_body_content(const axis2_env_t *env, axis2_char_t *echo_operation,
axis2_char_t *word_to_echo, axis2_om_node_t *body_node)
{
axis2_om_node_t* envelope_node = NULL;
@@ -299,12 +299,12 @@
AXIS2_OM_NODE_SERIALIZE(echo_om_node, env, om_output);
buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
- AXIS2_LOG_DEBUG((*env)->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "\nSending OM node in XML : %s \n", buffer);
return echo_om_node;
}
-void print_invalid_om(axis2_env_t **env, axis2_om_node_t *ret_node)
+void print_invalid_om(const axis2_env_t *env, axis2_om_node_t *ret_node)
{
axis2_xml_writer_t *writer = NULL;
Modified: webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/test_dep_engine.c Wed May 31 08:54:07 2006
@@ -19,14 +19,14 @@
axis2_env_t *env = axis2_env_create (allocator);
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dep_engine = axis2_dep_engine_create_with_repos_name(&env, axis2c_home
+ dep_engine = axis2_dep_engine_create_with_repos_name(env, axis2c_home
);
if(!dep_engine)
{
printf("dep engine is not created \n");
return;
}
- actual = AXIS2_DEP_ENGINE_FREE(dep_engine, &env);
+ actual = AXIS2_DEP_ENGINE_FREE(dep_engine, env);
CuAssertIntEquals(tc, expected, actual);
axis2_env_free(env);
}
@@ -45,12 +45,12 @@
allocator = axis2_allocator_init(NULL);
env = axis2_env_create(allocator);
- dep_engine = axis2_dep_engine_create(&env);
+ dep_engine = axis2_dep_engine_create(env);
CuAssertPtrNotNull(tc,dep_engine);
if (dep_engine)
- AXIS2_DEP_ENGINE_FREE(dep_engine, &env);
+ AXIS2_DEP_ENGINE_FREE(dep_engine, env);
axis2_env_free(env);
}
@@ -70,12 +70,12 @@
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dep_engine = axis2_dep_engine_create_with_repos_name(&env,axis2c_home);
+ dep_engine = axis2_dep_engine_create_with_repos_name(env,axis2c_home);
CuAssertPtrNotNull(tc, dep_engine);
if (dep_engine)
- AXIS2_DEP_ENGINE_FREE(dep_engine, &env);
+ AXIS2_DEP_ENGINE_FREE(dep_engine, env);
axis2_env_free(env);
}
@@ -99,14 +99,14 @@
axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
- dep_engine = axis2_dep_engine_create_with_repos_name(&env, axis2c_home);
+ dep_engine = axis2_dep_engine_create_with_repos_name(env, axis2c_home);
if (dep_engine)
- conf_actual = AXIS2_DEP_ENGINE_LOAD(dep_engine, &env);
+ conf_actual = AXIS2_DEP_ENGINE_LOAD(dep_engine, env);
CuAssertPtrNotNull(tc, conf_actual);
if (conf_actual)
- AXIS2_DEP_ENGINE_FREE(dep_engine, &env);
+ AXIS2_DEP_ENGINE_FREE(dep_engine, env);
axis2_env_free(env);
}
Modified: webservices/axis2/trunk/c/test/unit/core/deployment/test_phases_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/deployment/test_phases_info.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/test_phases_info.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/test_phases_info.c Wed May 31 08:54:07 2006
@@ -5,6 +5,6 @@
{
/*
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *environment = axis2_env_create (allocator);
+ const axis2_env_t *environment = axis2_env_create (allocator);
*/
}
Modified: webservices/axis2/trunk/c/test/unit/core/description/test_flow.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/test_flow.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/test_flow.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/test_flow.c Wed May 31 08:54:07 2006
@@ -11,7 +11,7 @@
axis2_handler_desc_t *
-test_flow_create_handler(axis2_env_t **env)
+test_flow_create_handler(const axis2_env_t *env)
{
axis2_handler_desc_t *handler_desc = NULL;
axis2_handler_t *handler = NULL;
@@ -48,13 +48,13 @@
printf("***************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- flow = axis2_flow_create(&env);
- handler_desc = test_flow_create_handler(&env);
- actual = AXIS2_FLOW_ADD_HANDLER(flow, &env, handler_desc);
+ flow = axis2_flow_create(env);
+ handler_desc = test_flow_create_handler(env);
+ actual = AXIS2_FLOW_ADD_HANDLER(flow, env, handler_desc);
CuAssertIntEquals(tc, expected, actual);
- AXIS2_FLOW_FREE (flow, &env);
+ AXIS2_FLOW_FREE (flow, env);
}
@@ -69,10 +69,10 @@
printf("********************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- flow = axis2_flow_create(&env);
- actual = AXIS2_FLOW_FREE (flow, &env);
+ flow = axis2_flow_create(env);
+ actual = AXIS2_FLOW_FREE (flow, env);
CuAssertIntEquals(tc, expected, actual);
Modified: webservices/axis2/trunk/c/test/unit/core/description/test_handler_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/test_handler_desc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/test_handler_desc.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/test_handler_desc.c Wed May 31 08:54:07 2006
@@ -8,7 +8,7 @@
#include <stdio.h>
axis2_handler_desc_t *
-test_handler_desc_create_handler_desc(axis2_env_t **env)
+test_handler_desc_create_handler_desc(const axis2_env_t *env)
{
axis2_handler_desc_t *handler_desc = NULL;
axis2_handler_t *handler = NULL;
@@ -44,10 +44,10 @@
printf("****************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- handler_desc = test_handler_desc_create_handler_desc(&env);
- actual = AXIS2_HANDLER_DESC_FREE (handler_desc, &env);
+ handler_desc = test_handler_desc_create_handler_desc(env);
+ actual = AXIS2_HANDLER_DESC_FREE (handler_desc, env);
CuAssertIntEquals(tc, expected, actual);
Modified: webservices/axis2/trunk/c/test/unit/core/description/test_op.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/test_op.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/test_op.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/test_op.c Wed May 31 08:54:07 2006
@@ -1,8 +1,8 @@
#include <stdio.h>
#include "test_op.h"
-void add_handlers_to_flow(struct axis2_flow *flow, axis2_env_t **env);
-axis2_array_list_t *get_op_op_in_phases(axis2_env_t **env);
+void add_handlers_to_flow(struct axis2_flow *flow, const axis2_env_t *env);
+axis2_array_list_t *get_op_op_in_phases(const axis2_env_t *env);
void Testaxis2_op_set_remaining_phases_inflow(CuTest *tc)
{
@@ -16,12 +16,12 @@
printf("*****************************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- op = axis2_op_create(&env);
- op_in_phases = get_op_op_in_phases(&env);
- actual = AXIS2_OP_SET_REMAINING_PHASES_INFLOW(op, &env, op_in_phases);
- AXIS2_OP_FREE(op, &env);
+ op = axis2_op_create(env);
+ op_in_phases = get_op_op_in_phases(env);
+ actual = AXIS2_OP_SET_REMAINING_PHASES_INFLOW(op, env, op_in_phases);
+ AXIS2_OP_FREE(op, env);
CuAssertIntEquals(tc, expected, actual);
}
@@ -29,7 +29,7 @@
/** helper method. This is the requirement method from phases_info's
* axis2_get_op_in_phases method
*/
-axis2_array_list_t *get_op_op_in_phases(axis2_env_t **env)
+axis2_array_list_t *get_op_op_in_phases(const axis2_env_t *env)
{
struct axis2_phase *phase = NULL;
axis2_array_list_t *op_in_phases = NULL;
Modified: webservices/axis2/trunk/c/test/unit/core/description/test_svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/test_svc.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/test_svc.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/test_svc.c Wed May 31 08:54:07 2006
@@ -5,9 +5,9 @@
#include <stdio.h>
#include <string.h>
-struct axis2_module_desc *create_module_desc(axis2_env_t **env);
-void add_handlers_to_flow(struct axis2_flow *flow, axis2_env_t **env);
-axis2_array_list_t *get_svc_op_in_phases(axis2_env_t **env);
+struct axis2_module_desc *create_module_desc(const axis2_env_t *env);
+void add_handlers_to_flow(struct axis2_flow *flow, const axis2_env_t *env);
+axis2_array_list_t *get_svc_op_in_phases(const axis2_env_t *env);
void Testaxis2_svc_add_module_ops(CuTest *tc)
{
@@ -20,7 +20,7 @@
axis2_qname_t *svc_qname = NULL;
axis2_allocator_t *allocator = NULL;
axis2_log_t *log = NULL;
- axis2_env_t *env = NULL;
+ const axis2_env_t *env = NULL;
axis2_error_t *error = NULL;
printf("**************************************\n");
@@ -35,15 +35,15 @@
env->log->level = AXIS2_LOG_LEVEL_TRACE;
axis2_error_init();
- conf = axis2_conf_create(&env);
- module_desc = create_module_desc(&env);
+ conf = axis2_conf_create(env);
+ module_desc = create_module_desc(env);
- inflow = axis2_flow_create(&env);
- add_handlers_to_flow(inflow, &env);
- svc_qname = axis2_qname_create(&env, "service name", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, svc_qname);
- AXIS2_SVC_SET_INFLOW(svc, &env, inflow);
- actual = AXIS2_SVC_ADD_MODULE_OPS(svc, &env, module_desc, conf);
+ inflow = axis2_flow_create(env);
+ add_handlers_to_flow(inflow, env);
+ svc_qname = axis2_qname_create(env, "service name", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, svc_qname);
+ AXIS2_SVC_SET_INFLOW(svc, env, inflow);
+ actual = AXIS2_SVC_ADD_MODULE_OPS(svc, env, module_desc, conf);
CuAssertIntEquals(tc, expected, actual);
@@ -60,26 +60,26 @@
printf("**************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- svc = axis2_svc_create(&env);
+ svc = axis2_svc_create(env);
axis2_param_t *param = NULL;
axis2_char_t *param_name = NULL;
axis2_char_t *param_value = NULL;
param_name = "damitha";
param_value = "kumarage";
- param = axis2_param_create(&env, NULL, NULL);
- AXIS2_PARAM_SET_NAME(param, &env, param_name);
- AXIS2_PARAM_SET_VALUE(param, &env, param_value);
- AXIS2_SVC_ADD_PARAM(svc, &env, param);
+ param = axis2_param_create(env, NULL, NULL);
+ AXIS2_PARAM_SET_NAME(param, env, param_name);
+ AXIS2_PARAM_SET_VALUE(param, env, param_value);
+ AXIS2_SVC_ADD_PARAM(svc, env, param);
CuAssertIntEquals(tc, expected, actual);
}
-struct axis2_module_desc *create_module_desc(axis2_env_t **env)
+struct axis2_module_desc *create_module_desc(const axis2_env_t *env)
{
struct axis2_op *op = NULL;
axis2_qname_t *op_qname = NULL;
@@ -104,7 +104,7 @@
}
-void add_handlers_to_flow(struct axis2_flow *flow, axis2_env_t **env)
+void add_handlers_to_flow(struct axis2_flow *flow, const axis2_env_t *env)
{
struct axis2_handler_desc *handler_desc = NULL;
struct axis2_handler *handler = NULL;
@@ -148,7 +148,7 @@
/** helper method. This is the requirement method from phases_info's
* axis2_get_op_in_phases method
*/
-axis2_array_list_t *get_svc_op_in_phases(axis2_env_t **env)
+axis2_array_list_t *get_svc_op_in_phases(const axis2_env_t *env)
{
struct axis2_phase *phase = NULL;
axis2_array_list_t *op_in_phases = NULL;
@@ -184,17 +184,17 @@
printf("********************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- expected = AXIS2_STRDUP("service name", &env);
- qname = axis2_qname_create(&env, "service name", NULL, NULL);
- svc = axis2_svc_create_with_qname(&env, qname);
- qactual = AXIS2_SVC_GET_QNAME(svc, &env);
- actual = AXIS2_QNAME_GET_LOCALPART(qactual, &env);
+ expected = AXIS2_STRDUP("service name", env);
+ qname = axis2_qname_create(env, "service name", NULL, NULL);
+ svc = axis2_svc_create_with_qname(env, qname);
+ qactual = AXIS2_SVC_GET_QNAME(svc, env);
+ actual = AXIS2_QNAME_GET_LOCALPART(qactual, env);
CuAssertStrEquals(tc, expected, actual);
AXIS2_FREE((env)->allocator, expected);
- AXIS2_QNAME_FREE(qname, &env);
- AXIS2_SVC_FREE(svc, &env);
+ AXIS2_QNAME_FREE(qname, env);
+ AXIS2_SVC_FREE(svc, env);
}
Modified: webservices/axis2/trunk/c/test/unit/core/engine/test_conf.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/engine/test_conf.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/test_conf.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/test_conf.c Wed May 31 08:54:07 2006
@@ -16,13 +16,13 @@
printf("***************************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- conf = axis2_conf_create(&env);
- AXIS2_CONF_SET_DEFAULT_DISPATCHERS(conf, &env);
- in_phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, &env);
+ conf = axis2_conf_create(env);
+ AXIS2_CONF_SET_DEFAULT_DISPATCHERS(conf, env);
+ in_phases = AXIS2_CONF_GET_IN_PHASES_UPTO_AND_INCLUDING_POST_DISPATCH(conf, env);
CuAssertPtrNotNull(tc, in_phases);
- size = AXIS2_ARRAY_LIST_SIZE(in_phases, &env);
+ size = AXIS2_ARRAY_LIST_SIZE(in_phases, env);
for(i = 0; i < size; i++)
{
axis2_qname_t *qname = NULL;
@@ -32,14 +32,14 @@
int j = 0;
int sizej = 0;
- phase = AXIS2_ARRAY_LIST_GET(in_phases, &env, i);
- handlers = AXIS2_PHASE_GET_HANDLERS (phase, &env);
- sizej = AXIS2_ARRAY_LIST_SIZE(handlers, &env);
+ phase = AXIS2_ARRAY_LIST_GET(in_phases, env, i);
+ handlers = AXIS2_PHASE_GET_HANDLERS (phase, env);
+ sizej = AXIS2_ARRAY_LIST_SIZE(handlers, env);
for(j = 0; j < sizej; j++)
{
- handler = AXIS2_ARRAY_LIST_GET(handlers, &env, j);
- qname = AXIS2_HANDLER_GET_NAME(handler, &env);
- handler_name = AXIS2_QNAME_GET_LOCALPART(qname, &env);
+ handler = AXIS2_ARRAY_LIST_GET(handlers, env, j);
+ qname = AXIS2_HANDLER_GET_NAME(handler, env);
+ handler_name = AXIS2_QNAME_GET_LOCALPART(qname, env);
if(0 == AXIS2_STRCMP(handler_name, "addressing_based_dispatcher"))
{
printf("handler_name:%s\n", handler_name);
@@ -49,7 +49,7 @@
}
}
- AXIS2_CONF_FREE(conf, &env);
+ AXIS2_CONF_FREE(conf, env);
CuAssertIntEquals(tc, expected, actual);
}
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_phase_holder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_phase_holder.c?rev=410566&r1=410565&r2=410566&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_phase_holder.c (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/test_phase_holder.c Wed May 31 08:54:07 2006
@@ -8,7 +8,7 @@
/** helper method
*/
-axis2_array_list_t *get_phases(axis2_env_t **env);
+axis2_array_list_t *get_phases(const axis2_env_t *env);
void Testaxis2_phase_holder_free(CuTest *tc)
{
@@ -22,11 +22,11 @@
printf("****************************************\n");
axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
+ const axis2_env_t *env = axis2_env_create (allocator);
- phases = get_phases(&env);
- phase_holder = axis2_phase_holder_create_with_phases(&env, phases);
- actual = AXIS2_PHASE_HOLDER_FREE(phase_holder, &env);
+ phases = get_phases(env);
+ phase_holder = axis2_phase_holder_create_with_phases(env, phases);
+ actual = AXIS2_PHASE_HOLDER_FREE(phase_holder, env);
CuAssertIntEquals(tc, expected, actual);
@@ -34,7 +34,7 @@
/** helper method
*/
-axis2_array_list_t *get_phases(axis2_env_t **env)
+axis2_array_list_t *get_phases(const axis2_env_t *env)
{
struct axis2_phase *phase = NULL;
axis2_array_list_t *phases = NULL;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org