Author: damitha
Date: Wed Apr 8 17:14:15 2009
New Revision: 763323
URL: http://svn.apache.org/viewvc?rev=763323&view=rev
Log: (empty)
Added:
webservices/savan/trunk/c/include/savan_subs_mgr.h (props changed)
- copied unchanged from r763318,
webservices/savan/trunk/c/include/savan_storage_mgr.h
webservices/savan/trunk/c/src/subs_mgrs/common/subs_mgr.c (props changed)
- copied unchanged from r763318,
webservices/savan/trunk/c/src/subs_mgrs/common/storage_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/inmemory/subs_mgr.c (contents,
props changed)
- copied, changed from r763318,
webservices/savan/trunk/c/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c (contents,
props changed)
- copied, changed from r763318,
webservices/savan/trunk/c/src/subs_mgrs/registry/storage_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c (contents,
props changed)
- copied, changed from r763318,
webservices/savan/trunk/c/src/subs_mgrs/service/service_storage_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c (props changed)
- copied unchanged from r763318,
webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c
Removed:
webservices/savan/trunk/c/include/savan_storage_mgr.h
webservices/savan/trunk/c/src/subs_mgrs/common/storage_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
webservices/savan/trunk/c/src/subs_mgrs/registry/storage_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/service/service_storage_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/sqlite/storage_mgr.c
Modified:
webservices/savan/trunk/c/src/subs_mgrs/common/Makefile.am
webservices/savan/trunk/c/src/subs_mgrs/registry/Makefile.am
webservices/savan/trunk/c/src/subs_mgrs/service/Makefile.am
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am
Propchange: webservices/savan/trunk/c/include/savan_subs_mgr.h
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/savan/trunk/c/src/subs_mgrs/common/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/common/Makefile.am?rev=763323&r1=763322&r2=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/common/Makefile.am (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/common/Makefile.am Wed Apr 8
17:14:15 2009
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libsavan_common_subs_mgr.la
libsavan_common_subs_mgr_la_SOURCES = \
- storage_mgr.c
+ subs_mgr.c
INCLUDES = -I$(top_builddir)/include \
@AXIS2INC@ \
Propchange: webservices/savan/trunk/c/src/subs_mgrs/common/subs_mgr.c
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: webservices/savan/trunk/c/src/subs_mgrs/inmemory/subs_mgr.c (from
r763318,
webservices/savan/trunk/c/src/subs_mgrs/inmemory/storage_mgr_inmemory.c)
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/inmemory/subs_mgr.c?p2=webservices/savan/trunk/c/src/subs_mgrs/inmemory/subs_mgr.c&p1=webservices/savan/trunk/c/src/subs_mgrs/inmemory/storage_mgr_inmemory.c&r1=763318&r2=763323&rev=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/inmemory/storage_mgr_inmemory.c
(original)
+++ webservices/savan/trunk/c/src/subs_mgrs/inmemory/subs_mgr.c Wed Apr 8
17:14:15 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <savan_storage_mgr.h>
+#include <savan_subs_mgr.h>
AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
savan_subs_mgr_create(
Propchange: webservices/savan/trunk/c/src/subs_mgrs/inmemory/subs_mgr.c
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/savan/trunk/c/src/subs_mgrs/registry/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/registry/Makefile.am?rev=763323&r1=763322&r2=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/registry/Makefile.am (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/registry/Makefile.am Wed Apr 8
17:14:15 2009
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_subs_mgr_la_SOURCES = storage_mgr.c
+libsavan_subs_mgr_la_SOURCES = subs_mgr.c
libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la \
-lregistry_client
Copied: webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c (from
r763318, webservices/savan/trunk/c/src/subs_mgrs/registry/storage_mgr.c)
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c?p2=webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c&p1=webservices/savan/trunk/c/src/subs_mgrs/registry/storage_mgr.c&r1=763318&r2=763323&rev=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/registry/storage_mgr.c (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c Wed Apr 8
17:14:15 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <savan_storage_mgr.h>
+#include <savan_subs_mgr.h>
#include <axutil_log.h>
#include <axutil_hash.h>
#include <axutil_property.h>
Propchange: webservices/savan/trunk/c/src/subs_mgrs/registry/subs_mgr.c
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/savan/trunk/c/src/subs_mgrs/service/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/Makefile.am?rev=763323&r1=763322&r2=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/Makefile.am (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/Makefile.am Wed Apr 8
17:14:15 2009
@@ -1,7 +1,7 @@
SUBDIRS = subs_mgr_svc
noinst_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_subs_mgr_la_SOURCES = service_storage_mgr.c
+libsavan_subs_mgr_la_SOURCES = subs_mgr.c
libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la
Copied: webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c (from
r763318, webservices/savan/trunk/c/src/subs_mgrs/service/service_storage_mgr.c)
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c?p2=webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c&p1=webservices/savan/trunk/c/src/subs_mgrs/service/service_storage_mgr.c&r1=763318&r2=763323&rev=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/service_storage_mgr.c
(original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c Wed Apr 8
17:14:15 2009
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <savan_storage_mgr.h>
+#include <savan_subs_mgr.h>
#include <axutil_log.h>
#include <axutil_hash.h>
#include <axutil_property.h>
Propchange: webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr.c
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c?rev=763323&r1=763322&r2=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
(original)
+++ webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c Wed
Apr 8 17:14:15 2009
@@ -25,7 +25,7 @@
#include <savan_constants.h>
#include "savan_subs_mgr_svc.h"
-#include <savan_storage_mgr.h>
+#include <savan_subs_mgr.h>
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
savan_subs_mgr_svc_add_subscriber(
@@ -46,7 +46,7 @@
axiom_element_t *sub_elem = NULL;
axiom_element_t *id_elem = NULL;
axiom_element_t *add_sub_elem = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
axis2_char_t *id = NULL;
@@ -99,13 +99,13 @@
}
}
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_DATABASE_CREATION_ERROR,
AXIS2_FAILURE);
return NULL;
}
- if(savan_storage_mgr_insert_subscriber(storage_mgr, env, subscriber))
+ if(savan_subs_mgr_insert_subscriber(subs_mgr, env, subscriber))
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[savan] Subscriber %s added", id);
@@ -137,7 +137,7 @@
axis2_char_t sql_remove[256];
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
Entry:savan_subs_mgr_svc_remove_subscriber");
@@ -162,14 +162,14 @@
sprintf(sql_remove, "delete from subscriber where id='%s'", subscriber_id);
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_DATABASE_CREATION_ERROR,
AXIS2_FAILURE);
return NULL;
}
- savan_storage_mgr_remove_subscriber(storage_mgr, env, subscriber_id);
+ savan_subs_mgr_remove_subscriber(subs_mgr, env, subscriber_id);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[savan] Subscriber %s removed", subscriber_id);
@@ -194,7 +194,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
axis2_status_t status = AXIS2_SUCCESS;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI,
"[savan] Entry:savan_subs_mgr_svc_get_subscriber");
@@ -249,13 +249,13 @@
return NULL;
}
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_DATABASE_CREATION_ERROR,
AXIS2_FAILURE);
return NULL;
}
- subscriber = savan_storage_mgr_retrieve_subscriber(storage_mgr, env,
subs_id);
+ subscriber = savan_subs_mgr_retrieve_subscriber(subs_mgr, env, subs_id);
subs_node = savan_util_create_savan_specific_subscriber_node(env,
subscriber, NULL);
if(!subs_node)
@@ -284,7 +284,7 @@
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_conf_t *conf = NULL;
int i = 0, size = 0;
- savan_storage_mgr_t *storage_mgr = NULL;
+ savan_subs_mgr_t *subs_mgr = NULL;
axiom_node_t *filter_parent_node = NULL;
axiom_node_t *filter_node = NULL;
axis2_char_t *filter = NULL;
@@ -342,13 +342,13 @@
return NULL;
}
- storage_mgr = savan_util_get_storage_mgr(env, conf_ctx, conf);
- if(!storage_mgr)
+ subs_mgr = savan_util_get_subs_mgr(env, conf_ctx, conf);
+ if(!subs_mgr)
{
AXIS2_HANDLE_ERROR(env, SAVAN_ERROR_DATABASE_CREATION_ERROR,
AXIS2_FAILURE);
return NULL;
}
- subs_store = savan_storage_mgr_retrieve_all_subscribers(storage_mgr, env,
filter);
+ subs_store = savan_subs_mgr_retrieve_all_subscribers(subs_mgr, env,
filter);
/* create the body of the subscribers element */
ns1 = axiom_namespace_create (env, SAVAN_NAMESPACE, SAVAN_NS_PREFIX);
Modified:
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c?rev=763323&r1=763322&r2=763323&view=diff
==============================================================================
---
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
(original)
+++
webservices/savan/trunk/c/src/subs_mgrs/service/subs_mgr_svc/subs_mgr_skel.c
Wed Apr 8 17:14:15 2009
@@ -32,7 +32,7 @@
#include "savan_subs_mgr_svc.h"
#include <savan_constants.h>
-#include <savan_storage_mgr.h>
+#include <savan_subs_mgr.h>
#include <savan_util.h>
#include <savan_error.h>
@@ -119,7 +119,7 @@
const axutil_env_t *env,
axis2_conf_t *conf)
{
- /*savan_storage_mgr_t *storage_mgr = NULL;
+ /*savan_subs_mgr_t *subs_mgr = NULL;
axutil_array_list_t *topic_param_list = NULL;
axis2_svc_t *subs_svc = NULL;
axis2_op_t *op = NULL;
@@ -127,8 +127,8 @@
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[savan]
Start:savan_subs_mgr_svc_init_with_conf");
- /*storage_mgr = savan_util_get_storage_mgr(env, NULL, conf);
- if(!storage_mgr)
+ /*subs_mgr = savan_util_get_subs_mgr(env, NULL, conf);
+ if(!subs_mgr)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[savan] Could not create the
database. Check \
whether database path is correct and accessible. Exit loading the
Savan module");
Modified: webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am?rev=763323&r1=763322&r2=763323&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am (original)
+++ webservices/savan/trunk/c/src/subs_mgrs/sqlite/Makefile.am Wed Apr 8
17:14:15 2009
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libsavan_subs_mgr.la
-libsavan_subs_mgr_la_SOURCES = storage_mgr.c sqlite3.c
+libsavan_subs_mgr_la_SOURCES = subs_mgr.c sqlite3.c
libsavan_subs_mgr_la_LIBADD = ../common/libsavan_common_subs_mgr.la
Propchange: webservices/savan/trunk/c/src/subs_mgrs/sqlite/subs_mgr.c
------------------------------------------------------------------------------
svn:mergeinfo =
