Author: damitha
Date: Thu Apr 9 00:20:27 2009
New Revision: 763470
URL: http://svn.apache.org/viewvc?rev=763470&view=rev
Log:
renaming publisher_mod to publisher
Modified:
webservices/savan/trunk/c/src/publisher/common/Makefile.am
webservices/savan/trunk/c/src/publisher/common/publisher_mod.c
webservices/savan/trunk/c/src/publisher/default/Makefile.am
webservices/savan/trunk/c/src/publisher/default/publisher_mod.c
webservices/savan/trunk/c/src/publisher/esb/Makefile.am
webservices/savan/trunk/c/src/publisher/esb/publisher_mod.c
Modified: webservices/savan/trunk/c/src/publisher/common/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/common/Makefile.am?rev=763470&r1=763469&r2=763470&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/common/Makefile.am (original)
+++ webservices/savan/trunk/c/src/publisher/common/Makefile.am Thu Apr 9
00:20:27 2009
@@ -1,6 +1,6 @@
-noinst_LTLIBRARIES = libsavan_common_publisher_mod.la
+noinst_LTLIBRARIES = libsavan_common_publisher.la
-libsavan_common_publisher_mod_la_SOURCES = publisher_mod.c
+libsavan_common_publisher_la_SOURCES = publisher.c
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@ \
Modified: webservices/savan/trunk/c/src/publisher/common/publisher_mod.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/common/publisher_mod.c?rev=763470&r1=763469&r2=763470&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/common/publisher_mod.c (original)
+++ webservices/savan/trunk/c/src/publisher/common/publisher_mod.c Thu Apr 9
00:20:27 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <savan_publisher_mod.h>
+#include <savan_publisher.h>
#include <savan_constants.h>
#include <savan_error.h>
#include <savan_util.h>
@@ -26,16 +26,16 @@
#include <axis2_msg_ctx.h>
AXIS2_EXTERN void AXIS2_CALL
-savan_publisher_mod_free(
- savan_publisher_mod_t *publishermod,
+savan_publisher_free(
+ savan_publisher_t *publishermod,
const axutil_env_t *env)
{
return publishermod->ops->free(publishermod, env);
}
AXIS2_EXTERN void AXIS2_CALL
-savan_publisher_mod_publish(
- savan_publisher_mod_t *publishermod,
+savan_publisher_publish(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
savan_subs_mgr_t *subs_mgr)
Modified: webservices/savan/trunk/c/src/publisher/default/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/default/Makefile.am?rev=763470&r1=763469&r2=763470&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/default/Makefile.am (original)
+++ webservices/savan/trunk/c/src/publisher/default/Makefile.am Thu Apr 9
00:20:27 2009
@@ -1,9 +1,9 @@
-noinst_LTLIBRARIES = libsavan_publisher_mod.la
-libsavan_publisher_mod_la_SOURCES = publisher_mod.c
+noinst_LTLIBRARIES = libsavan_publisher.la
+libsavan_publisher_la_SOURCES = publisher.c
data_DATA=
-libsavan_publisher_mod_la_LIBADD = $(top_builddir)/src/util/libsavan_util.la \
+libsavan_publisher_la_LIBADD = $(top_builddir)/src/util/libsavan_util.la \
../../filters/@SAVAN_FILTER_LIB@ \
-
../common/libsavan_common_publisher_mod.la
+
../common/libsavan_common_publisher.la
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/include/savan \
Modified: webservices/savan/trunk/c/src/publisher/default/publisher_mod.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/default/publisher_mod.c?rev=763470&r1=763469&r2=763470&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/default/publisher_mod.c (original)
+++ webservices/savan/trunk/c/src/publisher/default/publisher_mod.c Thu Apr 9
00:20:27 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <savan_publisher_mod.h>
+#include <savan_publisher.h>
#include <axutil_log.h>
#include <axutil_hash.h>
#include <axutil_property.h>
@@ -43,79 +43,79 @@
* @brief Savan Default Publisher Struct Impl
* Savan Default Publisher
*/
-typedef struct savan_default_publisher_mod
+typedef struct savan_default_publisher
{
- savan_publisher_mod_t publishermod;
+ savan_publisher_t publishermod;
axis2_conf_t *conf;
-} savan_default_publisher_mod_t;
+} savan_default_publisher_t;
-#define SAVAN_INTF_TO_IMPL(publishermod) ((savan_default_publisher_mod_t *)
publishermod)
+#define SAVAN_INTF_TO_IMPL(publishermod) ((savan_default_publisher_t *)
publishermod)
AXIS2_EXTERN void AXIS2_CALL
-savan_default_publisher_mod_free(
- savan_publisher_mod_t *publishermod,
+savan_default_publisher_free(
+ savan_publisher_t *publishermod,
const axutil_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
-savan_default_publisher_mod_publish(
- savan_publisher_mod_t *publishermod,
+savan_default_publisher_publish(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
savan_subs_mgr_t *subs_mgr);
static axis2_status_t
-savan_default_publisher_mod_publish_to_subscriber(
- savan_publisher_mod_t *publishermod,
+savan_default_publisher_publish_to_subscriber(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
axis2_svc_client_t *svc_client,
savan_subscriber_t *subscriber,
savan_filter_mod_t *filtermod,
axiom_node_t *payload);
-static const savan_publisher_mod_ops_t savan_publisher_mod_ops =
+static const savan_publisher_ops_t savan_publisher_ops =
{
- savan_default_publisher_mod_free,
- savan_default_publisher_mod_publish
+ savan_default_publisher_free,
+ savan_default_publisher_publish
};
-AXIS2_EXTERN savan_publisher_mod_t * AXIS2_CALL
-savan_publisher_mod_create_with_conf(
+AXIS2_EXTERN savan_publisher_t * AXIS2_CALL
+savan_publisher_create_with_conf(
const axutil_env_t *env,
axis2_conf_t *conf)
{
- savan_default_publisher_mod_t *publishermodimpl = NULL;
+ savan_default_publisher_t *publishermodimpl = NULL;
- publishermodimpl = AXIS2_MALLOC(env->allocator,
sizeof(savan_default_publisher_mod_t));
+ publishermodimpl = AXIS2_MALLOC(env->allocator,
sizeof(savan_default_publisher_t));
if (!publishermodimpl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_FILTER_CREATION_FAILED,
AXIS2_FAILURE);
return NULL;
}
- memset ((void *) publishermodimpl, 0,
sizeof(savan_default_publisher_mod_t));
+ memset ((void *) publishermodimpl, 0, sizeof(savan_default_publisher_t));
publishermodimpl->conf = conf;
- publishermodimpl->publishermod.ops = &savan_publisher_mod_ops;
+ publishermodimpl->publishermod.ops = &savan_publisher_ops;
- return (savan_publisher_mod_t *) publishermodimpl;
+ return (savan_publisher_t *) publishermodimpl;
}
-AXIS2_EXTERN savan_publisher_mod_t * AXIS2_CALL
-savan_publisher_mod_create(
+AXIS2_EXTERN savan_publisher_t * AXIS2_CALL
+savan_publisher_create(
const axutil_env_t *env)
{
return NULL;
}
AXIS2_EXTERN void AXIS2_CALL
-savan_default_publisher_mod_free(
- savan_publisher_mod_t *publishermod,
+savan_default_publisher_free(
+ savan_publisher_t *publishermod,
const axutil_env_t *env)
{
- savan_default_publisher_mod_t *publishermodimpl = NULL;
+ savan_default_publisher_t *publishermodimpl = NULL;
publishermodimpl = SAVAN_INTF_TO_IMPL(publishermod);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_default_publisher_mod_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_default_publisher_free");
publishermodimpl->conf = NULL;
@@ -125,17 +125,17 @@
publishermodimpl = NULL;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_default_publisher_mod_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_default_publisher_free");
}
AXIS2_EXTERN void AXIS2_CALL
-savan_default_publisher_mod_publish(
- savan_publisher_mod_t *publishermod,
+savan_default_publisher_publish(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
savan_subs_mgr_t *subs_mgr)
{
- savan_default_publisher_mod_t *publishermodimpl = NULL;
+ savan_default_publisher_t *publishermodimpl = NULL;
axutil_array_list_t *subs_store = NULL;
int i = 0, size = 0;
savan_filter_mod_t *filtermod = NULL;
@@ -151,7 +151,7 @@
publishermodimpl = SAVAN_INTF_TO_IMPL(publishermod);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_default_publisher_mod_publish");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_default_publisher_publish");
axutil_allocator_switch_to_global_pool(env->allocator);
if(subs_mgr)
@@ -215,7 +215,7 @@
* subscriber. However until Axis2/C provide a good thread pool to
handle
* such tasks I use this sequential publishing to subscribers.
*/
-
if(!savan_default_publisher_mod_publish_to_subscriber(publishermod, env,
svc_client, sub,
+ if(!savan_default_publisher_publish_to_subscriber(publishermod,
env, svc_client, sub,
filtermod, payload))
{
axis2_endpoint_ref_t *notifyto =
savan_subscriber_get_notify_to(sub, env);
@@ -243,12 +243,12 @@
}
axutil_allocator_switch_to_local_pool(env->allocator);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_default_publisher_mod_publish");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_default_publisher_publish");
}
static axis2_status_t
-savan_default_publisher_mod_publish_to_subscriber(
- savan_publisher_mod_t *publishermod,
+savan_default_publisher_publish_to_subscriber(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
axis2_svc_client_t *svc_client,
savan_subscriber_t *subscriber,
@@ -262,7 +262,7 @@
axis2_bool_t filter_apply = AXIS2_TRUE;
axis2_endpoint_ref_t *notifyto = NULL;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_default_publisher_mod_publish_to_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_default_publisher_publish_to_subscriber");
options = (axis2_options_t *) axis2_svc_client_get_options(svc_client,
env);
if(!options)
@@ -318,7 +318,7 @@
axiom_node_detach(payload, env); /*insert this to prevent payload
corruption in subsequent
"publish" calls with some payload.*/
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_default_publisher_mod_publish_to_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_default_publisher_publish_to_subscriber");
return status;
}
Modified: webservices/savan/trunk/c/src/publisher/esb/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/esb/Makefile.am?rev=763470&r1=763469&r2=763470&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/esb/Makefile.am (original)
+++ webservices/savan/trunk/c/src/publisher/esb/Makefile.am Thu Apr 9 00:20:27
2009
@@ -1,9 +1,9 @@
-lib_LTLIBRARIES = libsavan_publisher_mod.la
+lib_LTLIBRARIES = libsavan_publisher.la
-libsavan_publisher_mod_la_SOURCES = publisher_mod.c
-libsavan_publisher_mod_la_LIBADD = $(top_builddir)/src/util/libsavan_util.la \
+libsavan_publisher_la_SOURCES = publisher.c
+libsavan_publisher_la_LIBADD = $(top_builddir)/src/util/libsavan_util.la \
../../filters/@SAVAN_FILTER_LIB@ \
-
../common/libsavan_common_publisher_mod.la
+
../common/libsavan_common_publisher.la
data_DATA=
Modified: webservices/savan/trunk/c/src/publisher/esb/publisher_mod.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/publisher/esb/publisher_mod.c?rev=763470&r1=763469&r2=763470&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/publisher/esb/publisher_mod.c (original)
+++ webservices/savan/trunk/c/src/publisher/esb/publisher_mod.c Thu Apr 9
00:20:27 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <savan_publisher_mod.h>
+#include <savan_publisher.h>
#include <axutil_log.h>
#include <axutil_hash.h>
#include <axutil_property.h>
@@ -40,91 +40,91 @@
* @brief Savan XPath Publisher Struct Impl
* Savan XPath Publisher
*/
-typedef struct savan_esb_publisher_mod
+typedef struct savan_esb_publisher
{
- savan_publisher_mod_t publishermod;
+ savan_publisher_t publishermod;
axis2_conf_t *conf;
-} savan_esb_publisher_mod_t;
+} savan_esb_publisher_t;
-#define SAVAN_INTF_TO_IMPL(publishermod) ((savan_esb_publisher_mod_t *)
publishermod)
+#define SAVAN_INTF_TO_IMPL(publishermod) ((savan_esb_publisher_t *)
publishermod)
static axis2_status_t
-savan_esb_publisher_mod_publish_to_subscriber(
- savan_publisher_mod_t *publishermod,
+savan_esb_publisher_publish_to_subscriber(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
savan_subscriber_t *subscriber);
AXIS2_EXTERN void AXIS2_CALL
-savan_esb_publisher_mod_free(
- savan_publisher_mod_t *publishermod,
+savan_esb_publisher_free(
+ savan_publisher_t *publishermod,
const axutil_env_t *env);
AXIS2_EXTERN void AXIS2_CALL
-savan_esb_publisher_mod_publish(
- savan_publisher_mod_t *publishermod,
+savan_esb_publisher_publish(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
savan_subs_mgr_t *subs_mgr);
-static const savan_publisher_mod_ops_t savan_publisher_mod_ops =
+static const savan_publisher_ops_t savan_publisher_ops =
{
- savan_esb_publisher_mod_free,
- savan_esb_publisher_mod_publish
+ savan_esb_publisher_free,
+ savan_esb_publisher_publish
};
-AXIS2_EXTERN savan_publisher_mod_t * AXIS2_CALL
-savan_publisher_mod_create(
+AXIS2_EXTERN savan_publisher_t * AXIS2_CALL
+savan_publisher_create(
const axutil_env_t *env)
{
- savan_esb_publisher_mod_t *publishermodimpl = NULL;
+ savan_esb_publisher_t *publishermodimpl = NULL;
- publishermodimpl = AXIS2_MALLOC(env->allocator,
sizeof(savan_esb_publisher_mod_t));
+ publishermodimpl = AXIS2_MALLOC(env->allocator,
sizeof(savan_esb_publisher_t));
if (!publishermodimpl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_FILTER_CREATION_FAILED,
AXIS2_FAILURE);
return NULL;
}
- memset ((void *) publishermodimpl, 0, sizeof(savan_esb_publisher_mod_t));
+ memset ((void *) publishermodimpl, 0, sizeof(savan_esb_publisher_t));
publishermodimpl->conf = NULL;
- publishermodimpl->publishermod.ops = &savan_publisher_mod_ops;
+ publishermodimpl->publishermod.ops = &savan_publisher_ops;
- return (savan_publisher_mod_t *) publishermodimpl;
+ return (savan_publisher_t *) publishermodimpl;
}
-AXIS2_EXTERN savan_publisher_mod_t * AXIS2_CALL
-savan_publisher_mod_create_with_conf(
+AXIS2_EXTERN savan_publisher_t * AXIS2_CALL
+savan_publisher_create_with_conf(
const axutil_env_t *env,
axis2_conf_t *conf)
{
- savan_esb_publisher_mod_t *publishermodimpl = NULL;
+ savan_esb_publisher_t *publishermodimpl = NULL;
- publishermodimpl = AXIS2_MALLOC(env->allocator,
sizeof(savan_esb_publisher_mod_t));
+ publishermodimpl = AXIS2_MALLOC(env->allocator,
sizeof(savan_esb_publisher_t));
if (!publishermodimpl)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_FILTER_CREATION_FAILED,
AXIS2_FAILURE);
return NULL;
}
- memset ((void *) publishermodimpl, 0, sizeof(savan_esb_publisher_mod_t));
+ memset ((void *) publishermodimpl, 0, sizeof(savan_esb_publisher_t));
publishermodimpl->conf = conf;
- publishermodimpl->publishermod.ops = &savan_publisher_mod_ops;
+ publishermodimpl->publishermod.ops = &savan_publisher_ops;
- return (savan_publisher_mod_t *) publishermodimpl;
+ return (savan_publisher_t *) publishermodimpl;
}
AXIS2_EXTERN void AXIS2_CALL
-savan_esb_publisher_mod_free(
- savan_publisher_mod_t *publishermod,
+savan_esb_publisher_free(
+ savan_publisher_t *publishermod,
const axutil_env_t *env)
{
- savan_esb_publisher_mod_t *publishermodimpl = NULL;
+ savan_esb_publisher_t *publishermodimpl = NULL;
publishermodimpl = SAVAN_INTF_TO_IMPL(publishermod);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_esb_publisher_mod_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_esb_publisher_free");
publishermodimpl->conf = NULL;
@@ -134,17 +134,17 @@
publishermodimpl = NULL;
}
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_esb_publisher_mod_free");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_esb_publisher_free");
}
AXIS2_EXTERN void AXIS2_CALL
-savan_esb_publisher_mod_publish(
- savan_publisher_mod_t *publishermod,
+savan_esb_publisher_publish(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *esb_ctx,
savan_subs_mgr_t *subs_mgr)
{
- savan_esb_publisher_mod_t *publishermodimpl = NULL;
+ savan_esb_publisher_t *publishermodimpl = NULL;
axutil_array_list_t *subs_store = NULL;
int i = 0, size = 0;
@@ -152,7 +152,7 @@
publishermodimpl = SAVAN_INTF_TO_IMPL(publishermod);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_esb_publisher_mod_publish");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_esb_publisher_publish");
axutil_allocator_switch_to_global_pool(env->allocator);
if(subs_mgr)
@@ -181,7 +181,7 @@
* subscriber. However until Axis2/C provide a good thread pool to
handle
* such tasks I use this sequential publishing to subscribers.
*/
- if(!savan_esb_publisher_mod_publish_to_subscriber(publishermod,
env, esb_ctx, sub))
+ if(!savan_esb_publisher_publish_to_subscriber(publishermod, env,
esb_ctx, sub))
{
axis2_endpoint_ref_t *notifyto =
savan_subscriber_get_notify_to(sub, env);
const axis2_char_t *address = NULL;
@@ -201,12 +201,12 @@
axutil_allocator_switch_to_local_pool(env->allocator);
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_esb_publisher_mod_publish");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_esb_publisher_publish");
}
static axis2_status_t
-savan_esb_publisher_mod_publish_to_subscriber(
- savan_publisher_mod_t *publishermod,
+savan_esb_publisher_publish_to_subscriber(
+ savan_publisher_t *publishermod,
const axutil_env_t *env,
void *esb_ctx,
savan_subscriber_t *subscriber)
@@ -222,7 +222,7 @@
axis2_msg_ctx_t *msg_ctx = NULL;
msg_ctx = ((esb_ctx_t *) esb_ctx)->in_in_msg_ctx;
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_esb_publisher_mod_publish_to_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_esb_publisher_publish_to_subscriber");
notifyto = savan_subscriber_get_notify_to(subscriber, env);
if(notifyto)
@@ -247,7 +247,7 @@
axiom_node_detach(payload, env); /*insert this to prevent payload
corruption in subsequent
"publish" calls with some payload.*/
- AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_esb_publisher_mod_publish_to_subscriber");
+ AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Exit:savan_esb_publisher_publish_to_subscriber");
return status;
}
