You are viewing a plain text version of this content. The canonical link for it is here.
Posted to savan-dev@ws.apache.org by da...@apache.org on 2008/07/01 12:51:04 UTC
svn commit: r673052 - in /webservices/savan/trunk/c:
include/savan_publishing_client.h
samples/server/publisher/publisher_skeleton.c
src/client/savan_publishing_client.c src/data/module.xml
src/subs_mgr/subs_mgr_skel.c
Author: damitha
Date: Tue Jul 1 03:51:03 2008
New Revision: 673052
URL: http://svn.apache.org/viewvc?rev=673052&view=rev
Log:
Applied the patch in AXIS2C-1211
Modified:
webservices/savan/trunk/c/include/savan_publishing_client.h
webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c
webservices/savan/trunk/c/src/client/savan_publishing_client.c
webservices/savan/trunk/c/src/data/module.xml
webservices/savan/trunk/c/src/subs_mgr/subs_mgr_skel.c
Modified: webservices/savan/trunk/c/include/savan_publishing_client.h
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_publishing_client.h?rev=673052&r1=673051&r2=673052&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_publishing_client.h (original)
+++ webservices/savan/trunk/c/include/savan_publishing_client.h Tue Jul 1 03:51:03 2008
@@ -56,7 +56,7 @@
AXIS2_EXTERN savan_publishing_client_t * AXIS2_CALL
savan_publishing_client_create(
const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
+ axis2_conf_t *conf,
axis2_svc_t *svc);
AXIS2_EXTERN void AXIS2_CALL
Modified: webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c?rev=673052&r1=673051&r2=673052&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c (original)
+++ webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c Tue Jul 1 03:51:03 2008
@@ -222,7 +222,6 @@
axiom_node_t *test_node3 = NULL;
axis2_conf_t *conf = NULL;
axis2_svc_t *svc = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
axiom_attribute_t *test_data = NULL;
publisher_data_t *mydata = (publisher_data_t*)data;
@@ -233,16 +232,14 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Start:publisher_worker_func");
-
svc = axis2_conf_get_svc(conf, env, "publisher");
- conf_ctx = axis2_conf_ctx_create(env, conf);
while(1)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan]Inside while loop");
{
savan_publishing_client_t *pub_client = NULL;
- pub_client = savan_publishing_client_create(env, conf_ctx, svc);
+ pub_client = savan_publishing_client_create(env, conf, svc);
/* Build a payload and pass it to the savan publishing client */
test_ns = axiom_namespace_create (env,
"http://www.wso2.com/savan/c/publisher", "test");
Modified: webservices/savan/trunk/c/src/client/savan_publishing_client.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/client/savan_publishing_client.c?rev=673052&r1=673051&r2=673052&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Tue Jul 1 03:51:03 2008
@@ -19,7 +19,7 @@
#include <axiom_soap_body.h>
#include <axis2_options.h>
#include <axutil_array_list.h>
-#include <axis2_conf_ctx.h>
+#include <axis2_conf.h>
#include <axis2_svc.h>
#include <axis2_svc_client.h>
#include <axis2_endpoint_ref.h>
@@ -33,7 +33,7 @@
struct savan_publishing_client_t
{
- axis2_conf_ctx_t *conf_ctx;
+ axis2_conf_t *conf;
axis2_svc_t *svc;
};
@@ -45,7 +45,7 @@
AXIS2_EXTERN savan_publishing_client_t * AXIS2_CALL
savan_publishing_client_create(
const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
+ axis2_conf_t *conf,
axis2_svc_t *svc)
{
savan_publishing_client_t *client = NULL;
@@ -60,7 +60,7 @@
return NULL;
}
- client->conf_ctx = conf_ctx;
+ client->conf = conf;
client->svc = svc;
return client;
@@ -85,7 +85,6 @@
axutil_param_t *param = NULL;
axis2_svc_t *pubs_svc = NULL;
axutil_array_list_t *subs_store = NULL;
- axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
axis2_module_desc_t *module_desc = NULL;
int i = 0, size = 0;
@@ -98,7 +97,7 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[savan]Start:savan_publishing_client_publish");
- conf_ctx = client->conf_ctx;
+ conf = client->conf;
pubs_svc = client->svc;
topic_param = axis2_svc_get_param(pubs_svc, env, "TopicURL");
@@ -110,8 +109,6 @@
}
topic_url = axutil_param_get_value(topic_param, env);
-
- conf = axis2_conf_ctx_get_conf(conf_ctx, env);
qname = axutil_qname_create(env, "savan", NULL, NULL);
module_desc = axis2_conf_get_module(conf, env, qname);
Modified: webservices/savan/trunk/c/src/data/module.xml
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/data/module.xml?rev=673052&r1=673051&r2=673052&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/data/module.xml (original)
+++ webservices/savan/trunk/c/src/data/module.xml Tue Jul 1 03:51:03 2008
@@ -1,5 +1,5 @@
<module name="savan" class="mod_savan">
- <!--parameter name="SubscriptionMgrURL" locked="xsd:false">http://localhost:9092/axis2/services/subscription</parameter-->
+ <!--parameter name="SubscriptionMgrURL" locked="xsd:false">http://localhost:9092/axis2/services/subscription</parameter-->
<!-- Database connection parameters -->
<parameter name="savan_db" locked="false">/tmp/savan_db</parameter>
<inflow>
Modified: webservices/savan/trunk/c/src/subs_mgr/subs_mgr_skel.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgr/subs_mgr_skel.c?rev=673052&r1=673051&r2=673052&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgr/subs_mgr_skel.c (original)
+++ webservices/savan/trunk/c/src/subs_mgr/subs_mgr_skel.c Tue Jul 1 03:51:03 2008
@@ -122,7 +122,6 @@
axis2_svc_t *subs_svc = NULL;
axis2_op_t *op = NULL;
int i = 0, size = 0;
- axis2_conf_ctx_t *conf_ctx = NULL;
const axis2_char_t *dbname = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] Start:savan_subs_mgr_init_with_conf");
@@ -139,7 +138,6 @@
}
savan_subs_mgr_init(svc_skeleton, env);
- conf_ctx = axis2_conf_ctx_create(env, conf);
subs_svc = axis2_conf_get_svc(conf, env, "subscription");
op = axis2_svc_get_op_with_name(subs_svc, env, "get_topic_list");
topic_param_list = axis2_op_get_all_params(op, env);