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 sa...@apache.org on 2006/01/10 17:07:12 UTC
svn commit: r367667 -
/webservices/axis2/trunk/c/modules/core/transport/http/axis2_http_transport_utils.c
Author: samisa
Date: Tue Jan 10 08:07:07 2006
New Revision: 367667
URL: http://svn.apache.org/viewcvs?rev=367667&view=rev
Log:
Reverting the change
Modified:
webservices/axis2/trunk/c/modules/core/transport/http/axis2_http_transport_utils.c
Modified: webservices/axis2/trunk/c/modules/core/transport/http/axis2_http_transport_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/axis2_http_transport_utils.c?rev=367667&r1=367666&r2=367667&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/axis2_http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/axis2_http_transport_utils.c Tue Jan 10 08:07:07 2006
@@ -21,8 +21,6 @@
#include <axis2_op.h>
#include <axis2_qname.h>
#include <axis2_http_transport.h>
-#include <axis2_soap_envelope.h>
-#include <axis2_soap_model_builder.h>
/***************************** Function headers *******************************/
@@ -42,10 +40,10 @@
axis2_char_t *request_uri, axis2_conf_ctx_t *conf_ctx,
axis2_hash_t *request_params);
-axis2_soap_envelope_t* AXIS2_CALL
+/*axis2_soap_envelope_t* AXIS2_CALL
axis2_http_transport_utils_create_envelope_from_get_request
(axis2_env_t **env, axis2_char_t *request_uri,
- axis2_hash_t *request_params);
+ axis2_hash_t *request_params);*/
axis2_om_stax_builder_t* AXIS2_CALL
axis2_http_transport_utils_select_builder_for_mime
@@ -90,14 +88,6 @@
axis2_char_t *soap_action_header,
axis2_char_t *request_uri)
{
- axis2_soap_envelope_t *soap_envelope = NULL;
- axis2_soap_model_builder_t *soap_builder = NULL;
- axis2_om_stax_builder_t *om_builder = NULL;
- axis2_bool_t is_soap11 = AXIS2_FALSE;
- axis2_xml_reader_t *xml_reader = NULL;
- axis2_char_t *char_set = NULL;
- axis2_char_t *xml_char_set = NULL;
-
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, in_stream, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, out_stream, AXIS2_FAILURE);
@@ -115,60 +105,20 @@
{
soap_action_header[strlen(soap_action_header) -1] = '\0';
}
+ AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, soap_action_header);
+ AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, soap_action_header);
+ AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,
+ request_uri));
+ AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
+ AXIS2_TRANSPORT_OUT, out_stream, AXIS2_FALSE);
+ AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
+
+
}
- AXIS2_MSG_CTX_SET_WSA_ACTION(msg_ctx, env, soap_action_header);
- AXIS2_MSG_CTX_SET_SOAP_ACTION(msg_ctx, env, soap_action_header);
- AXIS2_MSG_CTX_SET_TO(msg_ctx, env, axis2_endpoint_ref_create(env,
- request_uri));
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env,
- AXIS2_TRANSPORT_OUT, out_stream, AXIS2_FALSE);
- AXIS2_MSG_CTX_SET_SERVER_SIDE(msg_ctx, env, AXIS2_TRUE);
-
- /* xml_reader = axis2_xml_reader_create_for_memory(env, );*/
- char_set = axis2_http_transport_utils_get_charset_enc(env,content_type);
- /* TODO set the charset of the stream before (at least default)
- * we read them
- */
- AXIS2_MSG_CTX_SET_PROPERTY(msg_ctx, env, AXIS2_CHARACTER_SET_ENCODING,
- char_set, AXIS2_TRUE);
- om_builder = axis2_om_stax_builder_create(env, xml_reader);
- if(NULL != strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_APPL_SOAP))
- {
- is_soap11 = AXIS2_FALSE;
- soap_builder = axis2_soap_model_builder_create(env, om_builder);
- /* TODO set the soap12 namespace URI */
- envelope = AXIS2_SOAP_MODEL_BUILDER_GET_SOAP_ENVELOPE(soap_builder,
- env);
- }
- else if(NULL != strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_TEXT_XML))
- {
- is_soap11 = AXIS2_TRUE;
- if(NULL != soap_action_header && AXIS2_STRLEN(soap_action_header)
- > 0))
- {
- soap_builder = axis2_soap_model_builder_create(env, om_builder);
- /* TODO set the soap11 namespace URI */
- envelope = AXIS2_SOAP_MODEL_BUILDER_GET_DOCUMENT_ELEMENT(
- soap_builder, env);
- }
- /* REST support
- * else
- * {
- * envelope = AXIS2_SOAP_ENVELOPE_GET_DEFAULT_SOAP_ENVELOPE(
- * env);
- * AXIS2_SOAP_BODY_ADD_CHILD(AXIS2_SOAP_ENVELOPE_GET_BODY(
- * envelope, env), AXIS2_OM_STAX_BUILDER_GET_DOCUMENT(
- * om_builder, env));
- */
- }
- xml_char_set = AXIS2_OM_DOCUAXIS2_OM_STAX_BUILDER_GET_DOCUMENT(env om_builder)
-
-
-
/*
- TODO code
- */
- return AXIS2_SUCCESS;
+ TODO code
+ */
+ return AXIS2_SUCCESS;
}
@@ -184,13 +134,13 @@
}
-axis2_soap_envelope_t* AXIS2_CALL
+/*axis2_soap_envelope_t* AXIS2_CALL
axis2_http_transport_utils_create_envelope_from_get_request
(axis2_env_t **env, axis2_char_t *request_uri,
axis2_hash_t *request_params)
{
return NULL;
-}
+}*/
axis2_om_stax_builder_t* AXIS2_CALL