axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dami...@apache.org
Subject svn commit: r367973 - in /webservices/axis2/trunk/c: include/ modules/core/description/ modules/core/phaseresolver/ modules/core/receivers/ modules/platforms/unix/ modules/wsdl/ test/unit/util/
Date Wed, 11 Jan 2006 08:43:54 GMT
Author: damitha
Date: Wed Jan 11 00:43:32 2006
New Revision: 367973

URL: http://svn.apache.org/viewcvs?rev=367973&view=rev
Log:
In axis2_description.h prefixed macros with AXIS2_.
In unit test for dir_hanlder_list_dir make the path to get from env

Modified:
    webservices/axis2/trunk/c/include/axis2.h
    webservices/axis2/trunk/c/include/axis2_msg_recv.h
    webservices/axis2/trunk/c/modules/core/description/axis2_description.h
    webservices/axis2/trunk/c/modules/core/description/op.c
    webservices/axis2/trunk/c/modules/core/description/svc.c
    webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
    webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
    webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
    webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c
    webservices/axis2/trunk/c/test/unit/util/util_dir_handler_test.c

Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Wed Jan 11 00:43:32 2006
@@ -135,6 +135,8 @@
  */
 #define AXIS2_SOAP_STYLE_DOC_LITERAL_WRAPPED 1002
 
+#define AXIS2_SCOPE "scope"
+
 /**
  * Field APPLICATION_SCOPE
  */

Modified: webservices/axis2/trunk/c/include/axis2_msg_recv.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_msg_recv.h?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_msg_recv.h (original)
+++ webservices/axis2/trunk/c/include/axis2_msg_recv.h Wed Jan 11 00:43:32 2006
@@ -34,17 +34,11 @@
 extern "C"
 {
 #endif
-
-#define AXIS2_SERVICE_CLASS "ServiceClass"
-#define AXIS2_SCOPE "scope"
     
 /** @defgroup axis2_msg_recv Message Receiver
   * @ingroup axis2_core_engine
   * @{
   */
-
-#define AXIS2_SVC_CLASS  "svc_class"
-#define AXIS2_SCOPE  "scope"
     
 struct axis2_msg_ctx;
 typedef struct axis2_msg_recv axis2_msg_recv_t;

Modified: webservices/axis2/trunk/c/modules/core/description/axis2_description.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/axis2_description.h?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/axis2_description.h (original)
+++ webservices/axis2/trunk/c/modules/core/description/axis2_description.h Wed Jan 11 00:43:32
2006
@@ -40,83 +40,83 @@
 /**
  * Field EXECUTION_CHAIN_KEY
  */
-#define EXECUTION_CHAIN_KEY  "EXECUTION_CHAIN_KEY"
+#define AXIS2_EXECUTION_CHAIN_KEY  "EXECUTION_CHAIN_KEY"
 
 /**
  * Field EXECUTION_OUT_CHAIN_KEY
  */
-#define EXECUTION_OUT_CHAIN_KEY "EXECUTION_OUT_CHAIN_KEY"
+#define AXIS2_EXECUTION_OUT_CHAIN_KEY "EXECUTION_OUT_CHAIN_KEY"
 
 /**
  * Field EXECUTION_FAULT_CHAIN_KEY
  */
-#define EXECUTION_FAULT_CHAIN_KEY "EXECUTION_FAULT_CHAIN_KEY"
+#define AXIS2_EXECUTION_FAULT_CHAIN_KEY "EXECUTION_FAULT_CHAIN_KEY"
 
 /**
  * Field MODULEREF_KEY
  */
-#define MODULEREF_KEY  "MODULEREF_KEY"
+#define AXIS2_MODULEREF_KEY  "MODULEREF_KEY"
 
 /**
  * Field OP_KEY
  */
-#define OP_KEY  "OP_KEY"
+#define AXIS2_OP_KEY  "OP_KEY"
 
 /**
  * Field CLASSLOADER_KEY
  */
-#define CLASSLOADER_KEY  "CLASSLOADER_KEY"
+#define AXIS2_CLASSLOADER_KEY  "CLASSLOADER_KEY"
 
 /**
  * Field CONTEXTPATH_KEY
  */
-#define CONTEXTPATH_KEY  "CONTEXTPATH_KEY"
+#define AXIS2_CONTEXTPATH_KEY  "CONTEXTPATH_KEY"
 
 /**
  * Field PROVIDER_KEY
  */
-#define MESSAGE_RECEIVER_KEY  "PROVIDER_KEY"
+#define AXIS2_MESSAGE_RECEIVER_KEY  "PROVIDER_KEY"
 
 /**
  * Field STYLE_KEY
  */
-#define STYLE_KEY  "STYLE_KEY"
+#define AXIS2_STYLE_KEY  "STYLE_KEY"
 
 /**
  * Field PARAMETER_KEY
  */
-#define PARAMETER_KEY  "PARAMETER_KEY"
+#define AXIS2_PARAMETER_KEY  "PARAMETER_KEY"
 
 /**
  * Field INFLOW_KEY
  */
-#define INFLOW_KEY  "INFLOW_KEY"
+#define AXIS2_INFLOW_KEY  "INFLOW_KEY"
 
 /**
  * Field OUTFLOW_KEY
  */
-#define OUTFLOW_KEY  "OUTFLOW_KEY"
+#define AXIS2_OUTFLOW_KEY  "OUTFLOW_KEY"
 
 /**
  * Field FAULTFLOW_KEY
  */
-#define IN_FAULTFLOW_KEY  "IN_FAULTFLOW_KEY"
-#define OUT_FAULTFLOW_KEY  "OUT_FAULTFLOW_KEY"
+#define AXIS2_IN_FAULTFLOW_KEY  "IN_FAULTFLOW_KEY"
+#define AXIS2_OUT_FAULTFLOW_KEY  "OUT_FAULTFLOW_KEY"
 
 /**
  * Field PHASES_KEY
  */
-#define PHASES_KEY  "PHASES_KEY"
+#define AXIS2_PHASES_KEY  "PHASES_KEY"
 
 /**
  * Field SERVICE_CLASS
  */
-#define SERVICE_CLASS  "SERVICE_CLASS"
+#define AXIS2_SERVICE_CLASS  "SERVICE_CLASS"
 
 /**
  * Field SERVICE_CLASS_NAME
  */
-#define SERVICE_CLASS_NAME "SERVICE_CLASS_NAME"
+#define AXIS2_SERVICE_CLASS_NAME "SERVICE_CLASS_NAME"
 
 	
 /*********************************** Constants*********************************/	

Modified: webservices/axis2/trunk/c/modules/core/description/op.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/op.c?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/op.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/op.c Wed Jan 11 00:43:32 2006
@@ -418,12 +418,13 @@
     if(NULL == param_container_l)
         return NULL;
     AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(op_impl->op.wsdl_op->
-        extensible_component->wsdl_component, env, PARAMETER_KEY, param_container_l);
+        extensible_component->wsdl_component, env, AXIS2_PARAMETER_KEY, 
+            param_container_l);
     
     array_list_l = axis2_array_list_create(env, 0);
     if(NULL == array_list_l) return NULL;
     AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(op_impl->op.wsdl_op->
-        extensible_component->wsdl_component, env, MODULEREF_KEY, array_list_l);
+        extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY, array_list_l);
     
     op_impl->op.ops = AXIS2_MALLOC((*env)->allocator, 
         sizeof(axis2_op_ops_t));
@@ -563,25 +564,28 @@
 axis2_op_free (axis2_op_t *op, axis2_env_t **env)
 { 
     axis2_op_impl_t *op_impl = NULL;
-    
+    printf("came10\n");
     AXIS2_FUNC_PARAM_CHECK(op, env, AXIS2_FAILURE);
     
     op_impl = AXIS2_INTF_TO_IMPL(op);
     
 	if(NULL != op->ops)
     {
+        printf("came11\n");
 		AXIS2_FREE((*env)->allocator, op->ops);
         op->ops = NULL;
     }
     
     if(NULL != op->param_container)
     {
+        printf("came12\n");
 	    AXIS2_PARAM_CONTAINER_FREE(op->param_container, env);
         op->param_container = NULL;
     }
     
     if(NULL != op->wsdl_op)
     {
+        printf("came13\n");
 	    AXIS2_WSDL_OP_FREE(op->wsdl_op, env);
         op->wsdl_op = NULL;
     }
@@ -592,6 +596,7 @@
     
     if(NULL != op_impl->remaining_phases_inflow)
     {
+        printf("came14\n");
         void *val = NULL;
         int i = 0;
         for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->remaining_phases_inflow, env);
i++)
@@ -613,6 +618,7 @@
     
     if(NULL != op_impl->phases_outflow)
     {
+        printf("came15\n");
         void *val = NULL;
         int i = 0;
         for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->phases_outflow, env); i++)
@@ -634,9 +640,13 @@
     
     if(NULL != op_impl->phases_in_fault_flow)
     {
+        printf("came16\n");
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->phases_in_fault_flow, env);
i++)
+        int size = 0;
+        size = AXIS2_ARRAY_LIST_SIZE(op_impl->phases_in_fault_flow, env);
+        printf("size:%d\n", size);
+        for (i = 0; i < size; i++)
         {
             struct axis2_phase *phase = NULL;
             phase = AXIS2_ARRAY_LIST_GET(op_impl->phases_in_fault_flow, env, i);
@@ -657,7 +667,11 @@
     {
         void *val = NULL;
         int i = 0;
-        for (i = 0; i < AXIS2_ARRAY_LIST_SIZE(op_impl->phases_out_fault_flow, env);
i++)
+        int size = 0;
+        printf("came17\n");
+        size = AXIS2_ARRAY_LIST_SIZE(op_impl->phases_out_fault_flow, env);
+        printf("size:%d\n", size);
+        for (i = 0; i < size; i++)
         {
             struct axis2_phase *phase = NULL;
             phase = AXIS2_ARRAY_LIST_GET(op_impl->phases_out_fault_flow, env, i);
@@ -726,7 +740,7 @@
         param_container_l = (axis2_param_container_t *) 
             AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
                 op->wsdl_op->extensible_component->wsdl_component, env, 
-                (axis2_char_t *) PARAMETER_KEY);
+                (axis2_char_t *) AXIS2_PARAMETER_KEY);
         return AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container_l, env, param);
     }
     
@@ -744,7 +758,8 @@
 	
     param_container_l = (axis2_param_container_t *) 
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op->wsdl_op->
-            extensible_component->wsdl_component, env, (axis2_char_t *) PARAMETER_KEY);
+            extensible_component->wsdl_component, env, (axis2_char_t *) 
+                AXIS2_PARAMETER_KEY);
 	
 	return AXIS2_PARAM_CONTAINER_GET_PARAM(param_container_l, env, param_name);
 }
@@ -760,7 +775,8 @@
 	
     param_container_l = (axis2_param_container_t *) 
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op->wsdl_op->
-            extensible_component->wsdl_component, env, (axis2_char_t *) PARAMETER_KEY);
+            extensible_component->wsdl_component, env, (axis2_char_t *) 
+                AXIS2_PARAMETER_KEY);
 	return AXIS2_PARAM_CONTAINER_GET_PARAMS(param_container_l, env);
 }
 
@@ -927,16 +943,18 @@
         
     AXIS2_FUNC_PARAM_CHECK(op, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, moduleref, AXIS2_FAILURE);
-    
+    printf("came20\n");
     collection_module = (axis2_array_list_t *) 
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op->wsdl_op->
-        extensible_component->wsdl_component, env, MODULEREF_KEY);
-    
+        extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY);
+    printf("came21\n");
     size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
+    printf("collection_module size:%d\n", size);
     if(AXIS2_SUCCESS != AXIS2_ERROR_GET_STATUS_CODE((*env)->error))
     {
         return AXIS2_FAILURE;
     }
+    
     for(index = 0; index < size; index++)
     {
         module_desc = (axis2_module_desc_t *) AXIS2_ARRAY_LIST_GET(
@@ -955,13 +973,17 @@
 
     }
     pr = axis2_phase_resolver_create(env);
+    printf("came1\n");
     if(pr)
     {
         status = AXIS2_PHASE_RESOLVER_ENGAGE_MODULE_TO_OP(pr, env, 
             op, moduleref);
+        printf("came2\n");
         if(AXIS2_FAILURE == status)
         {
+            printf("came3\n");
             AXIS2_PHASE_RESOLVER_FREE(pr, env);
+            printf("came4\n");
             pr = NULL;
             return AXIS2_FAILURE;
         }
@@ -990,7 +1012,7 @@
     
     collection_module = (axis2_array_list_t *) 
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(op->wsdl_op->
-            extensible_component->wsdl_component, env, MODULEREF_KEY);
+            extensible_component->wsdl_component, env, AXIS2_MODULEREF_KEY);
     
     size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
     if(AXIS2_TRUE != size)
@@ -1021,7 +1043,7 @@
     AXIS2_FUNC_PARAM_CHECK(op, env, NULL);
     return (axis2_array_list_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
         op->wsdl_op->extensible_component->wsdl_component, env, 
-            MODULEREF_KEY);
+            AXIS2_MODULEREF_KEY);
 }
 
 int AXIS2_CALL

Modified: webservices/axis2/trunk/c/modules/core/description/svc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc.c?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc.c Wed Jan 11 00:43:32 2006
@@ -364,7 +364,7 @@
     }
     
     status = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc_impl->svc.wsdl_svc->
-        wsdl_component, env, PARAMETER_KEY, param_container_l);
+        wsdl_component, env, AXIS2_PARAMETER_KEY, param_container_l);
     if(AXIS2_FAILURE == status)
     {
         axis2_svc_free(&(svc_impl->svc), env);
@@ -380,7 +380,7 @@
     }
     
     status = AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc_impl->svc.wsdl_svc->
-        wsdl_component, env, MODULEREF_KEY, array_list_l);
+        wsdl_component, env, AXIS2_MODULEREF_KEY, array_list_l);
     if(AXIS2_FAILURE == status)
     {
         axis2_svc_free(&(svc_impl->svc), env);
@@ -737,7 +737,7 @@
     {
         param_container_l = (struct axis2_param_container *)
             AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->
-                wsdl_component, env, PARAMETER_KEY);
+                wsdl_component, env, AXIS2_PARAMETER_KEY);
         return AXIS2_PARAM_CONTAINER_ADD_PARAM(param_container_l, env, param);
     }
     return AXIS2_FAILURE;
@@ -753,7 +753,7 @@
     
     param_container_l = (struct axis2_param_container *)
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->
-            wsdl_component, env, PARAMETER_KEY);
+            wsdl_component, env, AXIS2_PARAMETER_KEY);
     return AXIS2_PARAM_CONTAINER_GET_PARAM(param_container_l, env, name);
 }
 
@@ -766,7 +766,7 @@
 	
     param_container_l = (struct axis2_param_container *)
     AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->
-        wsdl_component, env, PARAMETER_KEY);
+        wsdl_component, env, AXIS2_PARAMETER_KEY);
     
     return AXIS2_PARAM_CONTAINER_GET_PARAMS(param_container_l, env);
 }
@@ -855,7 +855,7 @@
     
     collection_module = (axis2_array_list_t *) 
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
-            env, MODULEREF_KEY);
+            env, AXIS2_MODULEREF_KEY);
     
     size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
     if(AXIS2_TRUE != size)
@@ -986,7 +986,7 @@
     
     collection_module = (axis2_array_list_t *) 
         AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,

-            env, MODULEREF_KEY);
+            env, AXIS2_MODULEREF_KEY);
     
     size = AXIS2_ARRAY_LIST_SIZE(collection_module, env);
     if(AXIS2_TRUE != size)
@@ -1013,7 +1013,7 @@
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     
     return (axis2_array_list_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, MODULEREF_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_MODULEREF_KEY);
 }
 
 void * AXIS2_CALL
@@ -1050,8 +1050,8 @@
     context_path_l = AXIS2_STRDUP(context_path, env);
     if(context_path_l)
     {
-        return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
-            env, CONTEXTPATH_KEY, context_path);
+        return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
+            wsdl_component, env, AXIS2_CONTEXTPATH_KEY, context_path);
     }
     else
         return AXIS2_FAILURE;
@@ -1063,7 +1063,7 @@
 {
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     return (axis2_char_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, CONTEXTPATH_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_CONTEXTPATH_KEY);
 }
 
 axis2_status_t AXIS2_CALL
@@ -1078,8 +1078,8 @@
     
     style_l = AXIS2_STRDUP(style, env);
     if(style_l)
-        return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
-            env, STYLE_KEY, style);
+        return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
+            wsdl_component, env, AXIS2_STYLE_KEY, style);
     else
         return AXIS2_FAILURE;
 }
@@ -1090,7 +1090,7 @@
 {
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     return (axis2_char_t *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, STYLE_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_STYLE_KEY);
 }
 
 struct axis2_flow * AXIS2_CALL
@@ -1099,7 +1099,7 @@
 {
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, INFLOW_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_INFLOW_KEY);
 }
 
 axis2_status_t AXIS2_CALL
@@ -1110,8 +1110,8 @@
     AXIS2_FUNC_PARAM_CHECK(svc, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, inflow, AXIS2_FAILURE);
     
-    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
-        env, INFLOW_KEY, inflow);
+    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
+        wsdl_component, env, AXIS2_INFLOW_KEY, inflow);
 }
 
 struct axis2_flow * AXIS2_CALL
@@ -1120,7 +1120,7 @@
 {
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, OUTFLOW_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_OUTFLOW_KEY);
 }
 
 axis2_status_t AXIS2_CALL
@@ -1132,7 +1132,7 @@
     AXIS2_PARAM_CHECK((*env)->error, outflow, AXIS2_FAILURE);
     
     return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
-        wsdl_component, env, OUTFLOW_KEY, outflow);
+        wsdl_component, env, AXIS2_OUTFLOW_KEY, outflow);
 }
 
 struct axis2_flow *AXIS2_CALL
@@ -1142,7 +1142,7 @@
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     
     return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, IN_FAULTFLOW_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY);
 }
 
 axis2_status_t AXIS2_CALL
@@ -1152,8 +1152,8 @@
 {
     AXIS2_FUNC_PARAM_CHECK(svc, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, fault_flow, AXIS2_FAILURE);
-    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
-        env, IN_FAULTFLOW_KEY, fault_flow);
+    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
+        wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY, fault_flow);
 }
 
 struct axis2_flow * AXIS2_CALL
@@ -1163,7 +1163,7 @@
     AXIS2_FUNC_PARAM_CHECK(svc, env, NULL);
     
     return (struct axis2_flow *) AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(
-        svc->wsdl_svc->wsdl_component, env, OUT_FAULTFLOW_KEY);
+        svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY);
 }
 
 axis2_status_t AXIS2_CALL
@@ -1174,8 +1174,8 @@
     AXIS2_FUNC_PARAM_CHECK(svc, env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK((*env)->error, fault_flow, AXIS2_FAILURE);
     
-    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->wsdl_component,
env,
-        OUT_FAULTFLOW_KEY, fault_flow);
+    return AXIS2_WSDL_COMPONENT_SET_COMPONENT_PROPERTY(svc->wsdl_svc->
+        wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY, fault_flow);
 }
 
 struct axis2_op * AXIS2_CALL

Modified: webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c (original)
+++ webservices/axis2/trunk/c/modules/core/phaseresolver/phase_resolver.c Wed Jan 11 00:43:32
2006
@@ -468,25 +468,25 @@
         case AXIS2_INFLOW:
         {
             flow = AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(resolver_impl->
-                svc->wsdl_svc->wsdl_component, env, INFLOW_KEY);
+                svc->wsdl_svc->wsdl_component, env, AXIS2_INFLOW_KEY);
             break;
         }
         case AXIS2_OUTFLOW:
         {
             flow = AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(resolver_impl->
-                svc->wsdl_svc->wsdl_component, env, OUTFLOW_KEY);
+                svc->wsdl_svc->wsdl_component, env, AXIS2_OUTFLOW_KEY);
             break;
         }
         case AXIS2_FAULT_INFLOW:
         {
             flow = AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(resolver_impl->
-                svc->wsdl_svc->wsdl_component, env, IN_FAULTFLOW_KEY);
+                svc->wsdl_svc->wsdl_component, env, AXIS2_IN_FAULTFLOW_KEY);
             break;
         }
         case AXIS2_FAULT_OUTFLOW:
         {
             flow = AXIS2_WSDL_COMPONENT_GET_COMPONENT_PROPERTY(resolver_impl->
-                svc->wsdl_svc->wsdl_component, env, OUT_FAULTFLOW_KEY);
+                svc->wsdl_svc->wsdl_component, env, AXIS2_OUT_FAULTFLOW_KEY);
             break;
         }
     }

Modified: webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c (original)
+++ webservices/axis2/trunk/c/modules/core/receivers/msg_recv.c Wed Jan 11 00:43:32 2006
@@ -179,7 +179,7 @@
         return NULL;
     }
     
-    impl_info_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SVC_CLASS);
+    impl_info_param = AXIS2_SVC_GET_PARAM(svc, env, AXIS2_SERVICE_CLASS);
     if(!impl_info_param)
     {
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_INVALID_STATE_SVC, 

Modified: webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h (original)
+++ webservices/axis2/trunk/c/modules/platforms/unix/axis2_unix.h Wed Jan 11 00:43:32 2006
@@ -170,6 +170,11 @@
 #define AXIS2_X_OK X_OK /* test for execute or search permission */
 #define AXIS2_F_OK F_OK /* test whether the directories leading to the file can be 
                       searched and the file exists */
+                      
+/**
+ * Platform specific environment variable access method
+ */
+#define AXIS2_GETENV(_env_var_name) getenv(_env_var_name)
 
 /** @} */
 #ifdef __cplusplus

Modified: webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c (original)
+++ webservices/axis2/trunk/c/modules/wsdl/wsdl_component.c Wed Jan 11 00:43:32 2006
@@ -160,14 +160,14 @@
              
             axis2_hash_this (hi, &key, NULL, &val);
             
-            if(0 == AXIS2_STRCMP(PARAMETER_KEY, (axis2_char_t *)key))
+            if(0 == AXIS2_STRCMP(AXIS2_PARAMETER_KEY, (axis2_char_t *)key))
             {
                 param_container = (axis2_param_container_t *) val;
                 AXIS2_PARAM_CONTAINER_FREE(param_container, env);
                 param_container = NULL;
             }
             
-            if(0 == AXIS2_STRCMP(MODULEREF_KEY, (axis2_char_t *)key))
+            if(0 == AXIS2_STRCMP(AXIS2_MODULEREF_KEY, (axis2_char_t *)key))
             {
                 void *val = NULL;
                 int i = 0;
@@ -247,14 +247,14 @@
              
             axis2_hash_this (hi, &key, NULL, &val);
             
-            if(0 == AXIS2_STRCMP(PARAMETER_KEY, (axis2_char_t *)key))
+            if(0 == AXIS2_STRCMP(AXIS2_PARAMETER_KEY, (axis2_char_t *)key))
             {
                 param_container = (axis2_param_container_t *) val;
                 AXIS2_PARAM_CONTAINER_FREE(param_container, env);
                 param_container = NULL;
             }
             
-            if(0 == AXIS2_STRCMP(MODULEREF_KEY, (axis2_char_t *)key))
+            if(0 == AXIS2_STRCMP(AXIS2_MODULEREF_KEY, (axis2_char_t *)key))
             {
                 void *val = NULL;
                 int i = 0;

Modified: webservices/axis2/trunk/c/test/unit/util/util_dir_handler_test.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/test/unit/util/util_dir_handler_test.c?rev=367973&r1=367972&r2=367973&view=diff
==============================================================================
--- webservices/axis2/trunk/c/test/unit/util/util_dir_handler_test.c (original)
+++ webservices/axis2/trunk/c/test/unit/util/util_dir_handler_test.c Wed Jan 11 00:43:32 2006
@@ -14,9 +14,11 @@
     axis2_char_t *expected = NULL;
     axis2_char_t *actual = NULL;
     int i = 0;
+    axis2_char_t *axis2c_home = NULL;
+    
     expected = AXIS2_STRDUP("libaxis2_util.so", &env);
-	pathname = AXIS2_STRDUP(
-        "../infiles/dir_handler", &env);
+    axis2c_home = AXIS2_GETENV("AXIS2C_HOME");
+    pathname = AXIS2_STRACAT (axis2c_home, "/test/unit/infiles/dir_handler", &env);
     file_list = axis2_dir_handler_list_dir(&env, pathname);
     size = AXIS2_ARRAY_LIST_SIZE(file_list, &env);
     
@@ -33,4 +35,5 @@
     CuAssertStrEquals(tc, expected, actual);
     AXIS2_FREE(env->allocator, expected);
     AXIS2_FREE(env->allocator, pathname);
+    AXIS2_FREE(env->allocator, axis2c_home);
 }



Mime
View raw message