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 na...@apache.org on 2006/03/07 12:55:28 UTC
svn commit: r383855 - in /webservices/axis2/trunk/c: include/
modules/core/transport/http/ modules/core/transport/http/sender/
modules/xml/om/ modules/xml/parser/libxml2/
Author: nandika
Date: Tue Mar 7 03:55:25 2006
New Revision: 383855
URL: http://svn.apache.org/viewcvs?rev=383855&view=rev
Log:
modified to compile on win32
Modified:
webservices/axis2/trunk/c/include/axis2_om_namespace.h
webservices/axis2/trunk/c/include/axis2_om_node.h
webservices/axis2/trunk/c/include/axis2_xml_reader.h
webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
webservices/axis2/trunk/c/modules/xml/om/om_namespace.c
webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c
Modified: webservices/axis2/trunk/c/include/axis2_om_namespace.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_namespace.h?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_namespace.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_namespace.h Tue Mar 7 03:55:25 2006
@@ -91,25 +91,7 @@
*/
axis2_char_t* (AXIS2_CALL *get_prefix)(struct axis2_om_namespace *om_namespace,
axis2_env_t **env);
- /**
- *@param om_namespace pointer to om namespace struct
- *@param env environment, MUST NOT be NULL.
- *@param uri namespace uri to be set
- *@returns status of the op AXIS2_SUCCESS on success, AXIS2_FAILURE on error.
- */
- axis2_status_t (AXIS2_CALL *set_uri)(struct axis2_om_namespace *om_namespace,
- axis2_env_t **env,
- const axis2_char_t *uri);
- /**
- *@param om_namespace pointer to om_namespace struct
- *@param env environment struct
- *@param prefix prefix to be set
- *@returns status code of the op AXIS2_SUCCESS on success,
- * AXIS2_FAILURE on error.
- */
- axis2_status_t (AXIS2_CALL *set_prefix)(struct axis2_om_namespace *om_namespace,
- axis2_env_t **env,
- const axis2_char_t *prefix);
+
} axis2_om_namespace_ops_t;
@@ -152,12 +134,7 @@
/** get namespace uri */
#define AXIS2_OM_NAMESPACE_GET_URI(om_namespace, env) \
((om_namespace)->ops->get_uri(om_namespace, env))
-/** set uri */
-#define AXIS2_OM_NAMESPACE_SET_URI(om_namespace, env, uri) \
- ((om_namespace)->ops->set_uri(om_namespace, env, uri))
-/** set prefix */
-#define AXIS2_OM_NAMESPACE_SET_PREFIX(om_namespace, env, prefix) \
- ((om_namespace)->ops->set_prefix(om_namesapce, env, prefix))
+
/** @} */
Modified: webservices/axis2/trunk/c/include/axis2_om_node.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_node.h?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_node.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_node.h Tue Mar 7 03:55:25 2006
@@ -88,7 +88,8 @@
axis2_status_t (AXIS2_CALL *free) (axis2_om_node_t *om_node,
axis2_env_t **env);
/**
- * Adds given node as child to parent
+ * Adds given node as child to parent. child should not have a parent
+ * if child has a parent it will be detached from existing parent
* @param om_node parent node. cannot be NULL.
* @param env Environment. MUST NOT be NULL, .
* @param child child node.
Modified: webservices/axis2/trunk/c/include/axis2_xml_reader.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_xml_reader.h?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_xml_reader.h (original)
+++ webservices/axis2/trunk/c/include/axis2_xml_reader.h Tue Mar 7 03:55:25 2006
@@ -48,7 +48,7 @@
AXIS2_XML_READER_SPACE,
AXIS2_XML_READER_EMPTY_ELEMENT,
AXIS2_XML_READER_CHARACTER,
- AXIS2_XML_READER_ENTITY_REFERANCE,
+ AXIS2_XML_READER_ENTITY_REFERENCE,
AXIS2_XML_READER_COMMENT,
AXIS2_XML_READER_PROCESSING_INSTRUCTION,
AXIS2_XML_READER_CDATA,
Modified: webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/http_transport_utils.c Tue Mar 7 03:55:25 2006
@@ -844,10 +844,11 @@
axis2_callback_info_t *callback_ctx = NULL;
axis2_char_t *trans_enc = NULL;
int *content_length = NULL;
+ axis2_property_t *property = NULL;
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK((*env)->error, msg_ctx, NULL);
AXIS2_PARAM_CHECK((*env)->error, soap_ns_uri, NULL);
- axis2_property_t *property = NULL;
+
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_TRANSPORT_IN, AXIS2_FALSE);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_transport_sender.c Tue Mar 7 03:55:25 2006
@@ -268,6 +268,7 @@
axis2_op_ctx_t *op_ctx = NULL;
axis2_ctx_t *ctx = NULL;
axis2_http_out_transport_info_t *out_info = NULL;
+ axis2_bool_t is_soap11 = AXIS2_FALSE;
property = AXIS2_MSG_CTX_GET_PROPERTY(msg_ctx, env,
AXIS2_HTTP_OUT_TRANSPORT_INFO, AXIS2_FALSE);
@@ -278,7 +279,7 @@
AXIS2_PROPERTY_GET_VALUE(property, env);
property = NULL;
}
- axis2_bool_t is_soap11 = AXIS2_FALSE;
+
if(NULL == out_info)
{
Modified: webservices/axis2/trunk/c/modules/xml/om/om_namespace.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_namespace.c?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_namespace.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_namespace.c Tue Mar 7 03:55:25 2006
@@ -41,15 +41,7 @@
axis2_om_namespace_get_prefix(axis2_om_namespace_t *om_namespace,
axis2_env_t **env);
-axis2_status_t AXIS2_CALL
-axis2_om_namespace_set_uri(axis2_om_namespace_t *om_namespace,
- axis2_env_t **env,
- const axis2_char_t *uri);
-
-axis2_status_t AXIS2_CALL
-axis2_om_namespace_set_prefix(axis2_om_namespace_t *om_namespace,
- axis2_env_t **env,
- const axis2_char_t *prefix);
+
/****************************** axis2_om_namesapce_impl_struct **************************/
@@ -136,9 +128,7 @@
ns->om_namespace.ops->serialize = axis2_om_namespace_serialize;
ns->om_namespace.ops->get_uri = axis2_om_namespace_get_uri;
ns->om_namespace.ops->get_prefix = axis2_om_namespace_get_prefix;
- ns->om_namespace.ops->set_prefix = axis2_om_namespace_set_prefix;
- ns->om_namespace.ops->set_uri = axis2_om_namespace_set_uri;
-
+
return &(ns->om_namespace) ;
}
@@ -256,33 +246,3 @@
}
-axis2_status_t AXIS2_CALL
-axis2_om_namespace_set_uri(axis2_om_namespace_t *om_namespace,
- axis2_env_t **env,
- const axis2_char_t *uri)
-{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if(!uri)
- {
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error , AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- AXIS2_INTF_TO_IMPL(om_namespace)->uri = (axis2_char_t*)AXIS2_STRDUP(uri,env);
- return AXIS2_SUCCESS;
-}
-axis2_status_t AXIS2_CALL
-axis2_om_namespace_set_prefix(axis2_om_namespace_t *om_namespace,
- axis2_env_t **env,
- const axis2_char_t *prefix)
-{
- AXIS2_ENV_CHECK(env,AXIS2_FAILURE);
- if(!prefix)
- {
- AXIS2_ERROR_SET_ERROR_NUMBER((*env)->error, AXIS2_ERROR_INVALID_NULL_PARAM);
- AXIS2_ERROR_SET_STATUS_CODE((*env)->error, AXIS2_FAILURE);
- return AXIS2_FAILURE;
- }
- AXIS2_INTF_TO_IMPL(om_namespace)->prefix = (axis2_char_t*)AXIS2_STRDUP(prefix,env);
- return AXIS2_SUCCESS;
-}
Modified: webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/om_stax_builder.c Tue Mar 7 03:55:25 2006
@@ -748,7 +748,7 @@
node = axis2_om_stax_builder_create_om_text(om_stax_builder, env);
break;
- case AXIS2_XML_READER_ENTITY_REFERANCE:
+ case AXIS2_XML_READER_ENTITY_REFERENCE:
break;
case AXIS2_XML_READER_COMMENT:
@@ -956,7 +956,7 @@
axis2_om_stax_builder_create_om_text(builder, env);
break;
- case AXIS2_XML_READER_ENTITY_REFERANCE:
+ case AXIS2_XML_READER_ENTITY_REFERENCE:
break;
case AXIS2_XML_READER_COMMENT:
Modified: webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c?rev=383855&r1=383854&r2=383855&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c (original)
+++ webservices/axis2/trunk/c/modules/xml/parser/libxml2/libxml2_reader_wrapper.c Tue Mar 7 03:55:25 2006
@@ -184,7 +184,7 @@
AXIS2_XML_READER_END_ELEMENT;
parser->event_map [XML_READER_TYPE_ENTITY_REFERENCE] =
- AXIS2_XML_READER_ENTITY_REFERANCE;
+ AXIS2_XML_READER_ENTITY_REFERENCE;
parser->event_map [XML_READER_TYPE_END_ENTITY] = AXIS2_XML_READER_SPACE;