Author: kaushalye
Date: Tue Apr 3 03:11:15 2007
New Revision: 525126
URL: http://svn.apache.org/viewvc?view=rev&rev=525126
Log:
Fixing build breaks and changing echo service sample to comply with changes in
Axis2/C
Modified:
webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
webservices/rampart/trunk/c/samples/callback/Makefile.am
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am
webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
Modified: webservices/rampart/trunk/c/samples/authn_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/authn_provider/Makefile.am?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/authn_provider/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/authn_provider/Makefile.am Tue Apr 3
03:11:15 2007
@@ -4,4 +4,4 @@
libauthn_la_LIBADD = ../../src/util/librampart_util.la \
../../src/omxmlsec/openssl/libomopenssl.la
INCLUDES = -I ../../include\
- -I$(AXIS2C_HOME)/include
+ -I$(AXIS2C_HOME)/include/axis2-1.0
Modified: webservices/rampart/trunk/c/samples/callback/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/Makefile.am?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/callback/Makefile.am Tue Apr 3
03:11:15 2007
@@ -4,4 +4,4 @@
libpwcb_la_SOURCES = pwcb.c
libpwcb_la_LIBADD =
INCLUDES = -I ../../include\
- -I$(AXIS2C_HOME)/include
+ -I$(AXIS2C_HOME)/include/axis2-1.0
Modified:
webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/callback/htpasswd_callback/Makefile.am
Tue Apr 3 03:11:15 2007
@@ -5,4 +5,4 @@
libhtpwcb_la_LIBADD =
INCLUDES = -I ../../../include \
- -I$(AXIS2C_HOME)/include
+ -I$(AXIS2C_HOME)/include/axis2-1.0
Modified: webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/client/sec_echo/Makefile.am Tue Apr 3
03:11:15 2007
@@ -17,7 +17,7 @@
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
-INCLUDES = -I$(AXIS2C_HOME)/include \
+INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
-I ../../../include \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/credential_provider/Makefile.am?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/credential_provider/Makefile.am
(original)
+++ webservices/rampart/trunk/c/samples/credential_provider/Makefile.am Tue Apr
3 03:11:15 2007
@@ -4,4 +4,4 @@
libcredential_la_LIBADD = ../../src/util/librampart_util.la \
../../src/omxmlsec/openssl/libomopenssl.la
INCLUDES = -I ../../include\
- -I$(AXIS2C_HOME)/include
+ -I$(AXIS2C_HOME)/include/axis2-1.0
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am (original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/Makefile.am Tue Apr 3
03:11:15 2007
@@ -8,6 +8,6 @@
SUBDIRS =
libsec_echo_la_SOURCES = echo.c echo_skeleton.c
libsec_echo_la_LIBADD =
-INCLUDES = -I$(AXIS2C_HOME)/include \
+INCLUDES = -I$(AXIS2C_HOME)/include/axis2-1.0 \
@UTILINC@ \
@AXIOMINC@
Modified: webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c?view=diff&rev=525126&r1=525125&r2=525126
==============================================================================
--- webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c
(original)
+++ webservices/rampart/trunk/c/samples/server/sec_echo/echo_skeleton.c Tue Apr
3 03:11:15 2007
@@ -42,6 +42,14 @@
echo_on_fault(axis2_svc_skeleton_t *svc_skeli,
const axutil_env_t *env, axiom_node_t *node);
+static const axis2_svc_skeleton_ops_t echo_svc_skeleton_ops_var = {
+ echo_init,
+ echo_invoke,
+ echo_on_fault,
+ echo_free
+};
+
+
/*Create function */
axis2_svc_skeleton_t *
axis2_echo_create(const axutil_env_t *env)
@@ -54,12 +62,10 @@
svc_skeleton->ops = AXIS2_MALLOC(
env->allocator, sizeof(axis2_svc_skeleton_ops_t));
+ svc_skeleton->ops = &echo_svc_skeleton_ops_var;
+
svc_skeleton->func_array = NULL;
/* Assign function pointers */
- svc_skeleton->ops->free = echo_free;
- svc_skeleton->ops->init = echo_init;
- svc_skeleton->ops->invoke = echo_invoke;
- svc_skeleton->ops->on_fault = echo_on_fault;
return svc_skeleton;
}
@@ -126,12 +132,6 @@
svc_skeleton->func_array = NULL;
}
- /* Free the function array */
- if (svc_skeleton->ops)
- {
- AXIS2_FREE(env->allocator, svc_skeleton->ops);
- svc_skeleton->ops = NULL;
- }
/* Free the service skeleton */
if (svc_skeleton)
