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 da...@apache.org on 2006/06/15 13:11:10 UTC
svn commit: r414557 [1/3] - in /webservices/axis2/trunk/c: axiom/include/
axiom/src/attachments/ axiom/src/om/ axiom/src/parser/guththila/
axiom/src/parser/libxml2/ axiom/src/soap/ axiom/test/om/ axiom/test/soap/
include/ modules/core/clientapi/ module...
Author: damitha
Date: Thu Jun 15 04:11:07 2006
New Revision: 414557
URL: http://svn.apache.org/viewvc?rev=414557&view=rev
Log:
axis2_xml_reader and axis2_xml_writer and axis2_data_handler are changed respectively into
axiom_reader axiom_writer and axiom_data_handler
Added:
webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h
- copied, changed from r414543, webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h
webservices/axis2/trunk/c/axiom/include/axiom_reader.h
- copied, changed from r414543, webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h
webservices/axis2/trunk/c/axiom/include/axiom_writer.h
- copied, changed from r414543, webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h
Removed:
webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h
webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h
webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h
Modified:
webservices/axis2/trunk/c/axiom/include/axiom.h
webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h
webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h
webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h
webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h
webservices/axis2/trunk/c/axiom/include/axiom_output.h
webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h
webservices/axis2/trunk/c/axiom/include/axiom_text.h
webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c
webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c
webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.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_output.c
webservices/axis2/trunk/c/axiom/src/om/om_stax_builder.c
webservices/axis2/trunk/c/axiom/src/om/om_text.c
webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_reader_wrapper.c
webservices/axis2/trunk/c/axiom/src/parser/guththila/guththila_xml_writer_wrapper.c
webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_reader_wrapper.c
webservices/axis2/trunk/c/axiom/src/parser/libxml2/libxml2_writer_wrapper.c
webservices/axis2/trunk/c/axiom/src/soap/soap11_builder_helper.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/axiom/test/soap/test_soap.c
webservices/axis2/trunk/c/include/axis2_stub.h
webservices/axis2/trunk/c/modules/core/clientapi/diclient/di_client.c
webservices/axis2/trunk/c/modules/core/clientapi/op_client.c
webservices/axis2/trunk/c/modules/core/deployment/axis2_desc_builder.h
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/deployment/svc_builder.c
webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/rest_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/soap_over_http_sender.c
webservices/axis2/trunk/c/modules/core/transport/http/server/apache2/mod_axis2.c
webservices/axis2/trunk/c/modules/core/transport/http/server/simple_axis2_server/http_server_main.c
webservices/axis2/trunk/c/samples/client/math/math_client.c
webservices/axis2/trunk/c/samples/client/mtom/mtom_client.c
webservices/axis2/trunk/c/samples/server/echo/echo.c
webservices/axis2/trunk/c/samples/server/mtom/mtom.c
webservices/axis2/trunk/c/util/include/axis2_error.h
webservices/axis2/trunk/c/util/src/error.c
webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
webservices/axis2/trunk/c/woden/src/builder/reader.c
webservices/axis2/trunk/c/woden/test/woden_test.c
webservices/axis2/trunk/c/xml_schema/include/xml_schema_collection.h
webservices/axis2/trunk/c/xml_schema/samples/test_schema.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_builder.c
webservices/axis2/trunk/c/xml_schema/src/xml_schema_collection.c
webservices/axis2/trunk/c/xml_schema/test/xml_schema_test.c
Modified: webservices/axis2/trunk/c/axiom/include/axiom.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom.h Thu Jun 15 04:11:07 2006
@@ -32,8 +32,8 @@
#include <axiom_processing_instruction.h>
#include <axiom_stax_builder.h>
#include <axiom_text.h>
-#include <axis2_xml_reader.h>
-#include <axis2_xml_writer.h>
+#include <axiom_reader.h>
+#include <axiom_writer.h>
/**
* @file axiom.h
Modified: webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_child_element_iterator.h Thu Jun 15 04:11:07 2006
@@ -35,7 +35,7 @@
typedef struct axiom_child_element_iterator axiom_child_element_iterator_t;
/**
- * @defgroup axis2_xml_writer
+ * @defgroup axiom_writer
* @ingroup axiom_parser
* @{
*/
Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_iterator.h Thu Jun 15 04:11:07 2006
@@ -35,7 +35,7 @@
typedef struct axiom_children_iterator axiom_children_iterator_t;
/**
- * @defgroup axis2_xml_writer
+ * @defgroup axiom_writer
* @ingroup axiom_parser
* @{
*/
Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_qname_iterator.h Thu Jun 15 04:11:07 2006
@@ -36,7 +36,7 @@
typedef struct axiom_children_qname_iterator axiom_children_qname_iterator_t;
/**
- * @defgroup axis2_xml_writer
+ * @defgroup axiom_writer
* @ingroup axiom_parser
* @{
*/
Modified: webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_children_with_specific_attribute_iterator.h Thu Jun 15 04:11:07 2006
@@ -39,7 +39,7 @@
axiom_children_with_specific_attribute_iterator_t;
/**
- * @defgroup axis2_xml_writer
+ * @defgroup axiom_writer
* @ingroup axiom_parser
* @{
*/
Copied: webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h (from r414543, webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h&r1=414543&r2=414557&rev=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_data_handler.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_data_handler.h Thu Jun 15 04:11:07 2006
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#ifndef AXIS2_DATA_HANDLER_H
-#define AXIS2_DATA_HANDLER_H
+#ifndef AXIOM_DATA_HANDLER_H
+#define AXIOM_DATA_HANDLER_H
/**
- * @file axis2_data_handler.h
+ * @file axiom_data_handler.h
* @brief axis2 data_handler interface
*/
@@ -40,8 +40,8 @@
/* This should be moved to header file later axis2_defines.h*/
#define axis2_byte_t char
-typedef struct axis2_data_handler_ops axis2_data_handler_ops_t;
-typedef struct axis2_data_handler axis2_data_handler_t;
+typedef struct axiom_data_handler_ops axiom_data_handler_ops_t;
+typedef struct axiom_data_handler axiom_data_handler_t;
/*
private final DataSource ds;
@@ -50,49 +50,49 @@
private DataContentHandler dch;
*/
-/** @defgroup axis2_data_handler Flow
- * @ingroup axis2_data_handler
+/** @defgroup axiom_data_handler Flow
+ * @ingroup axiom_data_handler
* @{
*/
/**
* @brief Flow ops struct
- * Encapsulator struct for ops of axis2_data_handler
+ * Encapsulator struct for ops of axiom_data_handler
*/
-struct axis2_data_handler_ops
+struct axiom_data_handler_ops
{
axis2_char_t *(AXIS2_CALL *
- get_content_type)(axis2_data_handler_t *data_handler,
+ get_content_type)(axiom_data_handler_t *data_handler,
const axis2_env_t *env);
axis2_byte_t* (AXIS2_CALL *
- get_input_stream)(axis2_data_handler_t *data_handler,
+ get_input_stream)(axiom_data_handler_t *data_handler,
const axis2_env_t *env);
axis2_status_t (AXIS2_CALL *
- read_from)(axis2_data_handler_t *data_handler,
+ read_from)(axiom_data_handler_t *data_handler,
const axis2_env_t *env,
axis2_byte_t** output_stream,
int *output_stream_size);
axis2_status_t (AXIS2_CALL *
- set_binary_data)(axis2_data_handler_t *data_handler,
+ set_binary_data)(axiom_data_handler_t *data_handler,
const axis2_env_t *env,
axis2_byte_t* input_stream,
int input_stream_len);
axis2_status_t (AXIS2_CALL *
- write_to)(axis2_data_handler_t *data_handler,
+ write_to)(axiom_data_handler_t *data_handler,
const axis2_env_t *env);
axis2_status_t ( AXIS2_CALL *
set_file_name )(
- axis2_data_handler_t *data_handler,
+ axiom_data_handler_t *data_handler,
const axis2_env_t *env,
axis2_char_t* file_name);
axis2_status_t (AXIS2_CALL *
- free) (axis2_data_handler_t *data_handler,
+ free) (axiom_data_handler_t *data_handler,
const axis2_env_t *env);
};
@@ -100,9 +100,9 @@
* @brief Flow struct
* Flow
*/
-struct axis2_data_handler
+struct axiom_data_handler
{
- axis2_data_handler_ops_t *ops;
+ axiom_data_handler_ops_t *ops;
/*
axis2_char_t type;
@@ -114,32 +114,32 @@
* Creates data_handler struct
* @return pointer to newly created data_handler
*/
-AXIS2_EXTERN axis2_data_handler_t * AXIS2_CALL
-axis2_data_handler_create (const axis2_env_t *env,
+AXIS2_EXTERN axiom_data_handler_t * AXIS2_CALL
+axiom_data_handler_create (const axis2_env_t *env,
const axis2_char_t *file_name,
const axis2_char_t *mime_type);
/*************************** Function macros **********************************/
-#define AXIS2_DATA_HANDLER_FREE(data_handler, env) \
+#define AXIOM_DATA_HANDLER_FREE(data_handler, env) \
((data_handler)->ops->free (data_handler, env))
-#define AXIS2_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env) \
+#define AXIOM_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env) \
((data_handler)->ops->get_content_type (data_handler, env))
-#define AXIS2_DATA_HANDLER_GET_INPUT_STREAM(data_handler, env) \
+#define AXIOM_DATA_HANDLER_GET_INPUT_STREAM(data_handler, env) \
((data_handler)->ops->get_input_stream (data_handler, env))
-#define AXIS2_DATA_HANDLER_READ_FROM(data_handler, env, output_stream, output_stream_size) \
+#define AXIOM_DATA_HANDLER_READ_FROM(data_handler, env, output_stream, output_stream_size) \
((data_handler)->ops->read_from (data_handler, env, output_stream, output_stream_size))
-#define AXIS2_DATA_HANDLER_SET_BINARY_DATA(data_handler, env, input_stream, input_stream_size) \
+#define AXIOM_DATA_HANDLER_SET_BINARY_DATA(data_handler, env, input_stream, input_stream_size) \
((data_handler)->ops->set_binary_data (data_handler, env, input_stream, input_stream_size))
-#define AXIS2_DATA_HANDLER_WRITE_TO(data_handler, env) \
+#define AXIOM_DATA_HANDLER_WRITE_TO(data_handler, env) \
((data_handler)->ops->write_to (data_handler, env))
-#define AXIS2_DATA_HANDLER_SET_FILE_NAME(data_handler, env, file_name) \
+#define AXIOM_DATA_HANDLER_SET_FILE_NAME(data_handler, env, file_name) \
((data_handler)->ops->set_file_name (data_handler, env, file_name))
/*************************** End of function macros ***************************/
@@ -149,4 +149,4 @@
#ifdef __cplusplus
}
#endif
-#endif /* AXIS2_DATA_HANDLER_H */
+#endif /* AXIOM_DATA_HANDLER_H */
Modified: webservices/axis2/trunk/c/axiom/include/axiom_output.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_output.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_output.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_output.h Thu Jun 15 04:11:07 2006
@@ -26,7 +26,7 @@
#include <axis2_utils.h>
#include <axis2_env.h>
#include <axiom_node.h>
-#include <axis2_xml_writer.h>
+#include <axiom_writer.h>
#ifdef __cplusplus
extern "C"
@@ -128,7 +128,7 @@
/**
* returns the xml writer
*/
- axis2_xml_writer_t* (AXIS2_CALL *
+ axiom_writer_t* (AXIS2_CALL *
get_xml_writer)(axiom_output_t *om_output,
const axis2_env_t *env); /**
* returns the content type
@@ -198,7 +198,7 @@
AXIS2_EXTERN axiom_output_t* AXIS2_CALL
axiom_output_create (const axis2_env_t *env,
- axis2_xml_writer_t *xml_writer);
+ axiom_writer_t *xml_writer);
/**
Copied: webservices/axis2/trunk/c/axiom/include/axiom_reader.h (from r414543, webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_reader.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_reader.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h&r1=414543&r2=414557&rev=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_reader.h Thu Jun 15 04:11:07 2006
@@ -15,11 +15,11 @@
*
*/
-#ifndef AXIS2_XML_READER_H
-#define AXIS2_XML_READER_H
+#ifndef AXIOM_READER_H
+#define AXIOM_READER_H
/**
- *@file axis2_xml_reader.h
+ *@file axiom_reader.h
*@brief this is the parser abstraction layer for axis2
*/
@@ -31,69 +31,69 @@
{
#endif
-typedef struct axis2_xml_reader_ops axis2_xml_reader_ops_t;
-typedef struct axis2_xml_reader axis2_xml_reader_t;
+typedef struct axiom_reader_ops axiom_reader_ops_t;
+typedef struct axiom_reader axiom_reader_t;
/**
- * @defgroup axis2_xml_reader
+ * @defgroup axiom_reader
* @ingroup axiom_parser
* @{
*/
-typedef enum axis2_xml_reader_event_types
+typedef enum axiom_reader_event_types
{
- AXIS2_XML_READER_START_DOCUMENT = 0,
- AXIS2_XML_READER_START_ELEMENT,
- AXIS2_XML_READER_END_ELEMENT,
- AXIS2_XML_READER_SPACE,
- AXIS2_XML_READER_EMPTY_ELEMENT,
- AXIS2_XML_READER_CHARACTER,
- AXIS2_XML_READER_ENTITY_REFERENCE,
- AXIS2_XML_READER_COMMENT,
- AXIS2_XML_READER_PROCESSING_INSTRUCTION,
- AXIS2_XML_READER_CDATA,
- AXIS2_XML_READER_DOCUMENT_TYPE
-}axis2_xml_reader_event_types;
+ AXIOM_READER_START_DOCUMENT = 0,
+ AXIOM_READER_START_ELEMENT,
+ AXIOM_READER_END_ELEMENT,
+ AXIOM_READER_SPACE,
+ AXIOM_READER_EMPTY_ELEMENT,
+ AXIOM_READER_CHARACTER,
+ AXIOM_READER_ENTITY_REFERENCE,
+ AXIOM_READER_COMMENT,
+ AXIOM_READER_PROCESSING_INSTRUCTION,
+ AXIOM_READER_CDATA,
+ AXIOM_READER_DOCUMENT_TYPE
+}axiom_reader_event_types;
/**
- * \brief AXIS2_XML_READER ops
- * Encapsulator struct for ops of axis2_xml_reader
+ * \brief AXIOM_READER ops
+ * Encapsulator struct for ops of axiom_reader
*/
-AXIS2_DECLARE_DATA struct axis2_xml_reader_ops
+AXIS2_DECLARE_DATA struct axiom_reader_ops
{
/**
* causes the reader to read the next parse event.
* returns the event just read
- * @param parser axis2_xml_reader struct
+ * @param parser axiom_reader struct
* @param env axis2_environment, MUST NOT be NULL
* @returns one of the events defined in
- * axis2_xml_reader_event_types
+ * axiom_reader_event_types
*/
int (AXIS2_CALL *
- next)(axis2_xml_reader_t *parser,
+ next)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* free pull_parser
- * @param parser axis2_xml_reader struct
+ * @param parser axiom_reader struct
* @param env axis2_environment MUST NOT be NULL
* @returns axis2_status_code
*/
axis2_status_t (AXIS2_CALL *
- free)(axis2_xml_reader_t *parser,
+ free)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* Get the Number of attributes in the current element
- * @param parser axis2_xml_reader
+ * @param parser axiom_reader
* @param env axis2_environment, MUST NOT be NULL.
* @returns Number of attributes , AXIS2_FAILURE on error
*/
int (AXIS2_CALL *
- get_attribute_count)(axis2_xml_reader_t *parser,
+ get_attribute_count)(axiom_reader_t *parser,
const axis2_env_t *env);
@@ -104,10 +104,10 @@
* @param env environment struct
* @param i attribute index
* @returns the attribute localname
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_attribute_name_by_number)(axis2_xml_reader_t *parser,
+ get_attribute_name_by_number)(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
@@ -118,11 +118,11 @@
* @param env environment, MUST NOT be NULL
* @param i attribute index.
* @returns the attribute prefix, returns NULL on error,
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_attribute_prefix_by_number)(axis2_xml_reader_t *parser,
+ get_attribute_prefix_by_number)(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
@@ -133,11 +133,11 @@
* @param env environment, MUST NOT be NULL.
* @param i attribute index
* @returns the attribute value, returns NULL on error,
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_attribute_value_by_number)(axis2_xml_reader_t *parser,
+ get_attribute_value_by_number)(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
@@ -148,11 +148,11 @@
* @param env environment struct
* @param i attribute index
* @returns the attribute value, returns NULL on error
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_attribute_namespace_by_number)(axis2_xml_reader_t *parser,
+ get_attribute_namespace_by_number)(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
@@ -160,11 +160,11 @@
* @param parser pointer to parser
* @param env environment, MUST not be NULL
* @returns Text Value, NULL on error
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_value)(axis2_xml_reader_t *parser,
+ get_value)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
@@ -174,7 +174,7 @@
* @returns namespace count of current element,
*/
int (AXIS2_CALL *
- get_namespace_count)(axis2_xml_reader_t *parser,
+ get_namespace_count)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* access the namespace uri of the namespaces declared in current element
@@ -183,10 +183,10 @@
* @param env environment
* @param i index
* @returns namespace uri of corresponding namespace
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_namespace_uri_by_number)(axis2_xml_reader_t *parser,
+ get_namespace_uri_by_number)(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
/**
@@ -196,10 +196,10 @@
* @param env environment
* @param i index
* @returns namespace prefix of corresponding namespace
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_namespace_prefix_by_number)(axis2_xml_reader_t *parser,
+ get_namespace_prefix_by_number)(axiom_reader_t *parser,
const axis2_env_t *env,
int i);
/**
@@ -207,46 +207,46 @@
* @param parser parser struct
* @param env environment struct
* @returns prefix , NULL on error
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_prefix)(axis2_xml_reader_t *parser,
+ get_prefix)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* Used to obtain the current element localname
* @param parser parser struct
* @param env environment struct
* @returns localname , NULL on error
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_name)(axis2_xml_reader_t *parser,
+ get_name)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* Used to get the processingInstruction target
* @param parser parser struct
* @param env environment, MUST NOT be NULL.
* @returns target value of processingInstruction
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_pi_target)(axis2_xml_reader_t *parser,
+ get_pi_target)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* gets the processingInstruction data
*@param parser parser struct
*@param env environment, MUST NOT be NULL.
*@returns data of processingInstruction
- * caller must free the value using AXIS2_XML_READER_XML_FREE macro
+ * caller must free the value using AXIOM_READER_XML_FREE macro
*/
axis2_char_t* (AXIS2_CALL *
- get_pi_data)(axis2_xml_reader_t *parser,
+ get_pi_data)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* used to get the DTD
@@ -256,20 +256,20 @@
* exists.
*/
axis2_char_t* (AXIS2_CALL *
- get_dtd)(axis2_xml_reader_t *parser,
+ get_dtd)(axiom_reader_t *parser,
const axis2_env_t *env);
/**
* Free function , this function wraps the underlying parser's
* xml free function. For freeing values obatined by calling
* pull parser api methods, This function must be used.
- * @param parser pointer to axis2_xml_reader
+ * @param parser pointer to axiom_reader
* @param env environment, MUST NOT be NULL.
* @param data data values to be destroyed
* @return status of the op, AXIS2_SUCCESS on success,
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- xml_free)(axis2_xml_reader_t *parser,
+ xml_free)(axiom_reader_t *parser,
const axis2_env_t *env,
void *data);
@@ -281,15 +281,15 @@
*/
axis2_char_t* (AXIS2_CALL *
- get_char_set_encoding)(axis2_xml_reader_t *parser,
+ get_char_set_encoding)(axiom_reader_t *parser,
const axis2_env_t *env);
/** returns the namespace uri associated with current node */
axis2_char_t* (AXIS2_CALL *
- get_namespace_uri)(axis2_xml_reader_t *parser,
+ get_namespace_uri)(axiom_reader_t *parser,
const axis2_env_t *env);
axis2_char_t* (AXIS2_CALL *
- get_namespace_uri_by_prefix)(axis2_xml_reader_t *parser,
+ get_namespace_uri_by_prefix)(axiom_reader_t *parser,
const axis2_env_t *env,
axis2_char_t *prefix);
@@ -297,16 +297,16 @@
};
/**
- * @brief axis2_xml_reader struct
+ * @brief axiom_reader struct
* Axis2 OM pull_parser
*/
-struct axis2_xml_reader
+struct axiom_reader
{
- axis2_xml_reader_ops_t *ops;
+ axiom_reader_ops_t *ops;
};
/**
- * create an instance of axis2_xml_reader to parse
+ * create an instance of axiom_reader to parse
* a file using an xml document in a file system
* @param env environment struct, must not be null
* @param filename url of an xml document
@@ -314,12 +314,12 @@
* NULL on error with error code set in the environment's error
*/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_file(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_file(const axis2_env_t *env,
char *filename,
const axis2_char_t *encoding);
/**
- * This create an instance of axis2_xml_reader to
+ * This create an instance of axiom_reader to
* parse a xml document in a buffer. It takes a callback
* function that takes a buffer and the size of the buffer
* The user must implement a function that takes in buffer
@@ -334,23 +334,23 @@
* @param encoding encoding scheme of the xml stream
*/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_io(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_io(const axis2_env_t *env,
AXIS2_READ_INPUT_CALLBACK,
AXIS2_CLOSE_INPUT_CALLBACK,
void *ctx,
const axis2_char_t *encoding);
/**
- * create an axis2_xml_reader_t using a buffer, which is the xml input
+ * create an axiom_reader_t using a buffer, which is the xml input
* @param env environment, MUST not be NULL
* @param buffer xml input string in a char buffer
* @param size size of the @buffer
* @param encoding encoding of the xml
- * @return pointer to axis2_xml_reader_t struct on success , NULL otherwise
+ * @return pointer to axiom_reader_t struct on success , NULL otherwise
*/
-AXIS2_EXTERN axis2_xml_reader_t * AXIS2_CALL
-axis2_xml_reader_create_for_memory(const axis2_env_t *env,
+AXIS2_EXTERN axiom_reader_t * AXIS2_CALL
+axiom_reader_create_for_memory(const axis2_env_t *env,
void *container,
int size,
const axis2_char_t *encoding,
@@ -361,13 +361,13 @@
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_reader_init();
+axiom_reader_init();
/**
* parser cleanup function
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_xml_reader_cleanup();
+axiom_reader_cleanup();
/********************************* Macros *************************************/
@@ -376,64 +376,64 @@
/** causes the reader to read the next parse event.
returns an integer which identifies the type of event just read. */
-#define AXIS2_XML_READER_NEXT(parser, env) \
+#define AXIOM_READER_NEXT(parser, env) \
((parser)->ops->next(parser, env))
/** Free pull parser struct */
-#define AXIS2_XML_READER_FREE(parser, env) \
+#define AXIOM_READER_FREE(parser, env) \
((parser)->ops->free(parser, env))
/** Get the Number of attributes in an element */
-#define AXIS2_XML_READER_GET_ATTRIBUTE_COUNT(parser, env) \
+#define AXIOM_READER_GET_ATTRIBUTE_COUNT(parser, env) \
((parser)->ops->get_attribute_count(parser, env))
/** Get the localname of the attribute corresponding to index i */
-#define AXIS2_XML_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(parser, env, i) \
+#define AXIOM_READER_GET_ATTRIBUTE_NAME_BY_NUMBER(parser, env, i) \
((parser)->ops->get_attribute_name_by_number(parser, env, i))
/** Get value of attribute corresponding to index i */
-#define AXIS2_XML_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(parser, env, i) \
+#define AXIOM_READER_GET_ATTRIBUTE_VALUE_BY_NUMBER(parser, env, i) \
((parser)->ops->get_attribute_value_by_number(parser,env, i))
/** Get namespace uri of attribute corresponding to index i */
-#define AXIS2_XML_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(parser, env, i) \
+#define AXIOM_READER_GET_ATTRIBUTE_NAMESPACE_BY_NUMBER(parser, env, i) \
((parser)->ops->get_attribute_namespace_by_number(parser, env, i))
/** get prefix of attribute corresponding to index i */
-#define AXIS2_XML_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(parser, env, i) \
+#define AXIOM_READER_GET_ATTRIBUTE_PREFIX_BY_NUMBER(parser, env, i) \
((parser)->ops->get_attribute_prefix_by_number(parser, env, i))
/** get the localname of element */
-#define AXIS2_XML_READER_GET_NAME(parser, env) \
+#define AXIOM_READER_GET_NAME(parser, env) \
((parser)->ops->get_name(parser, env))
/** get value of element */
-#define AXIS2_XML_READER_GET_VALUE(parser, env) \
+#define AXIOM_READER_GET_VALUE(parser, env) \
((parser)->ops->get_value(parser, env))
/** get prefix of element */
-#define AXIS2_XML_READER_GET_PREFIX(parser, env) \
+#define AXIOM_READER_GET_PREFIX(parser, env) \
((parser)->ops->get_prefix(parser, env))
/** get the number of namespaces declared in an element */
-#define AXIS2_XML_READER_GET_NAMESPACE_COUNT(parser, env) \
+#define AXIOM_READER_GET_NAMESPACE_COUNT(parser, env) \
((parser)->ops->get_namespace_count(parser, env))
/** get the elements namespace uri corresponding to index i */
-#define AXIS2_XML_READER_GET_NAMESPACE_URI_BY_NUMBER(parser, env, i) \
+#define AXIOM_READER_GET_NAMESPACE_URI_BY_NUMBER(parser, env, i) \
((parser)->ops->get_namespace_uri_by_number(parser, env, i))
/** get the elements namespace prefix corresponding to index i */
-#define AXIS2_XML_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(parser, env, i) \
+#define AXIOM_READER_GET_NAMESPACE_PREFIX_BY_NUMBER(parser, env, i) \
((parser)->ops->get_namespace_prefix_by_number(parser, env, i))
/** get processing instruction data */
-#define AXIS2_XML_READER_GET_PI_DATA(parser, env) \
+#define AXIOM_READER_GET_PI_DATA(parser, env) \
((parser)->ops->get_pi_data(parser, env))
/** get processing instruction target */
-#define AXIS2_XML_READER_GET_PI_TARGET(parser, env) \
+#define AXIOM_READER_GET_PI_TARGET(parser, env) \
((parser)->ops->get_pi_target(parser, env))
/** get document type declaration text */
-#define AXIS2_XML_READER_GET_DTD(parser, env) \
+#define AXIOM_READER_GET_DTD(parser, env) \
((parser)->ops->get_dtd(parser, env))
/** macro to free values returned by pull parser */
-#define AXIS2_XML_READER_XML_FREE(parser, env, data) \
+#define AXIOM_READER_XML_FREE(parser, env, data) \
((parser)->ops->xml_free(parser, env, data))
-#define AXIS2_XML_READER_GET_CHAR_SET_ENCODING(parser, env) \
+#define AXIOM_READER_GET_CHAR_SET_ENCODING(parser, env) \
((parser)->ops->get_char_set_encoding(parser, env))
-#define AXIS2_XML_READER_GET_NAMESPACE_URI(parser, env) \
+#define AXIOM_READER_GET_NAMESPACE_URI(parser, env) \
((parser)->ops->get_namespace_uri(parser, env))
-#define AXIS2_XML_READER_GET_NAMESPACE_URI_BY_PREFIX(parser, env, prefix) \
+#define AXIOM_READER_GET_NAMESPACE_URI_BY_PREFIX(parser, env, prefix) \
((parser)->ops->get_namespace_uri_by_prefix(parser, env, prefix))
/******************************* End Macros ***********************************/
@@ -444,4 +444,4 @@
}
#endif
-#endif /* AXIS2_XML_READER_H */
+#endif /* AXIOM_READER_H */
Modified: webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_stax_builder.h Thu Jun 15 04:11:07 2006
@@ -23,7 +23,7 @@
*/
#include <axiom_node.h>
-#include <axis2_xml_reader.h>
+#include <axiom_reader.h>
#include <axiom_document.h>
#include <axis2_env.h>
@@ -126,7 +126,7 @@
*/
AXIS2_EXTERN axiom_stax_builder_t * AXIS2_CALL
axiom_stax_builder_create(const axis2_env_t *env,
- axis2_xml_reader_t *parser);
+ axiom_reader_t *parser);
/** builds next node */
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?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axiom_text.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_text.h Thu Jun 15 04:11:07 2006
@@ -25,7 +25,7 @@
#include <axis2_env.h>
#include <axiom_node.h>
#include <axiom_output.h>
-#include <axis2_data_handler.h>
+#include <axiom_data_handler.h>
#ifdef __cplusplus
extern "C"
@@ -114,7 +114,7 @@
const axis2_env_t *env,
axis2_bool_t is_binary);
- axis2_data_handler_t* (AXIS2_CALL *
+ axiom_data_handler_t* (AXIS2_CALL *
get_data_handler)(struct axiom_text *om_text,
const axis2_env_t *env);
@@ -167,7 +167,7 @@
AXIS2_EXTERN axiom_text_t* AXIS2_CALL
axiom_text_create_with_data_handler (const axis2_env_t *env,
axiom_node_t * parent,
- axis2_data_handler_t* data_handler,
+ axiom_data_handler_t* data_handler,
axiom_node_t **node);
/** frees given text */
Copied: webservices/axis2/trunk/c/axiom/include/axiom_writer.h (from r414543, webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/include/axiom_writer.h?p2=webservices/axis2/trunk/c/axiom/include/axiom_writer.h&p1=webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h&r1=414543&r2=414557&rev=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/include/axis2_xml_writer.h (original)
+++ webservices/axis2/trunk/c/axiom/include/axiom_writer.h Thu Jun 15 04:11:07 2006
@@ -15,11 +15,11 @@
*
*/
-#ifndef AXIS2_XML_WRITER_H
-#define AXIS2_XML_WRITER_H
+#ifndef AXIOM_WRITER_H
+#define AXIOM_WRITER_H
/**
- *@file axis2_xml_writer.h
+ *@file axiom_writer.h
*@brief this is the parser abstraction layer for axis2
*/
@@ -30,11 +30,11 @@
{
#endif
-typedef struct axis2_xml_writer_ops axis2_xml_writer_ops_t;
-typedef struct axis2_xml_writer axis2_xml_writer_t;
+typedef struct axiom_writer_ops axiom_writer_ops_t;
+typedef struct axiom_writer axiom_writer_t;
/**
- * @defgroup axis2_xml_writer
+ * @defgroup axiom_writer
* @ingroup axiom_parser
* @{
*/
@@ -42,11 +42,11 @@
/**
- * \brief axis2_xml_writer ops
- * Encapsulator struct for ops of axis2_xml_writer
+ * \brief axiom_writer ops
+ * Encapsulator struct for ops of axiom_writer
*/
- AXIS2_DECLARE_DATA struct axis2_xml_writer_ops
+ AXIS2_DECLARE_DATA struct axiom_writer_ops
{
/**
* Free xml writer
@@ -57,7 +57,7 @@
*/
axis2_status_t (AXIS2_CALL *
- free)(axis2_xml_writer_t *writer,
+ free)(axiom_writer_t *writer,
const axis2_env_t *env);
/**
* Write a start tag to output stream with localname.
@@ -69,7 +69,7 @@
AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_start_element)(axis2_xml_writer_t *writer,
+ write_start_element)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname);
/**
@@ -82,7 +82,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- end_start_element)(axis2_xml_writer_t *writer,
+ end_start_element)(axiom_writer_t *writer,
const axis2_env_t *env);
/**
* Write an element tag with localname and namespace uri
@@ -95,7 +95,7 @@
* AXIS2_FAILURE on error
*/
axis2_status_t (AXIS2_CALL *
- write_start_element_with_namespace)(axis2_xml_writer_t *writer,
+ write_start_element_with_namespace)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri);
@@ -111,7 +111,7 @@
AXIS2_SUCCESS on success. AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_start_element_with_namespace_prefix)(axis2_xml_writer_t *writer,
+ write_start_element_with_namespace_prefix)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri,
@@ -125,7 +125,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_empty_element)(axis2_xml_writer_t *writer,
+ write_empty_element)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname);
/**
@@ -139,7 +139,7 @@
*/
axis2_status_t (AXIS2_CALL *
- write_empty_element_with_namespace)(axis2_xml_writer_t *writer,
+ write_empty_element_with_namespace)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri);
@@ -154,7 +154,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_empty_element_with_namespace_prefix)(axis2_xml_writer_t *writer,
+ write_empty_element_with_namespace_prefix)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *namespace_uri,
@@ -167,7 +167,7 @@
* AXIS2_FAILURE on failure
*/
axis2_status_t (AXIS2_CALL *
- write_end_element)(axis2_xml_writer_t *writer,
+ write_end_element)(axiom_writer_t *writer,
const axis2_env_t *env);
/**
* write end document
@@ -177,7 +177,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_end_document)(axis2_xml_writer_t *writer,
+ write_end_document)(axiom_writer_t *writer,
const axis2_env_t *env);
/**
* write attribute with localname and value
@@ -189,7 +189,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_attribute)(axis2_xml_writer_t *writer,
+ write_attribute)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value);
@@ -203,7 +203,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_attribute_with_namespace)(axis2_xml_writer_t *writer,
+ write_attribute_with_namespace)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value,
@@ -217,7 +217,7 @@
* @param prefix prefix
*/
axis2_status_t (AXIS2_CALL *
- write_attribute_with_namespace_prefix)(axis2_xml_writer_t *writer,
+ write_attribute_with_namespace_prefix)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *localname,
axis2_char_t *value,
@@ -233,7 +233,7 @@
*/
axis2_status_t (AXIS2_CALL *
- write_namespace)(axis2_xml_writer_t *writer,
+ write_namespace)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *namespace_uri);
@@ -246,7 +246,7 @@
*/
axis2_status_t (AXIS2_CALL *
- write_default_namespace)(axis2_xml_writer_t *writer,
+ write_default_namespace)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *namespace_uri);
/**
@@ -259,7 +259,7 @@
axis2_status_t (AXIS2_CALL *
- write_comment)(axis2_xml_writer_t *writer,
+ write_comment)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *value);
/**
@@ -272,7 +272,7 @@
axis2_status_t (AXIS2_CALL *
- write_processing_instruction)(axis2_xml_writer_t *writer,
+ write_processing_instruction)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *target);
@@ -286,7 +286,7 @@
*/
axis2_status_t (AXIS2_CALL *
- write_processing_instruction_data)(axis2_xml_writer_t *writer,
+ write_processing_instruction_data)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *target,
axis2_char_t *data);
@@ -299,7 +299,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_cdata)(axis2_xml_writer_t *writer,
+ write_cdata)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *data);
@@ -312,7 +312,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_dtd)(axis2_xml_writer_t *writer,
+ write_dtd)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *dtd);
@@ -325,7 +325,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_entity_ref)(axis2_xml_writer_t *writer,
+ write_entity_ref)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *name);
@@ -336,7 +336,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_start_document)(axis2_xml_writer_t *writer,
+ write_start_document)(axiom_writer_t *writer,
const axis2_env_t *env);
@@ -348,7 +348,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_start_document_with_version)(axis2_xml_writer_t *writer,
+ write_start_document_with_version)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *version);
@@ -361,7 +361,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_start_document_with_version_encoding)(axis2_xml_writer_t *writer,
+ write_start_document_with_version_encoding)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *version,
axis2_char_t *encoding);
@@ -374,7 +374,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_characters)(axis2_xml_writer_t *writer,
+ write_characters)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text);
@@ -386,7 +386,7 @@
* AXIS2_FAILURE on error.
*/
axis2_char_t* (AXIS2_CALL *
- get_prefix)(axis2_xml_writer_t *writer,
+ get_prefix)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri);
@@ -399,7 +399,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- set_prefix)(axis2_xml_writer_t *writer,
+ set_prefix)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *prefix,
axis2_char_t *uri);
@@ -412,7 +412,7 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- set_default_prefix)(axis2_xml_writer_t *writer,
+ set_default_prefix)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *uri);
@@ -425,17 +425,17 @@
* AXIS2_FAILURE on error.
*/
axis2_status_t (AXIS2_CALL *
- write_encoded)(axis2_xml_writer_t *writer,
+ write_encoded)(axiom_writer_t *writer,
const axis2_env_t *env,
axis2_char_t *text,
int in_attr);
void* (AXIS2_CALL *
- get_xml)(axis2_xml_writer_t *writer,
+ get_xml)(axiom_writer_t *writer,
const axis2_env_t *env);
int (AXIS2_CALL *
- get_type)(axis2_xml_writer_t *writer,
+ get_type)(axiom_writer_t *writer,
const axis2_env_t *env);
};
@@ -444,24 +444,24 @@
* Axis2 OM pull_parser
*/
-struct axis2_xml_writer
+struct axiom_writer
{
- axis2_xml_writer_ops_t *ops;
+ axiom_writer_ops_t *ops;
};
/**
- * create function for axis2_xml_writer
+ * create function for axiom_writer
*
*/
-AXIS2_EXTERN axis2_xml_writer_t * AXIS2_CALL
-axis2_xml_writer_create(const axis2_env_t *env,
+AXIS2_EXTERN axiom_writer_t * AXIS2_CALL
+axiom_writer_create(const axis2_env_t *env,
axis2_char_t *filename,
axis2_char_t *encoding,
int is_prefix_default,
int compression);
-AXIS2_EXTERN axis2_xml_writer_t * AXIS2_CALL
-axis2_xml_writer_create_for_memory(const axis2_env_t *env,
+AXIS2_EXTERN axiom_writer_t * AXIS2_CALL
+axiom_writer_create_for_memory(const axis2_env_t *env,
axis2_char_t *encoding,
int is_prefix_default,
int compression,
@@ -469,113 +469,113 @@
/********************** start macros *******************************************/
-#define AXIS2_XML_WRITER_FREE(writer, env) \
+#define AXIOM_WRITER_FREE(writer, env) \
((writer)->ops->free(writer,env))
-#define AXIS2_XML_WRITER_WRITE_START_ELEMENT(writer, env, localname) \
+#define AXIOM_WRITER_WRITE_START_ELEMENT(writer, env, localname) \
((writer)->ops->write_start_element(writer, env, localname))
-#define AXIS2_XML_WRITER_END_START_ELEMENT(writer, env) \
+#define AXIOM_WRITER_END_START_ELEMENT(writer, env) \
((writer)->ops->end_start_element(writer,env))
-#define AXIS2_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(\
+#define AXIOM_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(\
writer, env, localname, namespace_uri)\
((writer)->ops->write_start_element_with_namespace(\
writer, env, localname, namespace_uri))
-#define AXIS2_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE_PREFIX(\
+#define AXIOM_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE_PREFIX(\
writer, env, localname, namespace_uri, prefix) \
((writer)->ops->write_start_element_with_namespace_prefix(\
writer,env,localname,namespace_uri,prefix))
-#define AXIS2_XML_WRITER_WRITE_EMPTY_ELEMENT(writer,env,localname) \
+#define AXIOM_WRITER_WRITE_EMPTY_ELEMENT(writer,env,localname) \
((writer)->ops->write_empty_element(writer,env,localname))
-#define AXIS2_XML_WRITER_WRITE_EMPTY_ELEMENT_WITH_NAMESPACE(\
+#define AXIOM_WRITER_WRITE_EMPTY_ELEMENT_WITH_NAMESPACE(\
writer, env,localname,namespace_uri) \
((writer)->ops->write_empty_element_with_namespace(writer,env,localname,namespace_uri))
-#define AXIS2_XML_WRITER_WRITE_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX(\
+#define AXIOM_WRITER_WRITE_EMPTY_ELEMENT_WITH_NAMESPACE_PREFIX(\
writer, env, localname, namespace_uri, prefix) \
((writer)->ops->write_empty_element_with_namespace_prefix(\
writer,env,localname,namespace_uri, prefix))
-#define AXIS2_XML_WRITER_WRITE_END_ELEMENT(writer, env) \
+#define AXIOM_WRITER_WRITE_END_ELEMENT(writer, env) \
((writer)->ops->write_end_element(writer,env))
-#define AXIS2_XML_WRITER_WRITE_END_DOCUMENT(writer, env) \
+#define AXIOM_WRITER_WRITE_END_DOCUMENT(writer, env) \
((writer)->ops->write_end_document(writer,env))
-#define AXIS2_XML_WRITER_WRITE_ATTRIBUTE(writer, env, localname, value) \
+#define AXIOM_WRITER_WRITE_ATTRIBUTE(writer, env, localname, value) \
((writer)->ops->write_attribute(writer,env, localname, value))
-#define AXIS2_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(\
+#define AXIOM_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(\
writer, env, localname, value, namespace_uri) \
((writer)->ops->write_attribute_with_namespace(\
writer,env, localname, value,namespace_uri))
-#define AXIS2_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE_PREFIX(\
+#define AXIOM_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE_PREFIX(\
writer, env, localname, value, namespace_uri, prefix) \
((writer)->ops->write_attribute_with_namespace_prefix(\
writer,env, localname, value,namespace_uri, prefix))
-#define AXIS2_XML_WRITER_WRITE_NAMESPACE(writer, env, prefix , namespace_uri) \
+#define AXIOM_WRITER_WRITE_NAMESPACE(writer, env, prefix , namespace_uri) \
((writer)->ops->write_namespace(writer, env, prefix, namespace_uri))
-#define AXIS2_XML_WRITER_WRITE_DEFAULT_NAMESPACE(writer, env, namespace_uri) \
+#define AXIOM_WRITER_WRITE_DEFAULT_NAMESPACE(writer, env, namespace_uri) \
((writer)->ops->write_default_namespace(writer, env, namespace_uri))
-#define AXIS2_XML_WRITER_WRITE_COMMENT(writer, env, value) \
+#define AXIOM_WRITER_WRITE_COMMENT(writer, env, value) \
((writer)->ops->write_comment(writer, env, value))
-#define AXIS2_XML_WRITER_WRITE_PROCESSING_INSTRUCTION(writer, env, target) \
+#define AXIOM_WRITER_WRITE_PROCESSING_INSTRUCTION(writer, env, target) \
((writer)->ops->write_processing_instruction(writer, env, target))
-#define AXIS2_XML_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(writer, env, target, data) \
+#define AXIOM_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(writer, env, target, data) \
((writer)->ops->write_processing_instruction_data(writer, env, target, data))
-#define AXIS2_XML_WRITER_WRITE_CDATA(writer, env, data) \
+#define AXIOM_WRITER_WRITE_CDATA(writer, env, data) \
((writer)->ops->write_cdata(writer, env, data))
-#define AXIS2_XML_WRITER_WRITE_DTD(writer, env, dtd) \
+#define AXIOM_WRITER_WRITE_DTD(writer, env, dtd) \
((writer)->ops->write_cdata(writer, env, dtd))
-#define AXIS2_XML_WRITER_WRITE_ENTITY_REF(writer, env, entity_ref) \
+#define AXIOM_WRITER_WRITE_ENTITY_REF(writer, env, entity_ref) \
((writer)->ops->write_entity_ref(writer, env, entity_ref))
-#define AXIS2_XML_WRITER_WRITE_START_DOCUMENT(writer, env) \
+#define AXIOM_WRITER_WRITE_START_DOCUMENT(writer, env) \
((writer)->ops->write_start_document(writer,env))
-#define AXIS2_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION(writer, env, version) \
+#define AXIOM_WRITER_WRITE_START_DOCUMENT_WITH_VERSION(writer, env, version) \
((writer)->ops->write_start_document_with_version(writer, env, version))
-#define AXIS2_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(\
+#define AXIOM_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(\
writer, env, version, encoding) \
((writer)->ops->write_start_document_with_version_encoding(\
writer, env, version, encoding))
-#define AXIS2_XML_WRITER_WRITE_CHARACTERS(writer, env, text) \
+#define AXIOM_WRITER_WRITE_CHARACTERS(writer, env, text) \
((writer)->ops->write_characters(writer, env, text))
-#define AXIS2_XML_WRITER_GET_PREFIX(writer, env, uri) \
+#define AXIOM_WRITER_GET_PREFIX(writer, env, uri) \
((writer)->ops->get_prefix(writer, env, uri))
-#define AXIS2_XML_WRITER_SET_PREFIX(writer, env, prefix, uri) \
+#define AXIOM_WRITER_SET_PREFIX(writer, env, prefix, uri) \
((writer)->ops->set_prefix(writer, env, prefix, uri))
-#define AXIS2_XML_WRITER_SET_DEFAULT_PREFIX(writer, env, uri) \
+#define AXIOM_WRITER_SET_DEFAULT_PREFIX(writer, env, uri) \
((writer)->ops->set_default_prefix(writer, env, uri))
-#define AXIS2_XML_WRITER_WRITE_ENCODED(writer, env, text, in_attr) \
+#define AXIOM_WRITER_WRITE_ENCODED(writer, env, text, in_attr) \
((writer)->ops->write_encoded(writer, env, text, in_attr))
-#define AXIS2_XML_WRITER_GET_XML(writer, env) \
+#define AXIOM_WRITER_GET_XML(writer, env) \
((writer)->ops->get_xml(writer, env))
-#define AXIS2_XML_WRITER_GET_TYPE(writer, env) \
+#define AXIOM_WRITER_GET_TYPE(writer, env) \
((writer)->ops->get_type(writer, env))
/** @} */
@@ -585,4 +585,4 @@
}
#endif
-#endif /* AXIS2_XML_WRITER_H */
+#endif /* AXIOM_WRITER_H */
Modified: webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/axiom_mime_body_part.h Thu Jun 15 04:11:07 2006
@@ -29,7 +29,7 @@
#include <axis2_allocator.h>
#include <axis2_string.h>
#include <axis2_array_list.h>
-#include <axis2_data_handler.h>
+#include <axiom_data_handler.h>
#ifdef __cplusplus
extern "C"
@@ -60,7 +60,7 @@
axis2_status_t (AXIS2_CALL *
set_data_handler)(axiom_mime_body_part_t *mime_body_part,
const axis2_env_t *env,
- axis2_data_handler_t *data_handler);
+ axiom_data_handler_t *data_handler);
axis2_status_t (AXIS2_CALL *
write_to)(axiom_mime_body_part_t *mime_body_part,
Modified: webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/data_handler.c Thu Jun 15 04:11:07 2006
@@ -14,61 +14,61 @@
* limitations under the License.
*/
-#include <axis2_data_handler.h>
+#include <axiom_data_handler.h>
#include <stdio.h>
#include <sys/stat.h>
-typedef struct axis2_data_handler_impl
+typedef struct axiom_data_handler_impl
{
- axis2_data_handler_t data_handler;
+ axiom_data_handler_t data_handler;
axis2_char_t* mime_type;
axis2_char_t* file_name;
axis2_byte_t* buffer;
int buffer_len;
-} axis2_data_handler_impl_t;
+} axiom_data_handler_impl_t;
-#define AXIS2_INTF_TO_IMPL(data_handler) ((axis2_data_handler_impl_t *)(data_handler))
+#define AXIS2_INTF_TO_IMPL(data_handler) ((axiom_data_handler_impl_t *)(data_handler))
/***************************** Function headers *******************************/
axis2_status_t AXIS2_CALL
-axis2_data_handler_free (axis2_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_free (axiom_data_handler_t *data_handler, const axis2_env_t *env);
axis2_char_t * AXIS2_CALL
-axis2_data_handler_get_content_type (axis2_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_get_content_type (axiom_data_handler_t *data_handler, const axis2_env_t *env);
axis2_byte_t * AXIS2_CALL
-axis2_data_handler_get_input_stream (axis2_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_get_input_stream (axiom_data_handler_t *data_handler, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_data_handler_read_from(axis2_data_handler_t *data_handler, const axis2_env_t *env,
+axiom_data_handler_read_from(axiom_data_handler_t *data_handler, const axis2_env_t *env,
axis2_byte_t** output_stream, int *output_stream_size);
axis2_status_t AXIS2_CALL
-axis2_data_handler_set_binary_data(axis2_data_handler_t *data_handler, const axis2_env_t *env,
+axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler, const axis2_env_t *env,
axis2_byte_t* input_stream, int input_stream_len);
axis2_status_t AXIS2_CALL
-axis2_data_handler_write_to(axis2_data_handler_t *data_handler, const axis2_env_t *env);
+axiom_data_handler_write_to(axiom_data_handler_t *data_handler, const axis2_env_t *env);
axis2_status_t AXIS2_CALL
-axis2_data_handler_set_file_name(axis2_data_handler_t *data_handler, const axis2_env_t *env,
+axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler, const axis2_env_t *env,
axis2_char_t* file_name);
/************************** End of Function headers ************************/
-AXIS2_EXTERN axis2_data_handler_t * AXIS2_CALL
-axis2_data_handler_create (const axis2_env_t *env,
+AXIS2_EXTERN axiom_data_handler_t * AXIS2_CALL
+axiom_data_handler_create (const axis2_env_t *env,
const axis2_char_t *file_name,
const axis2_char_t *mime_type)
{
- axis2_data_handler_impl_t *data_handler_impl = NULL;
+ axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
- data_handler_impl = (axis2_data_handler_impl_t *) AXIS2_MALLOC(env->allocator,
- sizeof(axis2_data_handler_impl_t));
+ data_handler_impl = (axiom_data_handler_impl_t *) AXIS2_MALLOC(env->allocator,
+ sizeof(axiom_data_handler_impl_t));
if(NULL == data_handler_impl)
{
@@ -87,7 +87,7 @@
data_handler_impl->mime_type = AXIS2_STRDUP(mime_type, env);
if (!(data_handler_impl->mime_type))
{
- axis2_data_handler_free(&(data_handler_impl->data_handler), env);
+ axiom_data_handler_free(&(data_handler_impl->data_handler), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
@@ -97,37 +97,37 @@
data_handler_impl->file_name = AXIS2_STRDUP(file_name, env);
if (!(data_handler_impl->file_name))
{
- axis2_data_handler_free(&(data_handler_impl->data_handler), env);
+ axiom_data_handler_free(&(data_handler_impl->data_handler), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
}
data_handler_impl->data_handler.ops = AXIS2_MALLOC (env->allocator,
- sizeof(axis2_data_handler_ops_t));
+ sizeof(axiom_data_handler_ops_t));
if(NULL == data_handler_impl->data_handler.ops)
{
- axis2_data_handler_free(&(data_handler_impl->data_handler), env);
+ axiom_data_handler_free(&(data_handler_impl->data_handler), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
- data_handler_impl->data_handler.ops->free = axis2_data_handler_free;
- data_handler_impl->data_handler.ops->get_content_type = axis2_data_handler_get_content_type;
- data_handler_impl->data_handler.ops->get_input_stream = axis2_data_handler_get_input_stream;
- data_handler_impl->data_handler.ops->read_from = axis2_data_handler_read_from;
- data_handler_impl->data_handler.ops->write_to = axis2_data_handler_write_to;
- data_handler_impl->data_handler.ops->set_binary_data = axis2_data_handler_set_binary_data;
- data_handler_impl->data_handler.ops->set_file_name = axis2_data_handler_set_file_name;
+ data_handler_impl->data_handler.ops->free = axiom_data_handler_free;
+ data_handler_impl->data_handler.ops->get_content_type = axiom_data_handler_get_content_type;
+ data_handler_impl->data_handler.ops->get_input_stream = axiom_data_handler_get_input_stream;
+ data_handler_impl->data_handler.ops->read_from = axiom_data_handler_read_from;
+ data_handler_impl->data_handler.ops->write_to = axiom_data_handler_write_to;
+ data_handler_impl->data_handler.ops->set_binary_data = axiom_data_handler_set_binary_data;
+ data_handler_impl->data_handler.ops->set_file_name = axiom_data_handler_set_file_name;
return &(data_handler_impl->data_handler);
}
/*************************** Start of op impls *************************/
axis2_status_t AXIS2_CALL
-axis2_data_handler_free (axis2_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_free (axiom_data_handler_t *data_handler, const axis2_env_t *env)
{
- axis2_data_handler_impl_t *data_handler_impl = NULL;
+ axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
data_handler_impl = AXIS2_INTF_TO_IMPL(data_handler);
@@ -148,14 +148,14 @@
}
axis2_char_t * AXIS2_CALL
-axis2_data_handler_get_content_type (axis2_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_get_content_type (axiom_data_handler_t *data_handler, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
return AXIS2_INTF_TO_IMPL(data_handler)->mime_type;
}
axis2_byte_t * AXIS2_CALL
-axis2_data_handler_get_input_stream (axis2_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_get_input_stream (axiom_data_handler_t *data_handler, const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -164,10 +164,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_data_handler_read_from(axis2_data_handler_t *data_handler, const axis2_env_t *env,
+axiom_data_handler_read_from(axiom_data_handler_t *data_handler, const axis2_env_t *env,
axis2_byte_t** output_stream, int *output_stream_size)
{
- axis2_data_handler_impl_t *data_handler_impl = NULL;
+ axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
data_handler_impl = AXIS2_INTF_TO_IMPL(data_handler);
@@ -284,10 +284,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_data_handler_set_binary_data(axis2_data_handler_t *data_handler, const axis2_env_t *env,
+axiom_data_handler_set_binary_data(axiom_data_handler_t *data_handler, const axis2_env_t *env,
axis2_byte_t* input_stream, int input_stream_len)
{
- axis2_data_handler_impl_t *data_handler_impl = NULL;
+ axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
data_handler_impl = AXIS2_INTF_TO_IMPL(data_handler);
@@ -298,9 +298,9 @@
}
axis2_status_t AXIS2_CALL
-axis2_data_handler_write_to(axis2_data_handler_t *data_handler, const axis2_env_t *env)
+axiom_data_handler_write_to(axiom_data_handler_t *data_handler, const axis2_env_t *env)
{
- axis2_data_handler_impl_t *data_handler_impl = NULL;
+ axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
data_handler_impl = AXIS2_INTF_TO_IMPL(data_handler);
@@ -328,10 +328,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_data_handler_set_file_name(axis2_data_handler_t *data_handler, const axis2_env_t *env,
+axiom_data_handler_set_file_name(axiom_data_handler_t *data_handler, const axis2_env_t *env,
axis2_char_t* file_name)
{
- axis2_data_handler_impl_t *data_handler_impl = NULL;
+ axiom_data_handler_impl_t *data_handler_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
data_handler_impl = AXIS2_INTF_TO_IMPL(data_handler);
@@ -347,7 +347,7 @@
data_handler_impl->file_name = AXIS2_STRDUP(file_name, env);
if (!(data_handler_impl->file_name))
{
- axis2_data_handler_free(&(data_handler_impl->data_handler), env);
+ axiom_data_handler_free(&(data_handler_impl->data_handler), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_body_part.c Thu Jun 15 04:11:07 2006
@@ -15,7 +15,7 @@
*/
#include <axiom_mime_body_part.h>
-#include <axis2_data_handler.h>
+#include <axiom_data_handler.h>
#include <axis2_hash.h>
typedef struct axiom_mime_body_part_impl
@@ -23,7 +23,7 @@
axiom_mime_body_part_t mime_body_part;
/** hash map to hold header name, value pairs */
axis2_hash_t *header_map;
- axis2_data_handler_t *data_handler;
+ axiom_data_handler_t *data_handler;
} axiom_mime_body_part_impl_t;
extern axis2_char_t AXIS2_CRLF[];
@@ -43,7 +43,7 @@
const axis2_char_t *value);
axis2_status_t AXIS2_CALL
-axiom_mime_body_part_set_data_handler (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env, axis2_data_handler_t *data_handler);
+axiom_mime_body_part_set_data_handler (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env, axiom_data_handler_t *data_handler);
axis2_status_t AXIS2_CALL
axiom_mime_body_part_write_to (axiom_mime_body_part_t *mime_body_part, const axis2_env_t *env,
@@ -146,7 +146,7 @@
axis2_status_t AXIS2_CALL
axiom_mime_body_part_set_data_handler (axiom_mime_body_part_t *mime_body_part,
- const axis2_env_t *env, axis2_data_handler_t *data_handler)
+ const axis2_env_t *env, axiom_data_handler_t *data_handler)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_INTF_TO_IMPL(mime_body_part)->data_handler = data_handler;
@@ -198,7 +198,7 @@
*/
if (mime_body_part_impl->data_handler)
{
- status = AXIS2_DATA_HANDLER_READ_FROM(mime_body_part_impl->data_handler, env,
+ status = AXIOM_DATA_HANDLER_READ_FROM(mime_body_part_impl->data_handler, env,
&data_handler_stream, &data_handler_stream_size);
if (status == AXIS2_FAILURE)
return AXIS2_FAILURE;
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?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_output.c Thu Jun 15 04:11:07 2006
@@ -15,7 +15,7 @@
*/
#include "axiom_mime_output.h"
-#include "axis2_data_handler.h"
+#include "axiom_data_handler.h"
#include "axiom_mime_body_part.h"
#include <axis2_string.h>
#include <axiom_text.h>
@@ -381,7 +381,7 @@
axiom_mime_body_part_t * AXIS2_CALL
axis2_create_mime_body_part (axiom_text_t *text, const axis2_env_t *env)
{
- axis2_data_handler_t *data_handler = NULL;
+ axiom_data_handler_t *data_handler = NULL;
const axis2_char_t *content_type = "application/octet-stream";
axiom_mime_body_part_t * mime_body_part = axiom_mime_body_part_create(env);
axis2_char_t *content_id = (axis2_char_t *)"<";
@@ -391,7 +391,7 @@
if (data_handler)
{
- content_type = AXIS2_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env);
+ content_type = AXIOM_DATA_HANDLER_GET_CONTENT_TYPE(data_handler, env);
}
AXIOM_MIME_BODY_PART_SET_DATA_HANDLER(mime_body_part, env,
Modified: webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c (original)
+++ webservices/axis2/trunk/c/axiom/src/attachments/mime_parser.c Thu Jun 15 04:11:07 2006
@@ -16,7 +16,7 @@
#include <axiom_mime_parser.h>
#include <axis2_string.h>
-#include <axis2_data_handler.h>
+#include <axiom_data_handler.h>
typedef struct axiom_mime_parser_impl
{
@@ -419,11 +419,11 @@
if (mime_id)
{
- axis2_data_handler_t *data_handler = NULL;
+ axiom_data_handler_t *data_handler = NULL;
memcpy(mime_id, id, mime_id_len);
mime_id[mime_id_len] = '\0';
- data_handler = axis2_data_handler_create(env, NULL, NULL);
- AXIS2_DATA_HANDLER_SET_BINARY_DATA(data_handler, env,
+ data_handler = axiom_data_handler_create(env, NULL, NULL);
+ AXIOM_DATA_HANDLER_SET_BINARY_DATA(data_handler, env,
mime_binary, mime_binary_len);
axis2_hash_set(mime_parser_impl->mime_parts_map, mime_id,
AXIS2_HASH_KEY_STRING, data_handler);
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?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_element.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_element.c Thu Jun 15 04:11:07 2006
@@ -18,7 +18,7 @@
#include "axiom_node_internal.h"
#include <axiom_attribute.h>
#include <axiom_namespace.h>
-#include <axis2_xml_writer.h>
+#include <axiom_writer.h>
#include <axiom_stax_builder.h>
#include <string.h>
#include <stdio.h>
@@ -1438,12 +1438,12 @@
{
int status = AXIS2_SUCCESS;
axiom_output_t *om_output = NULL;
- axis2_xml_writer_t *xml_writer = NULL;
+ axiom_writer_t *xml_writer = NULL;
axis2_char_t *xml = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, element_node, NULL);
- xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
+ xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
AXIS2_XML_PARSER_TYPE_BUFFER);
if(!xml_writer)
return NULL;
@@ -1455,7 +1455,7 @@
status = AXIOM_NODE_SERIALIZE(element_node, env, om_output);
if(status == AXIS2_SUCCESS)
{
- xml = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
+ xml = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env);
}
AXIOM_OUTPUT_FREE(om_output, env);
return xml;
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?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_node.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_node.c Thu Jun 15 04:11:07 2006
@@ -833,12 +833,12 @@
int status = AXIS2_SUCCESS;
axiom_output_t *om_output = NULL;
- axis2_xml_writer_t *xml_writer = NULL;
+ axiom_writer_t *xml_writer = NULL;
axis2_char_t *xml = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, om_node, NULL);
- xml_writer = axis2_xml_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
+ xml_writer = axiom_writer_create_for_memory(env, NULL, AXIS2_TRUE, 0,
AXIS2_XML_PARSER_TYPE_BUFFER);
if(!xml_writer)
return NULL;
@@ -846,13 +846,13 @@
om_output = axiom_output_create(env, xml_writer);
if(!om_output)
{
- AXIS2_XML_WRITER_FREE(xml_writer, env);
+ AXIOM_WRITER_FREE(xml_writer, env);
return NULL;
}
status = AXIOM_NODE_SERIALIZE(om_node, env, om_output);
if(status == AXIS2_SUCCESS)
{
- xml = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(xml_writer, env);
+ xml = (axis2_char_t*)AXIOM_WRITER_GET_XML(xml_writer, env);
}
AXIOM_OUTPUT_FREE(om_output, env);
return xml;
Modified: webservices/axis2/trunk/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/axiom/src/om/om_output.c?rev=414557&r1=414556&r2=414557&view=diff
==============================================================================
--- webservices/axis2/trunk/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/trunk/c/axiom/src/om/om_output.c Thu Jun 15 04:11:07 2006
@@ -17,7 +17,7 @@
#include <axiom_output.h>
#include <stdarg.h>
#include <axis2_string.h>
-#include <axis2_xml_writer.h>
+#include <axiom_writer.h>
#include <axiom_text.h>
#include <axiom_soap_const.h>
#include <axis2_array_list.h>
@@ -36,9 +36,9 @@
{
axiom_output_t om_output;
- /** axis2_xml_writer. any xml writer which
- implemet axis2_xml_writer.h interface */
- axis2_xml_writer_t *xml_writer;
+ /** axiom_writer. any xml writer which
+ implemet axiom_writer.h interface */
+ axiom_writer_t *xml_writer;
axis2_bool_t do_optimize;
@@ -122,7 +122,7 @@
axiom_output_is_optimized(axiom_output_t *om_output,
const axis2_env_t *env);
-axis2_xml_writer_t* AXIS2_CALL
+axiom_writer_t* AXIS2_CALL
axiom_output_get_xml_writer(axiom_output_t *om_output,
const axis2_env_t *env);
@@ -163,7 +163,7 @@
AXIS2_EXTERN axiom_output_t * AXIS2_CALL
axiom_output_create (const axis2_env_t *env,
- axis2_xml_writer_t *xml_writer)
+ axiom_writer_t *xml_writer)
{
axiom_output_impl_t *om_output_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -303,7 +303,7 @@
if(NULL != om_output_impl->xml_writer)
{
- AXIS2_XML_WRITER_FREE(om_output_impl->xml_writer, env);
+ AXIOM_WRITER_FREE(om_output_impl->xml_writer, env);
om_output_impl->xml_writer = NULL;
}
@@ -439,7 +439,7 @@
return AXIS2_SUCCESS;
}
-axis2_xml_writer_t* AXIS2_CALL
+axiom_writer_t* AXIS2_CALL
axiom_output_get_xml_writer
(axiom_output_t *om_output,
const axis2_env_t *env)
@@ -660,16 +660,16 @@
{
case 0:
status =
- AXIS2_XML_WRITER_WRITE_END_ELEMENT(om_output_impl->xml_writer,
+ AXIOM_WRITER_WRITE_END_ELEMENT(om_output_impl->xml_writer,
env);
break;
case 1:
status =
- AXIS2_XML_WRITER_WRITE_START_ELEMENT(om_output_impl->xml_writer,
+ AXIOM_WRITER_WRITE_START_ELEMENT(om_output_impl->xml_writer,
env, args_list[0]);
break;
case 2:
- status = AXIS2_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(
+ status = AXIOM_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE(
om_output_impl->xml_writer,
env,
args_list[0],
@@ -677,7 +677,7 @@
break;
case 3:
status =
- AXIS2_XML_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE_PREFIX(
+ AXIOM_WRITER_WRITE_START_ELEMENT_WITH_NAMESPACE_PREFIX(
om_output_impl->xml_writer,
env,
args_list[0],
@@ -692,13 +692,13 @@
{
case 2:
status =
- AXIS2_XML_WRITER_WRITE_ATTRIBUTE(om_output_impl->xml_writer,
+ AXIOM_WRITER_WRITE_ATTRIBUTE(om_output_impl->xml_writer,
env,
args_list[0],
args_list[1]);
break;
case 3:
- status = AXIS2_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(
+ status = AXIOM_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE(
om_output_impl->xml_writer,env,
args_list[0],
args_list[1],
@@ -706,7 +706,7 @@
break;
case 4:
status =
- AXIS2_XML_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE_PREFIX(
+ AXIOM_WRITER_WRITE_ATTRIBUTE_WITH_NAMESPACE_PREFIX(
om_output_impl->xml_writer, env,
args_list[0],
args_list[1],
@@ -719,18 +719,18 @@
break;
case AXIOM_NAMESPACE:
- status = AXIS2_XML_WRITER_WRITE_NAMESPACE(om_output_impl->xml_writer,
+ status = AXIOM_WRITER_WRITE_NAMESPACE(om_output_impl->xml_writer,
env,
args_list[0],
args_list[1]);
break;
case AXIOM_TEXT:
- status = AXIS2_XML_WRITER_WRITE_CHARACTERS(om_output_impl->xml_writer,
+ status = AXIOM_WRITER_WRITE_CHARACTERS(om_output_impl->xml_writer,
env,
args_list[0]);
break;
case AXIOM_COMMENT:
- status = AXIS2_XML_WRITER_WRITE_COMMENT(om_output_impl->xml_writer,
+ status = AXIOM_WRITER_WRITE_COMMENT(om_output_impl->xml_writer,
env,
args_list[0]);
break;
@@ -740,13 +740,13 @@
case 1:
status =
- AXIS2_XML_WRITER_WRITE_PROCESSING_INSTRUCTION(
+ AXIOM_WRITER_WRITE_PROCESSING_INSTRUCTION(
om_output_impl->xml_writer,
env, args_list[0]);
break;
case 2:
- status = AXIS2_XML_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(
+ status = AXIOM_WRITER_WRITE_PROCESSING_INSTRUCTION_DATA(
om_output_impl->xml_writer,
env,
args_list[0],
@@ -755,7 +755,7 @@
}
break;
case AXIOM_DOCTYPE:
- status = AXIS2_XML_WRITER_WRITE_DTD(om_output_impl->xml_writer,
+ status = AXIOM_WRITER_WRITE_DTD(om_output_impl->xml_writer,
env,
args_list[0]);
break;
@@ -779,7 +779,7 @@
axiom_output_impl_t *output_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
output_impl = AXIS2_INTF_TO_IMPL(om_output);
- return AXIS2_XML_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(
+ return AXIOM_WRITER_WRITE_START_DOCUMENT_WITH_VERSION_ENCODING(
output_impl->xml_writer,
env,
output_impl->xml_version,
@@ -803,7 +803,7 @@
{
axis2_byte_t* byte_stream = NULL;
axis2_char_t *root_content_id = NULL;
- axis2_char_t *buffer = (axis2_char_t*)AXIS2_XML_WRITER_GET_XML(output_impl->xml_writer, env);
+ axis2_char_t *buffer = (axis2_char_t*)AXIOM_WRITER_GET_XML(output_impl->xml_writer, env);
int stream_size = 0;
if (output_impl->is_soap11)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org