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 2007/04/19 06:18:43 UTC

svn commit: r530258 - in /webservices/sandesha/trunk/c: ./ src/client/ src/core/ src/handlers/ src/msgprocessors/ src/polling/ src/storage/ src/storage/beans/ src/storage/inmemory/ src/storage/permanent/ src/transport/ src/util/ src/workers/ src/wsrm/

Author: damitha
Date: Wed Apr 18 21:18:41 2007
New Revision: 530258

URL: http://svn.apache.org/viewvc?view=rev&rev=530258
Log:
sandesha2c is now working with latest axis2c svn changes in linux.
Please someone test this in windows

Modified:
    webservices/sandesha/trunk/c/Makefile.am
    webservices/sandesha/trunk/c/autogen.sh
    webservices/sandesha/trunk/c/src/client/Makefile.am
    webservices/sandesha/trunk/c/src/core/Makefile.am
    webservices/sandesha/trunk/c/src/handlers/Makefile.am
    webservices/sandesha/trunk/c/src/msgprocessors/Makefile.am
    webservices/sandesha/trunk/c/src/polling/Makefile.am
    webservices/sandesha/trunk/c/src/storage/Makefile.am
    webservices/sandesha/trunk/c/src/storage/beans/Makefile.am
    webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am
    webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am
    webservices/sandesha/trunk/c/src/transport/Makefile.am
    webservices/sandesha/trunk/c/src/util/Makefile.am
    webservices/sandesha/trunk/c/src/workers/Makefile.am
    webservices/sandesha/trunk/c/src/wsrm/Makefile.am

Modified: webservices/sandesha/trunk/c/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/Makefile.am (original)
+++ webservices/sandesha/trunk/c/Makefile.am Wed Apr 18 21:18:41 2007
@@ -1,4 +1,5 @@
-datadir=$(prefix)/sandesha2
+datadir=$(prefix)/modules/sandesha2
+docsdir=${prefix}
 SUBDIRS = src
 data_DATA = LICENSE config/module.xml \
 			include/sandesha2_client_constants.h \
@@ -6,4 +7,6 @@
 			include/sandesha2_client.h \
 			include/sandesha2_seq_report.h \
 			include/sandesha2_report.h
+
+docs_DATA=config/axis2.xml
 

Modified: webservices/sandesha/trunk/c/autogen.sh
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/autogen.sh?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/autogen.sh (original)
+++ webservices/sandesha/trunk/c/autogen.sh Wed Apr 18 21:18:41 2007
@@ -1,14 +1,42 @@
 #!/bin/bash
-  
-for i in libtoolize aclocal autoconf autoheader
-do
-    echo -n "Running $i..."
-    $i || exit 1
-    echo 'done.'
-done
-  
+echo -n 'Running libtoolize...'
+if libtoolize --force > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running aclocal...'
+if aclocal > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running autoheader...'
+if autoheader > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
+echo -n 'Running autoconf...'
+if autoconf > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
+
 echo -n 'Running automake...'
-automake --add-missing
-echo 'done.'
-exit 0
+if automake --add-missing > /dev/null 2>&1; then
+	echo 'done.'
+else
+	echo 'failed.'
+	exit 1
+fi
 
+echo 'done'

Modified: webservices/sandesha/trunk/c/src/client/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/client/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/client/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/client/Makefile.am Wed Apr 18 21:18:41 2007
@@ -8,4 +8,9 @@
 
 INCLUDES = -I$(top_builddir)/include \
 			-I$(top_builddir)/include/sandesha2 \
-			@AXIS2INC@
+           -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include
+

Modified: webservices/sandesha/trunk/c/src/core/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/core/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/core/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/core/Makefile.am Wed Apr 18 21:18:41 2007
@@ -1,4 +1,4 @@
-prglibdir=$(prefix)/sandesha2
+prglibdir=$(prefix)/modules/sandesha2
 prglib_LTLIBRARIES = libsandesha2.la
 
 libsandesha2_la_SOURCES = sandesha2_msg_ctx.c\
@@ -6,7 +6,12 @@
                           msg_validator.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIS2INC@
+            -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include
+
 libsandesha2_la_LIBADD = ../client/libsandesha2_client.la\
                         ../handlers/libsandesha_handlers.la\
                         ../msgprocessors/libsandesha2_msgprocessors.la\
@@ -19,7 +24,5 @@
                         ../workers/libsandesha2_workers.la\
                         ../wsrm/libsandesha2_wsrm.la \
                         ../polling/libsandesha2_polling.la \
-						-lsqlite3 \
 						-lmysqlclient -lnsl -lm -lz
-
 

Modified: webservices/sandesha/trunk/c/src/handlers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/handlers/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/handlers/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/handlers/Makefile.am Wed Apr 18 21:18:41 2007
@@ -7,4 +7,8 @@
 
 INCLUDES = -I$(top_builddir)/include \
 			-I$(top_builddir)/include/sandesha2 \
-			@AXIS2INC@
+            -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include

Modified: webservices/sandesha/trunk/c/src/msgprocessors/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/msgprocessors/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/msgprocessors/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/msgprocessors/Makefile.am Wed Apr 18 21:18:41 2007
@@ -14,4 +14,9 @@
 
 INCLUDES = -I$(top_builddir)/include \
 			-I$(top_builddir)/include/sandesha2 \
-           @AXIS2INC@
+           -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include
+

Modified: webservices/sandesha/trunk/c/src/polling/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/polling/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/polling/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/polling/Makefile.am Wed Apr 18 21:18:41 2007
@@ -3,5 +3,11 @@
 libsandesha2_polling_la_SOURCES = polling_mgr.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIS2INC@
+           -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include
+
+
 

Modified: webservices/sandesha/trunk/c/src/storage/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/Makefile.am Wed Apr 18 21:18:41 2007
@@ -12,4 +12,8 @@
 
 INCLUDES = -I$(top_builddir)/include \
 			-I$(top_builddir)/include/sandesha2 \
-			@AXIS2INC@
+            -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include

Modified: webservices/sandesha/trunk/c/src/storage/beans/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/beans/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/beans/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/beans/Makefile.am Wed Apr 18 21:18:41 2007
@@ -9,4 +9,9 @@
 				rm_bean.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIS2INC@
+            -I ../../../../axis2c/util/include \
+            -I ../../../../axis2c/include \
+            -I ../../../../axis2c/axiom/include \
+            -I ../../../../axis2c/xml_schema/include \
+            -I ../../../../axis2c/woden/include
+

Modified: webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/inmemory/Makefile.am Wed Apr 18 21:18:41 2007
@@ -12,4 +12,11 @@
 
 INCLUDES = -I$(top_builddir)/include \
 			-I$(top_builddir)/include/sandesha2 \
-			@AXIS2INC@
+           -I ../../../../axis2c/util/include \
+            -I ../../../../axis2c/include \
+            -I ../../../../axis2c/axiom/include \
+            -I ../../../../axis2c/xml_schema/include \
+            -I ../../../../axis2c/woden/include
+
+EXTRA_DIST=sandesha2_inmemory_bean_mgr.h
+

Modified: webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/storage/permanent/Makefile.am Wed Apr 18 21:18:41 2007
@@ -13,6 +13,11 @@
 
 INCLUDES = -I$(top_builddir)/include \
 			-I$(top_builddir)/include/sandesha2 \
-			-I/usr/include/mysql \
-			@AXIS2INC@
+            -I ../../../../axis2c/util/include \
+            -I ../../../../axis2c/include \
+            -I ../../../../axis2c/axiom/include \
+            -I ../../../../axis2c/xml_schema/include \
+            -I ../../../../axis2c/woden/include \
+			-I/usr/include/mysql
 
+EXTRA_DIST=sandesha2_sqls.h

Modified: webservices/sandesha/trunk/c/src/transport/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/transport/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/transport/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/transport/Makefile.am Wed Apr 18 21:18:41 2007
@@ -3,5 +3,8 @@
 libsandesha2_transport_la_SOURCES = sandesha2_transport_sender.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIS2INC@
-
+            -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include

Modified: webservices/sandesha/trunk/c/src/util/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/util/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/util/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/util/Makefile.am Wed Apr 18 21:18:41 2007
@@ -16,6 +16,9 @@
                             property_mgr.c
 
 INCLUDES = -I$(top_builddir)/include \
-			-I$(top_builddir)/include/sandesha2 \
-			-I/usr/include/mysql \
-			@AXIS2INC@
+            -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include \
+			-I/usr/include/mysql

Modified: webservices/sandesha/trunk/c/src/workers/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/workers/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/workers/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/workers/Makefile.am Wed Apr 18 21:18:41 2007
@@ -5,5 +5,9 @@
                                   sender_worker.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIS2INC@
+           -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include
 

Modified: webservices/sandesha/trunk/c/src/wsrm/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/sandesha/trunk/c/src/wsrm/Makefile.am?view=diff&rev=530258&r1=530257&r2=530258
==============================================================================
--- webservices/sandesha/trunk/c/src/wsrm/Makefile.am (original)
+++ webservices/sandesha/trunk/c/src/wsrm/Makefile.am Wed Apr 18 21:18:41 2007
@@ -31,4 +31,8 @@
 							   make_connection.c
 
 INCLUDES = -I$(top_builddir)/include \
-            @AXIS2INC@
+            -I ../../../axis2c/util/include \
+            -I ../../../axis2c/include \
+            -I ../../../axis2c/axiom/include \
+            -I ../../../axis2c/xml_schema/include \
+            -I ../../../axis2c/woden/include



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org