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 pi...@apache.org on 2007/03/30 21:24:23 UTC
svn commit: r524243 [2/17] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/
axiom/src/soap/ axiom/test/om/ axiom/test/soap/ guththila/include/
guththila/samples/ guththila/src/ include/ modu...
Modified: webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_processing_instruction.c Fri Mar 30 12:24:00 2007
@@ -16,7 +16,7 @@
*/
#include <axiom_processing_instruction.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include "axiom_node_internal.h"
struct axiom_processing_instruction
Modified: webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
#include <axiom_text.h>
#include <axiom_processing_instruction.h>
#include <axiom_comment.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axiom_xml_writer.h>
#include <axiom_doctype.h>
#include "axiom_node_internal.h"
@@ -102,8 +102,8 @@
axis2_char_t *prefix = NULL;
axis2_char_t *attr_name = NULL;
axis2_char_t *attr_value = NULL;
- axis2_string_t *attr_name_str = NULL;
- axis2_string_t *attr_value_str = NULL;
+ axutil_string_t *attr_name_str = NULL;
+ axutil_string_t *attr_value_str = NULL;
axis2_status_t status = AXIS2_SUCCESS;
@@ -146,12 +146,12 @@
attr_name = AXIOM_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(
om_builder->parser, env, i);
- attr_name_str = axis2_string_create_assume_ownership(env, &attr_name);
+ attr_name_str = axutil_string_create_assume_ownership(env, &attr_name);
attr_value = AXIOM_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(
om_builder->parser, env, i);
- attr_value_str = axis2_string_create_assume_ownership(env, &attr_value);
+ attr_value_str = axutil_string_create_assume_ownership(env, &attr_value);
if (attr_name)
{
@@ -178,11 +178,11 @@
}
if (attr_name_str)
{
- axis2_string_free(attr_name_str, env);
+ axutil_string_free(attr_name_str, env);
}
if (attr_value_str)
{
- axis2_string_free(attr_value_str, env);
+ axutil_string_free(attr_value_str, env);
}
ns = NULL;
}
@@ -194,7 +194,7 @@
const axutil_env_t *env)
{
axis2_char_t *temp_value = NULL;
- axis2_string_t *temp_value_str = NULL;
+ axutil_string_t *temp_value_str = NULL;
axiom_node_t *node = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -213,7 +213,7 @@
return NULL;
}
- temp_value_str = axis2_string_create_assume_ownership(env, &temp_value);
+ temp_value_str = axutil_string_create_assume_ownership(env, &temp_value);
if (AXIOM_NODE_IS_COMPLETE(om_builder->lastnode, env))
{
@@ -230,7 +230,7 @@
axiom_node_set_complete(node , env, AXIS2_TRUE);
om_builder->lastnode = node;
- axis2_string_free(temp_value_str, env);
+ axutil_string_free(temp_value_str, env);
return node;
}
@@ -295,8 +295,8 @@
axis2_char_t *temp_prefix = NULL;
axis2_char_t *temp_ns_prefix = NULL;
axis2_char_t *temp_ns_uri = NULL;
- axis2_string_t *temp_ns_prefix_str = NULL;
- axis2_string_t *temp_ns_uri_str = NULL;
+ axutil_string_t *temp_ns_prefix_str = NULL;
+ axutil_string_t *temp_ns_uri_str = NULL;
int i = 0;
@@ -311,16 +311,16 @@
temp_ns_uri = AXIOM_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(
om_builder->parser, env , i);
- temp_ns_prefix_str = axis2_string_create_assume_ownership(env, &temp_ns_prefix);
+ temp_ns_prefix_str = axutil_string_create_assume_ownership(env, &temp_ns_prefix);
- temp_ns_uri_str = axis2_string_create_assume_ownership(env, &temp_ns_uri);
+ temp_ns_uri_str = axutil_string_create_assume_ownership(env, &temp_ns_uri);
if (!temp_ns_prefix || axis2_strcmp(temp_ns_prefix, "xmlns") == 0)
{
/** default namespace case */
/** !temp_ns_prefix is for guththila */
axiom_element_t *om_ele = NULL;
- temp_ns_prefix_str = axis2_string_create(env, "");
+ temp_ns_prefix_str = axutil_string_create(env, "");
om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
om_ns = axiom_namespace_create_str(env, temp_ns_uri_str, temp_ns_prefix_str);
@@ -355,8 +355,8 @@
axutil_hash_set(om_builder->declared_namespaces,
prefix, AXIS2_HASH_KEY_STRING, om_ns);
}
- axis2_string_free(temp_ns_uri_str, env);
- axis2_string_free(temp_ns_prefix_str, env);
+ axutil_string_free(temp_ns_uri_str, env);
+ axutil_string_free(temp_ns_prefix_str, env);
if (!om_ns)
{
/* something went wrong */
@@ -400,7 +400,7 @@
axiom_node_t *element_node = NULL;
axiom_element_t *om_ele = NULL;
axis2_char_t *temp_localname = NULL;
- axis2_string_t *temp_localname_str = NULL;
+ axutil_string_t *temp_localname_str = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_builder, NULL);
@@ -414,7 +414,7 @@
return NULL;
}
- temp_localname_str = axis2_string_create_assume_ownership(env, &temp_localname);
+ temp_localname_str = axutil_string_create_assume_ownership(env, &temp_localname);
om_builder->element_level++;
@@ -473,7 +473,7 @@
}
}
- axis2_string_free(temp_localname_str, env);
+ axutil_string_free(temp_localname_str, env);
/** order of processing namespaces first is important */
axiom_stax_builder_process_namespaces(om_builder, env, element_node, 0);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_text.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Fri Mar 30 12:24:00 2007
@@ -17,7 +17,7 @@
#include <axiom_text.h>
#include <axiom_output.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include "axiom_node_internal.h"
#include <axiom_xml_writer.h>
#include <axiom_output.h>
@@ -41,7 +41,7 @@
struct axiom_text
{
/** Text value */
- axis2_string_t *value;
+ axutil_string_t *value;
/** The following fields are for MTOM */
axis2_char_t *mime_type;
axis2_bool_t optimize;
@@ -94,7 +94,7 @@
if (value)
{
- om_text->value = axis2_string_create(env, value);
+ om_text->value = axutil_string_create(env, value);
}
axiom_node_set_data_element((*node), env, om_text);
@@ -139,7 +139,7 @@
if (om_text->value)
{
- axis2_string_free(om_text->value, env);
+ axutil_string_free(om_text->value, env);
}
if (om_text->ns)
@@ -184,7 +184,7 @@
if (om_text->value)
{
status = axiom_output_write(om_output, env,
- AXIOM_TEXT, 1, axis2_string_get_buffer(om_text->value, env));
+ AXIOM_TEXT, 1, axutil_string_get_buffer(om_text->value, env));
}
}
else
@@ -236,7 +236,7 @@
{
if (om_text->value)
{
- return axis2_string_get_buffer(om_text->value, env);
+ return axutil_string_get_buffer(om_text->value, env);
}
return NULL;
}
@@ -251,11 +251,11 @@
if (om_text->value)
{
- axis2_string_free(om_text->value, env);
+ axutil_string_free(om_text->value, env);
om_text->value = NULL;
}
- om_text->value = axis2_string_create(env, value);
+ om_text->value = axutil_string_create(env, value);
if (!om_text->value)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY,
@@ -486,7 +486,7 @@
{
if (om_text->value)
{
- return axis2_string_get_buffer(om_text->value, env);
+ return axutil_string_get_buffer(om_text->value, env);
}
else
{
@@ -525,7 +525,7 @@
AXIS2_EXTERN axiom_text_t *AXIS2_CALL
axiom_text_create_str(const axutil_env_t *env,
axiom_node_t *parent,
- axis2_string_t *value,
+ axutil_string_t *value,
axiom_node_t ** node)
{
axiom_text_t *om_text = NULL;
@@ -563,7 +563,7 @@
if (value)
{
- om_text->value = axis2_string_clone(value, env);
+ om_text->value = axutil_string_clone(value, env);
}
axiom_node_set_data_element((*node), env, om_text);
@@ -582,21 +582,21 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_value_str(struct axiom_text *om_text,
const axutil_env_t *env,
- axis2_string_t *value)
+ axutil_string_t *value)
{
if (om_text->value)
{
- axis2_string_free(om_text->value, env);
+ axutil_string_free(om_text->value, env);
om_text->value = NULL;
}
if (value)
{
- om_text->value = axis2_string_clone(value, env);
+ om_text->value = axutil_string_clone(value, env);
}
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axiom_text_get_value_str(struct axiom_text *om_text,
const axutil_env_t *env)
{
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
#include <axis2_utils_defines.h>
#include <axis2_utils.h>
#include <string.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
/*************************** Function Prototypes ******************************/
Modified: webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c (original)
+++ webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c Fri Mar 30 12:24:00 2007
@@ -20,9 +20,9 @@
#include <axis2_utils_defines.h>
#include <axutil_env.h>
#include <axiom_xml_writer.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <string.h>
-#include <axis2_stack.h>
+#include <axutil_stack.h>
#include <axutil_hash.h>
#include <axutil_array_list.h>
@@ -66,7 +66,7 @@
int compression;
- axis2_stack_t *stack;
+ axutil_stack_t *stack;
axis2_bool_t in_empty_element;
@@ -453,7 +453,7 @@
AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- writer_impl->stack = axis2_stack_create(env);
+ writer_impl->stack = axutil_stack_create(env);
if (!(writer_impl->stack))
{
axis2_libxml2_writer_wrapper_free(&(writer_impl->writer), env);
@@ -580,7 +580,7 @@
}
if (writer_impl->stack)
{
- axis2_stack_free(writer_impl->stack, env);
+ axutil_stack_free(writer_impl->stack, env);
writer_impl->stack = NULL;
}
if (writer_impl->default_lang_namespace)
@@ -1365,7 +1365,7 @@
if (writer_impl->stack)
{
current_list = (axutil_array_list_t *)
- axis2_stack_get(writer_impl->stack, env);
+ axutil_stack_get(writer_impl->stack, env);
if (current_list)
{
@@ -1517,7 +1517,7 @@
{
return NULL;
}
- size = axis2_stack_size(writer_impl->stack, env);
+ size = axutil_stack_size(writer_impl->stack, env);
if (size <= 0)
{
return NULL;
@@ -1527,7 +1527,7 @@
{
axutil_array_list_t *context = NULL;
void *value = NULL;
- value = axis2_stack_get_at(writer_impl->stack, env, i);
+ value = axutil_stack_get_at(writer_impl->stack, env, i);
if (value)
{
uri_prefix_element_t *up_ele = NULL;
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Fri Mar 30 12:24:00 2007
@@ -398,8 +398,8 @@
{
if (axis2_strcmp(uri, AXIS2_XOP_NAMESPACE_URI) == 0)
{
- axis2_qname_t *qname = NULL;
- qname = axis2_qname_create(env, "href", NULL, NULL);
+ axutil_qname_t *qname = NULL;
+ qname = axutil_qname_create(env, "href", NULL, NULL);
if (qname)
{
axis2_char_t *id = NULL;
@@ -429,7 +429,7 @@
}
}
}
- axis2_qname_free(qname, env);
+ axutil_qname_free(qname, env);
}
}
}
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault.c Fri Mar 30 12:24:00 2007
@@ -440,7 +440,7 @@
axiom_element_t *detail_ele = NULL;
axiom_node_t *exception_node = NULL;
axiom_element_t *exception_ele = NULL;
- axis2_qname_t *qn = NULL;
+ axutil_qname_t *qn = NULL;
axis2_char_t *excep = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -453,14 +453,14 @@
detail_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
detail_node, env);
- qn = axis2_qname_create(env,
+ qn = axutil_qname_create(env,
AXIOM_SOAP_FAULT_DETAIL_EXCEPTION_ENTRY, NULL, NULL);
if (qn)
{
exception_ele = axiom_element_get_first_child_with_qname(
detail_ele, env,
qn, detail_node, &exception_node);
- axis2_qname_free(qn, env);
+ axutil_qname_free(qn, env);
if (exception_ele &&
(excep = axiom_element_get_text(exception_ele, env, exception_node)))
{
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_fault_text.c Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
#include "_axiom_soap_fault_text.h"
#include "_axiom_soap_fault_reason.h"
#include <axiom_namespace.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
struct axiom_soap_fault_text
{
@@ -199,7 +199,7 @@
const axutil_env_t *env)
{
axiom_element_t* om_ele = NULL;
- axis2_qname_t* tmp_qname = NULL;
+ axutil_qname_t* tmp_qname = NULL;
AXIS2_ENV_CHECK(env, NULL);
if (!fault_text->om_ele_node)
@@ -214,14 +214,14 @@
{
/* this logic need to be rechecked */
- tmp_qname = axis2_qname_create(env,
+ tmp_qname = axutil_qname_create(env,
AXIOM_SOAP12_SOAP_FAULT_TEXT_LANG_ATTR_LOCAL_NAME,
AXIOM_SOAP12_SOAP_FAULT_TEXT_LANG_ATTR_NS_URI,
AXIOM_SOAP12_SOAP_FAULT_TEXT_LANG_ATTR_NS_PREFIX);
fault_text->lang_attribute =
axiom_element_get_attribute(om_ele, env, tmp_qname);
- axis2_qname_free(tmp_qname, env);
+ axutil_qname_free(tmp_qname, env);
}
if (fault_text->lang_attribute)
{
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header.c Fri Mar 30 12:24:00 2007
@@ -42,8 +42,8 @@
static axis2_bool_t AXIS2_CALL
axiom_soap_header_qname_matches(const axutil_env_t *env,
- axis2_qname_t *element_qname,
- axis2_qname_t *qname_to_match);
+ axutil_qname_t *element_qname,
+ axutil_qname_t *qname_to_match);
AXIS2_EXTERN axiom_soap_header_t * AXIS2_CALL
axiom_soap_header_create(const axutil_env_t *env)
@@ -298,7 +298,7 @@
axiom_node_t *first_node = NULL;
axiom_element_t *first_ele = NULL;
- axis2_qname_t *qn = NULL;
+ axutil_qname_t *qn = NULL;
axiom_element_t *header_om_ele = NULL;
axiom_children_with_specific_attribute_iterator_t* iter = NULL;
@@ -318,7 +318,7 @@
nsuri = AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI;
}
- qn = axis2_qname_create(env, localname, nsuri, NULL);
+ qn = axutil_qname_create(env, localname, nsuri, NULL);
if (!qn)
return NULL;
@@ -336,7 +336,7 @@
}
}
- axis2_qname_free(qn, env);
+ axutil_qname_free(qn, env);
return iter;
@@ -524,7 +524,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_soap_header_remove_header_block(axiom_soap_header_t *soap_header,
const axutil_env_t *env,
- axis2_qname_t *qname)
+ axutil_qname_t *qname)
{
axis2_char_t *qn_localname = NULL;
axis2_char_t *qname_ns = NULL;
@@ -533,9 +533,9 @@
AXIS2_PARAM_CHECK(env->error, qname, AXIS2_FAILURE);
- qn_localname = axis2_qname_get_localpart(qname, env);
- qname_ns = axis2_qname_get_uri(qname, env);
- qname_prefix = axis2_qname_get_prefix(qname, env);
+ qn_localname = axutil_qname_get_localpart(qname, env);
+ qname_ns = axutil_qname_get_uri(qname, env);
+ qname_prefix = axutil_qname_get_prefix(qname, env);
if (!soap_header->header_blocks)
return AXIS2_FAILURE;
@@ -558,7 +558,7 @@
node = axiom_soap_header_block_get_base_node(header_block, env);
if (node)
{
- axis2_qname_t *element_qname = NULL;
+ axutil_qname_t *element_qname = NULL;
ele = (axiom_element_t*)AXIOM_NODE_GET_DATA_ELEMENT(node, env);
element_qname = axiom_element_get_qname(ele, env, node);
@@ -579,8 +579,8 @@
static axis2_bool_t AXIS2_CALL
axiom_soap_header_qname_matches(const axutil_env_t *env,
- axis2_qname_t *element_qname,
- axis2_qname_t *qname_to_match)
+ axutil_qname_t *element_qname,
+ axutil_qname_t *qname_to_match)
{
int lparts_match = 0;
int uris_match = 0;
@@ -593,13 +593,13 @@
return AXIS2_TRUE;
if (qname_to_match)
{
- match_lpart = axis2_qname_get_localpart(qname_to_match, env);
- match_nsuri = axis2_qname_get_uri(qname_to_match, env);
+ match_lpart = axutil_qname_get_localpart(qname_to_match, env);
+ match_nsuri = axutil_qname_get_uri(qname_to_match, env);
}
if (element_qname)
{
- ele_lpart = axis2_qname_get_localpart(element_qname, env);
- ele_nsuri = axis2_qname_get_uri(element_qname, env);
+ ele_lpart = axutil_qname_get_localpart(element_qname, env);
+ ele_nsuri = axutil_qname_get_uri(element_qname, env);
}
lparts_match = (!match_lpart ||
Modified: webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_header_block.c Fri Mar 30 12:24:00 2007
@@ -280,7 +280,7 @@
axiom_element_t *header_ele = NULL;
axiom_namespace_t *header_ns = NULL;
axis2_char_t *prefix = NULL;
- axis2_qname_t *qn = NULL;
+ axutil_qname_t *qn = NULL;
axiom_namespace_t *om_ns = NULL;
axiom_element_t *om_ele = NULL;
@@ -305,7 +305,7 @@
prefix = axiom_namespace_get_prefix(header_ns, env);
}
- qn = axis2_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
+ qn = axutil_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
if (!qn)
return AXIS2_FAILURE;
@@ -319,7 +319,7 @@
om_attr = axiom_element_get_attribute(om_ele, env, qn);
- axis2_qname_free(qn, env);
+ axutil_qname_free(qn, env);
if (om_attr)
{
return axiom_attribute_set_value(om_attr, env, attr_value);
@@ -357,7 +357,7 @@
axiom_element_t *header_ele = NULL;
axiom_namespace_t *header_ns = NULL;
axis2_char_t *prefix = NULL;
- axis2_qname_t *qn = NULL;
+ axutil_qname_t *qn = NULL;
axiom_element_t *om_ele = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, attr_name, NULL);
@@ -380,7 +380,7 @@
return NULL;
prefix = axiom_namespace_get_prefix(header_ns, env);
}
- qn = axis2_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
+ qn = axutil_qname_create(env, attr_name, soap_envelope_namespace_uri, prefix);
if (!qn)
return NULL;
om_ele = (axiom_element_t *)AXIOM_NODE_GET_DATA_ELEMENT(
@@ -388,7 +388,7 @@
om_attr = axiom_element_get_attribute(om_ele, env, qn);
if (om_attr)
attr_value = axiom_attribute_get_value(om_attr, env);
- axis2_qname_free(qn, env);
+ axutil_qname_free(qn, env);
return attr_value;
}
Modified: webservices/axis2/trunk/c/axiom/test/om/test_om.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/om/test_om.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
#include <axiom_element.h>
#include <axiom_text.h>
#include <axiom_data_source.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#include <axutil_log_default.h>
#include <axutil_error_default.h>
#include <axiom_xml_reader.h>
@@ -35,7 +35,7 @@
axutil_allocator_t *allocator = NULL;
axutil_env_t *environment = NULL;
-axis2_stream_t *stream = NULL;
+axutil_stream_t *stream = NULL;
axutil_error_t *error = NULL;
axutil_log_t *axis_log = NULL;
FILE *f = NULL;
@@ -218,7 +218,7 @@
axiom_node_t *node1 = NULL, *node2 = NULL, *node3 = NULL, *node4 =
NULL, *node5 = NULL, *node6 = NULL;
axiom_data_source_t *data_source = NULL;
- axis2_stream_t *stream = NULL;
+ axutil_stream_t *stream = NULL;
axiom_attribute_t *attr1 = NULL, *attr2 = NULL;
axiom_namespace_t *ns1 = NULL, *ns2 = NULL;
axiom_text_t *text1 = NULL;
Modified: webservices/axis2/trunk/c/axiom/test/soap/test_soap.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/test/soap/test_soap.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/soap/test_soap.c (original)
+++ webservices/axis2/trunk/c/axiom/test/soap/test_soap.c Fri Mar 30 12:24:00 2007
@@ -21,7 +21,7 @@
#include <axiom_node.h>
#include <axiom_element.h>
#include <axiom_text.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#include <axutil_log_default.h>
#include <axutil_error_default.h>
#include <axiom_xml_reader.h>
Modified: webservices/axis2/trunk/c/guththila/include/guththila.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila.h Fri Mar 30 12:24:00 2007
@@ -35,8 +35,8 @@
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_stack.h>
-#include <axis2_string.h>
+#include <axutil_stack.h>
+#include <axutil_string.h>
#define p_FILE __FILE__ /* file name */
#define LINE __LINE__ /* line number */
@@ -79,11 +79,11 @@
guththila_token_t *prefix;
guththila_token_t *name;
guththila_token_t *value;
- axis2_stack_t *stack;
- axis2_stack_t *attrib;
- axis2_stack_t *namesp;
- axis2_stack_t *dep;
- axis2_stack_t *other;
+ axutil_stack_t *stack;
+ axutil_stack_t *attrib;
+ axutil_stack_t *namesp;
+ axutil_stack_t *dep;
+ axutil_stack_t *other;
int _next;
int offset;
int last;
Modified: webservices/axis2/trunk/c/guththila/include/guththila_token.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_token.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_token.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_token.h Fri Mar 30 12:24:00 2007
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <string.h>
#include <axutil_env.h>
-#include <axis2_stack.h>
+#include <axutil_stack.h>
#include <guththila_defines.h>
@@ -122,7 +122,7 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_relocate_tokens(axutil_env_t *environment,
- axis2_stack_t *stack,
+ axutil_stack_t *stack,
int offset);
#endif /* GUTHTHILA_TOKEN_H */
Modified: webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h Fri Mar 30 12:24:00 2007
@@ -21,14 +21,14 @@
#include "guththila_writer.h"
#include "guththila_buffer.h"
#include <axutil_env.h>
-#include <axis2_stack.h>
+#include <axutil_stack.h>
typedef struct guththila_xml_writer_s
{
- axis2_stack_t *element;
- axis2_stack_t *attribute;
- axis2_stack_t *namespace;
- axis2_stack_t *depth;
+ axutil_stack_t *element;
+ axutil_stack_t *attribute;
+ axutil_stack_t *namespace;
+ axutil_stack_t *depth;
guththila_writer_t *writer;
int next;
int last;
Modified: webservices/axis2/trunk/c/guththila/samples/guththila_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/samples/guththila_main.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/samples/guththila_main.c (original)
+++ webservices/axis2/trunk/c/guththila/samples/guththila_main.c Fri Mar 30 12:24:00 2007
@@ -125,7 +125,7 @@
AXIS2_FREE(allocator, p);
}
}
- depth = (guththila_depth_t *) axis2_stack_get(parser->dep, environment);
+ depth = (guththila_depth_t *) axutil_stack_get(parser->dep, environment);
d = depth->count;
for (; d > 0; d--)
{
Modified: webservices/axis2/trunk/c/guththila/src/guththila_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_token.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_token.c Fri Mar 30 12:24:00 2007
@@ -20,7 +20,7 @@
#include "guththila_token.h"
#include "guththila_unicode.h"
/* #include "guththila_string.h" */
-#include <axis2_string.h>
+#include <axutil_string.h>
AXIS2_EXTERN guththila_token_t *
@@ -348,16 +348,16 @@
AXIS2_EXTERN void AXIS2_CALL
guththila_relocate_tokens(axutil_env_t *environment,
- axis2_stack_t *stack,
+ axutil_stack_t *stack,
int offset)
{
guththila_token_t *el = NULL;
int isize = 0;
- isize = axis2_stack_size(stack, environment);
- /* el = (guththila_token_t *) axis2_stack_get_at (stack, environment, isize-1); */
+ isize = axutil_stack_size(stack, environment);
+ /* el = (guththila_token_t *) axutil_stack_get_at (stack, environment, isize-1); */
for (; isize > 0; isize--)
{
- el = (guththila_token_t *) axis2_stack_get_at(stack,
+ el = (guththila_token_t *) axutil_stack_get_at(stack,
environment,
isize - 1);
guththila_token_relocate(environment, el, offset);
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_pull_parser.c Fri Mar 30 12:24:00 2007
@@ -42,11 +42,11 @@
else
parser->buffer = guththila_buffer_create(environment, GUTHTHILA_BUFFER_SIZE);
- parser->stack = axis2_stack_create(environment);
- parser->attrib = axis2_stack_create(environment);
- parser->namesp = axis2_stack_create(environment);
- parser->dep = axis2_stack_create(environment);
- parser->other = axis2_stack_create (environment);
+ parser->stack = axutil_stack_create(environment);
+ parser->attrib = axutil_stack_create(environment);
+ parser->namesp = axutil_stack_create(environment);
+ parser->dep = axutil_stack_create(environment);
+ parser->other = axutil_stack_create (environment);
parser->name = NULL;
parser->prefix = NULL;
parser->value = NULL;
@@ -78,37 +78,37 @@
if (parser->stack)
{
- ii = axis2_stack_size(parser->stack, environment);
+ ii = axutil_stack_size(parser->stack, environment);
for (; ii > 0; ii--)
{
guththila_token_t *d;
- d = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
+ d = (guththila_token_t *)axutil_stack_pop(parser->stack, environment);
guththila_token_free (environment, d);
}
- axis2_stack_free(parser->stack, environment);
+ axutil_stack_free(parser->stack, environment);
}
if (parser->attrib)
{
- int ii = axis2_stack_size(parser->attrib, environment);
+ int ii = axutil_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute;
for (; ii > 0; ii--)
{
- attribute = axis2_stack_pop(parser->attrib, environment);
+ attribute = axutil_stack_pop(parser->attrib, environment);
guththila_attribute_free (environment, attribute);
}
- axis2_stack_free(parser->attrib, environment);
+ axutil_stack_free(parser->attrib, environment);
}
if (parser->namesp)
{
- int ii = axis2_stack_size(parser->namesp, environment);
+ int ii = axutil_stack_size(parser->namesp, environment);
guththila_namespace_t *namespace;
for (; ii > 0; ii--)
{
- namespace = (guththila_namespace_t *) axis2_stack_pop(parser->namesp, environment);
+ namespace = (guththila_namespace_t *) axutil_stack_pop(parser->namesp, environment);
if (namespace->name)
{
AXIS2_FREE(environment->allocator, namespace->name);
@@ -121,31 +121,31 @@
}
AXIS2_FREE (environment->allocator, namespace);
}
- axis2_stack_free(parser->namesp, environment);
+ axutil_stack_free(parser->namesp, environment);
}
if (parser->dep)
{
- int ii = axis2_stack_size(parser->dep, environment);
+ int ii = axutil_stack_size(parser->dep, environment);
guththila_depth_t *depth;
for (; ii > 0; ii--)
{
- depth = (guththila_depth_t *)axis2_stack_pop(parser->dep, environment);
+ depth = (guththila_depth_t *)axutil_stack_pop(parser->dep, environment);
AXIS2_FREE(environment->allocator, depth);
}
- axis2_stack_free(parser->dep, environment);
+ axutil_stack_free(parser->dep, environment);
}
if (parser->other)
{
- int ii = axis2_stack_size(parser->other, environment);
+ int ii = axutil_stack_size(parser->other, environment);
void *element = NULL;
for (; ii > 0; ii--)
{
- element = axis2_stack_pop(parser->other, environment);
+ element = axutil_stack_pop(parser->other, environment);
AXIS2_FREE(environment->allocator, element);
}
- axis2_stack_free(parser->other, environment);
+ axutil_stack_free(parser->other, environment);
}
AXIS2_FREE(environment->allocator, (void *) parser);
@@ -198,7 +198,7 @@
guththila_buffer_grow(environment, parser->buffer, parser->_next);
guththila_relocate_tokens(environment, parser->stack,
(buff - parser->buffer->buff));
- axis2_stack_push(parser->other, environment, buff);
+ axutil_stack_push(parser->other, environment, buff);
}
}
c = guththila_reader_read(environment, (parser->buffer->buff),
@@ -307,7 +307,7 @@
sizeof(guththila_token_t));
t->type = Unknown;
t->start = guththila_last_char(environment, parser);
- axis2_stack_push(parser->stack, environment, t);
+ axutil_stack_push(parser->stack, environment, t);
}
@@ -317,7 +317,7 @@
int t, int refer)
{
guththila_token_t *token =
- (guththila_token_t *) axis2_stack_get(parser->stack, environment);
+ (guththila_token_t *) axutil_stack_get(parser->stack, environment);
token->type = t;
token->ref = refer;
token->end =
@@ -576,20 +576,20 @@
parser->is_whitespace = 0;
parser->is_char = 0;
- ii = axis2_stack_size(parser->attrib, environment);
+ ii = axutil_stack_size(parser->attrib, environment);
for (; ii > 0; ii--)
{
guththila_attribute_t *attribute;
- attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib,
+ attribute = (guththila_attribute_t *) axutil_stack_pop(parser->attrib,
environment);
guththila_attribute_free (environment, attribute);
}
- ii = axis2_stack_size(parser->stack, environment);
+ ii = axutil_stack_size(parser->stack, environment);
for (; ii > 0; ii--)
{
guththila_token_t *d;
- d = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
+ d = (guththila_token_t *)axutil_stack_pop(parser->stack, environment);
guththila_token_free (environment, d);
}
@@ -987,14 +987,14 @@
guththila_token_t *token;
guththila_token_t *att_name;
guththila_token_t *att_value;
- ix = axis2_stack_size(parser->stack, environment);
+ ix = axutil_stack_size(parser->stack, environment);
for (; ix > 0; ix--)
{
- token = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *)axutil_stack_pop(parser->stack, environment);
if (token->type == _attribute_value)
{
att_value = token;
- token = (guththila_token_t *)axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *)axutil_stack_pop(parser->stack, environment);
ix--;
att_name = token;
guththila_add_attribute(environment,
@@ -1011,18 +1011,18 @@
guththila_token_t *token;
guththila_token_t *name = NULL;
guththila_token_t *value = NULL;
- is = axis2_stack_size(parser->stack, environment);
+ is = axutil_stack_size(parser->stack, environment);
for (;
- is > 0 && axis2_stack_size(parser->stack, environment);
+ is > 0 && axutil_stack_size(parser->stack, environment);
is--)
{
- token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *) axutil_stack_pop(parser->stack, environment);
/* be careful about memory leaks, when we pull it we get
seperate _element need to free it properly */
if (token->type == _attribute_value)
{
value = token;
- token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *) axutil_stack_pop(parser->stack, environment);
is--;
name = token;
if (!guththila_token_compare
@@ -1055,7 +1055,7 @@
(environment, token, "xmlns", 5,
parser->unicode_state))
{
- attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib, environment);
+ attribute = (guththila_attribute_t *) axutil_stack_pop(parser->attrib, environment);
guththila_add_namespace(environment,
parser,
attribute->
@@ -1071,11 +1071,11 @@
parser->prefix = token;
else
{
- attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib, environment);
+ attribute = (guththila_attribute_t *) axutil_stack_pop(parser->attrib, environment);
guththila_add_attribute_with_prefix
(environment, parser, token,
attribute->name, attribute->value);
- axis2_stack_push (parser->other, environment, (void *) attribute);
+ axutil_stack_push (parser->other, environment, (void *) attribute);
}
}
}
@@ -1088,15 +1088,15 @@
case GUTHTHILA_END_ELEMENT:
{
guththila_token_t *token;
- token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *) axutil_stack_pop(parser->stack, environment);
if (token->type == _name)
{
parser->name = token;
}
- if (axis2_stack_size(parser->stack, environment))
+ if (axutil_stack_size(parser->stack, environment))
{
- token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *) axutil_stack_pop(parser->stack, environment);
if (token->type == _prefix)
parser->prefix = token;
}
@@ -1105,7 +1105,7 @@
case GUTHTHILA_CHARACTER:
{
guththila_token_t *token;
- token = (guththila_token_t *) axis2_stack_pop(parser->stack, environment);
+ token = (guththila_token_t *) axutil_stack_pop(parser->stack, environment);
parser->value = token;
}
break;
@@ -1129,22 +1129,22 @@
sizeof(guththila_depth_t));
guththila_depth_t *l = NULL;
guththila_depth_t *depth;
- ii = axis2_stack_size(parser->dep, environment);
+ ii = axutil_stack_size(parser->dep, environment);
if (!ii)
{
m->first = 0;
- m->total = axis2_stack_size(parser->namesp, environment);
+ m->total = axutil_stack_size(parser->namesp, environment);
m->count = m->total;
- axis2_stack_push(parser->dep, environment, m);
+ axutil_stack_push(parser->dep, environment, m);
}
else
{
- depth = (guththila_depth_t *) axis2_stack_get(parser->dep, environment);
+ depth = (guththila_depth_t *) axutil_stack_get(parser->dep, environment);
l = depth;
m->first = l->first + l->count;
- m->total = axis2_stack_size(parser->namesp, environment);
+ m->total = axutil_stack_size(parser->namesp, environment);
m->count = m->total - l->total;
- axis2_stack_push(parser->dep, environment, m);
+ axutil_stack_push(parser->dep, environment, m);
}
}
@@ -1157,11 +1157,11 @@
guththila_depth_t *depth;
guththila_namespace_t *namespace;
int ii;
- depth = (guththila_depth_t *) axis2_stack_pop(parser->dep, environment);
+ depth = (guththila_depth_t *) axutil_stack_pop(parser->dep, environment);
ii = depth->count;
for (; ii > 0; ii--)
{
- namespace = (guththila_namespace_t *) axis2_stack_pop(parser->namesp, environment);
+ namespace = (guththila_namespace_t *) axutil_stack_pop(parser->namesp, environment);
if (namespace->name)
{
AXIS2_FREE(environment->allocator, namespace->name);
@@ -1188,7 +1188,7 @@
{
guththila_attribute_t *att = NULL;
att = guththila_attribute_create (environment, NULL, name, value, NULL);
- axis2_stack_push(parser->attrib, environment, att);
+ axutil_stack_push(parser->attrib, environment, att);
}
@@ -1205,7 +1205,7 @@
{
guththila_attribute_t *att;
att = guththila_attribute_create (environment, prefix, name, value, NULL);
- axis2_stack_push(parser->attrib, environment, att);
+ axutil_stack_push(parser->attrib, environment, att);
}
void AXIS2_CALL
@@ -1226,7 +1226,7 @@
uri,
parser->unicode_state);
ns->lengthuri = axis2_strlen(ns->uri);
- axis2_stack_push(parser->namesp, environment, ns);
+ axutil_stack_push(parser->namesp, environment, ns);
}
@@ -1236,7 +1236,7 @@
guththila_t *
parser)
{
- return axis2_stack_size(parser->attrib, environment);
+ return axutil_stack_size(parser->attrib, environment);
}
@@ -1246,7 +1246,7 @@
guththila_t * parser)
{
guththila_attribute_t *attribute;
- attribute = (guththila_attribute_t *) axis2_stack_pop(parser->attrib, environment);
+ attribute = (guththila_attribute_t *) axutil_stack_pop(parser->attrib, environment);
if (attribute)
return attribute;
else
@@ -1305,13 +1305,13 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_prefix_by_number(axutil_env_t * environment, guththila_t * parser, int i)
{
- int ix = axis2_stack_size(parser->attrib, environment);
+ int ix = axutil_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- attribute = (guththila_attribute_t *) axis2_stack_get_at(parser->attrib, environment, ix - i);
+ attribute = (guththila_attribute_t *) axutil_stack_get_at(parser->attrib, environment, ix - i);
}
return guththila_token_to_string(environment, attribute->prefix,
parser->unicode_state);
@@ -1321,13 +1321,13 @@
AXIS2_EXTERN guththila_char_t * AXIS2_CALL
guththila_get_attribute_name_by_number(axutil_env_t * environment, guththila_t * parser, int i)
{
- int ix = axis2_stack_size(parser->attrib, environment);
+ int ix = axutil_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- attribute = (guththila_attribute_t *) axis2_stack_get_at(parser->attrib, environment, ix - i);
+ attribute = (guththila_attribute_t *) axutil_stack_get_at(parser->attrib, environment, ix - i);
}
return guththila_token_to_string(environment, attribute->name,
parser->unicode_state);
@@ -1338,13 +1338,13 @@
guththila_get_attribute_value_by_number(axutil_env_t * environment,
guththila_t * parser, int i)
{
- int ix = axis2_stack_size(parser->attrib, environment);
+ int ix = axutil_stack_size(parser->attrib, environment);
guththila_attribute_t *attribute = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- attribute = (guththila_attribute_t *) axis2_stack_get_at(parser->attrib, environment, ix - i);
+ attribute = (guththila_attribute_t *) axutil_stack_get_at(parser->attrib, environment, ix - i);
}
return guththila_token_to_string(environment, attribute->value,
parser->unicode_state);
@@ -1393,7 +1393,7 @@
parser)
{
if (parser->namesp)
- return axis2_stack_size(parser->namesp, environment);
+ return axutil_stack_size(parser->namesp, environment);
else
return 0;
}
@@ -1405,7 +1405,7 @@
guththila_t * parser)
{
guththila_namespace_t *namespace;
- namespace = (guththila_namespace_t *) axis2_stack_get(parser->namesp, environment);
+ namespace = (guththila_namespace_t *) axutil_stack_get(parser->namesp, environment);
if (namespace)
return namespace;
else
@@ -1446,13 +1446,13 @@
guththila_t * parser,
int i)
{
- int ix = axis2_stack_size(parser->namesp, environment);
+ int ix = axutil_stack_size(parser->namesp, environment);
guththila_namespace_t *ns = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- ns = (guththila_namespace_t *) axis2_stack_get_at(parser->namesp, environment, ix - i);
+ ns = (guththila_namespace_t *) axutil_stack_get_at(parser->namesp, environment, ix - i);
}
return axis2_strdup(environment, ns->name);
}
@@ -1464,13 +1464,13 @@
guththila_t
* parser, int i)
{
- int ix = axis2_stack_size(parser->namesp, environment);
+ int ix = axutil_stack_size(parser->namesp, environment);
guththila_namespace_t *ns = NULL;
if (i > ix)
guththila_exception(p_FILE, LINE, GUTHTHILA_ERROR_REQUESTED_NUMBER_GREATER_THAN_STACK_SIZE);
else
{
- ns = (guththila_namespace_t *) axis2_stack_get_at(parser->namesp, environment, ix - i);
+ ns = (guththila_namespace_t *) axutil_stack_get_at(parser->namesp, environment, ix - i);
}
return axis2_strdup(environment, ns->uri);
}
@@ -1483,7 +1483,7 @@
{
guththila_char_t *att_prefix;
int ii;
- int ix = axis2_stack_size(parser->namesp, environment);
+ int ix = axutil_stack_size(parser->namesp, environment);
guththila_namespace_t *ns = NULL;
att_prefix =
guththila_get_attribute_prefix_by_number(environment,
@@ -1491,7 +1491,7 @@
for (ii = 0; ii <= ix; ii++)
{
- ns = (guththila_namespace_t *) axis2_stack_get_at(parser->namesp, environment, ix - ii);
+ ns = (guththila_namespace_t *) axutil_stack_get_at(parser->namesp, environment, ix - ii);
if (ns)
{
if (ns && att_prefix)
Modified: webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c Fri Mar 30 12:24:00 2007
@@ -26,10 +26,10 @@
p->xsw = (guththila_xml_writer_t *) AXIS2_MALLOC(env->allocator,
sizeof(guththila_xml_writer_t));
p->xsw->writer = guththila_writer_create_for_file(env, file);
- p->xsw->element = axis2_stack_create(env);
- p->xsw->attribute = axis2_stack_create(env);
- p->xsw->namespace = axis2_stack_create(env);
- p->xsw->depth = axis2_stack_create(env);
+ p->xsw->element = axutil_stack_create(env);
+ p->xsw->attribute = axutil_stack_create(env);
+ p->xsw->namespace = axutil_stack_create(env);
+ p->xsw->depth = axutil_stack_create(env);
p->xsw->next = 0;
p->xsw->offset = 0;
p->xsw->last = GUTHTHILA_BUFFER_SIZE; /* size of the buffer */
@@ -49,10 +49,10 @@
p->xsw = (guththila_xml_writer_t *) AXIS2_MALLOC(env->allocator,
sizeof(guththila_xml_writer_t));
p->xsw->writer = guththila_writer_create_for_memory(env);
- p->xsw->element = axis2_stack_create(env);
- p->xsw->attribute = axis2_stack_create(env);
- p->xsw->namespace = axis2_stack_create(env);
- p->xsw->depth = axis2_stack_create(env);
+ p->xsw->element = axutil_stack_create(env);
+ p->xsw->attribute = axutil_stack_create(env);
+ p->xsw->namespace = axutil_stack_create(env);
+ p->xsw->depth = axutil_stack_create(env);
p->xsw->next = 0;
p->xsw->offset = 0;
p->xsw->last = GUTHTHILA_BUFFER_SIZE; /* size of the buffer */
@@ -79,17 +79,17 @@
void *element;
size = 0;
- size = axis2_stack_size(p->xsw->element, env);
+ size = axutil_stack_size(p->xsw->element, env);
if (size)
{
for (; size > 0; size--)
{
- element = axis2_stack_pop(p->xsw->element, env);
+ element = axutil_stack_pop(p->xsw->element, env);
AXIS2_FREE(env->allocator, element);
element = NULL;
}
}
- axis2_stack_free(p->xsw->element, env);
+ axutil_stack_free(p->xsw->element, env);
p->xsw->element = NULL;
}
@@ -97,18 +97,18 @@
if (p->xsw->attribute)
{
size = 0;
- size = axis2_stack_size(p->xsw->attribute, env);
+ size = axutil_stack_size(p->xsw->attribute, env);
if (size)
{
guththila_attribute_t* att;
for (;size > 0; size--)
{
- att = (guththila_attribute_t *)axis2_stack_pop(p->xsw->attribute, env);
+ att = (guththila_attribute_t *)axutil_stack_pop(p->xsw->attribute, env);
guththila_attribute_free (env, att);
att = NULL;
}
}
- axis2_stack_free(p->xsw->attribute, env);
+ axutil_stack_free(p->xsw->attribute, env);
p->xsw->attribute = NULL;
}
@@ -116,18 +116,18 @@
if (p->xsw->namespace)
{
size = 0;
- size = axis2_stack_size(p->xsw->namespace, env);
+ size = axutil_stack_size(p->xsw->namespace, env);
if (size)
{
guththila_namespace_t* ns;
for (;size > 0; size--)
{
- ns = (guththila_namespace_t *)axis2_stack_pop(p->xsw->namespace, env);
+ ns = (guththila_namespace_t *)axutil_stack_pop(p->xsw->namespace, env);
AXIS2_FREE(env->allocator, ns);
ns = NULL;
}
}
- axis2_stack_free(p->xsw->namespace, env);
+ axutil_stack_free(p->xsw->namespace, env);
p->xsw->namespace = NULL;
}
@@ -135,18 +135,18 @@
if (p->xsw->depth)
{
size = 0;
- size = axis2_stack_size(p->xsw->depth, env);
+ size = axutil_stack_size(p->xsw->depth, env);
if (size)
{
guththila_depth_t* depth;
for (;size > 0; size--)
{
- depth = (guththila_depth_t *)axis2_stack_pop(p->xsw->depth, env);
+ depth = (guththila_depth_t *)axutil_stack_pop(p->xsw->depth, env);
AXIS2_FREE(env->allocator, depth);
depth = NULL;
}
}
- axis2_stack_free(p->xsw->depth, env);
+ axutil_stack_free(p->xsw->depth, env);
p->xsw->depth = NULL;
}
@@ -193,7 +193,7 @@
{
void *element = NULL;
- element = axis2_stack_pop(p->xsw->element, env);
+ element = axutil_stack_pop(p->xsw->element, env);
if (p->xsw->empty_element_open)
{
guththila_close_start_element(env, p);
@@ -226,11 +226,11 @@
guththila_close_start_element(env, p);
guththila_open_depth_element(env, p);
- size = axis2_stack_size(p->xsw->element, env);
+ size = axutil_stack_size(p->xsw->element, env);
if (size)
{
- element = axis2_stack_get_at(p->xsw->element, env, 0);
+ element = axutil_stack_get_at(p->xsw->element, env, 0);
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
@@ -239,7 +239,7 @@
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- axis2_stack_push(p->xsw->element, env, start_element);
+ axutil_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
}
@@ -269,7 +269,7 @@
init_buffer = writer_impl->buffer->buff;
writer_impl->buffer = guththila_buffer_grow(env, writer_impl->buffer, ii);
p->xsw->last = writer_impl->buffer->size;
- axis2_stack_push (p->other, env, init_buffer);;
+ axutil_stack_push (p->other, env, init_buffer);;
}
}
c = guththila_writer_write(env, (char *)buff, 0, ii, p->xsw->writer);
@@ -313,13 +313,13 @@
guththila_write_to_buffer(env, p, ">");
}
- stack_size = axis2_stack_size(p->xsw->attribute, env);
+ stack_size = axutil_stack_size(p->xsw->attribute, env);
if (stack_size)
{
guththila_attribute_t* att = NULL;
for (;stack_size > 0; stack_size--)
{
- att = (guththila_attribute_t *)axis2_stack_pop(p->xsw->attribute, env);
+ att = (guththila_attribute_t *)axutil_stack_pop(p->xsw->attribute, env);
/* guththila_attribute_free (env, att); */
att = NULL;
}
@@ -454,13 +454,13 @@
if (!p->xsw->start_element_open)
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_EMPTY_ARGUMENTS);
- size = axis2_stack_size(p->xsw->attribute, env);
+ size = axutil_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->attribute, env, size - ii);
+ element = axutil_stack_get_at(p->xsw->attribute, env, size - ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -497,7 +497,7 @@
attr->value = (guththila_token_t *)value;
if (local_name && value)
{
- axis2_stack_push(p->xsw->attribute, env, attr);
+ axutil_stack_push(p->xsw->attribute, env, attr);
}
guththila_check_name_validity(env, p, (char *)local_name);
@@ -549,12 +549,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = axis2_stack_size(p->xsw->namespace, env);
+ size = axutil_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->namespace, env, size - ii);
+ element = axutil_stack_get_at(p->xsw->namespace, env, size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -581,7 +581,7 @@
ns->length = 0;
ns->uri = ns_uri;
ns->lengthuri = strlen(ns_uri);
- axis2_stack_push(p->xsw->namespace, env, (void *)ns);
+ axutil_stack_push(p->xsw->namespace, env, (void *)ns);
guththila_write_to_buffer(env, p, " ");
guththila_write_to_buffer(env, p, "xmlns");
@@ -616,12 +616,12 @@
int ii = 0;
void *element = NULL;
guththila_namespace_t *ns = NULL;
- size = axis2_stack_size(p->xsw->namespace, env);
+ size = axutil_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->namespace, env, size - ii);
+ element = axutil_stack_get_at(p->xsw->namespace, env, size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -656,7 +656,7 @@
ns->length = strlen(prefix);
ns->uri = uri;
ns->lengthuri = strlen(uri);
- axis2_stack_push(p->xsw->namespace, env, (void *)ns);
+ axutil_stack_push(p->xsw->namespace, env, (void *)ns);
guththila_write_to_buffer(env, p, " ");
guththila_write_to_buffer(env, p, "xmlns:");
@@ -682,13 +682,13 @@
if (prefix && namespace)
guththila_write_namespace(env, p, (char *)prefix, (char *)namespace);
- size = axis2_stack_size(p->xsw->attribute, env);
+ size = axutil_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->attribute, env, size - ii);
+ element = axutil_stack_get_at(p->xsw->attribute, env, size - ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -738,8 +738,8 @@
if (value)
attr->value = (guththila_token_t *)value;
- axis2_stack_push(p->xsw->attribute, env, (void *)attr);
- axis2_stack_push(p->other, env, attr);
+ axutil_stack_push(p->xsw->attribute, env, (void *)attr);
+ axutil_stack_push(p->other, env, attr);
guththila_check_name_validity(env, p, (char *)local_name);
if (strrchr(value, '&')
@@ -774,13 +774,13 @@
exsists or not. */
if (guththila_is_exsisting_prefix(env, p, prefix))
{
- size = axis2_stack_size(p->xsw->attribute, env);
+ size = axutil_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->attribute, env, ii);
+ element = axutil_stack_get_at(p->xsw->attribute, env, ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -832,12 +832,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = axis2_stack_size(p->xsw->namespace, env);
+ size = axutil_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->namespace, env, ii);
+ element = axutil_stack_get_at(p->xsw->namespace, env, ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -862,12 +862,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = axis2_stack_size(p->xsw->namespace, env);
+ size = axutil_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->namespace, env , size - ii);
+ element = axutil_stack_get_at(p->xsw->namespace, env , size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -900,13 +900,13 @@
{
char *prefix;
prefix = guththila_get_prefix_for_namespace(env, p, namespace);
- size = axis2_stack_size(p->xsw->attribute, env);
+ size = axutil_stack_size(p->xsw->attribute, env);
if (size)
{
int ii;
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->attribute, env, size - ii);
+ element = axutil_stack_get_at(p->xsw->attribute, env, size - ii);
if (element)
{
attr = (guththila_attribute_t *)element;
@@ -950,12 +950,12 @@
int ii;
void *element;
guththila_namespace_t *ns;
- size = axis2_stack_size(p->xsw->namespace, env);
+ size = axutil_stack_size(p->xsw->namespace, env);
if (size)
{
for (ii = 0; ii <= size; ii++)
{
- element = axis2_stack_get_at(p->xsw->namespace, env, size - ii);
+ element = axutil_stack_get_at(p->xsw->namespace, env, size - ii);
if (element)
{
ns = (guththila_namespace_t *)element;
@@ -1009,22 +1009,22 @@
else
start_element = (char *)local_name;
- size = axis2_stack_size(p->xsw->element, env);
+ size = axutil_stack_size(p->xsw->element, env);
if (size)
{
- element = axis2_stack_get_at(p->xsw->element, env, size);
+ element = axutil_stack_get_at(p->xsw->element, env, size);
if (start_element && element)
{
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
}
- axis2_stack_push(p->other, env, start_element);
+ axutil_stack_push(p->other, env, start_element);
guththila_check_name_validity(env, p, start_element);
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- axis2_stack_push(p->xsw->element, env, start_element);
+ axutil_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
guththila_write_namespace(env, p, (char *)prefix, (char *)namespace_uri);
@@ -1063,11 +1063,11 @@
else
strcat(start_element, local_name);
- size = axis2_stack_size(p->xsw->element, env);
+ size = axutil_stack_size(p->xsw->element, env);
if (size)
{
- element = axis2_stack_get_at(p->xsw->element, env, size);
+ element = axutil_stack_get_at(p->xsw->element, env, size);
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
@@ -1076,7 +1076,7 @@
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- axis2_stack_push(p->xsw->element, env, start_element);
+ axutil_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
}
@@ -1122,20 +1122,20 @@
memcpy (start_element + (prefix_length + 1), local_name, name_length);
}
- size = axis2_stack_size(p->xsw->element, env);
+ size = axutil_stack_size(p->xsw->element, env);
if (size)
{
- element = axis2_stack_get_at(p->xsw->element, env, size - 1);
+ element = axutil_stack_get_at(p->xsw->element, env, size - 1);
if (!strcmp((char *)element, start_element))
guththila_exception(p_FILE, LINE, GUTHTHILA_WRITER_ERROR_NON_MATCHING_ELEMENTS);
}
- axis2_stack_push(p->other, env, start_element);
+ axutil_stack_push(p->other, env, start_element);
guththila_check_name_validity(env, p, start_element);
p->xsw->start_element_open = 1;
if (!p->xsw->empty_element_open)
- axis2_stack_push(p->xsw->element, env, start_element);
+ axutil_stack_push(p->xsw->element, env, start_element);
guththila_write_to_buffer(env, p, "<");
guththila_write_to_buffer(env, p, start_element);
}
@@ -1182,26 +1182,26 @@
void AXIS2_CALL
guththila_open_depth_element(axutil_env_t *env, guththila_t *p)
{
- int size = axis2_stack_size(p->xsw->depth, env);
+ int size = axutil_stack_size(p->xsw->depth, env);
guththila_depth_t *d = (guththila_depth_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_depth_t));
if (size)
{
void *e = NULL;
guththila_depth_t *l = NULL;
- e = axis2_stack_get(p->xsw->depth, env);
+ e = axutil_stack_get(p->xsw->depth, env);
l = (guththila_depth_t *)e;
- d->total = axis2_stack_size(p->xsw->namespace, env);
+ d->total = axutil_stack_size(p->xsw->namespace, env);
d->first = l->first + l->count;
d->count = d->total - l->total;
- axis2_stack_push(p->xsw->depth, env, (void *)d);
+ axutil_stack_push(p->xsw->depth, env, (void *)d);
}
else
{
d->first = 0;
- d->total = axis2_stack_size(p->xsw->namespace, env);
+ d->total = axutil_stack_size(p->xsw->namespace, env);
d->count = d->total;
- axis2_stack_push(p->xsw->depth, env, (void *)d);
+ axutil_stack_push(p->xsw->depth, env, (void *)d);
}
}
@@ -1209,14 +1209,14 @@
void AXIS2_CALL
guththila_close_depth_element(axutil_env_t *env, guththila_t *p)
{
- void *e = axis2_stack_pop(p->xsw->depth, env);
+ void *e = axutil_stack_pop(p->xsw->depth, env);
guththila_depth_t *d = (guththila_depth_t *)e;
void *elem = NULL;
if (d->count)
{
for (; d->count > 0; d->count --)
{
- elem = axis2_stack_pop(p->xsw->namespace, env);
+ elem = axutil_stack_pop(p->xsw->namespace, env);
if (elem)
AXIS2_FREE(env->allocator, elem);
}
@@ -1231,7 +1231,7 @@
int ii = 0;
if (p->xsw->start_element_open || p->xsw->empty_element_open)
guththila_close_start_element(env, p);
- ii = axis2_stack_size(p->xsw->element, env);
+ ii = axutil_stack_size(p->xsw->element, env);
for (; ii > 0; ii --)
guththila_write_end_element(env, p);
/* guththila_flush(env, p); */
Modified: webservices/axis2/trunk/c/include/axis2_addr_mod.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_addr_mod.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_addr_mod.h (original)
+++ webservices/axis2/trunk/c/include/axis2_addr_mod.h Fri Mar 30 12:24:00 2007
@@ -32,11 +32,11 @@
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axis2_addr_in_handler_create(const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
AXIS2_EXTERN axis2_handler_t* AXIS2_CALL
axis2_addr_out_handler_create(const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_any_content_type.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_any_content_type.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_any_content_type.h (original)
+++ webservices/axis2/trunk/c/include/axis2_any_content_type.h Fri Mar 30 12:24:00 2007
@@ -31,7 +31,7 @@
#include <axutil_env.h>
#include <axis2_const.h>
#include <axutil_hash.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#ifdef __cplusplus
extern "C"
@@ -60,7 +60,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_any_content_type_add_value(axis2_any_content_type_t *any_content_type,
const axutil_env_t *env,
- const axis2_qname_t *qname,
+ const axutil_qname_t *qname,
const axis2_char_t *value);
/**
@@ -75,7 +75,7 @@
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_any_content_type_get_value(const axis2_any_content_type_t *any_content_type,
const axutil_env_t *env,
- const axis2_qname_t *qname);
+ const axutil_qname_t *qname);
/**
* Gets the map of all values.
* @param any_content_type pointer to any content type struct
Modified: webservices/axis2/trunk/c/include/axis2_conf.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_conf.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_conf.h (original)
+++ webservices/axis2/trunk/c/include/axis2_conf.h Fri Mar 30 12:24:00 2007
@@ -40,11 +40,11 @@
* @file axis2_config.h
*/
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
#include <axis2_svc_grp.h>
#include <axis2_transport_in_desc.h>
#include <axis2_transport_out_desc.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#include <axutil_hash.h>
#include <axis2_phases_info.h>
#include <axis2_msg_recv.h>
@@ -160,7 +160,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_conf_add_param(axis2_conf_t *conf,
const axutil_env_t *env,
- axis2_param_t *param);
+ axutil_param_t *param);
/**
* Gets a parameter with the given name.
@@ -170,7 +170,7 @@
* @return pointer to parameter with the given name if exists, else NULL.
* Returns a reference, not a cloned copy
*/
- AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_conf_get_param(const axis2_conf_t *conf,
const axutil_env_t *env,
const axis2_char_t *name);
@@ -284,7 +284,7 @@
AXIS2_EXTERN struct axis2_module_desc *AXIS2_CALL
axis2_conf_get_module(const axis2_conf_t *conf,
const axutil_env_t *env,
- const axis2_qname_t *qname);
+ const axutil_qname_t *qname);
/**
* Gets the list of engaged modules.
@@ -392,7 +392,7 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_conf_is_engaged(axis2_conf_t *conf,
const axutil_env_t *env,
- const axis2_qname_t *module_name);
+ const axutil_qname_t *module_name);
/**
* Gets phases information struct.
@@ -571,7 +571,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_conf_engage_module(axis2_conf_t *conf,
const axutil_env_t *env,
- const axis2_qname_t *module_ref);
+ const axutil_qname_t *module_ref);
/**
* Sets the deployment engine.
@@ -667,7 +667,7 @@
const axutil_env_t *env,
axis2_bool_t enable_security);
- AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_conf_get_param_container(const axis2_conf_t *conf,
const axutil_env_t *env);
Modified: webservices/axis2/trunk/c/include/axis2_core_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_core_utils.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_core_utils.h (original)
+++ webservices/axis2/trunk/c/include/axis2_core_utils.h Fri Mar 30 12:24:00 2007
@@ -23,7 +23,7 @@
#include <axutil_error.h>
#include <axutil_env.h>
#include <axis2_msg_ctx.h>
-#include <axis2_qname.h>
+#include <axutil_qname.h>
#ifdef __cplusplus
extern "C"
@@ -44,7 +44,7 @@
axis2_core_utils_reset_out_msg_ctx(const axutil_env_t *env,
axis2_msg_ctx_t *out_msg_ctx);
- AXIS2_EXTERN axis2_qname_t* AXIS2_CALL
+ AXIS2_EXTERN axutil_qname_t* AXIS2_CALL
axis2_core_utils_get_module_qname(const axutil_env_t *env,
const axis2_char_t *name,
const axis2_char_t *version);
Modified: webservices/axis2/trunk/c/include/axis2_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_ctx.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_ctx.h (original)
+++ webservices/axis2/trunk/c/include/axis2_ctx.h Fri Mar 30 12:24:00 2007
@@ -38,7 +38,7 @@
#include <axis2_defines.h>
#include <axutil_hash.h>
#include <axutil_env.h>
-#include <axis2_property.h>
+#include <axutil_property.h>
#ifdef __cplusplus
extern "C"
@@ -72,7 +72,7 @@
axis2_ctx_set_property(struct axis2_ctx *ctx,
const axutil_env_t *env,
const axis2_char_t *key,
- axis2_property_t *value);
+ axutil_property_t *value);
/**
* Gets the property with the given key.
@@ -84,7 +84,7 @@
* retrieved from the non-persistent store
* @return pointer to property struct corresponding to the given key
*/
- AXIS2_EXTERN axis2_property_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_property_t *AXIS2_CALL
axis2_ctx_get_property(const axis2_ctx_t *ctx,
const axutil_env_t *env,
const axis2_char_t *key);
Modified: webservices/axis2/trunk/c/include/axis2_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_desc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_desc.h Fri Mar 30 12:24:00 2007
@@ -26,7 +26,7 @@
* @{
*/
-#include <axis2_param_container.h>
+#include <axutil_param_container.h>
#include <axutil_hash.h>
#include <axis2_description.h>
@@ -66,7 +66,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_desc_add_param(axis2_desc_t *desc,
const axutil_env_t *env,
- axis2_param_t *param);
+ axutil_param_t *param);
/**
* Gets named parameter.
@@ -75,7 +75,7 @@
* @param param_name parameter name string
* @return pointer to named parameter, NULL if it does not exist
*/
- AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_desc_get_param(const axis2_desc_t *desc,
const axutil_env_t *env,
const axis2_char_t *param_name);
Modified: webservices/axis2/trunk/c/include/axis2_description.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_description.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_description.h (original)
+++ webservices/axis2/trunk/c/include/axis2_description.h Fri Mar 30 12:24:00 2007
@@ -28,7 +28,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axutil_hash.h>
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_disp.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_disp.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_disp.h (original)
+++ webservices/axis2/trunk/c/include/axis2_disp.h Fri Mar 30 12:24:00 2007
@@ -36,7 +36,7 @@
*/
#include <axis2_defines.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axis2_handler.h>
#include <axis2_svc.h>
@@ -68,7 +68,7 @@
* @return pointer to name. Returns a reference, not a
* cloned copy
*/
- AXIS2_EXTERN axis2_string_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axis2_disp_get_name(const axis2_disp_t *disp,
const axutil_env_t *env);
@@ -83,7 +83,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_disp_set_name(axis2_disp_t *disp,
const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
/**
* Frees dispatcher struct.
@@ -103,7 +103,7 @@
*/
AXIS2_EXTERN axis2_disp_t *AXIS2_CALL
axis2_disp_create(const axutil_env_t *env,
- const axis2_string_t *name);
+ const axutil_string_t *name);
axis2_status_t AXIS2_CALL
axis2_disp_find_svc_and_op(
Modified: webservices/axis2/trunk/c/include/axis2_endpoint_ref.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_endpoint_ref.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_endpoint_ref.h (original)
+++ webservices/axis2/trunk/c/include/axis2_endpoint_ref.h Fri Mar 30 12:24:00 2007
@@ -103,7 +103,7 @@
* @return pointer to interface QName, returns a reference, not a cloned
* copy
*/
- AXIS2_EXTERN const axis2_qname_t *AXIS2_CALL
+ AXIS2_EXTERN const axutil_qname_t *AXIS2_CALL
axis2_endpoint_ref_get_interface_qname(const axis2_endpoint_ref_t *endpoint_ref,
const axutil_env_t *env);
@@ -119,7 +119,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_endpoint_ref_set_interface_qname(axis2_endpoint_ref_t *endpoint_ref,
const axutil_env_t *env,
- const axis2_qname_t *interface_qname);
+ const axutil_qname_t *interface_qname);
/**
* Gets reference parameter list. A reference may contain a number
Modified: webservices/axis2/trunk/c/include/axis2_flow.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow.h Fri Mar 30 12:24:00 2007
@@ -31,7 +31,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axutil_array_list.h>
#include <axis2_handler_desc.h>
Modified: webservices/axis2/trunk/c/include/axis2_flow_container.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_flow_container.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_flow_container.h (original)
+++ webservices/axis2/trunk/c/include/axis2_flow_container.h Fri Mar 30 12:24:00 2007
@@ -35,7 +35,7 @@
#include <axis2_defines.h>
#include <axutil_env.h>
#include <axutil_allocator.h>
-#include <axis2_string.h>
+#include <axutil_string.h>
#include <axutil_array_list.h>
#include <axis2_flow.h>
Modified: webservices/axis2/trunk/c/include/axis2_handler.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler.h Fri Mar 30 12:24:00 2007
@@ -38,8 +38,8 @@
*/
#include <axis2_defines.h>
-#include <axis2_qname.h>
-#include <axis2_param.h>
+#include <axutil_qname.h>
+#include <axutil_param.h>
#ifdef __cplusplus
extern "C"
@@ -109,7 +109,7 @@
* @param env pointer to environment struct
* @return pointer to QName of the handler
*/
- const axis2_string_t *(AXIS2_CALL *
+ const axutil_string_t *(AXIS2_CALL *
get_name)(
const axis2_handler_t *handler,
const axutil_env_t *env);
@@ -120,7 +120,7 @@
* @param env pointer to environment struct
* @param name name of the parameter to be accessed
*/
- axis2_param_t *(AXIS2_CALL *
+ axutil_param_t *(AXIS2_CALL *
get_param)(
const axis2_handler_t *handler,
const axutil_env_t *env,
@@ -157,7 +157,7 @@
typedef axis2_handler_t *(AXIS2_CALL *
AXIS2_HANDLER_CREATE_FUNC)(
const axutil_env_t *env,
- const axis2_string_t *name);
+ const axutil_string_t *name);
/**
* Creates handler struct instance.
@@ -178,7 +178,7 @@
AXIS2_EXTERN axis2_handler_t *AXIS2_CALL
axis2_ctx_handler_create(
const axutil_env_t *env,
- const axis2_string_t *qname);
+ const axutil_string_t *qname);
/** Frees handler.
@sa axis2_handler_ops#free */
Modified: webservices/axis2/trunk/c/include/axis2_handler_desc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_handler_desc.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_handler_desc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_handler_desc.h Fri Mar 30 12:24:00 2007
@@ -34,9 +34,9 @@
*/
#include <axis2_utils_defines.h>
-#include <axis2_qname.h>
-#include <axis2_param.h>
-#include <axis2_param_container.h>
+#include <axutil_qname.h>
+#include <axutil_param.h>
+#include <axutil_param_container.h>
#include <axis2_phase_rule.h>
#include <axis2_handler.h>
@@ -54,7 +54,7 @@
* @param env pointer to environment struct
* @return pointer to QName, returns a reference, not a cloned copy
*/
- AXIS2_EXTERN const axis2_string_t *AXIS2_CALL
+ AXIS2_EXTERN const axutil_string_t *AXIS2_CALL
axis2_handler_desc_get_name(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env);
@@ -69,7 +69,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_desc_set_name(axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
/**
* Gets phase rules.
@@ -102,7 +102,7 @@
* @return pointer to parameter if found, else NULL. Return a reference
* not a cloned copy
*/
- AXIS2_EXTERN axis2_param_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_param_t *AXIS2_CALL
axis2_handler_desc_get_param(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
const axis2_char_t *name);
@@ -117,7 +117,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_desc_add_param(axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
- axis2_param_t *param);
+ axutil_param_t *param);
/**
* Gets all parameters stored within handler description.
@@ -197,7 +197,7 @@
* @return pointer to parent parameter container, returns a reference,
* not a cloned copy
*/
- AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_handler_desc_get_parent(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env);
@@ -213,7 +213,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_handler_desc_set_parent(axis2_handler_desc_t *handler_desc,
const axutil_env_t *env,
- axis2_param_container_t *parent);
+ axutil_param_container_t *parent);
/**
* Frees handler description.
@@ -232,7 +232,7 @@
* @return pointer to parameter container, returns a reference,
* not a cloned copy
*/
- AXIS2_EXTERN axis2_param_container_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_param_container_t *AXIS2_CALL
axis2_handler_desc_get_param_container(const axis2_handler_desc_t *handler_desc,
const axutil_env_t *env);
@@ -246,7 +246,7 @@
*/
AXIS2_EXTERN axis2_handler_desc_t *AXIS2_CALL
axis2_handler_desc_create(const axutil_env_t *env,
- axis2_string_t *name);
+ axutil_string_t *name);
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_chunked_stream.h Fri Mar 30 12:24:00 2007
@@ -33,7 +33,7 @@
#include <axis2_const.h>
#include <axis2_defines.h>
#include <axutil_env.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#ifdef __cplusplus
@@ -100,7 +100,7 @@
*/
AXIS2_EXTERN axis2_http_chunked_stream_t * AXIS2_CALL
axis2_http_chunked_stream_create(const axutil_env_t *env,
- axis2_stream_t* stream);
+ axutil_stream_t* stream);
/** Read. */
#define AXIS2_HTTP_CHUNKED_STREAM_READ(chunked_stream, env, buffer, count) \
Modified: webservices/axis2/trunk/c/include/axis2_http_response_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_response_writer.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_response_writer.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_response_writer.h Fri Mar 30 12:24:00 2007
@@ -32,7 +32,7 @@
#include <axis2_const.h>
#include <axis2_defines.h>
#include <axutil_env.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#ifdef __cplusplus
extern "C"
@@ -153,7 +153,7 @@
AXIS2_EXTERN axis2_http_response_writer_t *AXIS2_CALL
axis2_http_response_writer_create (
const axutil_env_t *env,
- axis2_stream_t *stream);
+ axutil_stream_t *stream);
/**
* @param env pointer to environment struct
@@ -163,7 +163,7 @@
AXIS2_EXTERN axis2_http_response_writer_t *AXIS2_CALL
axis2_http_response_writer_create_with_encoding(
const axutil_env_t *env,
- axis2_stream_t *stream,
+ axutil_stream_t *stream,
const axis2_char_t *encoding);
/** Get encoding.
Modified: webservices/axis2/trunk/c/include/axis2_http_simple_request.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_simple_request.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_simple_request.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_simple_request.h Fri Mar 30 12:24:00 2007
@@ -34,7 +34,7 @@
#include <axutil_env.h>
#include <axis2_http_request_line.h>
#include <axis2_http_header.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#include <axutil_array_list.h>
@@ -143,7 +143,7 @@
* @param simple_request pointer to simple request
* @param env pointer to environment struct
*/
- AXIS2_EXTERN axis2_stream_t *AXIS2_CALL
+ AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
axis2_http_simple_request_get_body(const axis2_http_simple_request_t *simple_request,
const axutil_env_t *env);
@@ -190,7 +190,7 @@
axis2_http_request_line_t *request_line,
axis2_http_header_t **http_headers,
axis2_ssize_t http_hdr_count,
- axis2_stream_t *content);
+ axutil_stream_t *content);
/** Gets the request line. */
#define AXIS2_HTTP_SIMPLE_REQUEST_GET_REQUEST_LINE(simple_request, env) \
Modified: webservices/axis2/trunk/c/include/axis2_http_simple_response.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_simple_response.h?view=diff&rev=524243&r1=524242&r2=524243
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_simple_response.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_simple_response.h Fri Mar 30 12:24:00 2007
@@ -35,7 +35,7 @@
#include <axutil_array_list.h>
#include <axis2_http_status_line.h>
#include <axis2_http_header.h>
-#include <axis2_stream.h>
+#include <axutil_stream.h>
#ifdef __cplusplus
@@ -200,13 +200,13 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_simple_response_set_body_stream(axis2_http_simple_response_t *simple_response,
const axutil_env_t *env,
- axis2_stream_t *stream);
+ axutil_stream_t *stream);
/**
* @param simple_response pointer to simple response struct
* @param env pointer to environment struct
*/
- AXIS2_EXTERN axis2_stream_t* AXIS2_CALL
+ AXIS2_EXTERN axutil_stream_t* AXIS2_CALL
axis2_http_simple_response_get_body(axis2_http_simple_response_t *simple_response,
const axutil_env_t *env);
@@ -242,7 +242,7 @@
axis2_http_status_line_t *status_line,
const axis2_http_header_t **http_headers,
const axis2_ssize_t http_hdr_count,
- axis2_stream_t *content);
+ axutil_stream_t *content);
/**
* @param env pointer to environment struct
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org