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 da...@apache.org on 2006/05/08 09:21:21 UTC
svn commit: r404947 [7/7] - in
/webservices/axis2/trunk/c/modules/wsdl/woden: ./ include/woden/
include/woden/schema/ include/woden/wsdl20/
include/woden/wsdl20/extensions/ include/woden/wsdl20/xml/
include/woden/xml/ src/schema/ src/util/ src/wsdl20/ ...
Modified: webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/uri_attr.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/uri_attr.c?rev=404947&r1=404946&r2=404947&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/uri_attr.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/uri_attr.c Mon May 8 00:21:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <woden/axis2_woden_uri_attr.h>
+#include <woden/xml/axis2_woden_uri_attr.h>
#include <axis2_url.h>
#include <axis2_om_element.h>
#include <axis2_om_node.h>
@@ -29,6 +29,7 @@
{
axis2_woden_uri_attr_t uri_attr;
axis2_woden_xml_attr_t *xml_attr;
+ axis2_woden_obj_types_t obj_type;
axis2_hash_t *methods;
};
@@ -36,42 +37,52 @@
((axis2_woden_uri_attr_impl_t *) uri_attr)
axis2_status_t AXIS2_CALL
-axis2_woden_uri_attr_free(void *uri_attr,
- axis2_env_t **env);
+axis2_woden_uri_attr_free(
+ void *uri_attr,
+ axis2_env_t **env);
+
+axis2_woden_obj_types_t AXIS2_CALL
+axis2_woden_uri_attr_type(
+ void *uri_attr,
+ axis2_env_t **env);
axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_uri_attr_get_base_impl(void *uri_attr,
- axis2_env_t **env);
+axis2_woden_uri_attr_get_base_impl(
+ void *uri_attr,
+ axis2_env_t **env);
axis2_url_t *AXIS2_CALL
-axis2_woden_uri_attr_get_uri(void *uri_attr,
- axis2_env_t **env);
+axis2_woden_uri_attr_get_uri(
+ void *uri_attr,
+ axis2_env_t **env);
void *AXIS2_CALL
-axis2_woden_uri_attr_convert(void *uri_attr,
- axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *owner_node,
- axis2_char_t *attr_value);
+axis2_woden_uri_attr_convert(
+ void *uri_attr,
+ axis2_env_t **env,
+ axis2_om_element_t *owner_el,
+ axis2_om_node_t *owner_node,
+ axis2_char_t *attr_value);
/*
* TODO This constructor is not used for extension attributes, but may be useful if
* parsing of native WSDL attributes is changed to use the XMLAttr interface.
*/
AXIS2_DECLARE(axis2_woden_uri_attr_t *)
-axis2_woden_uri_attr_create(axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *owner_node,
- axis2_qname_t *attr_type,
- axis2_char_t *attr_value)
+axis2_woden_uri_attr_create(
+ axis2_env_t **env,
+ axis2_om_element_t *owner_el,
+ axis2_om_node_t *owner_node,
+ axis2_qname_t *attr_type,
+ axis2_char_t *attr_value)
{
axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
- axis2_status_t status = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
uri_attr_impl = AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_woden_uri_attr_impl_t));
+ uri_attr_impl->obj_type = AXIS2_WODEN_URI_ATTR;
uri_attr_impl->xml_attr = NULL;
uri_attr_impl->methods = NULL;
uri_attr_impl->uri_attr.ops =
@@ -80,6 +91,8 @@
uri_attr_impl->uri_attr.ops->free =
axis2_woden_uri_attr_free;
+ uri_attr_impl->uri_attr.ops->type =
+ axis2_woden_uri_attr_type;
uri_attr_impl->uri_attr.ops->get_base_impl =
axis2_woden_uri_attr_get_base_impl;
uri_attr_impl->uri_attr.ops->get_uri =
@@ -96,6 +109,8 @@
}
axis2_hash_set(uri_attr_impl->methods, "free",
AXIS2_HASH_KEY_STRING, axis2_woden_uri_attr_free);
+ axis2_hash_set(uri_attr_impl->methods, "type",
+ AXIS2_HASH_KEY_STRING, axis2_woden_uri_attr_type);
axis2_hash_set(uri_attr_impl->methods, "get_uri",
AXIS2_HASH_KEY_STRING, axis2_woden_uri_attr_get_uri);
axis2_hash_set(uri_attr_impl->methods, "convert",
@@ -103,16 +118,27 @@
uri_attr_impl->xml_attr = axis2_woden_xml_attr_create(env, owner_el,
owner_node, attr_type, attr_value);
- status = axis2_woden_xml_attr_resolve_methods(&(uri_attr_impl->
- uri_attr.base), env, uri_attr_impl->
- xml_attr, uri_attr_impl->methods);
- if(AXIS2_SUCCESS != status) return NULL;
+
return &(uri_attr_impl->uri_attr);
}
+axis2_woden_obj_types_t AXIS2_CALL
+axis2_woden_uri_attr_type(
+ void *uri_attr,
+ axis2_env_t **env)
+{
+ axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
+
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ uri_attr_impl = INTF_TO_IMPL(uri_attr);
+
+ return uri_attr_impl->obj_type;
+}
+
axis2_status_t AXIS2_CALL
-axis2_woden_uri_attr_free(void *uri_attr,
- axis2_env_t **env)
+axis2_woden_uri_attr_free(
+ void *uri_attr,
+ axis2_env_t **env)
{
axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
@@ -146,8 +172,9 @@
}
axis2_woden_xml_attr_t *AXIS2_CALL
-axis2_woden_uri_attr_get_base_impl(void *uri_attr,
- axis2_env_t **env)
+axis2_woden_uri_attr_get_base_impl(
+ void *uri_attr,
+ axis2_env_t **env)
{
axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
@@ -159,35 +186,31 @@
axis2_status_t AXIS2_CALL
axis2_woden_uri_attr_resolve_methods(
- axis2_woden_uri_attr_t *uri_attr,
- axis2_env_t **env,
- axis2_woden_uri_attr_t *uri_attr_impl,
- axis2_hash_t *methods)
+ axis2_woden_uri_attr_t *uri_attr,
+ axis2_env_t **env,
+ axis2_hash_t *methods)
{
- axis2_woden_uri_attr_impl_t *uri_attr_impl_l = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, uri_attr_impl, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
- uri_attr_impl_l = (axis2_woden_uri_attr_impl_t *) uri_attr_impl;
-
- uri_attr->ops = AXIS2_MALLOC((*env)->allocator,
- sizeof(axis2_woden_uri_attr_ops_t));
- uri_attr->ops->free =
- axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
- uri_attr->ops->get_base_impl =
- uri_attr_impl_l->uri_attr.ops->get_base_impl;
- uri_attr->ops->get_uri = uri_attr_impl_l->uri_attr.ops->get_uri;
- uri_attr->ops->convert = uri_attr_impl_l->uri_attr.ops->convert;
-
- return axis2_woden_xml_attr_resolve_methods(&(uri_attr->base),
- env, uri_attr_impl_l->xml_attr, methods);
+ uri_attr->ops->free = axis2_hash_get(methods,
+ "free", AXIS2_HASH_KEY_STRING);
+ uri_attr->ops->to_uri_attr_free = axis2_hash_get(methods,
+ "to_uri_attr_free", AXIS2_HASH_KEY_STRING);
+ uri_attr->ops->type = axis2_hash_get(methods,
+ "type", AXIS2_HASH_KEY_STRING);
+ uri_attr->ops->get_uri = axis2_hash_get(methods,
+ "get_uri", AXIS2_HASH_KEY_STRING);
+ uri_attr->ops->convert = axis2_hash_get(methods,
+ "convert", AXIS2_HASH_KEY_STRING);
+
+ return AXIS2_SUCCESS;
}
axis2_url_t *AXIS2_CALL
-axis2_woden_uri_attr_get_uri(void *uri_attr,
- axis2_env_t **env)
+axis2_woden_uri_attr_get_uri(
+ void *uri_attr,
+ axis2_env_t **env)
{
axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
@@ -198,11 +221,12 @@
}
void *AXIS2_CALL
-axis2_woden_uri_attr_convert(void *uri_attr,
- axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *owner_node,
- axis2_char_t *attr_value)
+axis2_woden_uri_attr_convert(
+ void *uri_attr,
+ axis2_env_t **env,
+ axis2_om_element_t *owner_el,
+ axis2_om_node_t *owner_node,
+ axis2_char_t *attr_value)
{
axis2_woden_uri_attr_impl_t *uri_attr_impl = NULL;
axis2_url_t *url = NULL;
Modified: webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/xml_attr.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/xml_attr.c?rev=404947&r1=404946&r2=404947&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/xml_attr.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/woden/src/xml/xml_attr.c Mon May 8 00:21:09 2006
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <woden/axis2_woden_xml_attr.h>
+#include <woden/xml/axis2_woden_xml_attr.h>
#include <axis2_url.h>
#include <axis2_hash.h>
#include <axis2_om_element.h>
@@ -38,51 +38,52 @@
#define INTF_TO_IMPL(xml_attr) ((axis2_woden_xml_attr_impl_t *) xml_attr)
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_free(void *xml_attr,
- axis2_env_t **envv);
+axis2_woden_xml_attr_free(
+ void *xml_attr,
+ axis2_env_t **envv);
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_init(void *xml_attr,
- axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *owner_node,
- axis2_qname_t *attr_type,
- axis2_char_t *attr_value);
+axis2_woden_xml_attr_init(
+ void *xml_attr,
+ axis2_env_t **env,
+ axis2_om_element_t *owner_el,
+ axis2_om_node_t *owner_node,
+ axis2_qname_t *attr_type,
+ axis2_char_t *attr_value);
axis2_qname_t *AXIS2_CALL
-axis2_woden_xml_attr_get_attribute_type(void *xml_attr,
- axis2_env_t **env);
+axis2_woden_xml_attr_get_attribute_type(
+ void *xml_attr,
+ axis2_env_t **env);
void *AXIS2_CALL
-axis2_woden_xml_attr_get_content(void *xml_attr,
- axis2_env_t **env);
+axis2_woden_xml_attr_get_content(
+ void *xml_attr,
+ axis2_env_t **env);
axis2_char_t *AXIS2_CALL
-axis2_woden_xml_attr_to_external_form(void *xml_attr,
- axis2_env_t **env);
+axis2_woden_xml_attr_to_external_form(
+ void *xml_attr,
+ axis2_env_t **env);
axis2_bool_t AXIS2_CALL
-axis2_woden_xml_attr_is_valid(void *xml_attr,
- axis2_env_t **env);
-
-void *AXIS2_CALL
-axis2_woden_xml_attr_convert(void *xml_attr,
- axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *ownder_node,
- axis2_char_t *attr_value);
+axis2_woden_xml_attr_is_valid(
+ void *xml_attr,
+ axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_set_valid(void *xml_attr,
- axis2_env_t **env,
- axis2_bool_t validity);
+axis2_woden_xml_attr_set_valid(
+ void *xml_attr,
+ axis2_env_t **env,
+ axis2_bool_t validity);
AXIS2_DECLARE(axis2_woden_xml_attr_t *)
-axis2_woden_xml_attr_create(axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *owner_node,
- axis2_qname_t *attr_type,
- axis2_char_t *attr_value)
+axis2_woden_xml_attr_create(
+ axis2_env_t **env,
+ axis2_om_element_t *owner_el,
+ axis2_om_node_t *owner_node,
+ axis2_qname_t *attr_type,
+ axis2_char_t *attr_value)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -109,15 +110,15 @@
xml_attr_impl->xml_attr.ops->to_external_form =
axis2_woden_xml_attr_to_external_form;
xml_attr_impl->xml_attr.ops->is_valid = axis2_woden_xml_attr_is_valid;
- xml_attr_impl->xml_attr.ops->convert = axis2_woden_xml_attr_convert;
xml_attr_impl->xml_attr.ops->set_valid = axis2_woden_xml_attr_set_valid;
return &(xml_attr_impl->xml_attr);
}
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_free(void *xml_attr,
- axis2_env_t **env)
+axis2_woden_xml_attr_free(
+ void *xml_attr,
+ axis2_env_t **env)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -151,44 +152,46 @@
}
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_resolve_methods(axis2_woden_xml_attr_t *xml_attr,
- axis2_env_t **env,
- axis2_woden_xml_attr_t *xml_attr_impl,
- axis2_hash_t *methods)
+axis2_woden_xml_attr_resolve_methods(
+ axis2_woden_xml_attr_t *xml_attr,
+ axis2_env_t **env,
+ axis2_hash_t *methods)
{
- axis2_woden_xml_attr_impl_t *xml_attr_impl_l = NULL;
-
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK((*env)->error, xml_attr_impl, AXIS2_FAILURE);
AXIS2_PARAM_CHECK((*env)->error, methods, AXIS2_FAILURE);
- xml_attr_impl_l = (axis2_woden_xml_attr_impl_t *) xml_attr_impl;
-
xml_attr->ops = AXIS2_MALLOC((*env)->allocator,
sizeof(axis2_woden_xml_attr_ops_t));
xml_attr->ops->free = axis2_hash_get(methods, "free", AXIS2_HASH_KEY_STRING);
- xml_attr->ops->init = xml_attr_impl_l->xml_attr.ops->init;
- xml_attr->ops->get_attribute_type =
- xml_attr_impl_l->xml_attr.ops->get_attribute_type;
- xml_attr->ops->get_content = xml_attr_impl_l->xml_attr.ops->get_content;
- xml_attr->ops->to_external_form =
- xml_attr_impl_l->xml_attr.ops->to_external_form;
- xml_attr->ops->is_valid = xml_attr_impl_l->xml_attr.ops->is_valid;
- xml_attr->ops->convert = axis2_hash_get(methods, "convert", AXIS2_HASH_KEY_STRING);
- xml_attr_impl_l->xml_attr.ops->convert = axis2_hash_get(methods, "convert",
- AXIS2_HASH_KEY_STRING);
- xml_attr->ops->set_valid = xml_attr_impl_l->xml_attr.ops->set_valid;
+ xml_attr->ops->to_xml_attr_free = axis2_hash_get(methods,
+ "to_xml_attr_free", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->type = axis2_hash_get(methods, "type", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->init = axis2_hash_get(methods,
+ "init", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->get_attribute_type = axis2_hash_get(methods,
+ "get_attribute_type", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->get_content = axis2_hash_get(methods,
+ "get_content", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->to_external_form = axis2_hash_get(methods,
+ "to_external_form", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->is_valid = axis2_hash_get(methods,
+ "is_valid", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->convert = axis2_hash_get(methods,
+ "convert", AXIS2_HASH_KEY_STRING);
+ xml_attr->ops->set_valid = axis2_hash_get(methods,
+ "set_valid", AXIS2_HASH_KEY_STRING);
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_init(void *xml_attr,
- axis2_env_t **env,
- axis2_om_element_t *owner_el,
- axis2_om_node_t *owner_node,
- axis2_qname_t *attr_type,
- axis2_char_t *attr_value)
+axis2_woden_xml_attr_init(
+ void *xml_attr,
+ axis2_env_t **env,
+ axis2_om_element_t *owner_el,
+ axis2_om_node_t *owner_node,
+ axis2_qname_t *attr_type,
+ axis2_char_t *attr_value)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -220,8 +223,9 @@
}
axis2_qname_t *AXIS2_CALL
-axis2_woden_xml_attr_get_attribute_type(void *xml_attr,
- axis2_env_t **env)
+axis2_woden_xml_attr_get_attribute_type(
+ void *xml_attr,
+ axis2_env_t **env)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -232,8 +236,9 @@
}
void *AXIS2_CALL
-axis2_woden_xml_attr_get_content(void *xml_attr,
- axis2_env_t **env)
+axis2_woden_xml_attr_get_content(
+ void *xml_attr,
+ axis2_env_t **env)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -243,8 +248,9 @@
}
axis2_char_t *AXIS2_CALL
-axis2_woden_xml_attr_to_external_form(void *xml_attr,
- axis2_env_t **env)
+axis2_woden_xml_attr_to_external_form(
+ void *xml_attr,
+ axis2_env_t **env)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -254,8 +260,9 @@
}
axis2_bool_t AXIS2_CALL
-axis2_woden_xml_attr_is_valid(void *xml_attr,
- axis2_env_t **env)
+axis2_woden_xml_attr_is_valid(
+ void *xml_attr,
+ axis2_env_t **env)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -265,9 +272,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_woden_xml_attr_set_valid(void *xml_attr,
- axis2_env_t **env,
- axis2_bool_t validity)
+ axis2_woden_xml_attr_set_valid(
+ void *xml_attr,
+ axis2_env_t **env,
+ axis2_bool_t validity)
{
axis2_woden_xml_attr_impl_t *xml_attr_impl = NULL;
@@ -276,3 +284,4 @@
xml_attr_impl->f_valid = validity;
return AXIS2_SUCCESS;
}
+