You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2007/08/06 05:20:28 UTC
svn commit: r563014 - in /webservices/axis2/trunk/c: ./ include/
samples/server/ samples/server/echo/ src/core/clientapi/ src/core/engine/
src/core/transport/ src/modules/mod_addr/
Author: samisa
Date: Sun Aug 5 20:20:26 2007
New Revision: 563014
URL: http://svn.apache.org/viewvc?view=rev&rev=563014
Log:
Fixed the build breaks
Modified:
webservices/axis2/trunk/c/configure.ac
webservices/axis2/trunk/c/include/axis2_const.h
webservices/axis2/trunk/c/samples/server/axis2.xml
webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c
webservices/axis2/trunk/c/src/core/clientapi/op_client.c
webservices/axis2/trunk/c/src/core/engine/Makefile.am
webservices/axis2/trunk/c/src/core/transport/Makefile.am
webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am
webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c
Modified: webservices/axis2/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/configure.ac?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/configure.ac (original)
+++ webservices/axis2/trunk/c/configure.ac Sun Aug 5 20:20:26 2007
@@ -314,72 +314,6 @@
CFLAGS="$CFLAGS"
)
-AC_MSG_CHECKING(whether to use XMPP as a transport)
-AC_ARG_WITH(xmpp,
-[ --with-xmpp[=PATH] Whether to build XMPP transport support.
- ],
-[ case "$withval" in
- no)
- AC_MSG_RESULT(no)
- XMPP_DIR=""
- ;;
- *)
- AC_MSG_RESULT(yes)
- dnl Find iksemel include dir
- if test -d $withval; then
- iksemelinc="-I$withval"
- XMPP_DIR="xmpp"
- dnl else find the iksemel include dir in /usr/include
- elif test -d '/usr/include'; then
- iksemelinc="-I/usr/include"
- XMPP_DIR="xmpp"
- else
- AC_MSG_ERROR(could not find iksemel. stop)
- fi
- XMPP_DIR="xmpp"
- ;;
- esac ],
- AC_MSG_RESULT(no)
-)
-
-AC_MSG_CHECKING(whether to use gssapi)
-AC_ARG_ENABLE(gssapi, [ --enable-gssapi enable gssapi (default=no)],
-[ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- CFLAGS="$CFLAGS"
- gssapi_enabled=false
- ;;
- *)
- AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS -DAXIS2_XMPP_GSSAPI"
- gssapi_enabled=true
- ;;
- esac ],
- AC_MSG_RESULT(no)
- CFLAGS="$CFLAGS"
-)
-
-#AC_MSG_CHECKING(whether to build xmpp)
-#AC_ARG_ENABLE(xmpp, [ --enable-xmpp
-# enable xmpp build (default=no)],
-#[ case "${enableval}" in
-# no)
-# AC_MSG_RESULT(no)
-# CFLAGS="$CFLAGS"
-# xmpp_enabled=false
-# ;;
-# *)
-# AC_MSG_RESULT(yes)
-# XMPP_DIR="xmpp"
-# CFLAGS="$CFLAGS -DAXIS2_XMPP_ENABLED"
-# xmpp_enabled=false
-# ;;
-# esac ],
-# AC_MSG_RESULT(no)
-# CFLAGS="$CFLAGS"
-#)
-
APACHE2INC=$apache2inc
IKSEMELINC=$iksemelinc
@@ -403,8 +337,6 @@
AC_SUBST(GUTHTHILA_LIBS)
AM_CONDITIONAL(AXIS2_SSL_ENABLED, test x$ssl_enabled = xtrue)
AM_CONDITIONAL(AXIS2_LIBCURL_ENABLED, test x$libcurl_enabled = xtrue)
-AM_CONDITIONAL(AXIS2_XMPP_GSSAPI, test x$gssapi_enabled = xtrue)
-AM_CONDITIONAL(AXIS2_XMPP_ENABLED, test x$xmpp_enabled = xtrue)
#export PARSER_DIR
export WRAPPER_DIR
@@ -434,11 +366,6 @@
src/core/transport/tcp/receiver/Makefile \
src/core/transport/tcp/server/Makefile \
src/core/transport/tcp/server/simple_tcp_server/Makefile \
- src/core/transport/xmpp/Makefile \
- src/core/transport/xmpp/sender/Makefile \
- src/core/transport/xmpp/receiver/Makefile \
- src/core/transport/xmpp/server/Makefile \
- src/core/transport/xmpp/server/simple_xmpp_server/Makefile \
src/core/deployment/Makefile \
src/core/clientapi/Makefile \
src/core/receivers/Makefile \
Modified: webservices/axis2/trunk/c/include/axis2_const.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_const.h?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_const.h (original)
+++ webservices/axis2/trunk/c/include/axis2_const.h Sun Aug 5 20:20:26 2007
@@ -113,7 +113,6 @@
#define AXIS2_TRANSPORT_HTTP "http"
#define AXIS2_TRANSPORT_SMTP "smtp"
#define AXIS2_TRANSPORT_TCP "tcp"
-#define AXIS2_TRANSPORT_XMPP "xmpp"
#define AXIS2_TRANSPORT_HTTPS "https"
typedef enum
{
Modified: webservices/axis2/trunk/c/samples/server/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/axis2.xml?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/samples/server/axis2.xml (original)
+++ webservices/axis2/trunk/c/samples/server/axis2.xml Sun Aug 5 20:20:26 2007
@@ -38,7 +38,6 @@
<!--parameter name="PROXY" proxy_host="127.0.0.1" proxy_port="8080" locked="true"/-->
</transportSender>
<!-- Uncomment this one with the appropriate papameters to enable the XMPP transport Sender-->
- <!--transportSender name="xmpp" class="axis2_xmpp_sender">
<parameter name="PROTOCOL" locked="false">XMPP</parameter>
</transportSender-->
<!-- Uncomment this one with the appropriate papameters to enable the TCP transport Sender-->
Modified: webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo_skeleton.c Sun Aug 5 20:20:26 2007
@@ -19,145 +19,264 @@
#include <axutil_array_list.h>
#include <axis2_msg_ctx.h>
#include <stdio.h>
+#include <dlfcn.h>
int AXIS2_CALL
-echo_free(axis2_svc_skeleton_t *svc_skeleton,
- const axutil_env_t *env);
-/*
- * This method invokes the right service method
- */
-axiom_node_t* AXIS2_CALL
-echo_invoke(axis2_svc_skeleton_t *svc_skeleton,
- const axutil_env_t *env,
- axiom_node_t *node,
- axis2_msg_ctx_t *msg_ctx);
+ my_init(axis2_svc_skeleton_t *svc_skeleton,
+ const axutil_env_t *env)
-int AXIS2_CALL
-echo_init(axis2_svc_skeleton_t *svc_skeleton,
- const axutil_env_t *env);
+ {
-axiom_node_t* AXIS2_CALL
-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)
-{
- axis2_svc_skeleton_t *svc_skeleton = NULL;
- /* Allocate memory for the structs */
- svc_skeleton = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_svc_skeleton_t));
+ /*SpsErrorLog("\nSPSAS: Entered my_init()\n");*/
- svc_skeleton->ops = &echo_svc_skeleton_ops_var;
+ fflush(stdout);
- svc_skeleton->func_array = NULL;
+ svc_skeleton->func_array = axutil_array_list_create(env, 0);
- return svc_skeleton;
-}
+ axutil_array_list_add(svc_skeleton->func_array, env, (void*)"create");
-/* Initialize the service */
-int AXIS2_CALL
-echo_init(axis2_svc_skeleton_t *svc_skeleton,
- const axutil_env_t *env)
-{
- /* Any initialization stuff of echo service should go here */
- return AXIS2_SUCCESS;
-}
-
-/*
- * This method invokes the right service method
- */
-axiom_node_t* AXIS2_CALL
-echo_invoke(axis2_svc_skeleton_t *svc_skeleton,
- const axutil_env_t *env,
- axiom_node_t *node,
- axis2_msg_ctx_t *msg_ctx)
-{
- /* Invoke the business logic.
- * Depending on the function name invoke the correct impl method.
- * We have only echo in this sample, hence invoke echo method.
- * To see how to deal with multiple impl methods, have a look at the
- * math sample.
- */
-
- return axis2_echo_echo(env, node);
-}
-
-/* On fault, handle the fault */
-axiom_node_t* AXIS2_CALL
-echo_on_fault(axis2_svc_skeleton_t *svc_skeli,
- const axutil_env_t *env, axiom_node_t *node)
-{
- /* Here we are just setting a simple error message inside an element
- * called 'EchoServiceError'
- */
- axiom_node_t *error_node = NULL;
- axiom_node_t *text_node = NULL;
- axiom_element_t *error_ele = NULL;
-
- error_ele = axiom_element_create(env, NULL, "EchoServiceError", NULL, &error_node);
- axiom_element_set_text(error_ele, env, "Echo service failed ", text_node);
- return error_node;
-}
+ axutil_array_list_add(svc_skeleton->func_array, env, (void*)"delete");
+
+ axutil_array_list_add(svc_skeleton->func_array, env, (void*)"update");
+
+
+
+ /* Any initialization stuff goes here */
+
+ return AXIS2_SUCCESS;
+
+ }
+
+
+
+ int AXIS2_CALL
+
+ my_free(axis2_svc_skeleton_t *svc_skeleton,
+
+ const axutil_env_t *env)
+
+ {
+
+/* TraceLog("\n[AG-DEBUG] entered my_free\n");*/
+
+ fflush(stdout);
+
+
+
+ if(svc_skeleton)
+
+ {
+
+ AXIS2_FREE((env)->allocator, svc_skeleton);
+
+ svc_skeleton = NULL;
+
+ }
+
+ return AXIS2_SUCCESS;
+
+ }
+
+
+
+ axiom_node_t* AXIS2_CALL
+
+ acc_invoke(axis2_svc_skeleton_t *svc_skeleton,
+
+ const axutil_env_t *env,
+
+ axiom_node_t *node,
+
+ axis2_msg_ctx_t *msg_ctx)
+
+ {
+
+ fflush(stdout);
+
+ /* Depending on the function name invoke the
+
+ * corresponding method
+
+ */
+
+ if (node)
+
+ {
+
+ if (axiom_node_get_node_type(node, env) == AXIOM_ELEMENT)
+
+ {
+
+ axiom_element_t *element = NULL;
+
+ element = (axiom_element_t *)axiom_node_get_data_element(node, env);
+
+ if (element)
+
+ {
+
+ axis2_char_t *op_name = axiom_element_get_localname(element, env);
+
+ if (op_name)
+
+ {
+
+ /*if ( axutil_strcmp(op_name, "create") == 0 )
+
+ return axis2_my_create1(env, node);
+
+ if ( axutil_strcmp(op_name, "delete") == 0 )
+
+ return axis2_my_delete1(env, node);
+
+ if ( axutil_strcmp(op_name, "modify") == 0 )
+
+ return axis2_my_modify1(env, node);
+
+ if ( axutil_strcmp(op_name, "readList) == 0 )
+
+ return axis2_my_readList(env, node);*/
+
+ }
+
+ }
+
+ }
+
+ }
+
+ else
+
+ {
+
+/* ErrorLog("ERROR: invalid OM parameters in request\n");*/
+
+ }
+
+
+
+ /** TODO: return a SOAP fault here */
+
+ return node;
+
+ }
+
+
+
+ static const axis2_svc_skeleton_ops_t my_svc_skeleton_ops_var = {
+
+ my_init,
+
+ acc_invoke,
+
+ NULL,
+
+ my_free
+
+ };
+
+
+
+ axis2_svc_skeleton_t *
+
+ axis2_my_create(const axutil_env_t *env)
+
+ {
+
+
+
+ axis2_svc_skeleton_t *svc_skeleton = NULL;
+
+ svc_skeleton = (axis2_svc_skeleton_t*) AXIS2_MALLOC((env)->allocator,
+
+ sizeof(axis2_svc_skeleton_t));
+
+
+
+
+
+ svc_skeleton->ops = (axis2_svc_skeleton_ops_t*)AXIS2_MALLOC(
+
+ (env)->allocator, sizeof(axis2_svc_skeleton_ops_t));
+
+
+
+ svc_skeleton->func_array = NULL;
+
+ svc_skeleton->ops = &my_svc_skeleton_ops_var;
+
+
+
+ return svc_skeleton;
+
+ }
+
+
+
+ AXIS2_EXPORT int axis2_get_instance(struct axis2_svc_skeleton **inst,
+
+ const axutil_env_t *env)
+
+ {
+
+/* SpsTraceLog("\nCalling dlopen() inside axis2_get_instance\n");*/
+
+ void* ptr = dlopen("/root/lib/libMy.so",RTLD_LAZY|RTLD_GLOBAL);
+
+ if(NULL == ptr)
+
+ {
+
+/* SpsErrorLog("\ndlopen returned NULL");
+
+ SpsErrorLog("\nFor dlopen()...........dlerror says the following\n%s\n",dlerror());*/
+
+ }
+
+/* SpsTraceLog("\ndlopen returned ptr with addr %u",ptr);*/
+
+
+
+
+
+ *inst = axis2_my_create(env);
+
+ if(NULL == (*inst))
+
+ {
+
+ return AXIS2_FAILURE;
+
+ }
+
+
+
+ return AXIS2_SUCCESS;
+
+ }
+
+
+
+ AXIS2_EXPORT int axis2_remove_instance(axis2_svc_skeleton_t *inst,
+
+ const axutil_env_t *env)
+
+ {
+
+ axis2_status_t status = AXIS2_FAILURE;
+
+ if (inst)
+
+ {
+
+ status = AXIS2_SVC_SKELETON_FREE(inst, env);
+
+ }
+
+ return status;
+
+ }
-/* Free the resources used */
-int AXIS2_CALL
-echo_free(axis2_svc_skeleton_t *svc_skeleton,
- const axutil_env_t *env)
-{
- /* Free the function array */
- if (svc_skeleton->func_array)
- {
- axutil_array_list_free(svc_skeleton->func_array, env);
- svc_skeleton->func_array = NULL;
- }
-
- /* Free the service skeleton */
- if (svc_skeleton)
- {
- AXIS2_FREE(env->allocator, svc_skeleton);
- svc_skeleton = NULL;
- }
-
- return AXIS2_SUCCESS;
-}
-
-
-/**
- * Following block distinguish the exposed part of the dll.
- */
-AXIS2_EXPORT int
-axis2_get_instance(axis2_svc_skeleton_t **inst,
- const axutil_env_t *env)
-{
- *inst = axis2_echo_create(env);
- if (!(*inst))
- {
- return AXIS2_FAILURE;
- }
-
- return AXIS2_SUCCESS;
-}
-
-AXIS2_EXPORT int
-axis2_remove_instance(axis2_svc_skeleton_t *inst,
- const axutil_env_t *env)
-{
- axis2_status_t status = AXIS2_FAILURE;
- if (inst)
- {
- status = AXIS2_SVC_SKELETON_FREE(inst, env);
- }
- return status;
-}
Modified: webservices/axis2/trunk/c/src/core/clientapi/op_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/clientapi/op_client.c?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/src/core/clientapi/op_client.c (original)
+++ webservices/axis2/trunk/c/src/core/clientapi/op_client.c Sun Aug 5 20:20:26 2007
@@ -833,10 +833,6 @@
{
transport_enum = AXIS2_TRANSPORT_ENUM_HTTPS;
}
- else if (!axutil_strcmp (transport, "xmpp"))
- {
- transport_enum = AXIS2_TRANSPORT_ENUM_XMPP;
- }
else if (!axutil_strcmp (transport, "tcp"))
{
transport_enum = AXIS2_TRANSPORT_ENUM_TCP;
Modified: webservices/axis2/trunk/c/src/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/engine/Makefile.am?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/src/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/engine/Makefile.am Sun Aug 5 20:20:26 2007
@@ -23,13 +23,8 @@
$(top_builddir)/util/src/libaxutil.la \
$(top_builddir)/neethi/src/libneethi.la \
$(top_builddir)/axiom/src/om/libaxis2_axiom.la
-if AXIS2_XMPP_ENABLED
-libaxis2_engine_la_LIBADD+=$(top_builddir)/src/core/transport/xmpp/receiver/libaxis2_xmpp_receiver.la \
- $(top_builddir)/src/core/transport/xmpp/sender/libaxis2_xmpp_sender.la
-else
libaxis2_engine_la_LIBADD+=$(top_builddir)/src/core/transport/http/common/libaxis2_http_common.la \
$(top_builddir)/src/core/transport/http/util/libaxis2_http_util.la
-endif
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/src/core/transport/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/Makefile.am?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/core/transport/Makefile.am Sun Aug 5 20:20:26 2007
@@ -1,2 +1,2 @@
-SUBDIRS=http tcp ${XMPP_DIR}
+SUBDIRS=http tcp
EXTRA_DIST=Makefile.am
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/Makefile.am Sun Aug 5 20:20:26 2007
@@ -7,7 +7,8 @@
mod_addr.c
libaxis2_mod_addr_la_LIBADD = $(top_builddir)/axiom/src/om/libaxis2_axiom.la \
- $(top_builddir)/util/src/libaxutil.la
+ $(top_builddir)/util/src/libaxutil.la \
+ $(top_builddir)/src/core/engine/libaxis2_engine.la -laxis2_engine
libaxis2_mod_addr_la_LDFLAGS = -version-info $(VERSION_NO)
Modified: webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c?view=diff&rev=563014&r1=563013&r2=563014
==============================================================================
--- webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c (original)
+++ webservices/axis2/trunk/c/src/modules/mod_addr/addr_in_handler.c Sun Aug 5 20:20:26 2007
@@ -17,6 +17,7 @@
#include <axis2_addr_mod.h>
#include <axis2_addr.h>
+#include <axis2_handler.h>
#include <axis2_handler_desc.h>
#include <axutil_array_list.h>
#include <axiom_soap_const.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org