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 ma...@apache.org on 2008/07/05 14:20:58 UTC
svn commit: r674189 - in
/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src:
attachments/data_handler.c attachments/mime_body_part.c
attachments/mime_part.c om/om_output.c
Author: manjula
Date: Sat Jul 5 05:20:58 2008
New Revision: 674189
URL: http://svn.apache.org/viewvc?rev=674189&view=rev
Log:
Fixing compilations errors.
Modified:
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/data_handler.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_body_part.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_part.c
webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_output.c
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/data_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/data_handler.c?rev=674189&r1=674188&r2=674189&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/data_handler.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/data_handler.c Sat Jul 5 05:20:58 2008
@@ -434,7 +434,7 @@
{
axiom_mime_part_t *binary_part = NULL;
- binary_part = axiom_mime_output_part_create(env);
+ binary_part = axiom_mime_part_create(env);
if(!binary_part)
{
@@ -445,7 +445,7 @@
{
binary_part->part = (axis2_byte_t *)data_handler->buffer;
binary_part->part_size = data_handler->buffer_len;
- binary_part->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ binary_part->type = AXIOM_MIME_PART_BUFFER;
}
/* In the case of file we first calculate the file size
@@ -468,7 +468,7 @@
{
binary_part->file_name = data_handler->file_name;
binary_part->part_size = stat_p.st_size;
- binary_part->type = AXIOM_MIME_OUTPUT_PART_FILE;
+ binary_part->type = AXIOM_MIME_PART_FILE;
}
}
else
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_body_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_body_part.c?rev=674189&r1=674188&r2=674189&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_body_part.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_body_part.c Sat Jul 5 05:20:58 2008
@@ -265,13 +265,13 @@
* First wrap it as a mime_output_part_t .Then add it to the array list so
* later through the transport this can be written to the wire. */
- mime_header_part = axiom_mime_output_part_create(env);
+ mime_header_part = axiom_mime_part_create(env);
if(mime_header_part)
{
mime_header_part->part = (axis2_byte_t *)header_str;
mime_header_part->part_size = header_str_size;
- mime_header_part->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ mime_header_part->type = AXIOM_MIME_PART_BUFFER;
}
else
{
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_part.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_part.c?rev=674189&r1=674188&r2=674189&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_part.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/attachments/mime_part.c Sat Jul 5 05:20:58 2008
@@ -98,9 +98,9 @@
axis2_byte_t *byte_buffer = NULL;
axis2_byte_t *byte_stream = NULL;
int size = 0;
- axiom_mime_part_part_t *boundary_part = NULL;
+ axiom_mime_part_t *boundary_part = NULL;
- boundary_part = axiom_mime_part_part_create(env);
+ boundary_part = axiom_mime_part_create(env);
byte_buffer = (axis2_byte_t *)boundary;
size = axutil_strlen(boundary);
@@ -125,7 +125,7 @@
boundary_part->part = byte_stream;
boundary_part->part_size = size + 2;
- boundary_part->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ boundary_part->type = AXIOM_MIME_PART_BUFFER;
axutil_array_list_add(list, env, boundary_part);
@@ -147,8 +147,8 @@
axiom_mime_body_part_t *part,
axis2_char_t *boundary)
{
- axiom_mime_part_part_t *crlf1 = NULL;
- axiom_mime_part_part_t *crlf2 = NULL;
+ axiom_mime_part_t *crlf1 = NULL;
+ axiom_mime_part_t *crlf2 = NULL;
axis2_status_t status = AXIS2_SUCCESS;
/* We adding the following format here.
@@ -157,8 +157,8 @@
* mime_header2
* mime_header3 */
- status = axiom_mime_part_write_mime_boundary(mime_part,
- env, list, boundary);
+ status = axiom_mime_part_write_mime_boundary(
+ env, list, boundary);
if(status != AXIS2_SUCCESS)
{
@@ -168,11 +168,11 @@
/* Then we will add the new line charator after
* the mime_boundary */
- crlf1 = axiom_mime_part_part_create(env);
+ crlf1 = axiom_mime_part_create(env);
crlf1->part = (axis2_byte_t *)axutil_strdup(env, AXIS2_CRLF);
crlf1->part_size = 2;
- crlf1->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ crlf1->type = AXIOM_MIME_PART_BUFFER;
axutil_array_list_add(list, env, crlf1);
@@ -183,11 +183,11 @@
/* Then add the next \r\n after the attachment */
- crlf2 = axiom_mime_part_part_create(env);
+ crlf2 = axiom_mime_part_create(env);
crlf2->part = (axis2_byte_t *)axutil_strdup(env, AXIS2_CRLF);
crlf2->part_size = 2;
- crlf2->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ crlf2->type = AXIOM_MIME_PART_BUFFER;
axutil_array_list_add(list, env, crlf2);
@@ -207,7 +207,7 @@
axis2_byte_t *byte_buffer = NULL;
axis2_byte_t *byte_stream = NULL;
int size = 0;
- axiom_mime_part_part_t *final_part = NULL;
+ axiom_mime_part_t *final_part = NULL;
size = axutil_strlen(boundary);
byte_buffer = (axis2_byte_t *)boundary;
@@ -247,7 +247,7 @@
/* Now we add this as an mime_part part to
* the list. */
- final_part = axiom_mime_part_part_create(env);
+ final_part = axiom_mime_part_create(env);
if(!final_part)
{
@@ -259,7 +259,7 @@
final_part->part = byte_stream;
final_part->part_size = size + 4;
- final_part->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ final_part->type = AXIOM_MIME_PART_BUFFER;
axutil_array_list_add(list, env, final_part);
@@ -399,7 +399,7 @@
axiom_mime_body_part_t *root_mime_body_part = NULL;
axis2_char_t *soap_body_buffer = NULL;
axutil_array_list_t *part_list = NULL;
- axiom_mime_part_part_t *soap_part = NULL;
+ axiom_mime_part_t *soap_part = NULL;
part_list = axutil_array_list_create(env, 0);
@@ -479,7 +479,7 @@
AXIOM_MIME_BODY_PART_FREE(root_mime_body_part, env);
root_mime_body_part = NULL;
- soap_part = axiom_mime_part_part_create(env);
+ soap_part = axiom_mime_part_create(env);
if(!soap_part)
{
@@ -492,7 +492,7 @@
soap_part->part = (axis2_byte_t *)soap_body_buffer;
soap_part->part_size = (int) axutil_strlen(soap_body_buffer);
- soap_part->type = AXIOM_MIME_OUTPUT_PART_BUFFER;
+ soap_part->type = AXIOM_MIME_PART_BUFFER;
axutil_array_list_add(part_list, env, soap_part);
Modified: webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_output.c
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_output.c?rev=674189&r1=674188&r2=674189&view=diff
==============================================================================
--- webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_output.c (original)
+++ webservices/axis2/branches/c/post_1_4_mtom/c/axiom/src/om/om_output.c Sat Jul 5 05:20:58 2008
@@ -60,8 +60,6 @@
axutil_array_list_t *binary_node_list;
- axiom_mime_output_t *mime_output;
-
axis2_char_t *mime_boundry;
axis2_char_t *content_type;
@@ -98,7 +96,6 @@
om_output->xml_version = NULL;
om_output->ignore_xml_declaration = AXIS2_TRUE;
om_output->binary_node_list = NULL;
- om_output->mime_output = NULL;
om_output->mime_boundry = NULL;
om_output->content_type = NULL;
om_output->mime_parts = NULL;
@@ -140,10 +137,6 @@
axutil_array_list_free(om_output->binary_node_list, env);
}
- if (om_output->mime_output)
- {
- axiom_mime_output_free(om_output->mime_output, env);
- }
if (om_output->content_type)
{
AXIS2_FREE(env->allocator, om_output->content_type);
@@ -295,13 +288,9 @@
om_output->content_type =
(axis2_char_t *)
- axiom_mime_output_get_content_type_for_mime(om_output->mime_output,
- env,
- om_output->mime_boundry,
- om_output->
- root_content_id,
- om_output->
- char_set_encoding,
+ axiom_mime_part_get_content_type_for_mime(env, om_output->mime_boundry,
+ om_output->root_content_id,
+ om_output->char_set_encoding,
soap_content_type);
return om_output->content_type;
}
@@ -666,7 +655,6 @@
{
soap_content_type = AXIOM_SOAP12_CONTENT_TYPE;
}
- om_output->mime_output = axiom_mime_output_create(env);
/* The created mime_boundary for this soap message */
@@ -677,8 +665,7 @@
/* different parts of the message is added according to their order
* to an arraylist */
- om_output->mime_parts = axiom_mime_output_create_part_list(
- om_output->mime_output,
+ om_output->mime_parts = axiom_mime_part_create_part_list(
env, buffer, om_output->binary_node_list,
om_output->mime_boundry,
om_output->root_content_id,