Fixing the build break
diff --git a/configure.ac b/configure.ac
index 5d0a695..9118a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,11 +78,13 @@
;;
*)
AC_MSG_RESULT(yes)
+ SAVAN_SUBS_MGR_SQLITE="sqlite"
SAVAN_SUBS_MGR="sqlite"
;;
esac ],
AC_MSG_RESULT(yes)
+ SAVAN_SUBS_MGR_SQLITE="sqlite"
SAVAN_SUBS_MGR="sqlite"
)
@@ -93,13 +95,13 @@
[ case "${enableval}" in
no)
AC_MSG_RESULT(no)
+ SAVAN_SUBS_MGR_SERVICE=""
SAVAN_SUBS_MGR=""
- SVC_DIR=""
;;
*)
AC_MSG_RESULT(yes)
+ SAVAN_SUBS_MGR_SERVICE="service"
SAVAN_SUBS_MGR="service"
- SVC_DIR="subs_mgr_svc"
;;
esac ],
AC_MSG_RESULT(no)
@@ -114,10 +116,12 @@
[ case "$withval" in
no)
AC_MSG_RESULT(no)
+ SAVAN_SUBS_MGR_REGISTRY=""
SAVAN_SUBS_MGR=""
;;
*)
AC_MSG_RESULT(yes)
+ SAVAN_SUBS_MGR_REGISTRY="registry"
SAVAN_SUBS_MGR="registry"
dnl Find registry include dir in the path
if test -d $withval; then
@@ -167,7 +171,7 @@
)
#Default for savan publisher
-SAVAN_PUBLISHER="default"
+SAVAN_PUBLISHER_XPATH="default"
SAVAN_PUBLISHER_LIB="default/libsavan_publisher.la"
AC_MSG_CHECKING(To Use esb based publisher . This is an optional module to build Savan C)
@@ -179,12 +183,12 @@
[ case "$withval" in
no)
AC_MSG_RESULT(no)
- SAVAN_PUBLISHER=""
+ SAVAN_PUBLISHER_ESB=""
SAVAN_PUBLISHER_LIB=""
;;
*)
AC_MSG_RESULT(yes)
- SAVAN_PUBLISHER="esb"
+ SAVAN_PUBLISHER_ESB="esb"
SAVAN_PUBLISHER_LIB=esb/libsavan_publisher.la
dnl Find esbc include dir in the path
if test -d $withval; then
@@ -220,19 +224,25 @@
AC_SUBST(UTILINC)
AC_SUBST(NEETHIINC)
AC_SUBST(XMLSCHEMAINC)
+AC_SUBST(SAVAN_SUBS_MGR_REGISTRY)
+AC_SUBST(SAVAN_SUBS_MGR_SERVICE)
+AC_SUBST(SAVAN_SUBS_MGR_SQLITE)
AC_SUBST(SAVAN_SUBS_MGR)
AC_SUBST(SAVAN_FILTER)
AC_SUBST(SAVAN_FILTER_LIB)
-AC_SUBST(SAVAN_PUBLISHER)
+AC_SUBST(SAVAN_PUBLISHER_ESB)
+AC_SUBST(SAVAN_PUBLISHER_XPATH)
AC_SUBST(SAVAN_PUBLISHER_LIB)
-AC_SUBST(SVC_DIR)
+export SAVAN_SUBS_MGR_REGISTRY
+export SAVAN_SUBS_MGR_SERVICE
+export SAVAN_SUBS_MGR_SQLITE
export SAVAN_SUBS_MGR
export SAVAN_FILTER
export SAVAN_FILTER_LIB
-export SAVAN_PUBLISHER
+export SAVAN_PUBLISHER_ESB
+export SAVAN_PUBLISHER_XPATH
export SAVAN_PUBLISHER_LIB
-export SVC_DIR
AC_CONFIG_FILES([Makefile \
src/Makefile \
diff --git a/include/savan_publisher.h b/include/savan_publisher.h
index 8d79016..55087c9 100644
--- a/include/savan_publisher.h
+++ b/include/savan_publisher.h
@@ -27,7 +27,6 @@
#include <axis2_conf.h>
#include <axis2_msg_ctx.h>
#include <axiom_node.h>
-#include <savan_subs_mgr.h>
#ifdef __cplusplus
extern "C"
@@ -41,6 +40,7 @@
typedef struct savan_publisher savan_publisher_t;
typedef struct savan_publisher_ops savan_publisher_ops_t;
+struct savan_subs_mgr;
/**
* @brief Publisher ops struct
@@ -58,7 +58,7 @@
savan_publisher_t *publisher,
const axutil_env_t *env,
void *msg_ctx,
- savan_subs_mgr_t *subs_mgr);
+ struct savan_subs_mgr *subs_mgr);
};
@@ -109,7 +109,7 @@
savan_publisher_t *publishermod,
const axutil_env_t *env,
void *msg_ctx,
- savan_subs_mgr_t *subs_mgr);
+ struct savan_subs_mgr *subs_mgr);
/** @} */
#ifdef __cplusplus
diff --git a/include/savan_sub_processor.h b/include/savan_sub_processor.h
index a3dcba2..94143a1 100644
--- a/include/savan_sub_processor.h
+++ b/include/savan_sub_processor.h
@@ -34,7 +34,6 @@
#include <axutil_env.h>
#include <axis2_conf_ctx.h>
#include <axutil_array_list.h>
-#include <savan_subs_mgr.h>
#ifdef __cplusplus
extern "C"
@@ -42,6 +41,7 @@
#endif
typedef struct savan_sub_processor savan_sub_processor_t;
+ struct savan_subs_mgr;
/**
* This method creates a subcription object from the incoming message
@@ -110,7 +110,7 @@
AXIS2_EXTERN savan_sub_processor_t * AXIS2_CALL
savan_sub_processor_create(
const axutil_env_t *env,
- savan_subs_mgr_t *subs_mgr);
+ struct savan_subs_mgr *subs_mgr);
/**
* Freesf a subscription manager instance.
diff --git a/include/savan_util.h b/include/savan_util.h
index 957711f..3796ee4 100644
--- a/include/savan_util.h
+++ b/include/savan_util.h
@@ -46,6 +46,8 @@
* @{
*/
+struct savan_subs_mgr;
+
/**
* Create the fault envelope, to be sent
* to the client.
@@ -135,7 +137,7 @@
savan_util_get_subscriber_from_msg(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_subs_mgr_t *subs_mgr,
+ struct savan_subs_mgr *subs_mgr,
const axis2_char_t *sub_id);
/**
@@ -152,7 +154,7 @@
savan_util_get_subscriber_from_renew_msg(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_subs_mgr_t *subs_mgr,
+ struct savan_subs_mgr *subs_mgr,
const axis2_char_t *sub_id);
/**
@@ -186,14 +188,14 @@
savan_util_add_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_subs_mgr_t *subs_mgr,
+ struct savan_subs_mgr *subs_mgr,
savan_subscriber_t *subscriber);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
savan_util_update_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_subs_mgr_t *subs_mgr,
+ struct savan_subs_mgr *subs_mgr,
savan_subscriber_t *subscriber);
/**
@@ -212,7 +214,7 @@
savan_util_remove_subscriber(
const axutil_env_t *env,
axis2_msg_ctx_t *msg_ctx,
- savan_subs_mgr_t *subs_mgr,
+ struct savan_subs_mgr *subs_mgr,
savan_subscriber_t *subscriber);
/**
@@ -349,7 +351,7 @@
* @param conf Axis2 main configuration instance
* @return subs manager
*/
- AXIS2_EXTERN savan_subs_mgr_t * AXIS2_CALL
+ AXIS2_EXTERN struct savan_subs_mgr * AXIS2_CALL
savan_util_get_subs_mgr(
const axutil_env_t *env,
axis2_conf_ctx_t *conf_ctx,
diff --git a/samples/client/subscriber/subscriber.c b/samples/client/subscriber/subscriber.c
index f0704a7..5c7e2dc 100644
--- a/samples/client/subscriber/subscriber.c
+++ b/samples/client/subscriber/subscriber.c
@@ -106,10 +106,10 @@
axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER_DIALECT, AXIS2_HASH_KEY_STRING,
XPATH_FILTER_DIALECT);*/
- /*axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER, AXIS2_HASH_KEY_STRING, "weather/4");
+ axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER, AXIS2_HASH_KEY_STRING, "weather/4");
axutil_hash_set(savan_options, SAVAN_OP_KEY_FILTER_DIALECT, AXIS2_HASH_KEY_STRING,
- SYNAPSE_FILTER_DIALECT);*/
+ SYNAPSE_FILTER_DIALECT);
/* Create a savan client */
savan_client = savan_client_create(env);
diff --git a/src/publishers/Makefile.am b/src/publishers/Makefile.am
index a9af8b7..acb1755 100644
--- a/src/publishers/Makefile.am
+++ b/src/publishers/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common @SAVAN_PUBLISHER@
+SUBDIRS = common @SAVAN_PUBLISHER_ESB@ @SAVAN_PUBLISHER_XPATH@
diff --git a/src/subs_mgrs/Makefile.am b/src/subs_mgrs/Makefile.am
index a030724..2f3f0e2 100644
--- a/src/subs_mgrs/Makefile.am
+++ b/src/subs_mgrs/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common $(SVC_DIR) @SAVAN_SUBS_MGR@
+SUBDIRS = common @SAVAN_SUBS_MGR_SQLITE@ @SAVAN_SUBS_MGR_REGISTRY@ @SAVAN_SUBS_MGR_SERVICE@
diff --git a/src/subs_mgrs/service/subs_mgr_svc/Makefile.am b/src/subs_mgrs/service/subs_mgr_svc/Makefile.am
index 94099c3..c38524e 100644
--- a/src/subs_mgrs/service/subs_mgr_svc/Makefile.am
+++ b/src/subs_mgrs/service/subs_mgr_svc/Makefile.am
@@ -1,15 +1,17 @@
prglibdir=$(prefix)/services/subscription
prglib_LTLIBRARIES = libsubscription.la
prglib_DATA= services.xml
-noinst_HEADERS = savan_subs_mgr.h
+noinst_HEADERS = savan_subs_mgr_svc.h
SUBDIRS =
libsubscription_la_SOURCES = subs_mgr.c subs_mgr_skel.c
-libsubscription_la_LIBADD = ../client/libsavan_client.la
+libsubscription_la_LIBADD = ../../../client/libsavan_client.la
INCLUDES = -I$(top_builddir)/include \
- @AXIOMINC@ \
- @UTILINC@ \
- @NEETHIINC@ \
- @AXIS2INC@
+ -I$(top_builddir)/include/savan \
+ -I. \
+ @AXIOMINC@ \
+ @UTILINC@ \
+ @NEETHIINC@ \
+ @AXIS2INC@
-EXTRA_DIST=services.xml savan_subs_mgr.h
+EXTRA_DIST=services.xml savan_subs_mgr_svc.h
diff --git a/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h b/src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr_svc.h
similarity index 100%
rename from src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr.h
rename to src/subs_mgrs/service/subs_mgr_svc/savan_subs_mgr_svc.h
diff --git a/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c b/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
index 00b982a..3bee79d 100644
--- a/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
+++ b/src/subs_mgrs/service/subs_mgr_svc/subs_mgr.c
@@ -23,9 +23,8 @@
#include <savan_util.h>
#include <savan_error.h>
#include <savan_constants.h>
-
-#include "savan_subs_mgr_svc.h"
#include <savan_subs_mgr.h>
+#include "savan_subs_mgr_svc.h"
AXIS2_EXTERN axiom_node_t *AXIS2_CALL
savan_subs_mgr_svc_add_subscriber(
