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 2005/11/28 08:05:18 UTC
svn commit: r349395 - in /webservices/axis2/trunk/c/modules:
core/context/src/Makefile.in test/om/src/Makefile.am
test/om/src/Makefile.in xml/parser/libxml2/src/axis2_libxml2_wrapper.c
xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
Author: samisa
Date: Sun Nov 27 23:05:04 2005
New Revision: 349395
URL: http://svn.apache.org/viewcvs?rev=349395&view=rev
Log:
libxml2 support added
Modified:
webservices/axis2/trunk/c/modules/core/context/src/Makefile.in
webservices/axis2/trunk/c/modules/test/om/src/Makefile.am
webservices/axis2/trunk/c/modules/test/om/src/Makefile.in
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
Modified: webservices/axis2/trunk/c/modules/core/context/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/context/src/Makefile.in?rev=349395&r1=349394&r2=349395&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/context/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/context/src/Makefile.in Sun Nov 27 23:05:04 2005
@@ -62,7 +62,8 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libaxis2_context_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libaxis2_context_la_OBJECTS = ctx.lo msg_ctx.lo
+am_libaxis2_context_la_OBJECTS = ctx.lo msg_ctx.lo operation_ctx.lo \
+ svc_ctx.lo
libaxis2_context_la_OBJECTS = $(am_libaxis2_context_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -189,7 +190,7 @@
target_vendor = @target_vendor@
lib_LTLIBRARIES = libaxis2_context.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_context_la_SOURCES = ctx.c msg_ctx.c
+libaxis2_context_la_SOURCES = ctx.c msg_ctx.c operation_ctx.c svc_ctx.c
libaxis2_context_la_LIBADD = $(LDFLAGS)
INCLUDES = -I${CUTEST_HOME}/include \
-I$(top_builddir)/modules/xml/guththila/src \
@@ -267,6 +268,8 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ctx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msg_ctx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/operation_ctx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svc_ctx.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Modified: webservices/axis2/trunk/c/modules/test/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/Makefile.am?rev=349395&r1=349394&r2=349395&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.am Sun Nov 27 23:05:04 2005
@@ -5,8 +5,7 @@
test_om_SOURCES = test_om.c
test_om_LDADD = $(LDFLAGS) -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om \
- -L$(top_builddir)/modules/xml/parser/guththila/src/.libs -laxis2_guththila \
- -L$(top_builddir)/modules/xml/parser/guththila/impl/src/.libs -lguththila \
+ -L$(top_builddir)/modules/xml/parser/libxml2/src/.libs -laxis2_libxml2 \
-L$(top_builddir)/modules/util/src/.libs -laxis2_util
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/modules/test/om/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/Makefile.in?rev=349395&r1=349394&r2=349395&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/om/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.in Sun Nov 27 23:05:04 2005
@@ -194,8 +194,7 @@
AM_CPPFLAGS = $(CPPFLAGS) -g -O2 -pthread
test_om_SOURCES = test_om.c
test_om_LDADD = $(LDFLAGS) -L$(top_builddir)/modules/xml/om/src/.libs -laxis2_om \
- -L$(top_builddir)/modules/xml/parser/guththila/src/.libs -laxis2_guththila \
- -L$(top_builddir)/modules/xml/parser/guththila/impl/src/.libs -lguththila \
+ -L$(top_builddir)/modules/xml/parser/libxml2/src/.libs -laxis2_libxml2 \
-L$(top_builddir)/modules/util/src/.libs -laxis2_util
INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c?rev=349395&r1=349394&r2=349395&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_wrapper.c Sun Nov 27 23:05:04 2005
@@ -183,9 +183,6 @@
return AXIS2_FAILURE;
}
-
-
-
/*******************************************************************************/
AXIS2_DECLARE(axis2_pull_parser_t *)
axis2_pull_parser_create_for_file(axis2_env_t **env,
@@ -269,9 +266,6 @@
/************** create function for io callback function **********************/
-
-
-
AXIS2_DECLARE(axis2_pull_parser_t *)
axis2_pull_parser_create_for_memory(axis2_env_t **env,
int (*read_input_callback)(char *buffer,int size),
@@ -340,7 +334,6 @@
wrapper_impl->parser.ops->get_name =
axis2_libxml2_wrapper_get_name;
-
wrapper_impl->parser.ops->get_namespace_count =
axis2_libxml2_wrapper_get_namespace_count;
wrapper_impl->parser.ops->get_namespace_prefix_by_number =
@@ -410,7 +403,6 @@
axis2_env_t **env)
{
AXIS2_FUNC_PARAM_CHECK(parser,env, AXIS2_FAILURE);
-
if(AXIS2_INTF_TO_IMPL(parser)->reader)
xmlFreeTextReader(AXIS2_INTF_TO_IMPL(parser)->reader);
if(parser->ops)
@@ -531,17 +523,9 @@
axis2_env_t **env)
{
axis2_libxml2_wrapper_impl_t *parser_impl = NULL;
- int ret;
+
AXIS2_FUNC_PARAM_CHECK(parser, env, NULL);
parser_impl = AXIS2_INTF_TO_IMPL(parser);
- /* if(!(parser_impl->current_event == AXIS2_PULL_PARSER_CHARACTER))
- { ret = xmlTextReaderMoveToElement(parser_impl->reader);
- if(ret == 1)
- return (axis2_char_t*)xmlTextReaderValue(parser_impl->reader);
- else
- return NULL;
- }
- */
return (axis2_char_t*)xmlTextReaderValue(parser_impl->reader);
}
@@ -598,16 +582,12 @@
{
int ret = xmlTextReaderMoveToAttributeNo(parser_impl->reader,
parser_impl->namespace_map[i]);
-
if(ret == 1)
return (axis2_char_t*)xmlTextReaderLocalName(parser_impl->reader);
else
return NULL;
}
return NULL;
-
-
-
}
axis2_char_t* AXIS2_CALL
@@ -738,7 +718,6 @@
}
return AXIS2_SUCCESS;
}
-
static int axis2_libxml2_wrapper_read_input_callback(void *ctx,char *buffer,int size)
{
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c?rev=349395&r1=349394&r2=349395&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/axis2_libxml2_writer_wrapper.c Sun Nov 27 23:05:04 2005
@@ -256,14 +256,12 @@
int is_prefix_default,
int compression)
{
- int rc = 0;
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
writer_impl = (axis2_libxml2_writer_wrapper_impl_t *)AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_libxml2_writer_wrapper_impl_t));
if(!writer_impl)
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, NULL);
-
writer_impl->xml_writer = xmlNewTextWriterFilename(filename, compression);
@@ -580,8 +578,6 @@
axis2_libxml2_writer_wrapper_end_start_element(axis2_xml_writer_t *writer,
axis2_env_t **env)
{
- axis2_libxml2_writer_wrapper_impl_t *wrapper_impl = NULL;
- int status = 0;
AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
/* nothing to do ,
it is automatically taken care by the libxml2 writer */
@@ -597,7 +593,6 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- int exists = AXIS2_FALSE;
AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error,namespace_uri, AXIS2_FAILURE);
@@ -629,7 +624,6 @@
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
int status = 0;
- int exists = AXIS2_FALSE;
AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, namespace_uri, AXIS2_FAILURE);
@@ -637,8 +631,6 @@
writer_impl = AXIS2_INTF_TO_IMPL(writer);
axis2_libxml2_writer_wrapper_reset(writer, env);
- /* axis2_libxml2_writer_wrapper_validate_namespace(writer, env, namespace_uri, prefix);
- */
status = xmlTextWriterStartElementNS(writer_impl->xml_writer,
BAD_CAST prefix,
BAD_CAST localname,
@@ -663,10 +655,10 @@
AXIS2_FUNC_PARAM_CHECK(writer, env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, localname, AXIS2_FAILURE);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
-
+
axis2_libxml2_writer_wrapper_reset(writer, env);
-
status = xmlTextWriterStartElement(writer_impl->xml_writer,(xmlChar *)localname);
+
if(status < 0)
{
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_WRITING_EMPTY_ELEMENT, AXIS2_FAILURE);
@@ -1144,7 +1136,7 @@
wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
- BAD_CAST version , NULL, NULL);
+ version , NULL, NULL);
if(status < 0)
{ AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
@@ -1168,7 +1160,7 @@
wrapper_impl = AXIS2_INTF_TO_IMPL(writer);
status = xmlTextWriterStartDocument(wrapper_impl->xml_writer,
- BAD_CAST version , encoding , NULL);
+ version , encoding , NULL);
if(status < 0)
{ AXIS2_ERROR_SET((*env)->error,
AXIS2_ERROR_WRITING_START_DOCUMENT, AXIS2_FAILURE);
@@ -1208,7 +1200,6 @@
axis2_char_t *uri)
{
axis2_libxml2_writer_wrapper_impl_t *writer_impl = NULL;
- int status = 0;
AXIS2_FUNC_PARAM_CHECK(writer, env, NULL);
AXIS2_PARAM_CHECK((*env)->error, uri, NULL);
writer_impl = AXIS2_INTF_TO_IMPL(writer);
@@ -1355,4 +1346,4 @@
writer_impl->qname_array.current_no = 0;
return AXIS2_SUCCESS;
-}
\ No newline at end of file
+}