Author: dinesh
Date: Tue Dec 18 10:29:38 2007
New Revision: 605284
URL: http://svn.apache.org/viewvc?rev=605284&view=rev
Log:
fixed some formatting, fixed a segmentation fault when TopicURL value is not
present, modified build.sh to work with axis2c-1.2
Modified:
webservices/savan/trunk/c/build.sh
webservices/savan/trunk/c/samples/server/listener/listener.c
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/core/mod_savan.c
webservices/savan/trunk/c/src/core/savan_sub_processor.c
webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c
webservices/savan/trunk/c/src/subscribers/savan_subscriber.c
webservices/savan/trunk/c/src/util/db_mgr.c
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/build.sh
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/build.sh?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/build.sh (original)
+++ webservices/savan/trunk/c/build.sh Tue Dec 18 10:29:38 2007
@@ -1,12 +1,12 @@
#!/bin/bash
./autogen.sh
-./configure --prefix=$AXIS2C_HOME --enable-static=no
--with-axis2=${AXIS2C_HOME}/include/axis2-1.1 --enable-filtering=no
+./configure --prefix=$AXIS2C_HOME --enable-static=no
--with-axis2=${AXIS2C_HOME}/include/axis2-1.2 --enable-filtering=no
make -j30
make install
cd samples
sh autogen.sh
-./configure --prefix=${AXIS2C_HOME}
--with-axis2=${AXIS2C_HOME}/include/axis2-1.1
--with-savan=${AXIS2C_HOME}/include/savan-0.90
+./configure --prefix=${AXIS2C_HOME}
--with-axis2=${AXIS2C_HOME}/include/axis2-1.2
--with-savan=${AXIS2C_HOME}/include/savan-0.90
make -j10
make install
cd ..
Modified: webservices/savan/trunk/c/samples/server/listener/listener.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/samples/server/listener/listener.c?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/server/listener/listener.c (original)
+++ webservices/savan/trunk/c/samples/server/listener/listener.c Tue Dec 18
10:29:38 2007
@@ -1,3 +1,4 @@
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
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=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c
(original)
+++ webservices/savan/trunk/c/samples/server/publisher/publisher_skeleton.c Tue
Dec 18 10:29:38 2007
@@ -238,7 +238,7 @@
conf_ctx = axis2_conf_ctx_create(env, conf);
while(1)
{
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] Inside while loop");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan]Inside while loop");
{
savan_publishing_client_t *pub_client = NULL;
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=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/client/savan_publishing_client.c (original)
+++ webservices/savan/trunk/c/src/client/savan_publishing_client.c Tue Dec 18
10:29:38 2007
@@ -95,18 +95,29 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] "
- "Start:savan_publishing_client_publish");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[savan]Start:savan_publishing_client_publish");
conf_ctx = client->conf_ctx;
pubs_svc = client->svc;
+
topic_param = axis2_svc_get_param(pubs_svc, env, "TopicURL");
+ if (!topic_param)
+ {
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "[savan]TopicURL param not available");
+ return AXIS2_SUCCESS;
+ }
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);
+
param = axis2_module_desc_get_param(module_desc, env,
"SubscriptionMgrURL");
axutil_qname_free(qname, env);
+
if(param)
{
axis2_char_t *subs_mgr_url = NULL;
@@ -117,7 +128,10 @@
subs_mgr_url = axutil_param_get_value(param, env);
svc_client_param = axis2_svc_get_param(pubs_svc, env, "svc_client");
if(svc_client_param)
+ {
svc_client = axutil_param_get_value(svc_client_param, env);
+ }
+
if(!svc_client)
{
svc_client =
@@ -126,6 +140,7 @@
svc_client);
axis2_svc_add_param(pubs_svc, env, svc_client_param);
}
+
subs_store =
savan_util_get_subscriber_list_from_remote_subs_mgr(env,
topic_url, subs_mgr_url, svc_client);
@@ -142,14 +157,21 @@
" where topic.topic_name=subscriber.topic_name and"\
" topic.topic_name='%s';", topic_name);
db_mgr = savan_db_mgr_create(env, conf_ctx);
- if(db_mgr)
- subs_store = savan_db_mgr_retrieve_all(db_mgr, env,
- savan_db_mgr_subs_find_callback, sql_retrieve);
+ if(!db_mgr)
+ {
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
+ "[savan]database manager creation failed");
+ }
+
+ subs_store = savan_db_mgr_retrieve_all(db_mgr, env,
+
savan_db_mgr_subs_find_callback,
+ sql_retrieve);
}
+
if (!subs_store)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Subscriber store is NULL");
+ "[savan] Subscriber store is NULL");
return AXIS2_SUCCESS; /* returning FAILURE will break handler chain */
}
@@ -161,23 +183,29 @@
if (sub)
{
axis2_char_t *id = savan_subscriber_get_id(sub, env);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan][out handler] "
- "Publishing to %s", id);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[savan][out handler]Publishing to %s", id);
+
if(!savan_subscriber_publish(sub, env, payload))
{
axis2_endpoint_ref_t *notifyto =
savan_subscriber_get_notify_to(sub, env);
const axis2_char_t *address = NULL;
+
if(notifyto)
+ {
address = axis2_endpoint_ref_get_address(notifyto, env);
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Publishing to the "\
- "Data Sink:%s proviced by subscriber:%s Failed. Check "\
- "whether the Data Sink url is correct", address, id);
+ }
+
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
+ "Publishing to the Data Sink:%s proviced by \
+subscriber:%s Failed. Check whether the Data Sink url is correct",
+ address, id);
}
}
}
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] "
- "End:savan_publishing_client_publish");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
+ "[savan]End:savan_publishing_client_publish");
return AXIS2_SUCCESS;
}
Modified: webservices/savan/trunk/c/src/core/mod_savan.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/mod_savan.c?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/mod_savan.c (original)
+++ webservices/savan/trunk/c/src/core/mod_savan.c Tue Dec 18 10:29:38 2007
@@ -86,6 +86,7 @@
"[SAVAN] Error creating db_mgr struct");
return status;
}
+
if(!savan_db_mgr_create_db(db_mgr, env))
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[SAVAN] Could not create "\
@@ -93,9 +94,14 @@
"accessible. Exit loading the Savan module");
}
else
+ {
status = AXIS2_SUCCESS;
+ }
+
if(db_mgr)
+ {
savan_db_mgr_free(db_mgr, env);
+ }
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] End:mod_savan_init");
return status;
Modified: webservices/savan/trunk/c/src/core/savan_sub_processor.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/savan_sub_processor.c?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/savan_sub_processor.c (original)
+++ webservices/savan/trunk/c/src/core/savan_sub_processor.c Tue Dec 18
10:29:38 2007
@@ -100,16 +100,16 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_sub_processor_subscribe");
+ "[SAVAN] Start:savan_sub_processor_subscribe");
/* Extract info from incoming msg and create a subscriber */
subscriber = savan_sub_processor_create_subscriber_from_msg(env, msg_ctx);
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[SAVAN] Failed to create a"
- "subscriber");
+ "subscriber");
AXIS2_ERROR_SET(env->error, SAVAN_ERROR_FAILED_TO_CREATE_SUBSCRIBER,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
/* Set the expiry time on the subscription */
@@ -127,14 +127,14 @@
/* Validate the subscription with the available information
* If the validation fails, then, don't add the subscriber into
* the list.
- */
+ */
if (savan_sub_processor_validate_subscription(subscriber, env, msg_ctx)
- == AXIS2_FAILURE)
+ == AXIS2_FAILURE)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] End:"
- "savan_sub_processor_subscribe"
- "encountered a subscription validation fault.");
+ "savan_sub_processor_subscribe"
+ "encountered a subscription validation fault.");
return AXIS2_FAILURE;
}
@@ -144,7 +144,7 @@
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_sub_processor_subscribe");
+ "[SAVAN] End:savan_sub_processor_subscribe");
return AXIS2_SUCCESS;
}
@@ -163,13 +163,13 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_sub_processor_unsubscribe");
+ "[SAVAN] Start:savan_sub_processor_unsubscribe");
subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, NULL);
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to find the subscriber");
+ "[SAVAN] Failed to find the subscriber");
return AXIS2_FAILURE;
}
@@ -182,12 +182,12 @@
if (status != AXIS2_SUCCESS)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to remove the subscriber");
+ "[SAVAN] Failed to remove the subscriber");
return AXIS2_FAILURE;
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_sub_processor_unsubscribe");
+ "[SAVAN] End:savan_sub_processor_unsubscribe");
return AXIS2_SUCCESS;
}
@@ -211,17 +211,17 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_sub_processor_renew_subscription");
+ "[SAVAN] Start:savan_sub_processor_renew_subscription");
subscriber = savan_util_get_subscriber_from_msg(env, msg_ctx, NULL);
if (!subscriber)
{
savan_util_create_fault_envelope(msg_ctx, env,
- SAVAN_FAULT_UTR_CODE, SAVAN_FAULT_UTR_SUB_CODE,
- "Could not find the subscriber.", NULL);
+ SAVAN_FAULT_UTR_CODE,
SAVAN_FAULT_UTR_SUB_CODE,
+ "Could not find the subscriber.",
NULL);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to find the subscriber");
+ "[SAVAN] Failed to find the subscriber");
return AXIS2_FAILURE;
}
@@ -236,10 +236,10 @@
if (!renewable)
{
savan_util_create_fault_envelope(msg_ctx, env, SAVAN_FAULT_UTR_CODE,
- SAVAN_FAULT_UTR_SUB_CODE, "Subscription can not be renewed.",
NULL);
+ SAVAN_FAULT_UTR_SUB_CODE,
"Subscription can not be renewed.", NULL);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Subscription can not be renewed");
+ "[SAVAN] Subscription can not be renewed");
savan_subscriber_set_renew_status(subscriber, env, AXIS2_FALSE);
return AXIS2_FAILURE;
}
@@ -253,7 +253,7 @@
if(db_mgr)
status = savan_db_mgr_update_subscriber(db_mgr, env, subscriber);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_sub_processor_renew_subscription");
+ "[SAVAN] End:savan_sub_processor_renew_subscription");
return status;
}
@@ -271,7 +271,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_sub_processor_get_status");
+ "[SAVAN] Start:savan_sub_processor_get_status");
/* Extract the sub id and store it in msg ctx to be used by the msg
* receiver */
@@ -279,7 +279,7 @@
savan_sub_processor_set_sub_id_to_msg_ctx(env, msg_ctx, id);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_sub_processor_get_status");
+ "[SAVAN] End:savan_sub_processor_get_status");
return AXIS2_SUCCESS;
}
@@ -328,13 +328,13 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_sub_processor_create_subscriber_from_msg");
+ "[SAVAN]
Start:savan_sub_processor_create_subscriber_from_msg");
subscriber = savan_subscriber_create(env);
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to create a subscriber instance");
+ "[SAVAN] Failed to create a subscriber instance");
return NULL;
}
@@ -352,7 +352,7 @@
if (!envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the soap envelop");
+ "[SAVAN] Failed to extract the soap envelop");
return NULL;
}
@@ -360,7 +360,7 @@
if (!body)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the soap body");
+ "[SAVAN] Failed to extract the soap body");
return NULL;
}
@@ -371,7 +371,7 @@
/* Get Subscribe element from Body */
qname = axutil_qname_create(env, ELEM_NAME_SUBSCRIBE, EVENTING_NAMESPACE,
NULL);
sub_elem = axiom_element_get_first_child_with_qname(body_elem, env, qname,
- body_node, &sub_node);
+ body_node, &sub_node);
axutil_qname_free(qname, env);
/* Now read each sub element of Subscribe element */
@@ -380,7 +380,7 @@
/* EndTo */
qname = axutil_qname_create(env, ELEM_NAME_ENDTO, EVENTING_NAMESPACE,
NULL);
endto_elem = axiom_element_get_first_child_with_qname(sub_elem, env,
qname,
- sub_node, &endto_node);
+ sub_node,
&endto_node);
axutil_qname_free(qname, env);
if(endto_elem)
@@ -396,13 +396,13 @@
/* Get Delivery element and read NotifyTo */
qname = axutil_qname_create(env, ELEM_NAME_DELIVERY,
EVENTING_NAMESPACE, NULL);
delivery_elem = axiom_element_get_first_child_with_qname(sub_elem,
env, qname,
- sub_node, &delivery_node);
+ sub_node,
&delivery_node);
axutil_qname_free(qname, env);
if(delivery_elem)
{
qname = axutil_qname_create(env, ELEM_NAME_NOTIFYTO,
EVENTING_NAMESPACE, NULL);
notify_elem =
axiom_element_get_first_child_with_qname(delivery_elem, env, qname,
- delivery_node, ¬ify_node);
+
delivery_node, ¬ify_node);
axutil_qname_free(qname, env);
if(notify_elem)
{
@@ -417,7 +417,7 @@
/* Expires */
qname = axutil_qname_create(env, ELEM_NAME_EXPIRES,
EVENTING_NAMESPACE, NULL);
expires_elem = axiom_element_get_first_child_with_qname(sub_elem, env,
qname,
- sub_node, &expires_node);
+ sub_node,
&expires_node);
axutil_qname_free(qname, env);
if(expires_elem)
{
@@ -427,31 +427,46 @@
}
/* Filter */
- qname = axutil_qname_create(env, ELEM_NAME_FILTER, EVENTING_NAMESPACE,
NULL);
- filter_elem = axiom_element_get_first_child_with_qname(sub_elem, env,
qname,
- sub_node, &filter_node);
+ qname = axutil_qname_create(env, ELEM_NAME_FILTER, EVENTING_NAMESPACE,
+ NULL);
+ filter_elem = axiom_element_get_first_child_with_qname(sub_elem, env,
+ qname,
+ sub_node,
+ &filter_node);
axutil_qname_free(qname, env);
if(filter_elem)
{
qname = axutil_qname_create(env, "Dialect", NULL, NULL);
filter = axiom_element_get_text(filter_elem, env, filter_node);
filter_dialect = axiom_element_get_attribute_value(filter_elem,
- env, qname);
+ env, qname);
axutil_qname_free(qname, env);
if(filter_dialect)
- savan_subscriber_set_filter_dialect(subscriber, env,
filter_dialect);
+ {
+ savan_subscriber_set_filter_dialect(subscriber, env,
+ filter_dialect);
+ }
+
if(filter)
+ {
savan_subscriber_set_filter(subscriber, env, filter);
+ }
}
topic_epr = axis2_msg_ctx_get_to(msg_ctx, env);
if(topic_epr)
- topic = (axis2_char_t *)axis2_endpoint_ref_get_address(topic_epr,
env);
+ {
+ topic = (axis2_char_t *)axis2_endpoint_ref_get_address(topic_epr,
+ env);
+ }
+
if(topic)
+ {
savan_subscriber_set_topic(subscriber, env, topic);
+ }
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_sub_processor_create_subscriber_from_msg");
+ "[SAVAN]
End:savan_sub_processor_create_subscriber_from_msg");
return subscriber;
}
@@ -472,7 +487,7 @@
* Pass a copy because msg ctx free function frees all properties */
property = axutil_property_create(env);
axutil_property_set_value(property, env, (void*)axutil_strdup(env, id));
- axis2_msg_ctx_set_property(msg_ctx, env, SAVAN_KEY_SUB_ID, property);
+ axis2_msg_ctx_set_property(msg_ctx, env, SAVAN_KEY_SUB_ID, property);
return AXIS2_SUCCESS;
}
@@ -513,8 +528,10 @@
else
{
savan_util_create_fault_envelope(msg_ctx, env,
- SAVAN_FAULT_DMRU_CODE, SAVAN_FAULT_DMRU_SUB_CODE,
- SAVAN_FAULT_DMRU_REASON, SAVAN_FAULT_DMRU_DETAIL);
+ SAVAN_FAULT_DMRU_CODE,
+ SAVAN_FAULT_DMRU_SUB_CODE,
+ SAVAN_FAULT_DMRU_REASON,
+ SAVAN_FAULT_DMRU_DETAIL);
return AXIS2_FAILURE;
}
@@ -531,23 +548,23 @@
axis2_msg_ctx_t *msg_ctx)
{
/*
- axis2_char_t *expires = savan_subscriber_get_expires(subscriber, env);
- if(expires == NULL)
- {
- savan_util_create_fault_envelope(msg_ctx, env,
- SAVAN_FAULT_IET_CODE, SAVAN_FAULT_IET_SUB_CODE,
- SAVAN_FAULT_IET_REASON, SAVAN_FAULT_IET_DETAIL);
-
- return AXIS2_FAILURE;
- }
- else
- {
- savan_util_create_fault_envelope(msg_ctx, env,
- SAVAN_FAULT_UET_CODE, SAVAN_FAULT_UET_SUB_CODE,
- SAVAN_FAULT_UET_REASON, SAVAN_FAULT_UET_DETAIL);
+ axis2_char_t *expires = savan_subscriber_get_expires(subscriber, env);
+ if(expires == NULL)
+ {
+ savan_util_create_fault_envelope(msg_ctx, env,
+ SAVAN_FAULT_IET_CODE, SAVAN_FAULT_IET_SUB_CODE,
+ SAVAN_FAULT_IET_REASON, SAVAN_FAULT_IET_DETAIL);
+
+ return AXIS2_FAILURE;
+ }
+ else
+ {
+ savan_util_create_fault_envelope(msg_ctx, env,
+ SAVAN_FAULT_UET_CODE, SAVAN_FAULT_UET_SUB_CODE,
+ SAVAN_FAULT_UET_REASON, SAVAN_FAULT_UET_DETAIL);
- return AXIS2_FAILURE;
- }
+ return AXIS2_FAILURE;
+ }
*/
return AXIS2_SUCCESS;
}
@@ -573,23 +590,28 @@
}
else if(axutil_strcmp(filter_dialect, DEFAULT_FILTER_DIALECT) == 0)
{
- #ifdef SAVAN_FILTERING
- return AXIS2_SUCCESS;
- #else
- savan_util_create_fault_envelope(msg_ctx, env,
- SAVAN_FAULT_FNS_CODE, SAVAN_FAULT_FNS_SUB_CODE,
- SAVAN_FAULT_FNS_REASON, "Server doesn't support filtering");
+#ifdef SAVAN_FILTERING
+ return AXIS2_SUCCESS;
+#else
+ savan_util_create_fault_envelope(msg_ctx, env,
+ SAVAN_FAULT_FNS_CODE,
+ SAVAN_FAULT_FNS_SUB_CODE,
+ SAVAN_FAULT_FNS_REASON,
+ "Server doesn't support filtering");
return AXIS2_FAILURE;
- #endif
+#endif
}
else
{
savan_util_create_fault_envelope(msg_ctx, env,
- SAVAN_FAULT_FRU_CODE, SAVAN_FAULT_FRU_SUB_CODE,
- SAVAN_FAULT_FRU_REASON, "Server does not support the
dialect.");
+ SAVAN_FAULT_FRU_CODE,
+ SAVAN_FAULT_FRU_SUB_CODE,
+ SAVAN_FAULT_FRU_REASON,
+ "Server does not support the
dialect.");
return AXIS2_FAILURE;
}
+
}
/****************************************************************************/
@@ -601,18 +623,18 @@
axis2_msg_ctx_t *msg_ctx)
{
if(savan_sub_processor_validate_delivery_mode(subscriber,
- env, msg_ctx) == AXIS2_FAILURE)
+ env, msg_ctx) ==
AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
if(savan_sub_processor_validate_expiration_time(subscriber,
- env, msg_ctx) == AXIS2_FAILURE)
+ env, msg_ctx) ==
AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
if(savan_sub_processor_validate_filter(subscriber,
- env, msg_ctx) == AXIS2_FAILURE)
+ env, msg_ctx) == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
Modified: webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c Tue Dec 18 10:29:38 2007
@@ -500,8 +500,11 @@
topic);
db_mgr = savan_db_mgr_create(env, conf_ctx);
if(db_mgr)
+ {
subs_store = savan_db_mgr_retrieve_all(db_mgr, env,
savan_db_mgr_subs_find_callback, sql_retrieve);
+ }
+
if(subs_store)
{
size = axutil_array_list_size(subs_store, env);
Modified: webservices/savan/trunk/c/src/subscribers/savan_subscriber.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subscribers/savan_subscriber.c?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subscribers/savan_subscriber.c (original)
+++ webservices/savan/trunk/c/src/subscribers/savan_subscriber.c Tue Dec 18
10:29:38 2007
@@ -390,6 +390,15 @@
path = AXIS2_GETENV("AXIS2C_HOME");
svc_client = axis2_svc_client_create(env, path);
+ if(!svc_client)
+ {
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
+ "[savan]svc_client creation failed, unable to\
+continue");
+ return AXIS2_SUCCESS;
+ }
+
+
/* Setup options */
options = axis2_options_create(env);
if(subscriber->notify_to)
@@ -406,21 +415,17 @@
/* Apply the filter, and check whether it evaluates to success */
- #ifdef SAVAN_FILTERING
+#ifdef SAVAN_FILTERING
if (savan_util_apply_filter(subscriber, env, payload) == AXIS2_FAILURE)
{
return AXIS2_SUCCESS;
}
- #endif
+#endif
/* Set service client options */
- if(svc_client)
- {
- axis2_svc_client_set_options(svc_client, env, options);
- status = axis2_svc_client_send_robust(svc_client, env, payload);
-
- axis2_svc_client_free(svc_client, env);
- }
+ axis2_svc_client_set_options(svc_client, env, options);
+ status = axis2_svc_client_send_robust(svc_client, env, payload);
+ axis2_svc_client_free(svc_client, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[savan] End:savan_subscriber_publish");
Modified: webservices/savan/trunk/c/src/util/db_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/db_mgr.c?rev=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/db_mgr.c (original)
+++ webservices/savan/trunk/c/src/util/db_mgr.c Tue Dec 18 10:29:38 2007
@@ -141,6 +141,7 @@
{
subscriber = savan_subscriber_create(env);
}
+
for(i = 0; i < argc; i++)
{
if(0 == axutil_strcmp(col_name[i], "id"))
@@ -181,6 +182,7 @@
AXIS2_ATOI(argv[i]));
}
}
+
if(subscriber)
axutil_array_list_add(subscriber_list, env, subscriber);
return 0;
@@ -843,8 +845,11 @@
rc = sqlite3_exec(dbconn, sql_stmt_find, find_func, args,
&error_msg);
if(rc == SQLITE_BUSY)
+ {
rc = savan_db_mgr_busy_handler(dbconn, sql_stmt_find,
find_func, args, &error_msg, rc);
+ }
+
if(args->data)
data_list = (axutil_array_list_t *) args->data;
if(rc != SQLITE_OK )
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=605284&r1=605283&r2=605284&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Tue Dec 18 10:29:38 2007
@@ -200,7 +200,7 @@
payload_string = axiom_node_to_string(payload, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] payload_string before applying filter:%s", payload_string);
+ "[savan] payload_string before applying filter:%s", payload_string);
payload_doc = (xmlDocPtr)xmlParseDoc((xmlChar*)payload_string);
@@ -332,7 +332,7 @@
if (!info_header)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Cannot extract message info headers");
+ "[savan] Cannot extract message info headers");
return SAVAN_MSG_TYPE_UNKNOWN;
}
@@ -340,7 +340,7 @@
if( ! action)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Cannot extract soap action");
+ "[savan] Cannot extract soap action");
AXIS2_ERROR_SET(env->error, SAVAN_ERROR_SOAP_ACTION_NULL,
AXIS2_FAILURE);
return SAVAN_MSG_TYPE_UNKNOWN;
}
@@ -384,7 +384,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_get_subscription_id_from_msg");
+ "[savan] Start:savan_util_get_subscription_id_from_msg");
/* Get soap envelop and extract the subscription id */
@@ -392,7 +392,7 @@
if (!envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the soap envelop");
+ "[savan] Failed to extract the soap envelop");
return NULL;
}
@@ -400,7 +400,7 @@
if (!header)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the soap header");
+ "[savan] Failed to extract the soap header");
return NULL;
}
@@ -418,7 +418,7 @@
sub_id = axiom_element_get_text(id_elem, env, id_node);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_get_subscription_id_from_msg");
+ "[savan] End:savan_util_get_subscription_id_from_msg");
return sub_id;
}
@@ -435,7 +435,7 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_get_subscriber_from_msg");
+ "[savan] Start:savan_util_get_subscriber_from_msg");
/* Extract subscription id from msg if not already given */
if (!sub_id)
@@ -456,7 +456,7 @@
savan_db_mgr_subs_retrieve_callback, sql_retrieve);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_get_subscriber_from_msg");
+ "[savan] End:savan_util_get_subscriber_from_msg");
return subscriber;
}
@@ -481,7 +481,7 @@
axutil_qname_t *qname = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_add_subscriber");
+ "[savan] Start:savan_util_add_subscriber");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
topic_epr = axis2_msg_ctx_get_to(msg_ctx, env);
topic_url = (axis2_char_t *) axis2_endpoint_ref_get_address(topic_epr,
@@ -491,7 +491,7 @@
if (!pubs_svc)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to extract the %s publisher service", topic);
+ "[savan] Failed to extract the %s publisher service", topic);
return AXIS2_FAILURE;
}
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -521,7 +521,7 @@
axis2_msg_ctx_set_property(msg_ctx, env, SAVAN_SUBSCRIBER, subs_prop);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_add_subscriber");
+ "[savan] End:savan_util_add_subscriber");
return status;
}
@@ -534,7 +534,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_update_subscriber");
+ "[savan] Start:savan_util_update_subscriber");
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
{
savan_db_mgr_t *db_mgr = NULL;
@@ -544,7 +544,7 @@
savan_db_mgr_update_subscriber(db_mgr, env, subscriber);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_update_subscriber");
+ "[savan] End:savan_util_update_subscriber");
return AXIS2_SUCCESS;
}
@@ -556,7 +556,7 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_remove_subscriber");
+ "[savan] Start:savan_util_remove_subscriber");
{
axis2_char_t *subs_id = NULL;
@@ -573,7 +573,7 @@
savan_db_mgr_remove(db_mgr, env, sql_remove);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_remove_subscriber");
+ "[savan] End:savan_util_remove_subscriber");
return AXIS2_SUCCESS;
}
@@ -588,7 +588,7 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN][sub processor] "
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan][sub processor] "
"Start:set_sub_store");
/* Create a hash map */
@@ -596,7 +596,7 @@
if (!store)
{
/* TODO : error reporting */
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[SAVAN][sub processor] "
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan][sub processor] "
"Could not create subscriber store");
return AXIS2_FAILURE;
}
@@ -606,13 +606,13 @@
if (!param)
{
/* TODO : error reporting */
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[SAVAN][sub processor] "
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan][sub processor] "
"Could not create subscriber store param");
return AXIS2_FAILURE;
}
axis2_svc_add_param(svc, env, param);
- AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] End:set_sub_store");
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan] End:set_sub_store");
return AXIS2_SUCCESS;
}
@@ -690,7 +690,7 @@
savan_subscriber_t *subscriber = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_get_subscriber_from_remote_subs_mgr");
+ "[savan] Start:savan_util_get_subscriber_from_remote_subs_mgr");
svc_client = (axis2_svc_client_t *) s_client;
options = (axis2_options_t *)axis2_svc_client_get_options(svc_client,
env);
@@ -706,12 +706,12 @@
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Stub invoke FAILED: Error code:"
+ "[savan] Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
AXIS2_ERROR_GET_MESSAGE(env->error));
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_get_subscriber_from_remote_subs_mgr");
+ "[savan] End:savan_util_get_subscriber_from_remote_subs_mgr");
return subscriber;
}
@@ -756,7 +756,7 @@
sub_node = axiom_node_get_first_child(node, env);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:process_subscriber_node");
+ "[savan] Start:process_subscriber_node");
sub_elem = axiom_node_get_data_element(sub_node, env);
if(sub_node)
@@ -788,7 +788,7 @@
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Failed to create a subscriber instance");
+ "[savan] Failed to create a subscriber instance");
return NULL;
}
/* Now read each sub element of Subscribe element */
@@ -804,7 +804,7 @@
id = axiom_element_get_text(id_elem, env, id_node);
savan_subscriber_set_id(subscriber, env, id);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Received subscriber id:%s", id);
+ "[savan] Received subscriber id:%s", id);
/* EndTo */
qname = axutil_qname_create(env, ELEM_NAME_ENDTO, EVENTING_NAMESPACE,
NULL);
@@ -830,7 +830,7 @@
axutil_qname_free(qname, env);
notify = axiom_element_get_text(notify_elem, env, notify_node);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Received notify address:%s", notify);
+ "[savan] Received notify address:%s", notify);
notify_epr = axis2_endpoint_ref_create(env, notify);
@@ -857,7 +857,7 @@
savan_subscriber_set_filter(subscriber, env, filter);
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:process_subscriber_node");
+ "[savan] End:process_subscriber_node");
return subscriber;
}
@@ -876,7 +876,7 @@
axutil_array_list_t *subscriber_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_get_subscriber_list_from_remote_subs_mgr");
+ "[savan]Start:savan_util_get_subscriber_list_from_remote_subs_mgr");
svc_client = (axis2_svc_client_t *) s_client;
options = (axis2_options_t *)axis2_svc_client_get_options(svc_client,
env);
@@ -892,12 +892,12 @@
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Stub invoke FAILED: Error code:"
+ "[savan] Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
AXIS2_ERROR_GET_MESSAGE(env->error));
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_get_subscriber_list_from_remote_subs_mgr");
+ "[savan]End:savan_util_get_subscriber_list_from_remote_subs_mgr");
return subscriber_list;
}
@@ -943,7 +943,7 @@
axutil_array_list_t *subscriber_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:process_subscriber_list_node");
+ "[savan] Start:process_subscriber_list_node");
subs_list_element = axiom_node_get_data_element(subs_list_node, env);
/* Topic */
@@ -962,7 +962,7 @@
if(!subs_iter)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Subscribers list is empty");
+ "[savan] Subscribers list is empty");
return NULL;
}
if(axiom_children_qname_iterator_has_next(subs_iter, env))
@@ -1004,7 +1004,7 @@
subscriber = savan_subscriber_create(env);
if (!subscriber)
{
- AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[SAVAN] Failed to
create a"
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to
create a"
"subscriber instance");
return NULL;
}
@@ -1072,7 +1072,7 @@
}
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:process_subscriber_list_node");
+ "[savan] End:process_subscriber_list_node");
return subscriber_list;
}
@@ -1249,7 +1249,7 @@
axutil_array_list_t *topic_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:savan_util_get_topic_list_from_remote_subs_mgr");
+ "[savan] Start:savan_util_get_topic_list_from_remote_subs_mgr");
if(!s_client)
{
svc_client = (axis2_svc_client_t *) savan_util_get_svc_client(env);
@@ -1271,7 +1271,7 @@
else
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Stub invoke FAILED: Error code:"
+ "[savan] Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
AXIS2_ERROR_GET_MESSAGE(env->error));
}
@@ -1280,7 +1280,7 @@
/*axis2_svc_client_free(svc_client, env);*/
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:savan_util_get_topic_list_from_remote_subs_mgr");
+ "[savan] End:savan_util_get_topic_list_from_remote_subs_mgr");
return topic_list;
}
@@ -1317,7 +1317,7 @@
axutil_array_list_t *topic_list = NULL;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Start:process_topic_list_node");
+ "[savan] Start:process_topic_list_node");
topic_list_element = axiom_node_get_data_element(topic_list_node, env);
/* Get topic elements from topic list */
@@ -1329,7 +1329,7 @@
if(!topic_iter)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] Topic list is empty");
+ "[savan] Topic list is empty");
return NULL;
}
if(axiom_children_qname_iterator_has_next(topic_iter, env))
@@ -1355,7 +1355,7 @@
}
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "[SAVAN] End:process_topic_list_node");
+ "[savan] End:process_topic_list_node");
return topic_list;
}
@@ -1376,7 +1376,7 @@
if (!svc_client)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "[SAVAN] Stub invoke FAILED: Error code:"
+ "[savan] Stub invoke FAILED: Error code:"
" %d :: %s", env->error->error_number,
AXIS2_ERROR_GET_MESSAGE(env->error));
return NULL;
