You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by sa...@apache.org on 2006/04/26 04:12:51 UTC
svn commit: r397050 - in /webservices/axis2/trunk/c/include: axis2_defines.h
axis2_om_output.h axis2_om_text.h axis2_soap.h platforms/unix/axis2_unix.h
platforms/windows/axis2_windows.h
Author: samisa
Date: Tue Apr 25 19:12:45 2006
New Revision: 397050
URL: http://svn.apache.org/viewcvs?rev=397050&view=rev
Log:
Commiting in the MTOM related patches by Kapila
Modified:
webservices/axis2/trunk/c/include/axis2_defines.h
webservices/axis2/trunk/c/include/axis2_om_output.h
webservices/axis2/trunk/c/include/axis2_om_text.h
webservices/axis2/trunk/c/include/axis2_soap.h
webservices/axis2/trunk/c/include/platforms/unix/axis2_unix.h
webservices/axis2/trunk/c/include/platforms/windows/axis2_windows.h
Modified: webservices/axis2/trunk/c/include/axis2_defines.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_defines.h?rev=397050&r1=397049&r2=397050&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_defines.h (original)
+++ webservices/axis2/trunk/c/include/axis2_defines.h Tue Apr 25 19:12:45 2006
@@ -21,6 +21,9 @@
typedef int axis2_status_t;
typedef int axis2_scope_t;
typedef unsigned int axis2_ssize_t;
+ typedef char axis2_byte_t;
+
+#define AXIS2_CRLF_LENGTH 2
/* These constant definitions should later be moved to platform dependant
* files
Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=397050&r1=397049&r2=397050&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Tue Apr 25 19:12:45 2006
@@ -172,6 +172,13 @@
axis2_char_t* (AXIS2_CALL *
get_mime_boundry)(axis2_om_output_t *om_output,
axis2_env_t **env);
+
+ axis2_byte_t* (AXIS2_CALL *
+ flush)(axis2_om_output_t *om_output,
+ axis2_env_t **env,
+ axis2_byte_t **output_stream,
+ int *output_stream_size);
+
};
@@ -267,7 +274,8 @@
#define AXIS2_OM_OUTPUT_GET_MIME_BOUNDRY(om_output, env) \
((om_output)->ops->get_mime_boundry(om_output, env))
-
+#define AXIS2_OM_OUTPUT_FLUSH(om_output, env, output_stream, output_stream_size) \
+ ((om_output)->ops->flush(om_output, env, output_stream, output_stream_size))
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=397050&r1=397049&r2=397050&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_text.h Tue Apr 25 19:12:45 2006
@@ -25,6 +25,7 @@
#include <axis2_env.h>
#include <axis2_om_node.h>
#include <axis2_om_output.h>
+#include <axis2_data_handler.h>
#ifdef __cplusplus
extern "C"
@@ -112,6 +113,14 @@
set_is_binary)(struct axis2_om_text *om_text,
axis2_env_t **env,
axis2_bool_t is_binary);
+
+ axis2_data_handler_t* (AXIS2_CALL *
+ get_data_handler)(struct axis2_om_text *om_text,
+ axis2_env_t **env);
+
+ axis2_char_t* (AXIS2_CALL *
+ get_content_id)(struct axis2_om_text *om_text,
+ axis2_env_t **env);
} axis2_om_text_ops_t;
@@ -144,6 +153,23 @@
const axis2_char_t *value,
axis2_om_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 AXIS2_OM_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 AXIS2_OM_TEXT
+ * @return pointer to newly created text struct
+ */
+ AXIS2_DECLARE(axis2_om_text_t*)
+ axis2_om_text_create_with_data_handler (axis2_env_t **env,
+ axis2_om_node_t * parent,
+ axis2_data_handler_t* data_handler,
+ axis2_om_node_t **node);
+
/** frees given text */
#define AXIS2_OM_TEXT_FREE( om_text,env) \
((om_text)->ops->free(om_text,env))
@@ -165,7 +191,13 @@
/** set whether it binary */
#define AXIS2_OM_TEXT_SET_IS_BINARY(om_text, env, is_binary) \
((om_text)->ops->set_is_binary(om_text, env, is_binary))
-
+
+#define AXIS2_OM_TEXT_SET_GET_DATA_HANDLER(om_text, env) \
+ ((om_text)->ops->get_data_handler(om_text, env))
+
+#define AXIS2_OM_TEXT_SET_GET_CONTENT_ID(om_text, env) \
+ ((om_text)->ops->get_content_id(om_text, env))
+
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/include/axis2_soap.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_soap.h?rev=397050&r1=397049&r2=397050&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_soap.h (original)
+++ webservices/axis2/trunk/c/include/axis2_soap.h Tue Apr 25 19:12:45 2006
@@ -56,7 +56,7 @@
#define AXIS2_SOAP11_SOAP_FAULT_DETAIL_LOCAL_NAME "detail"
-#define AXIS2_SOAP_11_CONTENT_TYPE "text/xml"
+#define AXIS2_SOAP11_CONTENT_TYPE "text/xml"
#define AXIS2_SOAP11_FAULT_CODE_SENDER "Client"
@@ -107,7 +107,7 @@
#define AXIS2_SOAP12_SOAP_FAULT_ROLE_LOCAL_NAME "Role"
-#define AXIS2_SOAP_12_CONTENT_TYPE "application/soap+xml"
+#define AXIS2_SOAP12_CONTENT_TYPE "application/soap+xml"
#define AXIS2_SOAP12_FAULT_CODE_SENDER "Sender"
Modified: webservices/axis2/trunk/c/include/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/platforms/unix/axis2_unix.h?rev=397050&r1=397049&r2=397050&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/include/platforms/unix/axis2_unix.h Tue Apr 25 19:12:45 2006
@@ -190,6 +190,10 @@
/**
* Platform specific file handling
*/
+#define AXIS2_FOPEN fopen
+#define AXIS2_FREAD fread
+#define AXIS2_FWRITE fwrite
+#define AXIS2_FCLOSE fclose
#define AXIS2_ACCESS(zpath,imode) access(zpath,imode)
#define AXIS2_R_OK R_OK /* test for read permission */
#define AXIS2_W_OK W_OK /* test for write permission */
Modified: webservices/axis2/trunk/c/include/platforms/windows/axis2_windows.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/platforms/windows/axis2_windows.h?rev=397050&r1=397049&r2=397050&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/platforms/windows/axis2_windows.h (original)
+++ webservices/axis2/trunk/c/include/platforms/windows/axis2_windows.h Tue Apr 25 19:12:45 2006
@@ -162,6 +162,10 @@
/**
* Platform specific file handling
*/
+#define AXIS2_FOPEN fopen
+#define AXIS2_FREAD fread
+#define AXIS2_FWRITE fwrite
+#define AXIS2_FCLOSE fclose
#define AXIS2_ACCESS(zpath,imode) _access(zpath,imode)
#define AXIS2_R_OK 04 /* test for read permission */
#define AXIS2_W_OK 02 /* test for write permission */