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 2007/09/21 08:28:42 UTC
svn commit: r577995 - in /webservices/savan/trunk/c:
samples/client/subscriber/ samples/server/listener/
samples/server/publisher/ src/client/ src/data/ src/subs_mgr/ src/util/
Author: damitha
Date: Thu Sep 20 23:28:41 2007
New Revision: 577995
URL: http://svn.apache.org/viewvc?rev=577995&view=rev
Log:
Removed the SubscriptionMgr url from the data source service's service.xml. It is enough to take it from
module.xml
Modified:
webservices/savan/trunk/c/samples/client/subscriber/subscriber.c
webservices/savan/trunk/c/samples/server/listener/services.xml
webservices/savan/trunk/c/samples/server/publisher/services.xml
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/services.xml
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/samples/client/subscriber/subscriber.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/client/subscriber/subscriber.c?rev=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/client/subscriber/subscriber.c (original)
+++ webservices/savan/trunk/c/samples/client/subscriber/subscriber.c Thu Sep 20 23:28:41 2007
@@ -117,7 +117,7 @@
exit(0);
}
- AXIS2_SLEEP(5);
+ AXIS2_SLEEP(16);
printf("\n***************************************\n");
Modified: webservices/savan/trunk/c/samples/server/listener/services.xml
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/server/listener/services.xml?rev=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/server/listener/services.xml (original)
+++ webservices/savan/trunk/c/samples/server/listener/services.xml Thu Sep 20 23:28:41 2007
@@ -1,7 +1,6 @@
<service name="listener">
<parameter name="ServiceClass" locked="xsd:false">listener</parameter>
<operation name="notify">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping">http://ws.apache.org/axis2/c/samples/notify</parameter>
</operation>
</service>
Modified: webservices/savan/trunk/c/samples/server/publisher/services.xml
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/server/publisher/services.xml?rev=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/server/publisher/services.xml (original)
+++ webservices/savan/trunk/c/samples/server/publisher/services.xml Thu Sep 20 23:28:41 2007
@@ -2,16 +2,13 @@
<parameter name="ServiceClass" locked="xsd:false">publisher</parameter>
<parameter name="loadServiceAtStartup" locked="xsd:false">true</parameter>
<description>
- This is a testing service , to test the system is working or not
+ This is a sample eventing data source which loads as the axis2 engine startup and
+ start publishing to its subscribers.
</description>
-
<module ref="savan"/>
<parameter name="TopicURL" locked="xsd:false">http://localhost:9090/axis2/services/publisher</parameter>
- <!--parameter name="SubscriptionMgrURL" locked="xsd:false">http://localhost:9090/axis2/services/subscription</parameter-->
<operation name="start">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/savan/samples/pubilsher/start</parameter>
</operation>
-
</service>
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=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Thu Sep 20 23:28:41 2007
@@ -84,9 +84,12 @@
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;
axutil_param_t *topic_param = NULL;
axis2_char_t *topic_url = NULL;
+ axutil_qname_t *qname = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -97,7 +100,11 @@
pubs_svc = client->svc;
topic_param = axis2_svc_get_param(pubs_svc, env, "TopicURL");
topic_url = axutil_param_get_value(topic_param, env);
- param = axis2_svc_get_param(pubs_svc, env, "SubscriptionMgrURL");
+ 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);
+ param = axis2_module_desc_get_param(module_desc, env, "SubscriptionMgrURL");
+ axutil_qname_free(qname, env);
if(param)
{
axis2_char_t *subs_mgr_url = NULL;
Modified: webservices/savan/trunk/c/src/data/module.xml
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/data/module.xml?rev=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/data/module.xml (original)
+++ webservices/savan/trunk/c/src/data/module.xml Thu Sep 20 23:28:41 2007
@@ -1,6 +1,5 @@
<module name="savan" class="mod_savan">
- <!--parameter name="SubscriptionMgrName" >subscription</parameter>
- <parameter name="SubscriptionMgrURL" locked="xsd:false">http://localhost:9090/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">/axis2c/deploy/savan_db</parameter>
<inflow>
@@ -10,22 +9,18 @@
</inflow>
<operation name="Subscribe">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://schemas.xmlsoap.org/ws/2004/08/eventing/Subscribe</parameter>
</operation>
<operation name="Renew">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://schemas.xmlsoap.org/ws/2004/08/eventing/Renew</parameter>
</operation>
<operation name="Unsubscribe">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://schemas.xmlsoap.org/ws/2004/08/eventing/Unsubscribe</parameter>
</operation>
<operation name="GetStatus">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatus</parameter>
</operation>
Modified: webservices/savan/trunk/c/src/subs_mgr/services.xml
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgr/services.xml?rev=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgr/services.xml (original)
+++ webservices/savan/trunk/c/src/subs_mgr/services.xml Thu Sep 20 23:28:41 2007
@@ -7,26 +7,21 @@
<parameter name="loadServiceAtStartup" locked="xsd:false">true</parameter>
<operation name="add_subscriber">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/subscription/add_subscriber</parameter>
</operation>
<operation name="remove_subscriber">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/subscription/remove_subscriber</parameter>
</operation>
<operation name="get_subscriber">
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/subscription/get_subscriber</parameter>
</operation>
<operation name="get_subscriber_list">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/subscription/get_subscriber_list</parameter>
</operation>
<operation name="add_topic">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/subscription/add_topic</parameter>
</operation>
<operation name="get_topic_list">
- <!--messageReceiver class="axis2_receivers" /-->
<parameter name="wsamapping" >http://ws.apache.org/axis2/c/subscription/get_topic_list</parameter>
<parameter name="ganglia_heartbeat" locked="xsd:false">http://localhost:9090/axis2/services/ganglia_heartbeat</parameter>
<parameter name="ganglia_discovery" locked="xsd:false">http://localhost:9090/axis2/services/ganglia_discovery</parameter>
Modified: webservices/savan/trunk/c/src/util/savan_util.c
URL: http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/savan_util.c?rev=577995&r1=577994&r2=577995&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Thu Sep 20 23:28:41 2007
@@ -470,12 +470,15 @@
savan_subscriber_t *subscriber)
{
axis2_conf_ctx_t *conf_ctx = NULL;
+ axis2_conf_t *conf = NULL;
+ axis2_module_desc_t *module_desc = NULL;
axis2_svc_t *pubs_svc = NULL;
axutil_param_t *param = NULL;
axis2_endpoint_ref_t *topic_epr = NULL;
axis2_char_t *topic_url = NULL;
axis2_char_t *topic = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ axutil_qname_t *qname = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[SAVAN] Start:savan_util_add_subscriber");
@@ -491,7 +494,11 @@
"[SAVAN] Failed to extract the %s publisher service", topic);
return AXIS2_FAILURE;
}
- param = axis2_svc_get_param(pubs_svc, env, "SubscriptionMgrURL");
+ 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);
+ param = axis2_module_desc_get_param(module_desc, env, "SubscriptionMgrURL");
+ axutil_qname_free(qname, env);
if(param)
{
axis2_char_t *subs_mgr_url = NULL;