axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r414079 [9/26] - in /webservices/axis2/trunk/c/woden: include/ src/builder/ src/schema/ src/util/ src/wsdl20/ src/wsdl20/enumeration/ src/wsdl20/extensions/ src/wsdl20/extensions/soap/ src/wsdl20/xml/ src/xml/ test/
Date Wed, 14 Jun 2006 05:23:21 GMT
Modified: webservices/axis2/trunk/c/woden/src/schema/imported_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/imported_schema.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/imported_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/imported_schema.c Tue Jun 13 22:23:14 2006
@@ -14,124 +14,124 @@
  * limitations under the License.
  */
 
-#include <woden/schema/axis2_woden_imported_schema.h>
+#include <woden_imported_schema.h>
 #include <xml_schema.h>
 #include <axis2_uri.h>
 
-typedef struct axis2_woden_imported_schema_impl axis2_woden_imported_schema_impl_t;
+typedef struct woden_imported_schema_impl woden_imported_schema_impl_t;
 
 /** 
  * @brief Imported Schema Struct Impl
  *   Axis2 Imported Schema  
  */ 
-struct axis2_woden_imported_schema_impl
+struct woden_imported_schema_impl
 {
-    axis2_woden_imported_schema_t imported_schema;
-    axis2_woden_schema_t *schema;
-    axis2_woden_obj_types_t obj_type;
+    woden_imported_schema_t imported_schema;
+    woden_schema_t *schema;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
     axis2_uri_t *f_schema_location;
 };
 
 #define INTF_TO_IMPL(schema) \
-    ((axis2_woden_imported_schema_impl_t *) schema)
+    ((woden_imported_schema_impl_t *) schema)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_free(
+woden_imported_schema_free(
         void *schema,
         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_imported_schema_type(
+woden_obj_types_t AXIS2_CALL 
+woden_imported_schema_type(
         void *schema,
         const axis2_env_t *env);
 
-axis2_woden_schema_t *AXIS2_CALL
-axis2_woden_imported_schema_get_base_impl(
+woden_schema_t *AXIS2_CALL
+woden_imported_schema_get_base_impl(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_location(
+woden_imported_schema_set_location(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *location);
 
 axis2_uri_t *AXIS2_CALL
-axis2_woden_imported_schema_get_location(
+woden_imported_schema_get_location(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_namespace(
+woden_imported_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *namespc);
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_namespace(
+woden_imported_schema_get_namespace(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_schema_def(
+woden_imported_schema_set_schema_def(
         void *schema,
         const axis2_env_t *env,
         xml_schema_t *schema_def);
 
 xml_schema_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_schema_def(
+woden_imported_schema_get_schema_def(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_referenceable(
+woden_imported_schema_set_referenceable(
         void *schema,
         const axis2_env_t *env,
         axis2_bool_t referenceable);
 
 axis2_bool_t AXIS2_CALL 
-axis2_woden_imported_schema_is_referenceable(
+woden_imported_schema_is_referenceable(
         void *schema,
         const axis2_env_t *env);
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_namespace_as_string(
+woden_imported_schema_get_namespace_as_string(
         void *schema,
         const axis2_env_t *env);
 
 
-static axis2_woden_imported_schema_t *
+static woden_imported_schema_t *
 create(const axis2_env_t *env);
 
 static axis2_status_t
-axis2_woden_imported_schema_free_ops(
+woden_imported_schema_free_ops(
         void *schema,
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
-AXIS2_EXTERN axis2_woden_imported_schema_t * AXIS2_CALL
-axis2_woden_imported_schema_to_schema(
+AXIS2_EXTERN woden_imported_schema_t * AXIS2_CALL
+woden_imported_schema_to_schema(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if(!schema)
     {
-        schema_impl = (axis2_woden_imported_schema_impl_t *) create(env);
+        schema_impl = (woden_imported_schema_impl_t *) create(env);
     }
     else
-        schema_impl = (axis2_woden_imported_schema_impl_t *) schema;
+        schema_impl = (woden_imported_schema_impl_t *) schema;
 
-    axis2_woden_imported_schema_free_ops(schema, env);
+    woden_imported_schema_free_ops(schema, env);
             
     schema_impl->imported_schema.schema.ops = 
             AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_woden_schema_ops_t));
-    axis2_woden_schema_resolve_methods(&(schema_impl->imported_schema.schema), 
+            sizeof(woden_schema_ops_t));
+    woden_schema_resolve_methods(&(schema_impl->imported_schema.schema), 
             env, schema_impl->methods);
 
     return schema;
@@ -139,18 +139,18 @@
 
 /************************End of Woden C Internal Methods***********************/
 
-static axis2_woden_imported_schema_t *
+static woden_imported_schema_t *
 create(
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_imported_schema_impl_t));
+                    sizeof(woden_imported_schema_impl_t));
 
     schema_impl->schema = NULL;
-    schema_impl->obj_type = AXIS2_WODEN_IMPORTED_SCHEMA;
+    schema_impl->obj_type = WODEN_IMPORTED_SCHEMA;
     schema_impl->methods = NULL;
     schema_impl->f_schema_location = NULL;
 
@@ -158,18 +158,18 @@
 
     schema_impl->imported_schema.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_imported_schema_ops_t));
+                sizeof(woden_imported_schema_ops_t));
 
     schema_impl->imported_schema.ops->free = 
-        axis2_woden_imported_schema_free;
+        woden_imported_schema_free;
     schema_impl->imported_schema.ops->type = 
-        axis2_woden_imported_schema_type;
+        woden_imported_schema_type;
     schema_impl->imported_schema.ops->get_base_impl = 
-        axis2_woden_imported_schema_get_base_impl;
+        woden_imported_schema_get_base_impl;
     schema_impl->imported_schema.ops->set_location = 
-        axis2_woden_imported_schema_set_location;
+        woden_imported_schema_set_location;
     schema_impl->imported_schema.ops->get_location = 
-        axis2_woden_imported_schema_get_location;
+        woden_imported_schema_get_location;
     
     
     schema_impl->methods = axis2_hash_make(env);
@@ -179,49 +179,49 @@
         return NULL;
     }
     axis2_hash_set(schema_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_free);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_free);
     axis2_hash_set(schema_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_type);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_type);
     axis2_hash_set(schema_impl->methods, "set_location", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_set_location);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_set_location);
     axis2_hash_set(schema_impl->methods, "get_location", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_get_location);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_get_location);
     axis2_hash_set(schema_impl->methods, "set_namespace", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_set_namespace);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_set_namespace);
     axis2_hash_set(schema_impl->methods, "get_namespace", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_get_namespace);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_get_namespace);
     axis2_hash_set(schema_impl->methods, "set_schema_def", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_set_schema_def);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_set_schema_def);
     axis2_hash_set(schema_impl->methods, "get_schema_def", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_get_schema_def);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_get_schema_def);
     axis2_hash_set(schema_impl->methods, "set_referenceable", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_set_referenceable);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_set_referenceable);
     axis2_hash_set(schema_impl->methods, "is_referencealbe", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_is_referenceable);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_is_referenceable);
     axis2_hash_set(schema_impl->methods, "get_namespace_as_string", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_imported_schema_get_namespace_as_string);
+            AXIS2_HASH_KEY_STRING, woden_imported_schema_get_namespace_as_string);
 
     return &(schema_impl->imported_schema);
 }
-AXIS2_EXTERN axis2_woden_imported_schema_t * AXIS2_CALL
-axis2_woden_imported_schema_create(
+AXIS2_EXTERN woden_imported_schema_t * AXIS2_CALL
+woden_imported_schema_create(
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    schema_impl = (axis2_woden_imported_schema_impl_t *) create(env);
+    schema_impl = (woden_imported_schema_impl_t *) create(env);
 
-    schema_impl->schema = axis2_woden_schema_create(env);
+    schema_impl->schema = woden_schema_create(env);
     return &(schema_impl->imported_schema);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_imported_schema_type(
+woden_obj_types_t AXIS2_CALL 
+woden_imported_schema_type(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -230,11 +230,11 @@
 }
 
 static axis2_status_t
-axis2_woden_imported_schema_free_ops(
+woden_imported_schema_free_ops(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -250,11 +250,11 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_woden_imported_schema_free(
+woden_imported_schema_free(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -273,11 +273,11 @@
 
     if(schema_impl->schema)
     {
-        AXIS2_WODEN_SCHEMA_FREE(schema_impl->schema, env);
+        WODEN_SCHEMA_FREE(schema_impl->schema, env);
         schema_impl->schema = NULL;
     }
 
-    axis2_woden_imported_schema_free_ops(schema, env);
+    woden_imported_schema_free_ops(schema, env);
 
     if((&(schema_impl->imported_schema))->ops)
     {
@@ -293,12 +293,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_schema_t *AXIS2_CALL
-axis2_woden_imported_schema_get_base_impl(
+woden_schema_t *AXIS2_CALL
+woden_imported_schema_get_base_impl(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     schema_impl = INTF_TO_IMPL(schema);
@@ -307,8 +307,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_imported_schema_resolve_methods(
-        axis2_woden_imported_schema_t *schema,
+woden_imported_schema_resolve_methods(
+        woden_imported_schema_t *schema,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {
@@ -329,12 +329,12 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_location(
+woden_imported_schema_set_location(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *location)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -349,11 +349,11 @@
 }
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_location(
+woden_imported_schema_get_location(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -362,100 +362,100 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_namespace(
+woden_imported_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *namespc)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_SET_NAMESPACE(schema_impl->schema, env, namespc);
+    return WODEN_SCHEMA_SET_NAMESPACE(schema_impl->schema, env, namespc);
 }
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_namespace(
+woden_imported_schema_get_namespace(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_GET_NAMESPACE(schema_impl->schema, env);
+    return WODEN_SCHEMA_GET_NAMESPACE(schema_impl->schema, env);
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_schema_def(
+woden_imported_schema_set_schema_def(
         void *schema,
         const axis2_env_t *env,
         xml_schema_t *schema_def)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, schema_def, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
     
-    return AXIS2_WODEN_SCHEMA_SET_SCHEMA_DEF(schema_impl->schema, env, 
+    return WODEN_SCHEMA_SET_SCHEMA_DEF(schema_impl->schema, env, 
             schema_def);
 }
 
 xml_schema_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_schema_def(
+woden_imported_schema_get_schema_def(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_GET_SCHEMA_DEF(schema_impl->schema, env);
+    return WODEN_SCHEMA_GET_SCHEMA_DEF(schema_impl->schema, env);
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_imported_schema_set_referenceable(
+woden_imported_schema_set_referenceable(
         void *schema,
         const axis2_env_t *env,
         axis2_bool_t referenceable)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_SET_REFERENCEABLE(schema_impl->schema, env, 
+    return WODEN_SCHEMA_SET_REFERENCEABLE(schema_impl->schema, env, 
             referenceable); 
 }
 
 axis2_bool_t AXIS2_CALL 
-axis2_woden_imported_schema_is_referenceable(
+woden_imported_schema_is_referenceable(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_IS_REFERENCEABLE(schema_impl->schema, env);
+    return WODEN_SCHEMA_IS_REFERENCEABLE(schema_impl->schema, env);
 }
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_imported_schema_get_namespace_as_string(
+woden_imported_schema_get_namespace_as_string(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_imported_schema_impl_t *schema_impl = NULL;
+    woden_imported_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(schema_impl->schema, env);
+    return WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(schema_impl->schema, env);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/inlined_schema.c Tue Jun 13 22:23:14 2006
@@ -14,124 +14,124 @@
  * limitations under the License.
  */
 
-#include <woden/schema/axis2_woden_inlined_schema.h>
+#include <woden_inlined_schema.h>
 #include <xml_schema.h>
 #include <axis2_uri.h>
 
-typedef struct axis2_woden_inlined_schema_impl axis2_woden_inlined_schema_impl_t;
+typedef struct woden_inlined_schema_impl woden_inlined_schema_impl_t;
 
 /** 
  * @brief Inlined Schema Struct Impl
  *   Axis2 Inlined Schema  
  */ 
-struct axis2_woden_inlined_schema_impl
+struct woden_inlined_schema_impl
 {
-    axis2_woden_inlined_schema_t inlined_schema;
-    axis2_woden_schema_t *schema;
-    axis2_woden_obj_types_t obj_type;
+    woden_inlined_schema_t inlined_schema;
+    woden_schema_t *schema;
+    woden_obj_types_t obj_type;
     axis2_hash_t *methods;
     axis2_char_t *f_schema_id;
 };
 
 #define INTF_TO_IMPL(schema) \
-    ((axis2_woden_inlined_schema_impl_t *) schema)
+    ((woden_inlined_schema_impl_t *) schema)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_free(
+woden_inlined_schema_free(
         void *schema,
         const axis2_env_t *env);
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_inlined_schema_type(
+woden_obj_types_t AXIS2_CALL 
+woden_inlined_schema_type(
         void *schema,
         const axis2_env_t *env);
 
-axis2_woden_schema_t *AXIS2_CALL
-axis2_woden_inlined_schema_get_base_impl(
+woden_schema_t *AXIS2_CALL
+woden_inlined_schema_get_base_impl(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_id(
+woden_inlined_schema_set_id(
         void *schema,
         const axis2_env_t *env,
         axis2_char_t *id);
 
 axis2_char_t *AXIS2_CALL
-axis2_woden_inlined_schema_get_id(
+woden_inlined_schema_get_id(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_namespace(
+woden_inlined_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *namespc);
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_namespace(
+woden_inlined_schema_get_namespace(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_schema_def(
+woden_inlined_schema_set_schema_def(
         void *schema,
         const axis2_env_t *env,
         xml_schema_t *schema_def);
 
 xml_schema_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_schema_def(
+woden_inlined_schema_get_schema_def(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_referenceable(
+woden_inlined_schema_set_referenceable(
         void *schema,
         const axis2_env_t *env,
         axis2_bool_t referenceable);
 
 axis2_bool_t AXIS2_CALL 
-axis2_woden_inlined_schema_is_referenceable(
+woden_inlined_schema_is_referenceable(
         void *schema,
         const axis2_env_t *env);
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_namespace_as_string(
+woden_inlined_schema_get_namespace_as_string(
         void *schema,
         const axis2_env_t *env);
 
 
-static axis2_woden_inlined_schema_t *
+static woden_inlined_schema_t *
 create(const axis2_env_t *env);
 
 static axis2_status_t
-axis2_woden_inlined_schema_free_ops(
+woden_inlined_schema_free_ops(
         void *schema,
         const axis2_env_t *env);
 
 /************************Woden C Internal Methods******************************/
-AXIS2_EXTERN axis2_woden_inlined_schema_t * AXIS2_CALL
-axis2_woden_inlined_schema_to_schema(
+AXIS2_EXTERN woden_inlined_schema_t * AXIS2_CALL
+woden_inlined_schema_to_schema(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
 
     if(!schema)
     {
-        schema_impl = (axis2_woden_inlined_schema_impl_t *) create(env);
+        schema_impl = (woden_inlined_schema_impl_t *) create(env);
     }
     else
-        schema_impl = (axis2_woden_inlined_schema_impl_t *) schema;
+        schema_impl = (woden_inlined_schema_impl_t *) schema;
 
-    axis2_woden_inlined_schema_free_ops(schema, env);
+    woden_inlined_schema_free_ops(schema, env);
 
     schema_impl->inlined_schema.schema.ops = 
             AXIS2_MALLOC(env->allocator, 
-            sizeof(axis2_woden_schema_ops_t));
-    axis2_woden_schema_resolve_methods(&(schema_impl->inlined_schema.schema), 
+            sizeof(woden_schema_ops_t));
+    woden_schema_resolve_methods(&(schema_impl->inlined_schema.schema), 
             env, schema_impl->methods);
 
     return schema;
@@ -139,18 +139,18 @@
 
 /************************End of Woden C Internal Methods***********************/
 
-static axis2_woden_inlined_schema_t *
+static woden_inlined_schema_t *
 create(
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_inlined_schema_impl_t));
+                    sizeof(woden_inlined_schema_impl_t));
 
     schema_impl->schema = NULL;
-    schema_impl->obj_type = AXIS2_WODEN_INLINED_SCHEMA;
+    schema_impl->obj_type = WODEN_INLINED_SCHEMA;
     schema_impl->methods = NULL;
     schema_impl->f_schema_id = NULL;
 
@@ -158,19 +158,19 @@
 
     schema_impl->inlined_schema.ops = 
         AXIS2_MALLOC(env->allocator, 
-                sizeof(axis2_woden_inlined_schema_ops_t));
+                sizeof(woden_inlined_schema_ops_t));
 
     schema_impl->inlined_schema.ops->free = 
-        axis2_woden_inlined_schema_free;
+        woden_inlined_schema_free;
     schema_impl->inlined_schema.ops->type = 
-        axis2_woden_inlined_schema_type;
+        woden_inlined_schema_type;
     schema_impl->inlined_schema.ops->get_base_impl = 
-        axis2_woden_inlined_schema_get_base_impl;
+        woden_inlined_schema_get_base_impl;
 
     schema_impl->inlined_schema.ops->set_id = 
-        axis2_woden_inlined_schema_set_id;
+        woden_inlined_schema_set_id;
     schema_impl->inlined_schema.ops->get_id = 
-        axis2_woden_inlined_schema_get_id;
+        woden_inlined_schema_get_id;
     
     schema_impl->methods = axis2_hash_make(env);
     if(!schema_impl->methods) 
@@ -179,50 +179,50 @@
         return NULL;
     }
     axis2_hash_set(schema_impl->methods, "free", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_free);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_free);
     axis2_hash_set(schema_impl->methods, "type", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_type);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_type);
     
     axis2_hash_set(schema_impl->methods, "set_id", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_set_id);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_set_id);
     axis2_hash_set(schema_impl->methods, "get_id", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_get_id);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_get_id);
     axis2_hash_set(schema_impl->methods, "set_namespace", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_set_namespace);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_set_namespace);
     axis2_hash_set(schema_impl->methods, "get_namespace", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_get_namespace);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_get_namespace);
     axis2_hash_set(schema_impl->methods, "set_schema_def", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_set_schema_def);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_set_schema_def);
     axis2_hash_set(schema_impl->methods, "get_schema_def", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_get_schema_def);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_get_schema_def);
     axis2_hash_set(schema_impl->methods, "set_referenceable", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_set_referenceable);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_set_referenceable);
     axis2_hash_set(schema_impl->methods, "is_referencealbe", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_is_referenceable);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_is_referenceable);
     axis2_hash_set(schema_impl->methods, "get_namespace_as_string", 
-            AXIS2_HASH_KEY_STRING, axis2_woden_inlined_schema_get_namespace_as_string);
+            AXIS2_HASH_KEY_STRING, woden_inlined_schema_get_namespace_as_string);
 
     return &(schema_impl->inlined_schema);
 }
-AXIS2_EXTERN axis2_woden_inlined_schema_t * AXIS2_CALL
-axis2_woden_inlined_schema_create(
+AXIS2_EXTERN woden_inlined_schema_t * AXIS2_CALL
+woden_inlined_schema_create(
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
      
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    schema_impl = (axis2_woden_inlined_schema_impl_t *) create(env);
+    schema_impl = (woden_inlined_schema_impl_t *) create(env);
 
-    schema_impl->schema = axis2_woden_schema_create(env);
+    schema_impl->schema = woden_schema_create(env);
     return &(schema_impl->inlined_schema);
 }
 
-axis2_woden_obj_types_t AXIS2_CALL 
-axis2_woden_inlined_schema_type(
+woden_obj_types_t AXIS2_CALL 
+woden_inlined_schema_type(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -231,11 +231,11 @@
 }
 
 static axis2_status_t
-axis2_woden_inlined_schema_free_ops(
+woden_inlined_schema_free_ops(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -251,11 +251,11 @@
 
 
 axis2_status_t AXIS2_CALL
-axis2_woden_inlined_schema_free(
+woden_inlined_schema_free(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -274,11 +274,11 @@
 
     if(schema_impl->schema)
     {
-        AXIS2_WODEN_SCHEMA_FREE(schema_impl->schema, env);
+        WODEN_SCHEMA_FREE(schema_impl->schema, env);
         schema_impl->schema = NULL;
     }
 
-    axis2_woden_inlined_schema_free_ops(schema, env);
+    woden_inlined_schema_free_ops(schema, env);
     
     if((&(schema_impl->inlined_schema))->ops)
     {
@@ -294,12 +294,12 @@
     return AXIS2_SUCCESS;
 }
 
-axis2_woden_schema_t *AXIS2_CALL
-axis2_woden_inlined_schema_get_base_impl(
+woden_schema_t *AXIS2_CALL
+woden_inlined_schema_get_base_impl(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, NULL);
     schema_impl = INTF_TO_IMPL(schema);
@@ -308,8 +308,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_inlined_schema_resolve_methods(
-        axis2_woden_inlined_schema_t *schema,
+woden_inlined_schema_resolve_methods(
+        woden_inlined_schema_t *schema,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {
@@ -330,12 +330,12 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_id(
+woden_inlined_schema_set_id(
         void *schema,
         const axis2_env_t *env,
         axis2_char_t *id)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -350,11 +350,11 @@
 }
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_id(
+woden_inlined_schema_get_id(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -363,100 +363,100 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_namespace(
+woden_inlined_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *namespc)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_SET_NAMESPACE(schema_impl->schema, env, namespc);
+    return WODEN_SCHEMA_SET_NAMESPACE(schema_impl->schema, env, namespc);
 }
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_namespace(
+woden_inlined_schema_get_namespace(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_GET_NAMESPACE(schema_impl->schema, env);
+    return WODEN_SCHEMA_GET_NAMESPACE(schema_impl->schema, env);
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_schema_def(
+woden_inlined_schema_set_schema_def(
         void *schema,
         const axis2_env_t *env,
         xml_schema_t *schema_def)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, schema_def, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
     
-    return AXIS2_WODEN_SCHEMA_SET_SCHEMA_DEF(schema_impl->schema, env, 
+    return WODEN_SCHEMA_SET_SCHEMA_DEF(schema_impl->schema, env, 
             schema_def);
 }
 
 xml_schema_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_schema_def(
+woden_inlined_schema_get_schema_def(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_GET_SCHEMA_DEF(schema_impl->schema, env);
+    return WODEN_SCHEMA_GET_SCHEMA_DEF(schema_impl->schema, env);
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_inlined_schema_set_referenceable(
+woden_inlined_schema_set_referenceable(
         void *schema,
         const axis2_env_t *env,
         axis2_bool_t referenceable)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_SET_REFERENCEABLE(schema_impl->schema, env, 
+    return WODEN_SCHEMA_SET_REFERENCEABLE(schema_impl->schema, env, 
             referenceable); 
 }
 
 axis2_bool_t AXIS2_CALL 
-axis2_woden_inlined_schema_is_referenceable(
+woden_inlined_schema_is_referenceable(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_IS_REFERENCEABLE(schema_impl->schema, env);
+    return WODEN_SCHEMA_IS_REFERENCEABLE(schema_impl->schema, env);
 }
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_inlined_schema_get_namespace_as_string(
+woden_inlined_schema_get_namespace_as_string(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_inlined_schema_impl_t *schema_impl = NULL;
+    woden_inlined_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
 
-    return AXIS2_WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(schema_impl->schema, env);
+    return WODEN_SCHEMA_GET_NAMESPACE_AS_STRING(schema_impl->schema, env);
 }
 

Modified: webservices/axis2/trunk/c/woden/src/schema/schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/schema.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/schema.c Tue Jun 13 22:23:14 2006
@@ -14,106 +14,106 @@
  * limitations under the License.
  */
  
-#include <woden/schema/axis2_woden_schema.h>
+#include <woden_schema.h>
 #include <xml_schema.h>
 
-typedef struct axis2_woden_schema_impl axis2_woden_schema_impl_t;
+typedef struct woden_schema_impl woden_schema_impl_t;
 
 /** 
  * @brief Schema Struct Impl
  *   Axis2 Schema  
  */ 
-struct axis2_woden_schema_impl
+struct woden_schema_impl
 {
-    axis2_woden_schema_t schema;
+    woden_schema_t schema;
     axis2_uri_t *f_namespc;
     xml_schema_t *f_schema_def;
     axis2_bool_t f_is_referenceable;
 };
 
-#define INTF_TO_IMPL(schema) ((axis2_woden_schema_impl_t *) schema)
+#define INTF_TO_IMPL(schema) ((woden_schema_impl_t *) schema)
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_free(
+woden_schema_free(
         void *schema,
         const axis2_env_t *envv);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_set_namespace(
+woden_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *namespc);
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_schema_get_namespace(
+woden_schema_get_namespace(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_set_schema_def(
+woden_schema_set_schema_def(
         void *schema,
         const axis2_env_t *env,
         xml_schema_t *schema_def);
 
 xml_schema_t *AXIS2_CALL 
-axis2_woden_schema_get_schema_def(
+woden_schema_get_schema_def(
         void *schema,
         const axis2_env_t *env);
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_set_referenceable(
+woden_schema_set_referenceable(
         void *schema,
         const axis2_env_t *env,
         axis2_bool_t referenceable);
 
 axis2_bool_t AXIS2_CALL 
-axis2_woden_schema_is_referenceable(
+woden_schema_is_referenceable(
         void *schema,
         const axis2_env_t *env);
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_schema_get_namespace_as_string(
+woden_schema_get_namespace_as_string(
         void *schema,
         const axis2_env_t *env);
 
-AXIS2_EXTERN axis2_woden_schema_t * AXIS2_CALL
-axis2_woden_schema_create(
+AXIS2_EXTERN woden_schema_t * AXIS2_CALL
+woden_schema_create(
         const axis2_env_t *env)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
     
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_schema_impl_t));
+                    sizeof(woden_schema_impl_t));
 
     schema_impl->f_namespc = NULL;
     schema_impl->f_schema_def = NULL;
     schema_impl->f_is_referenceable = AXIS2_TRUE;
 
     schema_impl->schema.ops = AXIS2_MALLOC(env->allocator, 
-                    sizeof(axis2_woden_schema_ops_t)); 
+                    sizeof(woden_schema_ops_t)); 
     
-    schema_impl->schema.ops->free = axis2_woden_schema_free;
-    schema_impl->schema.ops->set_namespace = axis2_woden_schema_set_namespace;
-    schema_impl->schema.ops->get_namespace = axis2_woden_schema_get_namespace;
-    schema_impl->schema.ops->set_schema_def = axis2_woden_schema_set_schema_def;
-    schema_impl->schema.ops->get_schema_def = axis2_woden_schema_get_schema_def;
+    schema_impl->schema.ops->free = woden_schema_free;
+    schema_impl->schema.ops->set_namespace = woden_schema_set_namespace;
+    schema_impl->schema.ops->get_namespace = woden_schema_get_namespace;
+    schema_impl->schema.ops->set_schema_def = woden_schema_set_schema_def;
+    schema_impl->schema.ops->get_schema_def = woden_schema_get_schema_def;
     schema_impl->schema.ops->set_referenceable = 
-        axis2_woden_schema_set_referenceable;
+        woden_schema_set_referenceable;
     schema_impl->schema.ops->is_referenceable = 
-        axis2_woden_schema_is_referenceable;
+        woden_schema_is_referenceable;
     schema_impl->schema.ops->get_namespace_as_string = 
-        axis2_woden_schema_get_namespace_as_string;
+        woden_schema_get_namespace_as_string;
     
     return &(schema_impl->schema);
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_schema_free(
+woden_schema_free(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -145,8 +145,8 @@
 }
 
 axis2_status_t AXIS2_CALL
-axis2_woden_schema_resolve_methods(
-        axis2_woden_schema_t *schema,
+woden_schema_resolve_methods(
+        woden_schema_t *schema,
         const axis2_env_t *env,
         axis2_hash_t *methods)
 {
@@ -173,12 +173,12 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_set_namespace(
+woden_schema_set_namespace(
         void *schema,
         const axis2_env_t *env,
         axis2_uri_t *namespc)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, namespc, AXIS2_FAILURE);
@@ -195,11 +195,11 @@
 }
 
 axis2_uri_t *AXIS2_CALL 
-axis2_woden_schema_get_namespace(
+woden_schema_get_namespace(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -208,12 +208,12 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_set_schema_def(
+woden_schema_set_schema_def(
         void *schema,
         const axis2_env_t *env,
         xml_schema_t *schema_def)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, schema_def, AXIS2_FAILURE);
@@ -230,11 +230,11 @@
 }
 
 xml_schema_t *AXIS2_CALL 
-axis2_woden_schema_get_schema_def(
+woden_schema_get_schema_def(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -243,12 +243,12 @@
 }
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_schema_set_referenceable(
+woden_schema_set_referenceable(
         void *schema,
         const axis2_env_t *env,
         axis2_bool_t referenceable)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -259,11 +259,11 @@
 }
 
 axis2_bool_t AXIS2_CALL 
-axis2_woden_schema_is_referenceable(
+woden_schema_is_referenceable(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);
@@ -272,11 +272,11 @@
 }
 
 axis2_char_t *AXIS2_CALL 
-axis2_woden_schema_get_namespace_as_string(
+woden_schema_get_namespace_as_string(
         void *schema,
         const axis2_env_t *env)
 {
-    axis2_woden_schema_impl_t *schema_impl = NULL;
+    woden_schema_impl_t *schema_impl = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     schema_impl = INTF_TO_IMPL(schema);

Modified: webservices/axis2/trunk/c/woden/src/schema/schema_constants.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/schema_constants.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/schema_constants.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/schema_constants.c Tue Jun 13 22:23:14 2006
@@ -22,8 +22,8 @@
 #include <axis2_hash.h>
 #include <axis2_uri.h>
 #include <axis2_qname.h>
-#include <woden/axis2_woden.h>
-#include <woden/axis2_woden_schema_constants.h>
+#include <woden/woden.h>
+#include <woden/woden_schema_constants.h>
 
 axis2_bool_t AXIS2_CALL
 woden_schema_constants_compare_schema(

Modified: webservices/axis2/trunk/c/woden/src/util/component_model_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/component_model_builder.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/component_model_builder.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/component_model_builder.c Tue Jun 13 22:23:14 2006
@@ -14,26 +14,26 @@
  * limitations under the License.
  */
  
-#include <woden/util/axis2_woden_component_model_builder.h>
-#include ../wsdl20/axis2_woden_constants.h"
+#include <woden_component_model_builder.h>
+#include ../wsdl20/woden_constants.h"
 
-typedef struct axis2_woden_component_model_builder_impl
+typedef struct woden_component_model_builder_impl
 {
-    axis2_woden_component_model_builder_t component_model_builder;
+    woden_component_model_builder_t component_model_builder;
     void *f_desc;
     axis2_array_list_t *f_schemas_done;
     axis2_array_list_t *f_interfaces_done;
     axis2_array_list_t *f_bindings_done;
     axis2_array_list_t *f_svcs_done;
     
-}axis2_woden_component_model_builder_impl_t;
+}woden_component_model_builder_impl_t;
 
 #define AXIS2_INTF_TO_IMPL(builder) \
-    ((axis2_woden_component_model_builder_impl_t *) builder)
+    ((woden_component_model_builder_impl_t *) builder)
 
 axis2_status_t AXIS2_CALL
-axis2_woden_component_model_builder_free (
-        axis2_woden_component_model_builder_t *builder, 
+woden_component_model_builder_free (
+        woden_component_model_builder_t *builder, 
         const axis2_env_t *env); 
 
 /*
@@ -196,18 +196,18 @@
 
 /************************** End of function prototypes ************************/
 
-axis2_woden_component_model_builder_t *AXIS2_CALL 
-axis2_woden_component_model_builder_create(
+woden_component_model_builder_t *AXIS2_CALL 
+woden_component_model_builder_create(
         const axis2_env_t *env,
         void *desc)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     
    AXIS2_ENV_CHECK(env, NULL);
    
-   builder_impl = (axis2_woden_component_model_builder_impl_t *) 
+   builder_impl = (woden_component_model_builder_impl_t *) 
         AXIS2_MALLOC(env->allocator, 
-        sizeof(axis2_woden_component_model_builder_impl_t));
+        sizeof(woden_component_model_builder_impl_t));
    
    if(NULL == builder_impl)
     {
@@ -222,20 +222,20 @@
     
     builder_impl->builder.ops = 
       AXIS2_MALLOC (env->allocator, 
-                sizeof(axis2_woden_component_model_builder_ops_t));
+                sizeof(woden_component_model_builder_ops_t));
    if(NULL == builder_impl->builder.ops)
     {
-        axis2_woden_component_model_builder_free(&(builder_impl->builder), env);
+        woden_component_model_builder_free(&(builder_impl->builder), env);
       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
         return NULL;
     }
     
 
     builder_impl->builder.ops->free =  
-        axis2_woden_component_model_builder_free;
+        woden_component_model_builder_free;
     
     builder_impl->f_desc = desc;
-    axis2_woden_component_model_builder_init_components(&(builder_impl->builder), env, 
+    woden_component_model_builder_init_components(&(builder_impl->builder), env, 
             builder_impl->f_desc);
    return &(builder_impl->builder);
 }
@@ -243,11 +243,11 @@
 /***************************Function implementation****************************/
 
 axis2_status_t AXIS2_CALL 
-axis2_woden_component_model_builder_free (
-        axis2_woden_component_model_builder_t *builder, 
+woden_component_model_builder_free (
+        woden_component_model_builder_t *builder, 
         const axis2_env_t *env)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
@@ -281,7 +281,7 @@
     build_bindings(builder, env);
     build_svcs(builder, env);
     
-    includes = AXIS2_WODEN_DESC_GET_INCLUDE_ELEMENTS(desc, env);
+    includes = WODEN_DESC_GET_INCLUDE_ELEMENTS(desc, env);
     size = AXIS2_ARRAY_LIST_SIZE(includes, env);
     for(i = 0; i < size; i++)
     {
@@ -289,14 +289,14 @@
         void *incl_el = NULL;
 
         incl_el = AXIS2_ARRAY_LIST_GET(includes, env, i);
-        incl_desc = AXIS2_WODEN_INCLUDE_ELEMENT_GET_DESC_ELEMENT(incl_el, env);
+        incl_desc = WODEN_INCLUDE_ELEMENT_GET_DESC_ELEMENT(incl_el, env);
         if(NULL != incl_desc)
         {
             init_components(builder, env, incl_desc);
         }
     }
      
-    imports = AXIS2_WODEN_DESC_GET_IMPORT_ELEMENTS(desc, env);
+    imports = WODEN_DESC_GET_IMPORT_ELEMENTS(desc, env);
     size = AXIS2_ARRAY_LIST_SIZE(imports, env);
     for(i = 0; i < size; i++)
     {
@@ -304,7 +304,7 @@
         void *imp_el = NULL;
 
         imp_el = AXIS2_ARRAY_LIST_GET(imports, env, i);
-        imp_desc = AXIS2_WODEN_IMPORT_ELEMENT_GET_DESC_ELEMENT(imp_el, env);
+        imp_desc = WODEN_IMPORT_ELEMENT_GET_DESC_ELEMENT(imp_el, env);
         if(NULL != imp_desc)
         {
             init_components(builder, env, imp_desc);
@@ -326,7 +326,7 @@
         const axis2_env_t *env,
         void *desc)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     void *types = NULL;
     axis2_uri_t *type_system_uri = NULL;
 
@@ -334,7 +334,7 @@
     AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
 
-    types = AXIS2_WODEN_DESC_GET_TYPES_ELEMENT(desc, env);
+    types = WODEN_DESC_GET_TYPES_ELEMENT(desc, env);
     
     type_system_uri = axis2_uri_parse_string(env, WODEN_TYPE_XSD_2001);
     
@@ -344,7 +344,7 @@
         int i = 0, size = 0;
 
         referenceable_schema_defs = 
-            AXIS2_WODEN_TYPES_GET_REFERENCEABLE_SCHEMA_DEFS(types, env);
+            WODEN_TYPES_GET_REFERENCEABLE_SCHEMA_DEFS(types, env);
         if(referenceable_shcema_defs)
             size = AXIS2_ARRAY_LIST_SIZE(referenceable_schema_defs, env);
         for(i = 0; i < size; i++)
@@ -397,7 +397,7 @@
         void *schema_def,
         axis2_uri_t *type_system_uri)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_char_t *schema_tns = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -428,15 +428,15 @@
             {
                 void *ed = NULL;
 
-                ed = axis2_woden_element_decl_create(env);
-                AXIS2_WODEN_ELEMENT_DECL_SET_QNAME(ed, env, qname);
-                AXIS2_WODEN_ELEMENT_DECL_SET_SYSTEM(ed, env, type_system_uri);
-                AXIS2_WODEN_ELEMENT_DECL_SET_CONTENT_MODEL(ed, env, 
+                ed = woden_element_decl_create(env);
+                WODEN_ELEMENT_DECL_SET_QNAME(ed, env, qname);
+                WODEN_ELEMENT_DECL_SET_SYSTEM(ed, env, type_system_uri);
+                WODEN_ELEMENT_DECL_SET_CONTENT_MODEL(ed, env, 
                         WODEN_API_APACHE_WS_XS);
-                AXIS2_WODEN_ELEMENT_DECL_SET_CONTENT(ed, env, 
+                WODEN_ELEMENT_DECL_SET_CONTENT(ed, env, 
                         XML_SCHEMA_OBJ_TABLE_GET_ITEM(element_table, env, 
                             qname));
-                AXIS2_WODEN_DESC_ADD_TO_ALL_ELEMENT_DECLS(builder_impl->f_desc, 
+                WODEN_DESC_ADD_TO_ALL_ELEMENT_DECLS(builder_impl->f_desc, 
                         env, ed);
             }
         }
@@ -453,7 +453,7 @@
         void *schema_def,
         axis2_uri_t *type_system_uri)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_char_t *schema_tns = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -484,15 +484,15 @@
             {
                 void *td = NULL;
 
-                td = axis2_woden_type_def_create(env);
-                AXIS2_WODEN_TYPE_DEF_SET_QNAME(td, env, qname);
-                AXIS2_WODEN_TYPE_DEF_SET_SYSTEM(td, env, type_system_uri);
-                AXIS2_WODEN_TYPE_DEF_SET_CONTENT_MODEL(td, env, 
+                td = woden_type_def_create(env);
+                WODEN_TYPE_DEF_SET_QNAME(td, env, qname);
+                WODEN_TYPE_DEF_SET_SYSTEM(td, env, type_system_uri);
+                WODEN_TYPE_DEF_SET_CONTENT_MODEL(td, env, 
                         WODEN_API_APACHE_WS_XS);
-                AXIS2_WODEN_TYPE_DEF_SET_CONTENT(td, env, 
+                WODEN_TYPE_DEF_SET_CONTENT(td, env, 
                         XML_SCHEMA_OBJ_TABLE_GET_ITEM(type_table, env, 
                             qname));
-                AXIS2_WODEN_DESC_ADD_TO_ALL_TYPE_DEFS(builder_impl->f_desc, 
+                WODEN_DESC_ADD_TO_ALL_TYPE_DEFS(builder_impl->f_desc, 
                         env, td);
             }
         }
@@ -514,7 +514,7 @@
         const axis2_env_t *env,
         void *desc)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *interface_els = NULL;
     int i = 0, size = 0;
 
@@ -522,7 +522,7 @@
     AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
 
-    interface_els = AXIS2_WODEN_DESC_GET_INTERFACE_ELEMENTS(desc, env);
+    interface_els = WODEN_DESC_GET_INTERFACE_ELEMENTS(desc, env);
     if(NULL != interface_els)
     {
         size = AXIS2_ARRAY_LIST_SIZE(interface_els, env);
@@ -535,9 +535,9 @@
         if(AXIS2_TRUE != AXIS2_ARRAY_LIST_CONTAINS(interface_els, env, int_impl))
         {
             axis2_array_list_t *property_els = NULL;
-            AXIS2_WODEN_DESC_ADD_TO_ALL_INTERFACES(builder_impl->f_desc, 
+            WODEN_DESC_ADD_TO_ALL_INTERFACES(builder_impl->f_desc, 
                     env, int_impl);
-            property_els = AXIS2_WODEN_INTERFACE_GET_PROPERTY_ELEMENTS(int_impl, 
+            property_els = WODEN_INTERFACE_GET_PROPERTY_ELEMENTS(int_impl, 
                     env);
             build_properties(builder, env, property_els, int_impl);
             build_interface_faults(builder, env, int_impl);
@@ -561,7 +561,7 @@
         const axis2_env_t *env,
         void *interface)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *faults = NULL;
     int i = 0, size = 0;
 
@@ -569,8 +569,8 @@
     AXIS2_PARAM_CHECK(env->error, interface, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    interface = axis2_woden_interface_to_interface_element(interface, env);
-    faults = AXIS2_WODEN_INTERFACE_ELEMENT_GET_INTERFACE_FAULT_ELEMENTS(
+    interface = woden_interface_to_interface_element(interface, env);
+    faults = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_FAULT_ELEMENTS(
             interface, env);
     if(faults)
         size = AXIS2_ARRAY_LIST_SIZE(faults, env);
@@ -580,17 +580,17 @@
         axis2_array_list_t *property_elements = NULL;
         
         fault = AXIS2_ARRAY_LIST_GET(faults, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_FAULT_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_FAULT_GET_PROPERTY_ELEMENTS(
                 fault, env);
         build_properties(builder, env, property_elements, fault);
-        qname = AXIS2_WODEN_INTERFACE_FAULT_GET_ELEMENT_QNAME(fault, env);
+        qname = WODEN_INTERFACE_FAULT_GET_ELEMENT_QNAME(fault, env);
         if(NULL ! = qname)
         {
             void *element_decl = NULL;
             
-            element_decl = AXIS2_WODEN_DESC_GET_ELEMENT_DECL(
+            element_decl = WODEN_DESC_GET_ELEMENT_DECL(
                     builder_impl->f_desc, env, qname);
-            AXIS2_WODEN_INTERFACE_FAULT_SET_ELEMENT_DECL(fault, env, element_decl);
+            WODEN_INTERFACE_FAULT_SET_ELEMENT_DECL(fault, env, element_decl);
         }
     }
     return AXIS2_SUCCESS;
@@ -602,7 +602,7 @@
         const axis2_env_t *env,
         void *interface)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *ops = NULL;
     int i = 0, size = 0;
 
@@ -610,8 +610,8 @@
     AXIS2_PARAM_CHECK(env->error, interface, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    interface = axis2_woden_interface_to_interface_element(interface, env);
-    ops = AXIS2_WODEN_INTERFACE_ELEMENT_GET_INTERFACE_OP_ELEMENTS(
+    interface = woden_interface_to_interface_element(interface, env);
+    ops = WODEN_INTERFACE_ELEMENT_GET_INTERFACE_OP_ELEMENTS(
             interface, env);
     if(ops)
         size = AXIS2_ARRAY_LIST_SIZE(ops, env);
@@ -621,7 +621,7 @@
         axis2_array_list_t *property_elements = NULL;
         
         op = AXIS2_ARRAY_LIST_GET(ops, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_OP_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_OP_GET_PROPERTY_ELEMENTS(
                 op, env);
         build_properties(builder, env, property_elements, op);
         build_interface_fault_refs(builder, env, op);
@@ -636,7 +636,7 @@
         const axis2_env_t *env,
         void *op)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *fault_refs = NULL;
     int i = 0, size = 0;
 
@@ -644,8 +644,8 @@
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    op = axis2_woden__interface_op_to_interface_op_element(op, env);
-    fault_refs = AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_FAULT_REF_ELEMENTS(
+    op = woden__interface_op_to_interface_op_element(op, env);
+    fault_refs = WODEN_INTERFACE_OP_ELEMENT_GET_FAULT_REF_ELEMENTS(
             op, env);
     if(fault_refs)
         size = AXIS2_ARRAY_LIST_SIZE(fault_refs, env);
@@ -655,18 +655,18 @@
         axis2_array_list_t *property_elements = NULL;
         
         fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
                 fault_ref, env);
         build_properties(builder, env, property_elements, fault_ref);
-        qname = AXIS2_WODEN_INTERFACE_FAULT_REF_GET_REF(fault_ref, env);
+        qname = WODEN_INTERFACE_FAULT_REF_GET_REF(fault_ref, env);
         if(NULL ! = qname)
         {
             void *interface = NULL;
             void *interface_fault = NULL;
             
-            interface = AXIS2_WODEN_INTERFACE_OP_GET_PARENT(op, env);
-            interface_fault = AXIS2_WODEN_INTERFACE_GET_INTERFACE_FAULT(interface, env, qname)
-            AXIS2_WODEN_INTERFACE_FAULT_REF_SET_INTERFACE_FAULT(fault_ref, env, interface_fault);
+            interface = WODEN_INTERFACE_OP_GET_PARENT(op, env);
+            interface_fault = WODEN_INTERFACE_GET_INTERFACE_FAULT(interface, env, qname)
+            WODEN_INTERFACE_FAULT_REF_SET_INTERFACE_FAULT(fault_ref, env, interface_fault);
         }
     }
     return AXIS2_SUCCESS;
@@ -678,7 +678,7 @@
         const axis2_env_t *env,
         void *op)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *msgs = NULL;
     int i = 0, size = 0;
 
@@ -686,8 +686,8 @@
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    op = axis2_woden_interface_op_to_interface_op_element(op, env);
-    msgs = AXIS2_WODEN_INTERFACE_OP_ELEMENT_GET_MSG_REF_ELEMENTS(
+    op = woden_interface_op_to_interface_op_element(op, env);
+    msgs = WODEN_INTERFACE_OP_ELEMENT_GET_MSG_REF_ELEMENTS(
             op, env);
     if(fault_refs)
         size = AXIS2_ARRAY_LIST_SIZE(msgs, env);
@@ -698,21 +698,21 @@
         axis2_char_t *msg_content_model = NULL;
         
         fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
                 msg, env);
         build_properties(builder, env, property_elements, msg);
-        msg_content_model = AXIS2_WODEN_INTERFACE_MSG_REF_GET_MSG_CONTENT_MODEL(
+        msg_content_model = WODEN_INTERFACE_MSG_REF_GET_MSG_CONTENT_MODEL(
                 msg, env);
         if(0 == AXIS2_STRCMP(WODEN_NMTOKEN_ELEMENT, msg_content_model))
         {
             axis2_qname_t *qname = NULL;
 
-            qname = AXIS2_WODEN_INTERFACE_MSG_REF_GET_ELEMENT_QNAME(msg, env);
+            qname = WODEN_INTERFACE_MSG_REF_GET_ELEMENT_QNAME(msg, env);
             if(qname)
             {
-                void *element_decl = AXIS2_WODEN_DESC_GET_ELEMENT_DECL(
+                void *element_decl = WODEN_DESC_GET_ELEMENT_DECL(
                         builder_impl->f_desc, env, qname);
-                AXIS2_WODEN_INTERFACE_MSG_REF_SET_ELEMENT_DECLARATION(msg, env, 
+                WODEN_INTERFACE_MSG_REF_SET_ELEMENT_DECLARATION(msg, env, 
                         element_decl); 
             }
         }
@@ -734,7 +734,7 @@
         const axis2_env_t *env,
         void *desc)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *binding_els = NULL;
     int i = 0, size = 0;
 
@@ -742,7 +742,7 @@
     AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
 
-    binding_els = AXIS2_WODEN_DESC_GET_BINDING_ELEMENTS(desc, env);
+    binding_els = WODEN_DESC_GET_BINDING_ELEMENTS(desc, env);
     if(binding_els)
         size = AXIS2_ARRAY_LIST_SIZE(binding_els, env);
     for(i = 0; i < size; i++)
@@ -756,9 +756,9 @@
         {
             axis2_array_list_t *property_elements = NULL;
 
-            AXIS2_WODEN_DESC_ADD_TO_ALL_BINDINGS(builder_impl->f_desc, 
+            WODEN_DESC_ADD_TO_ALL_BINDINGS(builder_impl->f_desc, 
                     env, bind_impl);
-            property_elements = AXIS2_WODEN_BINDING_GET_PROPERTY_ELEMENTS(
+            property_elements = WODEN_BINDING_GET_PROPERTY_ELEMENTS(
                     bind_impl, env);
             build_properties(builder, env, property_elements, bind_impl);
             build_binding_faults(builder, env, bind_impl);
@@ -784,7 +784,7 @@
         const axis2_env_t *env,
         void *binding)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *faults = NULL;
     int i = 0, size = 0;
 
@@ -792,8 +792,8 @@
     AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    binding = axis2_woden_binding_to_binding_element(binding, env);
-    faults = AXIS2_WODEN_BINDING_ELEMENT_GET_BINDING_FAULT_ELEMENTS(
+    binding = woden_binding_to_binding_element(binding, env);
+    faults = WODEN_BINDING_ELEMENT_GET_BINDING_FAULT_ELEMENTS(
             binding, env);
     if(faults)
         size = AXIS2_ARRAY_LIST_SIZE(faults, env);
@@ -803,7 +803,7 @@
         axis2_array_list_t *property_elements = NULL;
         
         fault = AXIS2_ARRAY_LIST_GET(faults, env, i);
-        property_elements = AXIS2_WODEN_BINDING_FAULT_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_BINDING_FAULT_GET_PROPERTY_ELEMENTS(
                 fault, env);
         build_properties(builder, env, property_elements, fault);
         build_binding_fault_extensions(builder, env, fault);
@@ -817,7 +817,7 @@
         const axis2_env_t *env,
         void *binding)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *ops = NULL;
     int i = 0, size = 0;
 
@@ -825,8 +825,8 @@
     AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    binding = axis2_woden_binding_to_binding_element(binding, env);
-    ops = AXIS2_WODEN_BINDING_ELEMENT_GET_BINDING_OP_ELEMENTS(
+    binding = woden_binding_to_binding_element(binding, env);
+    ops = WODEN_BINDING_ELEMENT_GET_BINDING_OP_ELEMENTS(
             binding, env);
     if(ops)
         size = AXIS2_ARRAY_LIST_SIZE(ops, env);
@@ -836,7 +836,7 @@
         axis2_array_list_t *property_elements = NULL;
         
         op = AXIS2_ARRAY_LIST_GET(ops, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_OP_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_OP_GET_PROPERTY_ELEMENTS(
                 op, env);
         build_properties(builder, env, property_elements, op);
         build_binding_fault_refs(builder, env, op);
@@ -852,7 +852,7 @@
         const axis2_env_t *env,
         void *op)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *fault_refs = NULL;
     int i = 0, size = 0;
 
@@ -860,8 +860,8 @@
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    op = axis2_woden_binding_op_to_binding_op_element(op, env);
-    fault_refs = AXIS2_WODEN_BINDING_OP_ELEMENT_GET_FAULT_REF_ELEMENTS(
+    op = woden_binding_op_to_binding_op_element(op, env);
+    fault_refs = WODEN_BINDING_OP_ELEMENT_GET_FAULT_REF_ELEMENTS(
             op, env);
     if(fault_refs)
         size = AXIS2_ARRAY_LIST_SIZE(fault_refs, env);
@@ -871,7 +871,7 @@
         axis2_array_list_t *property_elements = NULL;
         
         fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
                 fault_ref, env);
         build_properties(builder, env, property_elements, fault_ref);
         build_binding_fault_ref_extensions(builder, env, fault_ref);
@@ -885,7 +885,7 @@
         const axis2_env_t *env,
         void *op)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *msgs = NULL;
     int i = 0, size = 0;
 
@@ -893,8 +893,8 @@
     AXIS2_PARAM_CHECK(env->error, op, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
     
-    op = axis2_woden_binding_op_to_binding_op_element(op, env);
-    msgs = AXIS2_WODEN_BINDING_OP_ELEMENT_GET_MSG_REF_ELEMENTS(
+    op = woden_binding_op_to_binding_op_element(op, env);
+    msgs = WODEN_BINDING_OP_ELEMENT_GET_MSG_REF_ELEMENTS(
             op, env);
     if(fault_refs)
         size = AXIS2_ARRAY_LIST_SIZE(msgs, env);
@@ -905,7 +905,7 @@
         axis2_char_t *msg_content_model = NULL;
         
         fault_ref = AXIS2_ARRAY_LIST_GET(fault_refs, env, i);
-        property_elements = AXIS2_WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
+        property_elements = WODEN_INTERFACE_FAULT_REF_GET_PROPERTY_ELEMENTS(
                 msg, env);
         build_properties(builder, env, property_elements, msg);
         build_binding_msg_ref_extensions(builder, env, msg);
@@ -919,15 +919,15 @@
         const axis2_env_t *env,
         void *binding)
 {
-    axis2_woden_ext_registry_t *er = NULL;
+    woden_ext_registry_t *er = NULL;
     axis2_array_list_t *ext_namespcs = NULL;
     int i = 0, size = 0;
     void *parent_element = NULL;
     axis2_uri_t *binding_type = NULL;
     axis2_char_t *binding_type_str = NULL;
 
-    er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
-    ext_namespcs = AXIS2_WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, 
+    er = WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
+    ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, 
             env, "binding");
     
     /*
@@ -942,13 +942,13 @@
         axis2_bool_t temp2 = AXIS2_FALSE;
         
         ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
-        binding = axis2_woden_binding_to_attr_extensible(
+        binding = woden_binding_to_attr_extensible(
                 binding, env);
-        temp1 = AXIS2_WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 binding, env, ext_ns);
-        binding = axis2_woden_binding_to_element_extensible(
+        binding = woden_binding_to_element_extensible(
                 binding, env);
-        temp2 = AXIS2_WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 binding, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -956,8 +956,8 @@
 
             comp_ext = create_component_exts(builder, env, "binding", 
                     bind_fault, ext_ns);
-            binding = axis2_woden_binding_to_wsdl_obj(binding, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(binding, env, ext_ns, comp_ext);
+            binding = woden_binding_to_wsdl_obj(binding, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(binding, env, ext_ns, comp_ext);
         }
     }
     
@@ -969,9 +969,9 @@
      * TODO chg this hardcoded behaviour so that any default rules for SOAP, HTTP or user-defined
      * extensions can be registered in some way and interpreted here at run time.
      */
-    binding_type = AXIS2_WODEN_BINDING_GET_TYPE(binding, env);
+    binding_type = WODEN_BINDING_GET_TYPE(binding, env);
     binding_type_str = AXIS2_URI_TO_STRING(binding_type, env);
-    if(0 == AXIS2_STRCMP(AXIS2_WODEN_URI_NS_SOAP, binding_type_str))
+    if(0 == AXIS2_STRCMP(WODEN_URI_NS_SOAP, binding_type_str))
     {
         void *sbe = NULL;
 
@@ -979,20 +979,20 @@
          * a SOAP Binding Extensions object has not already been created, create one now to handle
          * this default value.
          */
-        binding = axis2_woden_binding_to_wsdl_component(binding, env);
-        if(NULL == AXIS2_WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(binding, 
-                    env, AXIS2_WODEN_URI_NS_SOAP))
+        binding = woden_binding_to_wsdl_component(binding, env);
+        if(NULL == WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(binding, 
+                    env, WODEN_URI_NS_SOAP))
         {
             void *comp_ext = NULL;
 
             comp_ext = create_component_exts(builder, env, "binding", 
-                    binding, AXIS2_WODEN_URI_NS_SOAP);
-            binding = axis2_woden_binding_to_wsdl_obj(binding, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(binding, env, 
-                    AXIS2_WODEN_URI_NS_SOAP, comp_ext);
+                    binding, WODEN_URI_NS_SOAP);
+            binding = woden_binding_to_wsdl_obj(binding, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(binding, env, 
+                    WODEN_URI_NS_SOAP, comp_ext);
         }
-        sbe = AXIS2_WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(binding, 
-                    env, AXIS2_WODEN_URI_NS_SOAP)
+        sbe = WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(binding, 
+                    env, WODEN_URI_NS_SOAP)
         /* TODO Complete this */
     }
     return AXIS2_SUCCESS;
@@ -1005,15 +1005,15 @@
         const axis2_env_t *env,
         void *bind_fault)
 {
-    axis2_woden_ext_registry_t *er = NULL;
+    woden_ext_registry_t *er = NULL;
     axis2_array_list_t *ext_namespcs = NULL;
     int i = 0, size = 0;
     void *parent_element = NULL;
     axis2_uri_t *binding_type = NULL;
     axis2_char_t *binding_type_str = NULL;
 
-    er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
-    ext_namespcs = AXIS2_WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, 
+    er = WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
+    ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, 
             env, "binding_fault");
     
     /*
@@ -1028,13 +1028,13 @@
         axis2_bool_t temp2 = AXIS2_FALSE;
         
         ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
-        bind_fault = axis2_woden_binding_fault_to_attr_extensible(
+        bind_fault = woden_binding_fault_to_attr_extensible(
                 bind_fault, env);
-        temp1 = AXIS2_WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_fault, env, ext_ns);
-        bind_fault = axis2_woden_binding_fault_to_element_extensible(
+        bind_fault = woden_binding_fault_to_element_extensible(
                 bind_fault, env);
-        temp2 = AXIS2_WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_fault, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1042,8 +1042,8 @@
 
             comp_ext = create_component_exts(builder, env, "binding_fault", 
                     bind_fault, ext_ns);
-            bind_fault = axis2_woden_binding_fault_to_wsdl_obj(bind_fault, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_fault, env, ext_ns, comp_ext);
+            bind_fault = woden_binding_fault_to_wsdl_obj(bind_fault, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_fault, env, ext_ns, comp_ext);
         }
     }
     
@@ -1055,28 +1055,28 @@
      * TODO chg this hardcoded behaviour so that any default rules for SOAP, HTTP or user-defined
      * extensions can be registered in some way and interpreted here at run time.
      */
-    bind_fault = axis2_woden_binding_fault_to_nested_element(bind_fault);
-    parent_element = AXIS2_WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_fault, env);
-    parent_element = axis2_woden_binding_to_binding_element(parent_element, env);
-    binding_type = AXIS2_WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
+    bind_fault = woden_binding_fault_to_nested_element(bind_fault);
+    parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_fault, env);
+    parent_element = woden_binding_to_binding_element(parent_element, env);
+    binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
     binding_type_str = AXIS2_URI_TO_STRING(binding_type, env);
-    if(0 == AXIS2_STRCMP(AXIS2_WODEN_URI_NS_SOAP, binding_type_str))
+    if(0 == AXIS2_STRCMP(WODEN_URI_NS_SOAP, binding_type_str))
     {
         /* If the binding type is SOAP, the {soap fault code} and {soap fault subcodes} properties
          * default to xs:token "#any", so if a SOAP Binding Fault Extensions object has not already 
          * been created, create one now to handle these default values.
          */
-        bind_fault = axis2_woden_binding_fault_to_wsdl_component(bind_fault, env);
-        if(NULL == AXIS2_WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(bind_fault, 
-                    env, AXIS2_WODEN_URI_NS_SOAP))
+        bind_fault = woden_binding_fault_to_wsdl_component(bind_fault, env);
+        if(NULL == WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(bind_fault, 
+                    env, WODEN_URI_NS_SOAP))
         {
             void *comp_ext = NULL;
 
             comp_ext = create_component_exts(builder, env, "binding_fault", 
-                    bind_fault, AXIS2_WODEN_URI_NS_SOAP);
-            bind_fault = axis2_woden_binding_fault_to_wsdl_obj(bind_fault, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_fault, env, 
-                    AXIS2_WODEN_URI_NS_SOAP, comp_ext);
+                    bind_fault, WODEN_URI_NS_SOAP);
+            bind_fault = woden_binding_fault_to_wsdl_obj(bind_fault, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_fault, env, 
+                    WODEN_URI_NS_SOAP, comp_ext);
         }
     }
     return AXIS2_SUCCESS;
@@ -1090,8 +1090,8 @@
 {
     axis2_ext_registry_t *er = NULL;
 
-    er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
-    ext_namespcs = AXIS2_WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_op");
+    er = WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
+    ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_op");
     if(ext_namespcs)
         size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
     /*
@@ -1105,13 +1105,13 @@
         axis2_bool_t temp2 = AXIS2_FALSE;
 
         ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
-        bind_op = axis2_woden_binding_op_to_attr_extensible(
+        bind_op = woden_binding_op_to_attr_extensible(
                 bind_op, env);
-        temp1 = AXIS2_WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_op, env, ext_ns);
-        bind_op = axis2_woden_binding_op_to_element_extensible(
+        bind_op = woden_binding_op_to_element_extensible(
                 bind_op, env);
-        temp2 = AXIS2_WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_op, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1119,8 +1119,8 @@
 
             comp_ext = create_component_exts(builder, env, "binding_op", 
                     bind_op, ext_ns);
-            binding_op = axis2_woden_binding_op_to_wsdl_obj(binding_op, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_op, env, 
+            binding_op = woden_binding_op_to_wsdl_obj(binding_op, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_op, env, 
                     ext_ns, comp_ext);
         }
     }
@@ -1132,12 +1132,12 @@
      * TODO chg this hardcoded behaviour so that any default rules for SOAP, HTTP or user-defined
      * extensions can be registered in some way and interpreted here at run time.
      */
-    bind_op = axis2_woden_binding_op_to_nested_element(bind_op);
-    parent_element = AXIS2_WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_op, env);
-    parent_element = axis2_woden_binding_to_binding_element(parent_element, env);
-    binding_type = AXIS2_WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
+    bind_op = woden_binding_op_to_nested_element(bind_op);
+    parent_element = WODEN_NESTED_ELEMENT_GET_PARENT_ELEMENT(bind_op, env);
+    parent_element = woden_binding_to_binding_element(parent_element, env);
+    binding_type = WODEN_BINDING_ELEMENT_GET_TYPE(parent_element, env);
     binding_type_str = AXIS2_URI_TO_STRING(binding_type, env);
-    if(0 == AXIS2_STRCMP(AXIS2_WODEN_URI_NS_SOAP, binding_type_str))
+    if(0 == AXIS2_STRCMP(WODEN_URI_NS_SOAP, binding_type_str))
     {
         /*
          * If the binding type is HTTP then the {http input serialization} and {http output serialization} 
@@ -1147,17 +1147,17 @@
          * HTTP Binding Operation Extensions object has not already been created, create one now to handle 
          * these default values.
          */
-        bind_op = axis2_woden_binding_op_to_wsdl_component(bind_op, env);
-        if(NULL == AXIS2_WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(bind_op, 
-                    env, AXIS2_WODEN_URI_NS_SOAP))
+        bind_op = woden_binding_op_to_wsdl_component(bind_op, env);
+        if(NULL == WODEN_WSDL_COMPONENT_GET_COMPONENT_EXTS_FOR_NAMESPACE(bind_op, 
+                    env, WODEN_URI_NS_SOAP))
         {
             /*void *comp_ext = NULL;
 
             comp_ext = create_component_exts(builder, env, "binding_op", 
-                    bind_op, AXIS2_WODEN_URI_NS_SOAP);
-            bind_op = axis2_woden_binding_op_to_wsdl_obj(bind_op, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_op, env, 
-                    AXIS2_WODEN_URI_NS_SOAP, comp_ext);*/
+                    bind_op, WODEN_URI_NS_SOAP);
+            bind_op = woden_binding_op_to_wsdl_obj(bind_op, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_op, env, 
+                    WODEN_URI_NS_SOAP, comp_ext);*/
         }
     }
     return AXIS2_SUCCESS;
@@ -1172,8 +1172,8 @@
 {
     axis2_ext_registry_t *er = NULL;
 
-    er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
-    ext_namespcs = AXIS2_WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_msg_ref");
+    er = WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
+    ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_msg_ref");
     if(ext_namespcs)
         size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
     for(i = 0; i < size; i++)
@@ -1183,13 +1183,13 @@
         axis2_bool_t temp2 = AXIS2_FALSE;
 
         ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
-        bind_msg_ref = axis2_woden_binding_msg_ref_to_attr_extensible(
+        bind_msg_ref = woden_binding_msg_ref_to_attr_extensible(
                 bind_msg_ref, env);
-        temp1 = AXIS2_WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_msg_ref, env, ext_ns);
-        bind_msg_ref = axis2_woden_binding_msg_ref_to_element_extensible(
+        bind_msg_ref = woden_binding_msg_ref_to_element_extensible(
                 bind_msg_ref, env);
-        temp2 = AXIS2_WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_msg_ref, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1197,8 +1197,8 @@
 
             comp_ext = create_component_exts(builder, env, "binding_msg_ref", 
                     bind_msg_ref, ext_ns);
-            bind_msg_ref = axis2_woden_binding_msg_ref_to_wsdl_obj(bind_msg_ref, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_msg_ref, env, 
+            bind_msg_ref = woden_binding_msg_ref_to_wsdl_obj(bind_msg_ref, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_msg_ref, env, 
                     ext_ns, comp_ext);
         }
     }
@@ -1213,8 +1213,8 @@
 {
     axis2_ext_registry_t *er = NULL;
 
-    er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
-    ext_namespcs = AXIS2_WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_fault_ref");
+    er = WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
+    ext_namespcs = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT_NAMESPACES(er, env, "binding_fault_ref");
     if(ext_namespcs)
         size = AXIS2_ARRAY_LIST_SIZE(ext_namespcs, env);
     for(i = 0; i < size; i++)
@@ -1224,13 +1224,13 @@
         axis2_bool_t temp2 = AXIS2_FALSE;
 
         ext_ns = AXIS2_ARRAY_LIST_GET(ext_namespcs, env, i);
-        bind_fault_ref = axis2_woden_binding_fault_ref_to_attr_extensible(
+        bind_fault_ref = woden_binding_fault_ref_to_attr_extensible(
                 bind_fault_ref, env);
-        temp1 = AXIS2_WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp1 = WODEN_ATTR_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_fault_ref, env, ext_ns);
-        bind_fault_ref = axis2_woden_binding_fault_ref_to_element_extensible(
+        bind_fault_ref = woden_binding_fault_ref_to_element_extensible(
                 bind_fault_ref, env);
-        temp2 = AXIS2_WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
+        temp2 = WODEN_ELEMENT_EXTENSIBLE_HAS_EXT_ATTRS_FOR_NAMESPACE(
                 bind_fault_ref, env, ext_ns);
         if(AXIS2_TRUE == temp1 || AXIS2_TRUE == temp2)
         {
@@ -1238,8 +1238,8 @@
 
             comp_ext = create_component_exts(builder, env, "binding_fault_ref", 
                     bind_fault_ref, ext_ns);
-            bind_fault_ref = axis2_woden_binding_fault_ref_to_wsdl_obj(bind_fault_ref, env);
-            AXIS2_WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_fault_ref, env, 
+            bind_fault_ref = woden_binding_fault_ref_to_wsdl_obj(bind_fault_ref, env);
+            WODEN_WSDL_OBJ_SET_COMPONENT_EXTS(bind_fault_ref, env, 
                     ext_ns, comp_ext);
         }
     }
@@ -1258,8 +1258,8 @@
         void *parent_elem,
         axis2_uri_t *ext_ns)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
-    axis2_woden_ext_registry_t *er = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_ext_registry_t *er = NULL;
     void *comp_ext = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1268,10 +1268,10 @@
     AXIS2_PARAM_CHECK(env->error, ext_ns, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
         
-    er = AXIS2_WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
-    comp_ext = AXIS2_WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT(er, env, 
+    er = WODEN_DESC_GET_EXT_REGISTRY(builder_impl->f_desc, env);
+    comp_ext = WODEN_EXT_REGISTRY_QUERY_COMPONENT_EXT(er, env, 
             parent_class, ext_ns);
-    AXIS2_WODEN_COMPONENT_EXTS_INIT(comp_ext, env, parent_elem, ext_ns);
+    WODEN_COMPONENT_EXTS_INIT(comp_ext, env, parent_elem, ext_ns);
     
     return comp_ext;
 }
@@ -1286,14 +1286,14 @@
         const axis2_env_t *env,
         void *desc)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     axis2_array_list_t *svcs = NULL;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, desc, AXIS2_FAILURE);
     builder_impl = AXIS2_INTF_TO_IMPL(builder);
 
-    svcs = AXIS2_WODEN_DESC_GET_SVC_ELEMENTS(desc, env);
+    svcs = WODEN_DESC_GET_SVC_ELEMENTS(desc, env);
     if(svcs)
         size = AXIS2_ARRAY_LIST_SIZE(svcs, env);
     for(i = 0; i < size; i++)
@@ -1304,7 +1304,7 @@
         if(AXIS2_TRUE != AXIS2_ARRAY_LIST_CONTAINS(builder_impl->f_svcs_done, 
                     env, svc))
         {
-            AXIS2_WODEN_DESC_ADD_TO_ALL_SVCS(builder_impl->f_desc, env, svc);
+            WODEN_DESC_ADD_TO_ALL_SVCS(builder_impl->f_desc, env, svc);
             if(!builder_impl->f_svcs_done)
             {
                 builder_impl->f_svcs_done = axis2_array_list_create(env, 0);
@@ -1333,7 +1333,7 @@
         axis2_array_list_t *prop_els,
         void *parent)
 {
-    axis2_woden_component_model_builder_impl_t *builder_impl = NULL;
+    woden_component_model_builder_impl_t *builder_impl = NULL;
     int i = 0, size = 0;
 
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -1348,13 +1348,13 @@
         axis2_qname_t *qname = NULL;
 
         prop = AXIS2_ARRAY_LIST_GET(props_el, env, i);
-        qname = AXIS2_WODEN_PROPERTY_GET_CONSTRAINT_QNAME(prop, env);
+        qname = WODEN_PROPERTY_GET_CONSTRAINT_QNAME(prop, env);
         if(NULL != qname)
         {
             void *value = NULL;
 
-            value = AXIS2_WODEN_DESC_GET_TYPE_DEF(builder_impl->f_desc, env, qname);
-            AXIS2_WODEN_PROPERTY_SET_VALUE_CONSTRAINT(prop, env, value);
+            value = WODEN_DESC_GET_TYPE_DEF(builder_impl->f_desc, env, qname);
+            WODEN_PROPERTY_SET_VALUE_CONSTRAINT(prop, env, value);
         }
     }
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/woden/src/util/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/generic_obj.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/generic_obj.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/generic_obj.c Tue Jun 13 22:23:14 2006
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
  
-#include <woden/util/axis2_woden_generic_obj.h>
+#include <woden_generic_obj.h>
 
 typedef struct axis2_generic_obj_impl
 {

Modified: webservices/axis2/trunk/c/woden/src/util/qname_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/qname_util.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/qname_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/qname_util.c Tue Jun 13 22:23:14 2006
@@ -16,7 +16,7 @@
  
 #include <axiom_node.h>
 #include <axiom_element.h>
-#include <woden/util/axis2_qname_util.h>
+#include <woden_qname_util.h>
 
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL

Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?rev=414079&r1=414078&r2=414079&view=diff
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Tue Jun 13 22:23:14 2006
@@ -64,8 +64,8 @@
     axis2_char_t *ns_uri_str = NULL;
     axis2_char_t *tmp_prefix = NULL;
 
-    desc = axis2_woden_desc_to_desc_element(desc, env);
-    ns_uri = AXIS2_WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, prefix);
+    desc = woden_desc_to_desc_element(desc, env);
+    ns_uri = WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, prefix);
     ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
     if(NULL != ns_uri_str && 0 == AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
     {
@@ -78,7 +78,7 @@
         axis2_char_t *temp = NULL;
 
         temp = AXIS2_STRACAT(tmp_prefix, "_", env); 
-        ns_uri = AXIS2_WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, temp);
+        ns_uri = WODEN_DESC_ELEMENT_GET_NAMESPACE(desc, env, temp);
         ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
         AXIS2_FREE(env->allocator, tmp_prefix);
         tmp_prefix = AXIS2_STRDUP(temp, env);
@@ -86,6 +86,6 @@
     }
     uri = axis2_uri_parse_string(env, namespc_uri_str);
     
-    return AXIS2_WODEN_DESC_ELEMENT_ADD_NAMESPACE(desc, env, prefix, uri);
+    return WODEN_DESC_ELEMENT_ADD_NAMESPACE(desc, env, prefix, uri);
 }
  



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message