You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by du...@apache.org on 2007/03/12 11:14:46 UTC
svn commit: r517162 - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/soap/ axiom/test/om/
rampart/src/omxmlsec/c14n/ samples/client/mtom/ samples/server/Calculator/
samples/server/echo/ samples/server/math/...
Author: dushshantha
Date: Mon Mar 12 03:14:43 2007
New Revision: 517162
URL: http://svn.apache.org/viewvc?view=rev&rev=517162
Log:
removed macros and corrected indentation
Modified:
webservices/axis2/trunk/c/axiom/include/axiom_text.h
webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
webservices/axis2/trunk/c/axiom/src/om/om_element.c
webservices/axis2/trunk/c/axiom/src/om/om_node.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c
webservices/axis2/trunk/c/axiom/test/om/test_om.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
webservices/axis2/trunk/c/samples/server/Calculator/calc.c
webservices/axis2/trunk/c/samples/server/echo/echo.c
webservices/axis2/trunk/c/samples/server/math/math.c
webservices/axis2/trunk/c/samples/server/mtom/mtom.c
webservices/axis2/trunk/c/samples/server/notify/notify.c
webservices/axis2/trunk/c/samples/server/sg_math/add.c
webservices/axis2/trunk/c/samples/server/sg_math/div.c
webservices/axis2/trunk/c/samples/server/sg_math/mul.c
webservices/axis2/trunk/c/samples/server/sg_math/sub.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom_text.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_text.h?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_text.h Mon Mar 12 03:14:43 2007
@@ -18,11 +18,6 @@
#ifndef AXIOM_TEXT_H
#define AXIOM_TEXT_H
-/**
- * @file axiom_text.h
- * @brief Axis2 AXIOM XML text
- */
-
#include <axis2_env.h>
#include <axiom_node.h>
#include <axiom_output.h>
@@ -46,45 +41,46 @@
* Creates a new text struct
* @param env Environment. MUST NOT be NULL, .
* @param parent parent of the new node. Optinal, can be NULL.
- * The parent element must be of type AXIOM_ELEMENT
+ * The parent element must be of type AXIOM_ELEMENT
* @param value Text value. Optinal, can be NULL.
* @param comment_node This is an out parameter. cannot be NULL.
- * Returns the node corresponding to the text struct created.
- * Node type will be set to AXIOM_TEXT
+ * Returns the node corresponding to the text struct created.
+ * Node type will be set to AXIOM_TEXT
* @return pointer to newly created text struct
*/
- AXIS2_EXTERN axiom_text_t * AXIS2_CALL
+ AXIS2_EXTERN axiom_text_t *AXIS2_CALL
axiom_text_create(const axis2_env_t *env,
- axiom_node_t *parent,
- const axis2_char_t *value,
- axiom_node_t ** node);
+ axiom_node_t *parent,
+ const axis2_char_t *value,
+ axiom_node_t ** node);
/**
* Creates a new text struct for binary data (MTOM)
* @param env Environment. MUST NOT be NULL, .
* @param parent parent of the new node. Optinal, can be NULL.
- * The parent element must be of type AXIOM_ELEMENT
+ * The parent element must be of type AXIOM_ELEMENT
* @param data_handler data handler. Optinal, can be NULL.
* @param comment_node This is an out parameter. cannot be NULL.
- * Returns the node corresponding to the text struct created.
- * Node type will be set to AXIOM_TEXT
+ * Returns the node corresponding to the text struct created.
+ * Node type will be set to AXIOM_TEXT
* @return pointer to newly created text struct
*/
- AXIS2_EXTERN axiom_text_t* AXIS2_CALL
+ AXIS2_EXTERN axiom_text_t *AXIS2_CALL
axiom_text_create_with_data_handler(const axis2_env_t *env,
- axiom_node_t * parent,
- axiom_data_handler_t* data_handler,
- axiom_node_t **node);
+ axiom_node_t * parent,
+ axiom_data_handler_t* data_handler,
+ axiom_node_t **node);
+
/**
* Free an axiom_text struct
* @param env environment. MUST NOT be NULL.
* @param om_text pointer to om text struct to be freed.
* @return satus of the op. AXIS2_SUCCESS on success
- * AXIS2_FAILURE on error.
+ * AXIS2_FAILURE on error.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_free(struct axiom_text *om_text,
- const axis2_env_t *env);
+ const axis2_env_t *env);
/**
* Serialize op
@@ -92,35 +88,38 @@
* @param om_text pointer to om text struct to be serialized.
* @param om_output AXIOM output handler to be used in serializing.
* @return satus of the op. AXIS2_SUCCESS on success,
- * AXIS2_FAILURE on error
+ * AXIS2_FAILURE on error
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_serialize(struct axiom_text *om_text,
const axis2_env_t *env,
axiom_output_t *om_output);
- /**
- * set the text value
+
+ /**
+ * Sets the text value
* @param om_text om_text struct
* @param env environment , MUST NOT be NULL.
- * @param value text
+ * @param value text
* @return status of the op. AXIS2_SUCCESS on success,
- * AXIS2_FAILURE on error.
+ * AXIS2_FAILURE on error.
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_value(struct axiom_text *om_text,
- const axis2_env_t *env,
- const axis2_char_t *value);
- /**
- * get text value
+ const axis2_env_t *env,
+ const axis2_char_t *value);
+
+ /**
+ * Gets text value
* @param om_text om_text struct
* @param env environment, MUST NOT be NULL.
* @return text value , NULL is returned if there is no text value.
*/
- AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_text_get_value(struct axiom_text *om_text,
- const axis2_env_t *env);
- /**
- * set optimized
+ const axis2_env_t *env);
+
+ /**
+ * Sets optimized
* @param om_text pointer to om_text struct
* @param env environment
* @optimize optimize value
@@ -128,8 +127,8 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_optimize(struct axiom_text *om_text,
- const axis2_env_t *env,
- axis2_bool_t optimize);
+ const axis2_env_t *env,
+ axis2_bool_t optimize);
/**
* @param om_text text value
@@ -139,44 +138,16 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axiom_text_set_is_binary(struct axiom_text *om_text,
- const axis2_env_t *env,
- const axis2_bool_t is_binary);
+ const axis2_env_t *env,
+ const axis2_bool_t is_binary);
- AXIS2_EXTERN axiom_data_handler_t* AXIS2_CALL
+ AXIS2_EXTERN axiom_data_handler_t *AXIS2_CALL
axiom_text_get_data_handler(struct axiom_text *om_text,
- const axis2_env_t *env);
+ const axis2_env_t *env);
- AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axiom_text_get_content_id(struct axiom_text *om_text,
- const axis2_env_t *env);
-
- /** frees given text */
-#define AXIOM_TEXT_FREE( om_text,env) \
- axiom_text_free(om_text,env)
-
- /** serializes given text */
-#define AXIOM_TEXT_SERIALIZE(om_text, env, om_output) \
- axiom_text_serialize(om_text, env, om_output)
- /** get the text value */
-#define AXIOM_TEXT_GET_VALUE(om_text, env) \
- axiom_text_get_value(om_text, env)
- /** set text value */
-#define AXIOM_TEXT_SET_VALUE(om_text, env, value) \
- axiom_text_set_value(om_text, env, value)
-
- /** set whether it is to be optimized */
-#define AXIOM_TEXT_SET_OPTIMIZE(om_text, env, optimize) \
- axiom_text_set_optimize(om_text, env, optimize)
-
- /** set whether it binary */
-#define AXIOM_TEXT_SET_IS_BINARY(om_text, env, is_binary) \
- axiom_text_set_is_binary(om_text, env, is_binary)
-
-#define AXIOM_TEXT_GET_DATA_HANDLER(om_text, env) \
- axiom_text_get_data_handler(om_text, env)
-
-#define AXIOM_TEXT_GET_CONTENT_ID(om_text, env) \
- axiom_text_get_content_id(om_text, env)
+ const axis2_env_t *env);
/** @} */
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Mon Mar 12 03:14:43 2007
@@ -417,7 +417,7 @@
axis2_char_t *temp_content_id = NULL;
if (!mime_body_part)
return NULL;
- data_handler = AXIOM_TEXT_GET_DATA_HANDLER(text, env);
+ data_handler = axiom_text_get_data_handler(text, env);
if (data_handler)
{
@@ -427,7 +427,7 @@
AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env,
data_handler);
content_id = AXIS2_STRACAT(content_id,
- AXIOM_TEXT_GET_CONTENT_ID(text, env), env);
+ axiom_text_get_content_id(text, env), env);
temp_content_id = AXIS2_STRACAT(content_id, ">", env);
AXIS2_FREE(env->allocator, content_id);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_element.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_element.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Mon Mar 12 03:14:43 2007
@@ -1078,7 +1078,7 @@
text_node = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(temp_node, env);
if (text_node)
{
- temp_text = AXIOM_TEXT_GET_VALUE(text_node, env);
+ temp_text = axiom_text_get_value(text_node, env);
if (dest && temp_text && AXIS2_STRCMP(temp_text, "") != 0)
{
dest_len = AXIS2_STRLEN(dest);
Modified: webservices/axis2/trunk/c/axiom/src/om/om_node.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_node.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Mon Mar 12 03:14:43 2007
@@ -129,9 +129,9 @@
else if (om_node->node_type == AXIOM_TEXT)
{
if (om_node->data_element)
- AXIOM_TEXT_FREE((axiom_text_t*)(om_node->data_element), env);
+ axiom_text_free((axiom_text_t*)(om_node->data_element), env);
}
-
+
AXIS2_FREE(env->allocator, om_node);
return AXIS2_SUCCESS;
@@ -369,9 +369,8 @@
{
if (om_node->data_element)
{
- status = AXIOM_TEXT_SERIALIZE(
- (axiom_text_t*)(om_node->data_element),
- env, om_output);
+ status = axiom_text_serialize((axiom_text_t*)(om_node->data_element),
+ env, om_output);
}
if (status != AXIS2_SUCCESS)
return status;
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=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_text.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_text.c Mon Mar 12 03:14:43 2007
@@ -25,18 +25,18 @@
#include <axiom_namespace.h>
#include <axis2_base64.h>
-static axis2_char_t* AXIS2_CALL
+static axis2_char_t *AXIS2_CALL
axiom_text_get_text(axiom_text_t *om_text,
- const axis2_env_t *env);
+ const axis2_env_t *env);
static axis2_bool_t AXIS2_CALL
axiom_text_get_is_binary(axiom_text_t *om_text,
- const axis2_env_t *env);
+ const axis2_env_t *env);
static axis2_status_t AXIS2_CALL
axiom_text_serialize_start_part(axiom_text_t *om_text,
- const axis2_env_t *env,
- axiom_output_t *om_output);
+ const axis2_env_t *env,
+ axiom_output_t *om_output);
struct axiom_text
{
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=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c (original)
+++ webservices/axis2/trunk/c/axiom/src/soap/soap_builder.c Mon Mar 12 03:14:43 2007
@@ -427,7 +427,7 @@
axiom_node_t *data_om_node = NULL;
data_text = axiom_text_create_with_data_handler(
env, om_element_node, data_handler, &data_om_node);
- AXIOM_TEXT_SET_OPTIMIZE(data_text, env, AXIS2_FALSE);
+ axiom_text_set_optimize(data_text, env, AXIS2_FALSE);
}
}
}
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=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/axiom/test/om/test_om.c (original)
+++ webservices/axis2/trunk/c/axiom/test/om/test_om.c Mon Mar 12 03:14:43 2007
@@ -155,8 +155,8 @@
case AXIOM_TEXT:
text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(node2, environment);
- if (text && AXIOM_TEXT_GET_VALUE(text , environment))
- printf("\n text value %s \n", AXIOM_TEXT_GET_VALUE(text, environment));
+ if (text && axiom_text_get_value(text , environment))
+ printf("\n text value %s \n", axiom_text_get_value(text, environment));
break;
default:
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/c14n/c14n.c Mon Mar 12 03:14:43 2007
@@ -705,7 +705,7 @@
if (text)
{
- axis2_char_t *textval = AXIOM_TEXT_GET_VALUE(text, ctx->env);
+ axis2_char_t *textval = axiom_text_get_value(text, ctx->env);
textval = c14n_normalize_text(textval, ctx);
c14n_output(textval, ctx);
if (textval)
Modified: webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c (original)
+++ webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c Mon Mar 12 03:14:43 2007
@@ -175,7 +175,7 @@
data_handler = axiom_data_handler_create(env, image_name, "image/jpeg");
data_text = axiom_text_create_with_data_handler(env, image_om_node, data_handler, &data_om_node);
- AXIOM_TEXT_SET_OPTIMIZE(data_text, env, optimized);
+ axiom_text_set_optimize(data_text, env, optimized);
om_str = AXIOM_NODE_TO_STRING(mtom_om_node, env);
if (om_str)
{
Modified: webservices/axis2/trunk/c/samples/server/Calculator/calc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/Calculator/calc.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/Calculator/calc.c (original)
+++ webservices/axis2/trunk/c/samples/server/Calculator/calc.c Mon Mar 12 03:14:43 2007
@@ -69,9 +69,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -98,9 +98,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
@@ -179,9 +179,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -210,9 +210,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
@@ -292,9 +292,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -323,9 +323,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
@@ -405,9 +405,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -436,9 +436,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
Modified: webservices/axis2/trunk/c/samples/server/echo/echo.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/echo/echo.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/echo/echo.c (original)
+++ webservices/axis2/trunk/c/samples/server/echo/echo.c Mon Mar 12 03:14:43 2007
@@ -61,9 +61,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
+ axis2_char_t *text_str = axiom_text_get_value(text, env);
/*printf("Echoing text value %s \n", text_str);*/
ret_node = build_om_programatically(env, text_str);
}
Modified: webservices/axis2/trunk/c/samples/server/math/math.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/math/math.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/math/math.c (original)
+++ webservices/axis2/trunk/c/samples/server/math/math.c Mon Mar 12 03:14:43 2007
@@ -55,9 +55,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -86,9 +86,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
@@ -167,9 +167,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -198,9 +198,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
@@ -280,9 +280,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -311,9 +311,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
@@ -393,9 +393,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -424,9 +424,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
Modified: webservices/axis2/trunk/c/samples/server/mtom/mtom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/mtom/mtom.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/mtom/mtom.c (original)
+++ webservices/axis2/trunk/c/samples/server/mtom/mtom.c Mon Mar 12 03:14:43 2007
@@ -63,10 +63,10 @@
if (AXIOM_NODE_GET_NODE_TYPE(file_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(file_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
axiom_node_t *image_node = NULL;
- axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
+ axis2_char_t *text_str = axiom_text_get_value(text, env);
printf("File Name %s \n", text_str);
image_node = AXIOM_NODE_GET_NEXT_SIBLING(file_name_node, env);
@@ -83,7 +83,7 @@
axiom_data_handler_t *data_handler = NULL;
axiom_text_t *bin_text = (axiom_text_t *)
AXIOM_NODE_GET_DATA_ELEMENT(binary_node, env);
- data_handler = AXIOM_TEXT_GET_DATA_HANDLER(bin_text, env);
+ data_handler = axiom_text_get_data_handler(bin_text, env);
if (data_handler)
{
AXIOM_DATA_HANDLER_SET_FILE_NAME(data_handler, env, text_str);
@@ -99,7 +99,7 @@
axis2_byte_t *plain_binary = NULL;
axiom_data_handler_t *data_handler = NULL;
- axis2_char_t *base64text = AXIOM_TEXT_GET_VALUE(bin_text, env);
+ axis2_char_t *base64text = axiom_text_get_value(bin_text, env);
printf("base64text = %s\n", base64text);
plain_binary_len = axis2_base64_decode_len(base64text);
plain_binary = AXIS2_MALLOC(env->
Modified: webservices/axis2/trunk/c/samples/server/notify/notify.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/notify/notify.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/notify/notify.c (original)
+++ webservices/axis2/trunk/c/samples/server/notify/notify.c Mon Mar 12 03:14:43 2007
@@ -46,9 +46,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- axis2_char_t *text_str = AXIOM_TEXT_GET_VALUE(text, env);
+ axis2_char_t *text_str = axiom_text_get_value(text, env);
printf("Notification received : %s \n", text_str);
}
}
Modified: webservices/axis2/trunk/c/samples/server/sg_math/add.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/add.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/add.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/add.c Mon Mar 12 03:14:43 2007
@@ -56,9 +56,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -87,9 +87,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
Modified: webservices/axis2/trunk/c/samples/server/sg_math/div.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/div.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/div.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/div.c Mon Mar 12 03:14:43 2007
@@ -55,9 +55,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -86,9 +86,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
Modified: webservices/axis2/trunk/c/samples/server/sg_math/mul.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/mul.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/mul.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/mul.c Mon Mar 12 03:14:43 2007
@@ -55,9 +55,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -86,9 +86,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
Modified: webservices/axis2/trunk/c/samples/server/sg_math/sub.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/server/sg_math/sub.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/samples/server/sg_math/sub.c (original)
+++ webservices/axis2/trunk/c/samples/server/sg_math/sub.c Mon Mar 12 03:14:43 2007
@@ -55,9 +55,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param1_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param1_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param1_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param1_str = axiom_text_get_value(text, env);
}
}
else
@@ -86,9 +86,9 @@
if (AXIOM_NODE_GET_NODE_TYPE(param2_text_node, env) == AXIOM_TEXT)
{
axiom_text_t *text = (axiom_text_t *)AXIOM_NODE_GET_DATA_ELEMENT(param2_text_node, env);
- if (text && AXIOM_TEXT_GET_VALUE(text , env))
+ if (text && axiom_text_get_value(text , env))
{
- param2_str = AXIOM_TEXT_GET_VALUE(text, env);
+ param2_str = axiom_text_get_value(text, env);
}
}
else
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Mon Mar 12 03:14:43 2007
@@ -3755,7 +3755,7 @@
axiom_text_t *text_node = NULL;
text_node = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- temp_str = AXIOM_TEXT_GET_VALUE(text_node, env);
+ temp_str = axiom_text_get_value(text_node, env);
text_value = AXIS2_STRTRIM(env, temp_str, NULL);
len = AXIS2_STRLEN(text_value);
if (len > 0)
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=517162&r1=517161&r2=517162
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Mon Mar 12 03:14:43 2007
@@ -3572,7 +3572,7 @@
axiom_text_t *text_node = NULL;
text_node = AXIOM_NODE_GET_DATA_ELEMENT(node, env);
- temp_str = AXIOM_TEXT_GET_VALUE(text_node, env);
+ temp_str = axiom_text_get_value(text_node, env);
text_value = AXIS2_STRTRIM(env, temp_str, NULL);
len = AXIS2_STRLEN(text_value);
if (len > 0)
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org