Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 92997 invoked from network); 6 Jul 2006 11:33:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 6 Jul 2006 11:33:26 -0000 Received: (qmail 97788 invoked by uid 500); 6 Jul 2006 11:33:24 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 97702 invoked by uid 500); 6 Jul 2006 11:33:24 -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 97691 invoked by uid 500); 6 Jul 2006 11:33:24 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 97688 invoked by uid 99); 6 Jul 2006 11:33:24 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 04:33:24 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jul 2006 04:33:23 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 425101A981A; Thu, 6 Jul 2006 04:33:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r419525 - in /webservices/axis2/trunk/c/woden: include/woden_reader.h include/woden_wsdl10_reader.h samples/test_wsdl2.c samples/wsdl10/test_wsdl1.c src/builder/reader.c src/builder/wsdl10/wsdl10_reader.c test/woden_test.c Date: Thu, 06 Jul 2006 11:33:01 -0000 To: axis2-cvs@ws.apache.org From: damitha@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060706113303.425101A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: damitha Date: Thu Jul 6 04:33:01 2006 New Revision: 419525 URL: http://svn.apache.org/viewvc?rev=419525&view=rev Log: More refactoring work Modified: webservices/axis2/trunk/c/woden/include/woden_reader.h webservices/axis2/trunk/c/woden/include/woden_wsdl10_reader.h webservices/axis2/trunk/c/woden/samples/test_wsdl2.c webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c webservices/axis2/trunk/c/woden/src/builder/reader.c webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c webservices/axis2/trunk/c/woden/test/woden_test.c Modified: webservices/axis2/trunk/c/woden/include/woden_reader.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_reader.h?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden_reader.h (original) +++ webservices/axis2/trunk/c/woden/include/woden_reader.h Thu Jul 6 04:33:01 2006 @@ -57,7 +57,7 @@ read_wsdl) ( void *reader, const axis2_env_t *env, - axiom_document_t *om_doc, + axiom_node_t *root_node, const axis2_char_t *uri); axis2_status_t (AXIS2_CALL * @@ -86,9 +86,9 @@ #define WODEN_READER_FREE(reader, env) \ (((woden_reader_t *) reader)->ops->free(reader, env)) -#define WODEN_READER_READ_WSDL(reader, env, om_doc, uri) \ +#define WODEN_READER_READ_WSDL(reader, env, root_node, uri) \ (((woden_reader_t *) reader)->ops->\ - read_wsdl (reader, env, om_doc, uri)) + read_wsdl (reader, env, root_node, uri)) #define WODEN_READER_SET_EXT_REGISTRY(reader, env, ext_reg) \ (((woden_reader_t *) reader)->ops->\ Modified: webservices/axis2/trunk/c/woden/include/woden_wsdl10_reader.h URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_wsdl10_reader.h?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/include/woden_wsdl10_reader.h (original) +++ webservices/axis2/trunk/c/woden/include/woden_wsdl10_reader.h Thu Jul 6 04:33:01 2006 @@ -57,7 +57,7 @@ read_wsdl) ( void *reader, const axis2_env_t *env, - axiom_document_t *om_doc, + axiom_node_t *root_node, const axis2_char_t *uri); axis2_status_t (AXIS2_CALL * @@ -86,9 +86,9 @@ #define WODEN_WSDL10_READER_FREE(reader, env) \ (((woden_wsdl10_reader_t *) reader)->ops->free(reader, env)) -#define WODEN_WSDL10_READER_READ_WSDL(reader, env, om_doc, uri) \ +#define WODEN_WSDL10_READER_READ_WSDL(reader, env, root_node, uri) \ (((woden_wsdl10_reader_t *) reader)->ops->\ - read_wsdl (reader, env, om_doc, uri)) + read_wsdl (reader, env, root_node, uri)) #define WODEN_WSDL10_READER_SET_EXT_REGISTRY(reader, env, ext_reg) \ (((woden_wsdl10_reader_t *) reader)->ops->\ Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original) +++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Thu Jul 6 04:33:01 2006 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -38,7 +38,7 @@ axiom_document_t *om_doc = NULL; axis2_char_t *doc_base_uri = NULL; axis2_char_t *axis2c_home = NULL; - woden_reader_t *reader = NULL; + woden_resolver_t *resolver = NULL; void *desc = NULL; void *intface = NULL; axis2_array_list_t *intfaces = NULL; @@ -62,9 +62,9 @@ om_doc = get_root_element_from_filename(env, filename); axis2c_home = AXIS2_GETENV("AXIS2C_HOME"); doc_base_uri = AXIS2_STRACAT (axis2c_home, "/woden", env); - reader = woden_reader_create(env); + resolver = woden_resolver_create(env); - desc = (void *)WODEN_READER_READ_WSDL(reader, env, om_doc, doc_base_uri); + desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri); intfaces = WODEN_DESC_GET_INTERFACES(desc, env); intface = AXIS2_ARRAY_LIST_GET(intfaces, env, 0); intface_qname = WODEN_INTERFACE_GET_QNAME(intface, env); Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original) +++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Thu Jul 6 04:33:01 2006 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -40,7 +40,7 @@ axiom_document_t *om_doc = NULL; axis2_char_t *doc_base_uri = NULL; axis2_char_t *axis2c_home = NULL; - woden_wsdl10_reader_t *reader = NULL; + woden_resolver_t *resolver = NULL; void *desc = NULL; void *intface = NULL; axis2_array_list_t *intfaces = NULL; @@ -68,9 +68,9 @@ om_doc = get_root_element_from_filename(env, filename); axis2c_home = AXIS2_GETENV("AXIS2C_HOME"); doc_base_uri = AXIS2_STRACAT (axis2c_home, "/woden", env); - reader = woden_wsdl10_reader_create(env); + resolver = woden_resolver_create(env); - desc = (void *)WODEN_WSDL10_READER_READ_WSDL(reader, env, om_doc, doc_base_uri); + desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri); intfaces = WODEN_WSDL10_DESC_GET_INTERFACES(desc, env); intface = AXIS2_ARRAY_LIST_GET(intfaces, env, 0); if (intface) Modified: webservices/axis2/trunk/c/woden/src/builder/reader.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/reader.c?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/builder/reader.c (original) +++ webservices/axis2/trunk/c/woden/src/builder/reader.c Thu Jul 6 04:33:01 2006 @@ -149,7 +149,7 @@ woden_reader_read_wsdl( void *reader, const axis2_env_t *env, - axiom_document_t *om_doc, + axiom_node_t *root_node, const axis2_char_t *uri); axis2_status_t AXIS2_CALL @@ -570,20 +570,19 @@ woden_reader_read_wsdl( void *reader, const axis2_env_t *env, - axiom_document_t *om_doc, + axiom_node_t *root_node, const axis2_char_t *uri) { woden_reader_impl_t *reader_impl = NULL; void *desc = NULL; AXIS2_ENV_CHECK(env, NULL); - AXIS2_PARAM_CHECK(env->error, om_doc, NULL); + AXIS2_PARAM_CHECK(env->error, root_node, NULL); AXIS2_PARAM_CHECK(env->error, uri, NULL); reader_impl = INTF_TO_IMPL(reader); /* TODO add WSDL locator for resolving URIs */ - reader_impl->om_doc = om_doc; - reader_impl->root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env); + reader_impl->root_node = root_node; if(!reader_impl->root_node) return NULL; desc = parse_desc(reader, env, uri, reader_impl->root_node, NULL); Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original) +++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Thu Jul 6 04:33:01 2006 @@ -151,7 +151,7 @@ woden_wsdl10_reader_read_wsdl( void *reader, const axis2_env_t *env, - axiom_document_t *om_doc, + axiom_node_t *root_node, const axis2_char_t *uri); axis2_status_t AXIS2_CALL @@ -570,20 +570,19 @@ woden_wsdl10_reader_read_wsdl( void *reader, const axis2_env_t *env, - axiom_document_t *om_doc, + axiom_node_t *root_node, const axis2_char_t *uri) { woden_wsdl10_reader_impl_t *reader_impl = NULL; void *desc = NULL; AXIS2_ENV_CHECK(env, NULL); - AXIS2_PARAM_CHECK(env->error, om_doc, NULL); + AXIS2_PARAM_CHECK(env->error, root_node, NULL); AXIS2_PARAM_CHECK(env->error, uri, NULL); reader_impl = INTF_TO_IMPL(reader); /* TODO add WSDL locator for resolving URIs */ - reader_impl->om_doc = om_doc; - reader_impl->root_node = AXIOM_DOCUMENT_GET_ROOT_ELEMENT(om_doc, env); + reader_impl->root_node = root_node; if(!reader_impl->root_node) return NULL; desc = parse_desc(reader, env, uri, reader_impl->root_node, NULL); Modified: webservices/axis2/trunk/c/woden/test/woden_test.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/test/woden_test.c?rev=419525&r1=419524&r2=419525&view=diff ============================================================================== --- webservices/axis2/trunk/c/woden/test/woden_test.c (original) +++ webservices/axis2/trunk/c/woden/test/woden_test.c Thu Jul 6 04:33:01 2006 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -53,7 +53,7 @@ axiom_document_t *om_doc = NULL; axis2_char_t *doc_base_uri = NULL; axis2_char_t *axis2c_home = NULL; - void *reader = NULL; + void *resolver = NULL; void *desc = NULL; void *intface = NULL; axis2_array_list_t *intfaces = NULL; @@ -67,9 +67,9 @@ om_doc = get_root_element_from_filename(env, filename); axis2c_home = AXIS2_GETENV("AXIS2C_HOME"); doc_base_uri = AXIS2_STRACAT (axis2c_home, "/woden", env); - reader = (void *)woden_reader_create(env); + resolver = woden_resolver_create(env); - desc = (void *)WODEN_READER_READ_WSDL(reader, env, om_doc, doc_base_uri); + desc = WODEN_RESOLVER_READ(resolver, env, om_doc, doc_base_uri); CuAssertPtrNotNull(tc, desc); intfaces = WODEN_DESC_GET_INTERFACES(desc, env); CuAssertPtrNotNull(tc, intfaces); --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org