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 sa...@apache.org on 2005/12/01 06:11:00 UTC
svn commit: r350165 - in
/webservices/axis2/trunk/c/modules/xml/parser/libxml2: src/Makefile.in
test/libxml_test.c
Author: samisa
Date: Wed Nov 30 21:10:53 2005
New Revision: 350165
URL: http://svn.apache.org/viewcvs?rev=350165&view=rev
Log:
modified
Modified:
webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.in
webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.in?rev=350165&r1=350164&r2=350165&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/src/Makefile.in Wed Nov 30 21:10:53 2005
@@ -62,7 +62,7 @@
LTLIBRARIES = $(lib_LTLIBRARIES)
am__DEPENDENCIES_1 =
libaxis2_libxml2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libaxis2_libxml2_la_OBJECTS = axis2_libxml2_wrapper.lo \
+am_libaxis2_libxml2_la_OBJECTS = axis2_libxml2_reader_wrapper.lo \
axis2_libxml2_writer_wrapper.lo
libaxis2_libxml2_la_OBJECTS = $(am_libaxis2_libxml2_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@@ -190,7 +190,7 @@
target_vendor = @target_vendor@
lib_LTLIBRARIES = libaxis2_libxml2.la
AM_CPPFLAGS = $(CPPFLAGS)
-libaxis2_libxml2_la_SOURCES = axis2_libxml2_wrapper.c \
+libaxis2_libxml2_la_SOURCES = axis2_libxml2_reader_wrapper.c \
axis2_libxml2_writer_wrapper.c
libaxis2_libxml2_la_LIBADD = -L${LIBXML2_LIB} -lxml2 $(LDFLAGS)
@@ -268,7 +268,7 @@
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_libxml2_wrapper.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_libxml2_reader_wrapper.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_libxml2_writer_wrapper.Plo@am__quote@
.c.o:
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c?rev=350165&r1=350164&r2=350165&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/test/libxml_test.c Wed Nov 30 21:10:53 2005
@@ -1,4 +1,4 @@
-#include <axis2_pull_parser.h>
+#include <axis2_xml_reader.h>
#include <axis2_env.h>
#include <axis2_defines.h>
#include <axis2_stream_default.h>
@@ -12,7 +12,7 @@
{
axis2_env_t *env = NULL;
axis2_allocator_t *allocator = NULL;
- axis2_pull_parser_t *parser = NULL;
+ axis2_xml_reader_t *parser = NULL;
axis2_stream_t *stream = NULL;
axis2_error_t *error = NULL;
axis2_log_t *log = NULL;
@@ -30,7 +30,7 @@
error = axis2_error_create(allocator);
stream = axis2_stream_create(allocator, NULL);
env = axis2_env_create_with_error_stream_log(allocator, error, stream, log);
- parser = axis2_pull_parser_create_for_file(&env,filename,NULL);
+ parser = axis2_xml_reader_create_for_file(&env,filename,NULL);
if(!parser)
{ printf("error creatin parser ");
return;
@@ -38,76 +38,76 @@
printf("running test\n\n\n");
do{
- token = AXIS2_PULL_PARSER_NEXT(parser, &env);
+ token = AXIS2_XML_READER_NEXT(parser, &env);
if(token == -1) break;
switch(token)
{
- case AXIS2_PULL_PARSER_START_DOCUMENT:
+ case AXIS2_XML_READER_START_DOCUMENT:
break;
- case AXIS2_PULL_PARSER_SPACE:
+ case AXIS2_XML_READER_SPACE:
break;
- case AXIS2_PULL_PARSER_START_ELEMENT:
+ case AXIS2_XML_READER_START_ELEMENT:
printf ("\n<");
- p = AXIS2_PULL_PARSER_GET_PREFIX (parser, &env);
+ p = AXIS2_XML_READER_GET_PREFIX (parser, &env);
if (p)
{
printf ("%s:", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
}
- p = AXIS2_PULL_PARSER_GET_NAME(parser, &env);
+ p = AXIS2_XML_READER_GET_NAME(parser, &env);
printf ("%s", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
- ns_count = AXIS2_PULL_PARSER_GET_NAMESPACE_COUNT(parser, &env);
+ ns_count = AXIS2_XML_READER_GET_NAMESPACE_COUNT(parser, &env);
/* printf(" __ ns count %d ",ns_count); */
for (i=1; i <= ns_count ; i++)
{
- p = AXIS2_PULL_PARSER_GET_NAMESPACE_PREFIX_BY_NUMBER (parser, &env, i);
+ p = AXIS2_XML_READER_GET_NAMESPACE_PREFIX_BY_NUMBER (parser, &env, i);
printf (" xmlns");
if(p)
printf (":%s=\"", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
- p = AXIS2_PULL_PARSER_GET_NAMESPACE_URI_BY_NUMBER (parser, &env, i);
+ p = AXIS2_XML_READER_GET_NAMESPACE_URI_BY_NUMBER (parser, &env, i);
printf ("%s\" ", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
}
- attr_count = AXIS2_PULL_PARSER_GET_ATTRIBUTE_COUNT (parser, &env);
+ attr_count = AXIS2_XML_READER_GET_ATTRIBUTE_COUNT (parser, &env);
/* printf("__ attr count %d ",attr_count); */
for (i = 1 ; i <= attr_count ; i++)
{
- p = AXIS2_PULL_PARSER_GET_ATTRIBUTE_PREFIX_BY_NUMBER (parser, &env, i);
+ p = AXIS2_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER (parser, &env, i);
if (p)
{
printf (" %s:", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
- p = AXIS2_PULL_PARSER_GET_ATTRIBUTE_NAME_BY_NUMBER (parser, &env, i );
+ p = AXIS2_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER (parser, &env, i );
printf ("%s=\"", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
- p = AXIS2_PULL_PARSER_GET_ATTRIBUTE_VALUE_BY_NUMBER (parser, &env, i);
+ p = AXIS2_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER (parser, &env, i);
printf ("%s\"", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
}
else
{
- p = AXIS2_PULL_PARSER_GET_ATTRIBUTE_NAME_BY_NUMBER (parser, &env, i);
+ p = AXIS2_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER (parser, &env, i);
printf (" %s=\"", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
- p = AXIS2_PULL_PARSER_GET_ATTRIBUTE_VALUE_BY_NUMBER (parser, &env, i);
+ p = AXIS2_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER (parser, &env, i);
printf ("%s\"", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
}
}
@@ -117,72 +117,72 @@
break;
- case AXIS2_PULL_PARSER_END_ELEMENT:
+ case AXIS2_XML_READER_END_ELEMENT:
printf ("</");
- p = AXIS2_PULL_PARSER_GET_PREFIX (parser, &env);
+ p = AXIS2_XML_READER_GET_PREFIX (parser, &env);
if (p)
{
printf ("%s:", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
}
- p = AXIS2_PULL_PARSER_GET_NAME (parser, &env);
+ p = AXIS2_XML_READER_GET_NAME (parser, &env);
printf ("%s", p);
printf (">\n");
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
break;
- case AXIS2_PULL_PARSER_CHARACTER:
- p = AXIS2_PULL_PARSER_GET_VALUE (parser, &env);
+ case AXIS2_XML_READER_CHARACTER:
+ p = AXIS2_XML_READER_GET_VALUE (parser, &env);
if(p)
{
printf("%s",p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
}
break;
- case AXIS2_PULL_PARSER_EMPTY_ELEMENT:
+ case AXIS2_XML_READER_EMPTY_ELEMENT:
printf ("\n<");
- p = AXIS2_PULL_PARSER_GET_PREFIX (parser, &env);
+ p = AXIS2_XML_READER_GET_PREFIX (parser, &env);
if (p)
{
printf ("%s:", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
}
- p = AXIS2_PULL_PARSER_GET_NAME(parser, &env);
+ p = AXIS2_XML_READER_GET_NAME(parser, &env);
printf ("%s", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
p = NULL;
printf(">");
break;
- case AXIS2_PULL_PARSER_COMMENT:
+ case AXIS2_XML_READER_COMMENT:
- p = AXIS2_PULL_PARSER_GET_VALUE(parser, &env);
+ p = AXIS2_XML_READER_GET_VALUE(parser, &env);
printf ("<!-- %s -->", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
break;
- case AXIS2_PULL_PARSER_PROCESSING_INSTRUCTION:
+ case AXIS2_XML_READER_PROCESSING_INSTRUCTION:
- p = AXIS2_PULL_PARSER_GET_PI_TARGET(parser, &env);
+ p = AXIS2_XML_READER_GET_PI_TARGET(parser, &env);
printf ("<? %s ", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
- p = AXIS2_PULL_PARSER_GET_PI_DATA(parser, &env);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
+ p = AXIS2_XML_READER_GET_PI_DATA(parser, &env);
printf (" %s ?>", p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
break;
- case AXIS2_PULL_PARSER_DOCUMENT_TYPE:
- p= AXIS2_PULL_PARSER_GET_DTD(parser, &env);
+ case AXIS2_XML_READER_DOCUMENT_TYPE:
+ p= AXIS2_XML_READER_GET_DTD(parser, &env);
printf("<!DOCTYPE %s>",p);
- AXIS2_PULL_PARSER_XML_FREE(parser, &env, p);
+ AXIS2_XML_READER_XML_FREE(parser, &env, p);
break;
default:
@@ -193,7 +193,7 @@
}while(1);
- AXIS2_PULL_PARSER_FREE(parser, &env);
+ AXIS2_XML_READER_FREE(parser, &env);
axis2_env_free(env);
printf("\n\n");
getchar();