Author: damitha
Date: Tue Nov 11 08:07:34 2008
New Revision: 713073
URL: http://svn.apache.org/viewvc?rev=713073&view=rev
Log:
Adding error messages
Modified:
webservices/savan/trunk/c/include/savan_error.h
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/util/error.c
webservices/savan/trunk/c/src/util/savan_util.c
Modified: webservices/savan/trunk/c/include/savan_error.h
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_error.h?rev=713073&r1=713072&r2=713073&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_error.h (original)
+++ webservices/savan/trunk/c/include/savan_error.h Tue Nov 11 08:07:34 2008
@@ -77,6 +77,12 @@
SAVAN_ERROR_UNABLE_TO_RENEW,
/* Subscriber is not found */
SAVAN_ERROR_SUBSCRIBER_NOT_FOUND,
+ /* Could not populate Topic */
+ SAVAN_ERROR_COULD_NOT_POPULATE_TOPIC,
+ /* Parsing subsriber node failed */
+ SAVAN_ERROR_PARSING_SUBSCRIBER_NODE_FAILED,
+ /* Applying filter failed */
+ SAVAN_ERROR_APPLYING_FILTER_FAILED,
SAVAN_ERROR_LAST
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=713073&r1=713072&r2=713073&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/savan_sub_processor.c (original)
+++ webservices/savan/trunk/c/src/core/savan_sub_processor.c Tue Nov 11
08:07:34 2008
@@ -73,6 +73,7 @@
if (!sub_processor)
{
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Cound not create
sub_processor");
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -291,7 +292,7 @@
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to create a
subscriber instance");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_FAILED_TO_CREATE_SUBSCRIBER,
AXIS2_FAILURE);
return NULL;
}
@@ -309,7 +310,7 @@
if (!envelope)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the
soap envelop");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL, AXIS2_FAILURE);
return NULL;
}
@@ -317,7 +318,7 @@
if (!body)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to extract the
soap body");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL, AXIS2_FAILURE);
return NULL;
}
@@ -336,7 +337,7 @@
if(AXIS2_SUCCESS != status)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Parsing subscriber
node failed");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
SAVAN_ERROR_PARSING_SUBSCRIBER_NODE_FAILED, AXIS2_FAILURE);
return NULL;
}
@@ -352,7 +353,8 @@
status = savan_util_populate_topic(env, topic_url, conf);
if(status != AXIS2_SUCCESS)
{
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_COULD_NOT_POPULATE_TOPIC,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not
populate topic");
return NULL;
}
}
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=713073&r1=713072&r2=713073&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgr/subs_mgr.c Tue Nov 11 08:07:34 2008
@@ -21,11 +21,11 @@
#include <stdio.h>
#include <savan_subscriber.h>
#include <savan_util.h>
+#include <savan_error.h>
#include <savan_constants.h>
#include "savan_subs_mgr.h"
#include <savan_db_mgr.h>
-#include <savan_util.h>
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
savan_subs_mgr_add_subscriber(
@@ -84,7 +84,8 @@
status = savan_util_populate_topic(env, topic_url, conf);
if(status != AXIS2_SUCCESS)
{
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_COULD_NOT_POPULATE_TOPIC,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not
populate topic");
return NULL;
}
@@ -116,7 +117,7 @@
if(AXIS2_SUCCESS != status)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Parsing
subscriber node failed");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
SAVAN_ERROR_PARSING_SUBSCRIBER_NODE_FAILED, AXIS2_FAILURE);
return NULL;
}
}
@@ -400,7 +401,7 @@
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[savan] Creating Savan specific Subscriber
node failed");
- axutil_error_set_status_code(env->error,
AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
SAVAN_ERROR_FAILED_TO_CREATE_SUBSCRIBER, AXIS2_FAILURE);
return NULL;
}
}
Modified: webservices/savan/trunk/c/src/util/error.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/util/error.c?rev=713073&r1=713072&r2=713073&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/error.c (original)
+++ webservices/savan/trunk/c/src/util/error.c Tue Nov 11 08:07:34 2008
@@ -49,6 +49,15 @@
axutil_error_messages[SAVAN_ERROR_SUBSCRIBER_NOT_FOUND] =
"Subscriber is not found";
+
+ axutil_error_messages[SAVAN_ERROR_COULD_NOT_POPULATE_TOPIC] =
+ "Could not populate Topic";
+
+ axutil_error_messages[SAVAN_ERROR_PARSING_SUBSCRIBER_NODE_FAILED] =
+ "Parsing subsriber node failed";
+
+ axutil_error_messages[SAVAN_ERROR_APPLYING_FILTER_FAILED] =
+ "Applying filter failed";
return AXIS2_SUCCESS;
}
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=713073&r1=713072&r2=713073&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/util/savan_util.c (original)
+++ webservices/savan/trunk/c/src/util/savan_util.c Tue Nov 11 08:07:34 2008
@@ -242,7 +242,7 @@
if(!node)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Applying filter for
payload failed");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_APPLYING_FILTER_FAILED,
AXIS2_FAILURE);
return NULL;
}
else
@@ -737,7 +737,7 @@
if (!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Failed to create a
subscriber instance");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_FAILED_TO_CREATE_SUBSCRIBER,
AXIS2_FAILURE);
return NULL;
}
@@ -764,7 +764,8 @@
status = savan_util_populate_topic(env, topic_url, conf);
if(status != AXIS2_SUCCESS)
{
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_COULD_NOT_POPULATE_TOPIC,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not
populate topic");
return NULL;
}
@@ -782,7 +783,7 @@
if(AXIS2_SUCCESS != status)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Parsing
subscriber node failed");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error,
SAVAN_ERROR_PARSING_SUBSCRIBER_NODE_FAILED, AXIS2_FAILURE);
return NULL;
}
}
@@ -1446,7 +1447,7 @@
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_util_create_subscriber_node");
if(!subscriber)
{
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_SUBSCRIBER_NOT_FOUND,
AXIS2_FAILURE);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Subscriber structure
passed is NULL");
return NULL;
}
@@ -1521,7 +1522,7 @@
if(!subscriber)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Subscriber structure
must be present");
- axutil_error_set_status_code(env->error, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, SAVAN_ERROR_SUBSCRIBER_NOT_FOUND,
AXIS2_FAILURE);
return NULL;
}
