Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 82595 invoked from network); 16 Nov 2005 06:20:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 16 Nov 2005 06:20:20 -0000 Received: (qmail 28613 invoked by uid 500); 16 Nov 2005 06:20:19 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 28563 invoked by uid 500); 16 Nov 2005 06:20:18 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 28552 invoked by uid 500); 16 Nov 2005 06:20:18 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 28549 invoked by uid 99); 16 Nov 2005 06:20:18 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 15 Nov 2005 22:20:17 -0800 Received: (qmail 82452 invoked by uid 65534); 16 Nov 2005 06:19:57 -0000 Message-ID: <20051116061957.82449.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r344936 - in /webservices/axis2/trunk/c/modules/test/om/src: Makefile.am Makefile.in test_om.c Date: Wed, 16 Nov 2005 06:19:56 -0000 To: axis2-cvs@ws.apache.org From: samisa@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: samisa Date: Tue Nov 15 22:19:48 2005 New Revision: 344936 URL: http://svn.apache.org/viewcvs?rev=344936&view=rev Log: (empty) Modified: 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/test/om/src/test_om.c 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=344936&r1=344935&r2=344936&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/test/om/src/Makefile.am (original) +++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.am Tue Nov 15 22:19:48 2005 @@ -5,9 +5,10 @@ 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/guththila/src/.libs -lguththila \ + -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/util/src/.libs -laxis2_util INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \ - -I$(top_builddir)/modules/xml/guththila/src \ - -I$(top_builddir)/modules/util/src + -I$(top_builddir)/modules/xml/parser \ + -I$(top_builddir)/modules/util/src 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=344936&r1=344935&r2=344936&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/test/om/src/Makefile.in (original) +++ webservices/axis2/trunk/c/modules/test/om/src/Makefile.in Tue Nov 15 22:19:48 2005 @@ -45,7 +45,6 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/conftools/libtool.m4 \ - $(top_srcdir)/conftools/libtool.m4 \ $(top_srcdir)/conftools/ac_c_bigendian_cross.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -195,12 +194,13 @@ 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/guththila/src/.libs -lguththila \ + -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/util/src/.libs -laxis2_util INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include \ - -I$(top_builddir)/modules/xml/guththila/src \ - -I$(top_builddir)/modules/util/src + -I$(top_builddir)/modules/xml/parser \ + -I$(top_builddir)/modules/util/src all: all-recursive Modified: webservices/axis2/trunk/c/modules/test/om/src/test_om.c URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/om/src/test_om.c?rev=344936&r1=344935&r2=344936&view=diff ============================================================================== --- webservices/axis2/trunk/c/modules/test/om/src/test_om.c (original) +++ webservices/axis2/trunk/c/modules/test/om/src/test_om.c Tue Nov 15 22:19:48 2005 @@ -5,20 +5,15 @@ #include #include -#include +#include axis2_allocator_t *allocator = NULL; axis2_env_t *environment = NULL; -guththila_environment_t *my_guththila_environment = NULL; -guththila_allocator_t *my_guththila_allocator = NULL; - int test_om_build (char *file_name) { - guththila_reader_t *reader = NULL; - guththila_xml_pull_parser_t *parser = NULL; axis2_om_element_t *ele1 = NULL, *ele2 = NULL, *ele3 = NULL, *ele4 = NULL; axis2_om_stax_builder_t *builder = NULL; axis2_om_text_t *text = NULL; @@ -27,27 +22,19 @@ FILE *fp = NULL; axis2_om_output_t *om_output = NULL; axis2_om_namespace_t* ns = NULL; + axis2_xml_writer_t *xml_writer = NULL; fp = fopen (file_name, "r"); - reader = guththila_reader_create (my_guththila_environment, fp); - - parser = - guththila_xml_pull_parser_create (my_guththila_environment, reader); - - guththila_xml_pull_parser_read (my_guththila_environment, parser); - - - builder = axis2_om_stax_builder_create (&environment, parser, - my_guththila_environment); + builder = axis2_om_stax_builder_create (&environment,fp); document = axis2_om_document_create (&environment, NULL, builder); node1 = AXIS2_OM_DOCUMENT_GET_ROOT_ELEMENT (document,&environment); if(node1) { printf ("NODE TYPE %d\n",AXIS2_OM_NODE_GET_NODE_TYPE(node1,&environment)); - + ele1 =AXIS2_OM_NODE_GET_DATA_ELEMENT(node1,&environment); if(ele1) @@ -75,14 +62,14 @@ case AXIS2_OM_ELEMENT: ele2 =(axis2_om_element_t*) AXIS2_OM_NODE_GET_DATA_ELEMENT(node2, &environment); if(ele2 && AXIS2_OM_ELEMENT_GET_LOCALNAME(ele2,&environment)) - printf("Element localname %s\n" , AXIS2_OM_ELEMENT_GET_LOCALNAME(ele2,&environment)); + printf("\n localname %s\n" , AXIS2_OM_ELEMENT_GET_LOCALNAME(ele2,&environment)); break; case AXIS2_OM_TEXT: text = (axis2_om_text_t *)AXIS2_OM_NODE_GET_DATA_ELEMENT(node2,&environment); if( text && AXIS2_OM_TEXT_GET_VALUE(text ,&environment)) - printf("Text value %s \n", AXIS2_OM_TEXT_GET_VALUE(text,&environment)); + printf("\n text value %s \n", AXIS2_OM_TEXT_GET_VALUE(text,&environment)); break; default: @@ -95,14 +82,13 @@ printf ("END: pull document\n"); printf ("Serialize pulled document\n"); - - om_output = axis2_om_output_create (&environment, NULL, NULL); + + om_output = axis2_om_output_create (&environment, NULL); AXIS2_OM_NODE_SERIALIZE (node1, &environment , om_output); AXIS2_FREE (environment->allocator, om_output); - guththila_xml_pull_parser_free (my_guththila_environment, parser); - printf ("\n\n"); + printf ("\ndone\n"); } @@ -164,8 +150,8 @@ AXIS2_OM_ELEMENT_ADD_ATTRIBUTE(ele4,&environment, attr2); - /* serializing stuff */ - om_output = axis2_om_output_create (&environment, NULL, NULL); + /* serializing stuff */ + om_output = axis2_om_output_create (&environment, NULL); printf ("Serialize built document\n"); int status = AXIS2_OM_NODE_SERIALIZE (node1,&environment ,om_output); @@ -193,11 +179,6 @@ file_name = argv[1]; allocator = axis2_allocator_init (NULL); environment = axis2_env_create (allocator); - - my_guththila_allocator = guththila_allocator_init (NULL); - my_guththila_environment = - guththila_environment_create (my_guththila_allocator, NULL, NULL, - NULL, NULL); test_om_build (file_name); test_om_serialize ();