You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2006/07/06 14:28:20 UTC
svn commit: r419536 - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/util/ include/ modules/core/clientapi/ modules/core/description/
modules/core/transport/http/server/simple_axis2_server/
samples/client/echo/ samples/client/google/ samples/c...
Author: damitha
Date: Thu Jul 6 05:28:18 2006
New Revision: 419536
URL: http://svn.apache.org/viewvc?rev=419536&view=rev
Log:
dynamic client code is complete. Need to be tested
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_util.h
webservices/axis2/trunk/c/axiom/src/util/om_util.c
webservices/axis2/trunk/c/include/axis2_op.h
webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
webservices/axis2/trunk/c/modules/core/description/Makefile.am
webservices/axis2/trunk/c/modules/core/description/svc.c
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
webservices/axis2/trunk/c/samples/client/echo/Makefile.am
webservices/axis2/trunk/c/samples/client/google/Makefile.am
webservices/axis2/trunk/c/samples/client/math/Makefile.am
webservices/axis2/trunk/c/samples/client/mtom/Makefile.am
webservices/axis2/trunk/c/samples/client/notify/Makefile.am
webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
webservices/axis2/trunk/c/test/core/addr/Makefile.am
webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
webservices/axis2/trunk/c/test/core/context/Makefile.am
webservices/axis2/trunk/c/test/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/core/description/Makefile.am
webservices/axis2/trunk/c/test/core/engine/Makefile.am
webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am
webservices/axis2/trunk/c/test/unit/Makefile.am
webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
webservices/axis2/trunk/c/util/test/unit/util/util_test.c
webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c
webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.h
webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_util.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_util.h?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_util.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_util.h Thu Jul 6 05:28:18 2006
@@ -179,6 +179,12 @@
axiom_util_get_child_elements(axiom_element_t *om_ele,
const axis2_env_t *env,
axiom_node_t *om_node);
+
+AXIS2_EXTERN axiom_document_t* AXIS2_CALL
+axiom_util_new_document(
+ const axis2_env_t *env,
+ const axis2_uri_t *uri);
+
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/axiom/src/util/om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/util/om_util.c?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/util/om_util.c (original)
+++ webservices/axis2/trunk/c/axiom/src/util/om_util.c Thu Jul 6 05:28:18 2006
@@ -16,7 +16,9 @@
#include <axiom_node.h>
#include <axiom_element.h>
+#include <axiom_document.h>
#include <axis2_array_list.h>
+#include <axis2_uri.h>
#include <axiom_util.h>
AXIS2_EXTERN axiom_element_t * AXIS2_CALL
@@ -1038,5 +1040,29 @@
return axiom_child_element_iterator_create(env, first_node);
}
return NULL;
+}
+
+AXIS2_EXTERN axiom_document_t* AXIS2_CALL
+axiom_util_new_document(
+ const axis2_env_t *env,
+ const axis2_uri_t *uri)
+{
+ axis2_char_t *path = NULL;
+ axiom_xml_reader_t *reader = NULL;
+ axiom_stax_builder_t *om_builder = NULL;
+ axiom_document_t *doc = NULL;
+
+ AXIS2_PARAM_CHECK(env->error, uri, NULL);
+ /* This is temporary code. Later complete the code to read from uri and build
+ * the document
+ */
+ path = AXIS2_URI_GET_PATH((axis2_uri_t *) uri, env);
+
+ reader = axiom_xml_reader_create_for_file(env, path, NULL);
+ om_builder = axiom_stax_builder_create(env, reader);
+ doc = axiom_document_create(env, NULL, om_builder);
+ AXIOM_DOCUMENT_BUILD_ALL(doc, env);
+
+ return doc;
}
Modified: webservices/axis2/trunk/c/include/axis2_op.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_op.h?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_op.h (original)
+++ webservices/axis2/trunk/c/include/axis2_op.h Thu Jul 6 05:28:18 2006
@@ -64,7 +64,9 @@
struct axis2_msg;
typedef struct axis2_op_ops axis2_op_ops_t;
typedef struct axis2_op axis2_op_t;
-
+
+#define AXIS2_SOAP_ACTION "soapAction"
+
/**
* @brief Operation ops struct
* Encapsulator struct for ops of axis2_op
Modified: webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c (original)
+++ webservices/axis2/trunk/c/modules/core/clientapi/svc_client.c Thu Jul 6 05:28:18 2006
@@ -17,6 +17,7 @@
#include <axis2_svc_client.h>
#include <axis2_const.h>
#include <axis2_hash.h>
+#include <axis2_uri.h>
#include "callback_recv.h"
#include <axiom_soap_const.h>
#include <axiom_soap_body.h>
@@ -27,6 +28,7 @@
#include <axis2_options.h>
#include <axis2_conf_init.h>
#include <axis2_mep_client.h>
+#include "../description/axis2_client_utils.h"
typedef struct axis2_svc_client_impl
{
@@ -186,6 +188,112 @@
return &(svc_client_impl->svc_client);
}
+
+axis2_svc_client_t* AXIS2_CALL
+axis2_svc_client_create_with_conf_ctx_and_wsdl_uri_wsdl_svc_name_and_endpoint(
+ const axis2_env_t *env,
+ axis2_conf_ctx_t *conf_ctx,
+ const axis2_uri_t *wsdl_uri,
+ const axis2_qname_t *wsdl_svc_qname,
+ const axis2_char_t *endpoint_name,
+ const axis2_char_t *client_home)
+{
+ axis2_svc_client_impl_t *svc_client_impl = NULL;
+ axis2_svc_grp_t *svc_grp = NULL;
+ axis2_svc_grp_ctx_t *svc_grp_ctx = NULL;
+ axis2_char_t *svc_grp_name = NULL;
+
+ AXIS2_ENV_CHECK(env, NULL);
+
+ svc_client_impl = AXIS2_MALLOC( env->allocator, sizeof(axis2_svc_client_impl_t));
+ if (!svc_client_impl)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ return NULL;
+ }
+
+ svc_client_impl->svc = NULL;
+ svc_client_impl->conf = NULL;
+ svc_client_impl->conf_ctx = NULL;
+ svc_client_impl->svc_ctx = NULL;
+ svc_client_impl->options = NULL;
+ svc_client_impl->override_options = NULL;
+ svc_client_impl->headers = NULL;
+ svc_client_impl->callback_recv = NULL;
+ svc_client_impl->listener_manager = NULL;
+ svc_client_impl->op_client = NULL;
+ axis2_char_t *repos_path = NULL;
+ axis2_char_t *wsdl_path = NULL;
+
+
+ /** initialize private data to NULL, create options */
+ if (!axis2_svc_client_init_data(env, svc_client_impl))
+ {
+ axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+ return NULL;
+ }
+
+ /* the following method call will create the deafult conf_ctx if it is NULL */
+ if (!axis2_svc_client_init_transports_from_conf_ctx(env, svc_client_impl,
+ conf_ctx, client_home))
+ {
+ axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+ return NULL;
+ }
+
+ svc_client_impl->conf = AXIS2_CONF_CTX_GET_CONF(svc_client_impl->conf_ctx, env);
+ repos_path = AXIS2_CONF_GET_REPOS(svc_client_impl->conf, env);
+ wsdl_path = axis2_strcat(env, repos_path, AXIS2_PATH_SEP_STR, "woden", NULL);
+
+ svc_client_impl->svc = axis2_client_utils_create_axis2_svc(env, wsdl_uri,
+ wsdl_svc_qname, endpoint_name, wsdl_path, NULL);
+ /** add the service to the config context if it isn't in there already */
+ if (NULL == AXIS2_CONF_GET_SVC(svc_client_impl->conf, env,
+ AXIS2_SVC_GET_NAME(svc_client_impl->svc, env)))
+ {
+ AXIS2_CONF_ADD_SVC(svc_client_impl->conf, env, svc_client_impl->svc);
+ }
+
+ /** create a service context for myself: create a new service group
+ context and then get the service context for myself as I'll need that
+ later for stuff that I gotta do
+ */
+ svc_grp = AXIS2_SVC_GET_PARENT(svc_client_impl->svc, env);
+ if (!svc_grp)
+ return NULL;
+
+ svc_grp_ctx = AXIS2_SVC_GRP_GET_SVC_GRP_CTX(svc_grp, env,
+ svc_client_impl->conf_ctx);
+ if (!svc_grp_ctx)
+ return NULL;
+
+ svc_grp_name = AXIS2_SVC_GRP_GET_NAME(svc_grp, env);
+ if (!svc_grp_name)
+ return NULL; /* cannot proceed without svc group name */
+
+ AXIS2_CONF_CTX_REGISTER_SVC_GRP_CTX(svc_client_impl->conf_ctx, env,
+ svc_grp_name, svc_grp_ctx);
+
+ svc_client_impl->svc_ctx = AXIS2_SVC_GRP_CTX_GET_SVC_CTX(svc_grp_ctx, env,
+ AXIS2_SVC_GET_NAME(svc_client_impl->svc, env));
+
+ /* create ops */
+ svc_client_impl->svc_client.ops =
+ AXIS2_MALLOC( env->allocator, sizeof(axis2_svc_client_ops_t));
+
+ if (!svc_client_impl->svc_client.ops)
+ {
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ axis2_svc_client_free(&(svc_client_impl->svc_client), env);
+ return NULL;
+ }
+
+ /** initialize ops */
+ axis2_svc_client_init_ops(&(svc_client_impl->svc_client));
+
+ return &(svc_client_impl->svc_client);
+}
+
axis2_svc_client_t* AXIS2_CALL
axis2_svc_client_create_with_conf_ctx_and_svc(const axis2_env_t *env,
Modified: webservices/axis2/trunk/c/modules/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/Makefile.am Thu Jul 6 05:28:18 2006
@@ -13,11 +13,13 @@
flow_container.c \
transport_in_desc.c \
transport_out_desc.c \
- msg.c
+ msg.c \
+ client_utils.c
INCLUDES = -I$(top_builddir)/include \
-I$(top_builddir)/modules/wsdl \
-I$(top_builddir)/modules/core/engine \
+ -I$(top_builddir)/woden/include \
@AXIOMINC@ \
@UTILINC@ \
-I$(top_builddir)/xml_schema/include
Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Thu Jul 6 05:28:18 2006
@@ -1245,6 +1245,7 @@
}
return status;
}
+ break;
}
}
Modified: webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/Makefile.am Thu Jul 6 05:28:18 2006
@@ -18,6 +18,8 @@
-laxis2_http_sender \
-laxis2_http_receiver \
-lxml2 \
+ -lwoden \
+ -laxis2_xml_schema \
$(LIBXML2_LIBS) \
$(GUTHTHILA_LIBS)
Modified: webservices/axis2/trunk/c/samples/client/echo/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/echo/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/echo/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/echo/Makefile.am Thu Jul 6 05:28:18 2006
@@ -12,6 +12,8 @@
-laxis2_engine \
-laxis2_parser \
-lpthread \
+ -lwoden \
+ -laxis2_xml_schema \
-laxis2_http_sender \
-laxis2_http_receiver \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/samples/client/google/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/google/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/google/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/google/Makefile.am Thu Jul 6 05:28:18 2006
@@ -13,6 +13,8 @@
-laxis2_parser \
-laxis2_http_sender \
-laxis2_http_receiver \
+ -lwoden \
+ -laxis2_xml_schema \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/samples/client/math/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/math/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/math/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/math/Makefile.am Thu Jul 6 05:28:18 2006
@@ -16,6 +16,8 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
+ -lwoden \
+ -laxis2_xml_schema \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/samples/client/mtom/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/Makefile.am Thu Jul 6 05:28:18 2006
@@ -16,6 +16,8 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
+ -lwoden \
+ -laxis2_xml_schema \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/samples/client/notify/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/notify/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/client/notify/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/client/notify/Makefile.am Thu Jul 6 05:28:18 2006
@@ -14,6 +14,8 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
+ -lwoden \
+ -laxis2_xml_schema \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am (original)
+++ webservices/axis2/trunk/c/samples/user_guide/clients/Makefile.am Thu Jul 6 05:28:18 2006
@@ -22,6 +22,8 @@
-lpthread \
-laxis2_http_sender \
-laxis2_http_receiver \
+ -lwoden \
+ -laxis2_xml_schema \
$(GUTHTHILA_LIBS) \
$(LIBXML2_LIBS)
Modified: webservices/axis2/trunk/c/test/core/addr/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/addr/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/addr/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/addr/Makefile.am Thu Jul 6 05:28:18 2006
@@ -10,6 +10,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/core/clientapi/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/clientapi/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/clientapi/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/clientapi/Makefile.am Thu Jul 6 05:28:18 2006
@@ -12,6 +12,8 @@
-laxis2_axiom \
-laxis2_parser \
-lpthread \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
@@ -23,6 +25,8 @@
-laxis2_axiom \
-laxis2_parser \
-lpthread \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
Modified: webservices/axis2/trunk/c/test/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/context/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/context/Makefile.am Thu Jul 6 05:28:18 2006
@@ -11,6 +11,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/deployment/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/deployment/Makefile.am Thu Jul 6 05:28:18 2006
@@ -9,6 +9,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/description/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/description/Makefile.am Thu Jul 6 05:28:18 2006
@@ -10,6 +10,8 @@
-laxis2_axiom \
-laxis2_parser \
-lpthread \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/engine/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/engine/Makefile.am Thu Jul 6 05:28:18 2006
@@ -11,6 +11,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/core/transport/http/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/core/transport/http/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/core/transport/http/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/core/transport/http/Makefile.am Thu Jul 6 05:28:18 2006
@@ -11,6 +11,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)/modules/core/transport/http/sender/libaxis2_http_sender.la \
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round1/Makefile.am Thu Jul 6 05:28:18 2006
@@ -6,6 +6,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
Modified: webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/itest/whitemesa/round2/Makefile.am Thu Jul 6 05:28:18 2006
@@ -6,6 +6,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
Modified: webservices/axis2/trunk/c/test/unit/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/Makefile.am Thu Jul 6 05:28:18 2006
@@ -15,6 +15,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(top_builddir)//modules/core/transport/http/sender/libaxis2_http_sender.la \
Modified: webservices/axis2/trunk/c/test/unit/core/context/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/context/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/context/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/context/Makefile.am Thu Jul 6 05:28:18 2006
@@ -21,6 +21,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/deployment/Makefile.am Thu Jul 6 05:28:18 2006
@@ -32,6 +32,8 @@
-laxis2_axiom \
-laxis2_parser \
-lpthread \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/description/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/description/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/description/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/description/Makefile.am Thu Jul 6 05:28:18 2006
@@ -33,6 +33,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/engine/Makefile.am Thu Jul 6 05:28:18 2006
@@ -25,6 +25,8 @@
-L$(CUTEST_HOME)/lib \
-lcutest \
-laxis2_util \
+ -lwoden \
+ -laxis2_xml_schema \
-laxis2_axiom \
-laxis2_parser \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
Modified: webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/core/phaseresolver/Makefile.am Thu Jul 6 05:28:18 2006
@@ -30,6 +30,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am (original)
+++ webservices/axis2/trunk/c/test/unit/wsdl/Makefile.am Thu Jul 6 05:28:18 2006
@@ -32,6 +32,8 @@
-laxis2_util \
-laxis2_axiom \
-laxis2_parser \
+ -lwoden \
+ -laxis2_xml_schema \
$(top_builddir)/modules/core/engine/libaxis2_engine.la \
$(top_builddir)/modules/wsdl/libaxis2_wsdl.la \
$(GUTHTHILA_LIBS) \
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_test.c?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_test.c Thu Jul 6 05:28:18 2006
@@ -38,6 +38,7 @@
SUITE_ADD_TEST(suite, Testaxis2_uri_parse_string);
SUITE_ADD_TEST(suite, Testaxis2_uri_parse_relative);
SUITE_ADD_TEST(suite, Testaxis2_uri_clone);
+ SUITE_ADD_TEST(suite, Testaxis2_uri_get_path);
/* Samisa - need to remove this as we run make check before make install
SUITE_ADD_TEST(suite, Testaxis2_dir_handler_list_dir); */
return suite;
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.c Thu Jul 6 05:28:18 2006
@@ -103,3 +103,28 @@
}
+void Testaxis2_uri_get_path(CuTest *tc)
+{
+ axis2_char_t *actual = NULL;
+ axis2_char_t *expected = "/home/damitha/temp/my.wsdl";
+ axis2_char_t *uri_str = NULL;
+ axis2_uri_t *uri = NULL;
+
+ printf("******************************************\n");
+ printf("testing axis2_uri_get_path\n");
+ printf("******************************************\n");
+ axis2_allocator_t *allocator = axis2_allocator_init (NULL);
+ const axis2_env_t *env = axis2_env_create (allocator);
+
+ uri_str = "/home/damitha/temp/my.wsdl";
+ /*uri_str = "http://myserver:80/home/damitha/temp/my.wsdl";*/
+ uri = axis2_uri_parse_string(env, uri_str);
+ actual = axis2_uri_get_path(uri, env);
+
+ printf("actual:%s\n", actual);
+
+ CuAssertStrEquals(tc, expected, actual);
+ AXIS2_URI_FREE(uri, env);
+}
+
+
Modified: webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.h?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.h (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_uri_test.h Thu Jul 6 05:28:18 2006
@@ -26,4 +26,6 @@
void Testaxis2_uri_clone(CuTest *tc);
+void Testaxis2_uri_get_path(CuTest *tc);
+
#endif /* UTIL_URI_TEST_H*/
Modified: webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c?rev=419536&r1=419535&r2=419536&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c (original)
+++ webservices/axis2/trunk/c/xml_schema/src/xml_schema_obj_table.c Thu Jul 6 05:28:18 2006
@@ -245,9 +245,12 @@
for (hi = axis2_hash_first (obj_table_impl->collection, env); hi;
hi = axis2_hash_next ( env, hi))
{
- void *val = NULL;
- axis2_hash_this (hi, NULL, NULL, &val);
- AXIS2_ARRAY_LIST_ADD(obj_table_impl->names, env, val);
+ const void *val = NULL;
+ axis2_qname_t *qname = NULL;
+ /*axis2_hash_this (hi, NULL, NULL, &val);*/
+ axis2_hash_this (hi, &val, NULL, NULL);
+ qname = axis2_qname_create_from_string(env, val);
+ AXIS2_ARRAY_LIST_ADD(obj_table_impl->names, env, qname);
val = NULL;
}
return obj_table_impl->names;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org