axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r531499 - in /webservices/axis2/scratch/c/neethi/axis2c: neethi/include/neethi_engine.h neethi/src/engine.c neethi/src/operator.c src/core/deployment/svc_builder.c src/core/description/policy_include.c
Date Mon, 23 Apr 2007 15:26:20 GMT
Author: samisa
Date: Mon Apr 23 08:26:17 2007
New Revision: 531499

URL: http://svn.apache.org/viewvc?view=rev&rev=531499
Log:
Fixed build breaks, and crash problems

Modified:
    webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c
    webservices/axis2/scratch/c/neethi/axis2c/neethi/src/operator.c
    webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c
    webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h?view=diff&rev=531499&r1=531498&r2=531499
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/include/neethi_engine.h Mon Apr 23 08:26:17
2007
@@ -41,29 +41,25 @@
 #endif
 
     AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-    neethi_engine_get_policy(
-            const axutil_env_t *env,
+    neethi_engine_get_policy(const axutil_env_t *env,
             axiom_node_t *node,
             axiom_element_t *element);
 
     AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-    neethi_engine_get_normalize(
+    neethi_engine_get_normalize(const axutil_env_t *env,
             neethi_policy_t *neethi_policy,
-            axis2_bool_t deep,
-            const axutil_env_t *env);
+            axis2_bool_t deep);
     
     AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-    neethi_engine_normalize(
+    neethi_engine_normalize(const axutil_env_t *env,
             neethi_policy_t *neethi_policy,
             neethi_registry_t *registry,
-            axis2_bool_t deep,
-            const axutil_env_t *env);
+            axis2_bool_t deep);
     
     AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-    neethi_engine_merge(
+    neethi_engine_merge(const axutil_env_t *env,
             neethi_policy_t *neethi_policy1,
-            neethi_policy_t *neethi_policy2,
-            const axutil_env_t *env);
+            neethi_policy_t *neethi_policy2);
         
 
     /** @} */

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c?view=diff&rev=531499&r1=531498&r2=531499
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/engine.c Mon Apr 23 08:26:17 2007
@@ -87,8 +87,7 @@
 
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-neethi_engine_get_policy(
-    const axutil_env_t *env,
+neethi_engine_get_policy(const axutil_env_t *env,
     axiom_node_t *node,
     axiom_element_t *element)
 {
@@ -394,21 +393,19 @@
 /************************************************/
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-neethi_engine_get_normalize(
+neethi_engine_get_normalize(const axutil_env_t *env,
         neethi_policy_t *neethi_policy,
-        axis2_bool_t deep,
-        const axutil_env_t *env)
+        axis2_bool_t deep)
 {
-    return neethi_engine_normalize(neethi_policy, NULL, deep, env);
+    return neethi_engine_normalize(env, neethi_policy, NULL, deep);
 }
 
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-neethi_engine_normalize(
+neethi_engine_normalize(const axutil_env_t *env,
     neethi_policy_t *neethi_policy,
     neethi_registry_t *registry,
-    axis2_bool_t deep,
-    const axutil_env_t *env)
+    axis2_bool_t deep)
 {
     neethi_policy_t *resultant_neethi_policy = NULL;
     neethi_operator_t *operator = NULL;
@@ -435,10 +432,9 @@
 }
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
-neethi_engine_merge(
+neethi_engine_merge(const axutil_env_t *env,
     neethi_policy_t *neethi_policy1,
-    neethi_policy_t *neethi_policy2,
-    const axutil_env_t *env)
+    neethi_policy_t *neethi_policy2)
 {
 
     neethi_exactlyone_t *exactlyone1 = NULL;
@@ -564,7 +560,8 @@
 
         }
     }
-    else return NULL;
+    
+    return NULL;
 }
 
 

Modified: webservices/axis2/scratch/c/neethi/axis2c/neethi/src/operator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/neethi/src/operator.c?view=diff&rev=531499&r1=531498&r2=531499
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/neethi/src/operator.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/neethi/src/operator.c Mon Apr 23 08:26:17 2007
@@ -90,6 +90,10 @@
                     neethi_operator->value = NULL;
                     break;
                 */
+                case OPERATOR_TYPE_ASSERTION:
+                    break;
+                case OPERATOR_TYPE_UNKNOWN:
+                    break;
             }
             AXIS2_FREE(env->allocator,neethi_operator->value);     
         }            

Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c?view=diff&rev=531499&r1=531498&r2=531499
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/deployment/svc_builder.c Mon Apr 23
08:26:17 2007
@@ -479,6 +479,14 @@
                 AXIS2_FAILURE);
             return AXIS2_FAILURE;
         }
+        
+        op_name = axiom_attribute_get_value(op_name_att, env);
+        qopname = axutil_qname_create(env, op_name, NULL, NULL);
+        op_desc = axis2_op_create(env);
+        axis2_op_set_qname(op_desc, env, qopname);
+        axutil_qname_free(qopname, env);
+        qopname = NULL;
+
         /* set the mep of the operation */
         qmep = axutil_qname_create(env, AXIS2_MEP, NULL, NULL);
         op_mep_att = axiom_element_get_attribute(op_element, env, qmep);
@@ -492,12 +500,6 @@
                 axis2_op_set_msg_exchange_pattern(op_desc, env, mep_url);
             }
         }
-        op_name = axiom_attribute_get_value(op_name_att, env);
-        qopname = axutil_qname_create(env, op_name, NULL, NULL);
-        op_desc = axis2_op_create(env);
-        axis2_op_set_qname(op_desc, env, qopname);
-        axutil_qname_free(qopname, env);
-        qopname = NULL;
 
         desc = axis2_op_get_base(op_desc,  env);
         policy_include = axis2_desc_get_policy_include(desc, env);

Modified: webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c?view=diff&rev=531499&r1=531498&r2=531499
==============================================================================
--- webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c (original)
+++ webservices/axis2/scratch/c/neethi/axis2c/src/core/description/policy_include.c Mon Apr
23 08:26:17 2007
@@ -98,10 +98,8 @@
             axis2_desc_get_policy_include(parent_desc, env);
         if (preant_policy_include)
         {
-            /* TODO : uncomment when neethi_registry_create_with_parent implemented
             policy_include->registry = neethi_registry_create_with_parent(env, 
                 axis2_policy_include_get_registry(preant_policy_include, env));
-            */
         }
         else
         {
@@ -201,9 +199,7 @@
             wrapper->type = AXIS2_ANON_POLICY;
             wrapper->value = policy;
             
-            /* TODO: uncomment when neethi_policy_get_name done
             policy_name = neethi_policy_get_name(policy, env);
-            */
             
             if (policy_name)
             {
@@ -212,11 +208,9 @@
             }
             else
             {
-                /* TODO: uncomment when neethi_policy_get_id done
                 axutil_hash_set(policy_include->wrapper_elements, 
                     neethi_policy_get_id(policy, env),
                     AXIS2_HASH_KEY_STRING, wrapper);
-                */
             }
         }
     }
@@ -231,11 +225,9 @@
     axis2_char_t *key;
     axis2_policy_wrapper_t *wrapper = NULL;
 
-    /* TODO: uncomment when neethi_policy_get_name & neethi_policy_get_id done
     key = neethi_policy_get_name(policy, env);
     if (!key)
         key = neethi_policy_get_id(policy, env);
-    */
 
     if (!key)
     {
@@ -320,8 +312,10 @@
                     (neethi_reference_t *)wrapper->value;
                 if (reference)
                 {
+                    /* TOOD add neethi_reference_normalize
                     policy = (neethi_policy_t*) neethi_reference_normalize(
                         reference, env, policy_include->registry, AXIS2_FALSE);
+                    */
                 }
             } 
             else 
@@ -329,10 +323,8 @@
                 policy = (neethi_policy_t *)wrapper->value;
             } 
 
-            /* TODO: uncomment when neethi_policy_merge done
-            result = (result == NULL) ? (neethi_policy_t) policy : 
-                (neethi_policy_t*) neethi_policy_merge(result, env, policy);
-           */
+            result = (result == NULL) ? (neethi_policy_t*) policy : 
+                (neethi_policy_t*) neethi_engine_merge(env, result, policy);
         }
     }
 
@@ -364,8 +356,8 @@
         {
             if (axis2_policy_include_get_policy(policy_include, env)) 
             {
-                result = (neethi_policy_t*) neethi_policy_merge(parent_policy,
-                    env, axis2_policy_include_get_policy(policy_include, env));
+                result = (neethi_policy_t*) neethi_engine_merge(env, parent_policy,
+                    axis2_policy_include_get_policy(policy_include, env));
 
             } 
             else 
@@ -505,11 +497,9 @@
             wrapper->type = type;
             wrapper->value = policy;
             
-    /* TODO: uncomment when neethi_policy_get_name & neethi_policy_get_id done
             policy_name = neethi_policy_get_name(policy, env);
             if (!policy_name)
                 policy_name = neethi_policy_get_id(policy, env);
-            */
             
             if (policy_name)
             {



---------------------------------------------------------------------
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