You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by da...@apache.org on 2008/06/13 22:38:35 UTC
svn commit: r667643 - in
/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008: ./
samples/ samples/RMSampleService/ samples/rm_echo_1_0/
samples/rm_echo_1_0_large_sequence/ samples/rm_echo_1_1/
samples/rm_echo_single_1_0_large_sequenc...
Author: damitha
Date: Fri Jun 13 13:38:34 2008
New Revision: 667643
URL: http://svn.apache.org/viewvc?rev=667643&view=rev
Log:
Removing sqlite3, mysql and libxml2 external dependancies. Removing warnings
Modified:
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/configure.ac
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0/rm_echo.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0_large_sequence/rm_echo.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_1/rm_echo_1_1.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_single_1_0_large_sequence/rm_echo_single.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0/rm_ping_1_0.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/core/Makefile.am
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/Makefile.am
webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/sqlite3.c
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/configure.ac?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/configure.ac (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/configure.ac Fri Jun 13 13:38:34 2008
@@ -65,66 +65,6 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(path to use sqlite storage .)
-AC_ARG_WITH(sqlite,
-[ --with-sqlite[=PATH] use sqlite storage.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- WRAPPER_DIR=""
- ;;
- *)
- AC_MSG_RESULT($withval)
- WRAPPER_DIR="sqlite"
- dnl Find sqlite include dir in the path
- if test -d $withval; then
- sqliteinc="-I$withval"
- dnl else find the sqliteinc include dir in /usr/include
- elif test -d '/usr/include'; then
- sqliteinc="-I/usr/include"
- else
- AC_MSG_ERROR(could not find sqliteinc. stop)
- fi
- WRAPPER_DIR="sqlite"
- LDFLAGS="$LDFLAGS -lsqlite3"
- ;;
- esac ],
- AC_MSG_RESULT(yes)
- WRAPPER_DIR="sqlite"
- sqliteinc="-I/usr/include"
- LDFLAGS="$LDFLAGS -lsqlite3"
-)
-
-AC_MSG_CHECKING(path to use mysql storage .)
-AC_ARG_WITH(mysql,
-[ --with-mysql[=PATH] use mysql storage.],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- WRAPPER_DIR=""
- ;;
- *)
- AC_MSG_RESULT($withval)
- WRAPPER_DIR="mysql"
- dnl Find mysql include dir in the path
- if test -d $withval; then
- mysqlinc="-I$withval"
- LDFLAGS="-L$withval/lib $LDFLAGS"
- dnl else find the mysqlinc include dir in /usr/include/mysql
- elif test -d '/usr/include/mysql'; then
- mysqlinc="-I/usr/include/mysql"
- else
- AC_MSG_ERROR(could not find mysqlinc. stop)
- fi
- WRAPPER_DIR="mysql"
- dnl LDFLAGS="$LDFLAGS -lmysqlclient -lnsl -lm -lz"
- LDFLAGS="$LDFLAGS -lmysqlclient -lm -lz"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-
AXIOMINC="-I$abs_top_builddir/../axis2c/axiom/include"
UTILINC="-I$abs_top_builddir/../axis2c/util/include"
NEETHIINC="-I$abs_top_builddir/../axis2c/neethi/include"
@@ -132,12 +72,6 @@
AC_SUBST(AXIOMINC)
AC_SUBST(UTILINC)
AC_SUBST(NEETHIINC)
-MYSQLINC=$mysqlinc
-SQLITEINC=$sqliteinc
-
-AC_SUBST(MYSQLINC)
-AC_SUBST(SQLITEINC)
-AC_SUBST(WRAPPER_DIR)
AC_CONFIG_FILES([Makefile \
src/Makefile \
@@ -151,7 +85,6 @@
src/storage/beans/Makefile \
src/storage/common/Makefile \
src/storage/sqlite/Makefile \
- src/storage/mysql/Makefile \
src/client/Makefile \
src/core/Makefile \
src/polling/Makefile
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/RMSampleService/rm_sample_svc.c Fri Jun 13 13:38:34 2008
@@ -39,15 +39,9 @@
axiom_node_t *node)
{
axiom_node_t *text_parent_node = NULL;
- axiom_element_t *text_parent_element = NULL;
axiom_node_t *text_node = NULL;
axiom_node_t *ret_node = NULL;
- axiom_element_t *element = NULL;
- axis2_char_t *ns = "http://tempuri.org/";
- axutil_qname_t *qname = NULL;
- AXIS2_ENV_CHECK(env, NULL);
-
/* Expected request format is :-
* <ns1:echoString xmlns:ns1="http://ws.apache.org/axis2/c/samples">
* <text>echo5</text>
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/configure.ac Fri Jun 13 13:38:34 2008
@@ -22,7 +22,7 @@
dnl Checks for libraries.
AC_CHECK_LIB(dl, dlopen)
-CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -g"
+CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -g -Werror"
LDFLAGS="-L$AXIS2C_HOME/lib -lpthread"
dnl Checks for header files.
@@ -36,11 +36,6 @@
AC_FUNC_MALLOC
AC_FUNC_REALLOC
-PKG_CHECK_MODULES(LIBXML2, libxml-2.0)
-if test "$GCC" = "yes"; then
- CFLAGS="$CFLAGS $LIBXML2_CFLAGS $GUTHTHILA_CFLAGS -g"
-fi
-
AC_MSG_CHECKING(To Use Axis2 C Axis2. This is a compulsory module to build Sandesha2 C)
AC_ARG_WITH(axis2,
[ --with-axis2[=PATH] use axis2.],
@@ -72,12 +67,6 @@
AC_SUBST(APACHE2INC)
AC_SUBST(APRINC)
AC_SUBST(AXIS2INC)
-AC_SUBST(LIBXML2_CFLAGS)
-AC_SUBST(LIBXML2_LIBS)
-AC_SUBST(LIBXML2_DIR)
-AC_SUBST(GUTHTHILA_DIR)
-AC_SUBST(GUTHTHILA_LIBS)
-AC_SUBST(DICLIENT_DIR)
AC_CONFIG_FILES([Makefile \
RMSampleService/Makefile \
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0/rm_echo.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0/rm_echo.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0/rm_echo.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0/rm_echo.c Fri Jun 13 13:38:34 2008
@@ -271,7 +271,7 @@
/* We are done with the callback */
break;
}
- AXIS2_USLEEP(100000);
+ AXIS2_SLEEP(1);
}
return;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0_large_sequence/rm_echo.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0_large_sequence/rm_echo.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0_large_sequence/rm_echo.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_0_large_sequence/rm_echo.c Fri Jun 13 13:38:34 2008
@@ -271,7 +271,7 @@
/* We are done with the callback */
break;
}
- AXIS2_USLEEP(100000);
+ AXIS2_SLEEP(1);
}
return;
}
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_1/rm_echo_1_1.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_1/rm_echo_1_1.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_1/rm_echo_1_1.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_1_1/rm_echo_1_1.c Fri Jun 13 13:38:34 2008
@@ -56,8 +56,6 @@
int main(int argc, char** argv)
{
- int optopt;
- char *optarg;
const axutil_env_t *env = NULL;
const axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_single_1_0_large_sequence/rm_echo_single.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_single_1_0_large_sequence/rm_echo_single.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_single_1_0_large_sequence/rm_echo_single.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_echo_single_1_0_large_sequence/rm_echo_single.c Fri Jun 13 13:38:34 2008
@@ -45,7 +45,6 @@
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
axiom_node_t *payload2 = NULL;
- axiom_node_t *payload3 = NULL;
axutil_property_t *property = NULL;
axis2_char_t *offered_seq_id = NULL;
axiom_node_t *result = NULL;
@@ -186,8 +185,8 @@
property = axutil_property_create_with_args(env, 0, 0, 0, AXIS2_VALUE_TRUE);
axis2_options_set_property(options, env, "Sandesha2LastMessage", property);
- payload3 = build_om_payload_for_echo_svc(env, "echo100", seq_key);
- result = axis2_svc_client_send_receive(svc_client, env, payload3);
+ payload2 = build_om_payload_for_echo_svc(env, "echo100", seq_key);
+ result = axis2_svc_client_send_receive(svc_client, env, payload2);
if(result)
{
axis2_char_t *om_str = NULL;
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0/rm_ping_1_0.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0/rm_ping_1_0.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0/rm_ping_1_0.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0/rm_ping_1_0.c Fri Jun 13 13:38:34 2008
@@ -37,8 +37,6 @@
int main(int argc, char** argv)
{
- int optopt;
- char *optarg;
const axutil_env_t *env = NULL;
const axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/samples/rm_ping_1_0_large_sequence/rm_ping_1_0.c Fri Jun 13 13:38:34 2008
@@ -37,8 +37,6 @@
int main(int argc, char** argv)
{
- int optopt;
- char *optarg;
const axutil_env_t *env = NULL;
const axis2_char_t *address = NULL;
axis2_endpoint_ref_t* endpoint_ref = NULL;
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/core/Makefile.am?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/core/Makefile.am (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/core/Makefile.am Fri Jun 13 13:38:34 2008
@@ -13,7 +13,7 @@
../msgprocessors/libsandesha2_msgprocessors.la\
../storage/beans/libsandesha2_storage_beans.la\
../storage/common/libsandesha2_storage.la\
- ../storage/${WRAPPER_DIR}/libsandesha2_permanent.la\
+ ../storage/sqlite/libsandesha2_permanent.la\
../transport/libsandesha2_transport.la\
../util/libsandesha_util.la\
../workers/libsandesha2_workers.la\
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/Makefile.am?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/Makefile.am (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/Makefile.am Fri Jun 13 13:38:34 2008
@@ -1,2 +1 @@
-SUBDIRS = beans $(WRAPPER_DIR) common
-EXTRA_DIST=mysql
+SUBDIRS = beans sqlite common
Modified: webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/sqlite3.c
URL: http://svn.apache.org/viewvc/webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/sqlite3.c?rev=667643&r1=667642&r2=667643&view=diff
==============================================================================
--- webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/sqlite3.c (original)
+++ webservices/sandesha/tags/sandesha2/c/worker_thread_removed-23may2008/src/storage/sqlite/sqlite3.c Fri Jun 13 13:38:34 2008
@@ -6821,7 +6821,7 @@
#endif
SQLITE_PRIVATE void sqlite3Attach(Parse*, Expr*, Expr*, Expr*);
SQLITE_PRIVATE void sqlite3Detach(Parse*, Expr*);
-SQLITE_PRIVATE int sqlite3BtreeFactory(const sqlite3 *db, const char *zFilename,
+SQLITE_PRIVATE int sqlite3BtreeFactory(sqlite3 *db, const char *zFilename,
int omitJournal, int nCache, int flags, Btree **ppBtree);
SQLITE_PRIVATE int sqlite3FixInit(DbFixer*, Parse*, int, const char*, const Token*);
SQLITE_PRIVATE int sqlite3FixSrcList(DbFixer*, SrcList*);
@@ -70587,7 +70587,7 @@
** 3 any memory
*/
SQLITE_PRIVATE int sqlite3BtreeFactory(
- const sqlite3 *db, /* Main database when opening aux otherwise 0 */
+ sqlite3 *db, /* Main database when opening aux otherwise 0 */
const char *zFilename, /* Name of the file containing the BTree database */
int omitJournal, /* if TRUE then do not journal this file */
int nCache, /* How many pages in the page cache */
---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org