axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject svn commit: r643997 - in /webservices/axis2/trunk/c/neethi/src: ./ secpolicy/builder/
Date Wed, 02 Apr 2008 17:59:21 GMT
Author: pini
Date: Wed Apr  2 10:59:17 2008
New Revision: 643997

URL: http://svn.apache.org/viewvc?rev=643997&view=rev
Log:
Fixing jira issues 1095, 1096, 1097, 1098, 1099


Modified:
    webservices/axis2/trunk/c/neethi/src/exactlyone.c
    webservices/axis2/trunk/c/neethi/src/operator.c
    webservices/axis2/trunk/c/neethi/src/policy.c
    webservices/axis2/trunk/c/neethi/src/reference.c
    webservices/axis2/trunk/c/neethi/src/registry.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/bootstrap_policy_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/encryption_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/protection_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/trust10_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss11_builder.c
    webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c
    webservices/axis2/trunk/c/neethi/src/util.c

Modified: webservices/axis2/trunk/c/neethi/src/exactlyone.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/exactlyone.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/exactlyone.c (original)
+++ webservices/axis2/trunk/c/neethi/src/exactlyone.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,7 +24,7 @@
 
 AXIS2_EXTERN neethi_exactlyone_t *AXIS2_CALL
 neethi_exactlyone_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     neethi_exactlyone_t *neethi_exactlyone = NULL;
 
@@ -38,6 +37,7 @@
     if (neethi_exactlyone == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     neethi_exactlyone->policy_components = NULL;
@@ -47,6 +47,7 @@
     {
         neethi_exactlyone_free(neethi_exactlyone, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     return neethi_exactlyone;
@@ -54,11 +55,9 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 neethi_exactlyone_free(
-    neethi_exactlyone_t * neethi_exactlyone,
-    const axutil_env_t * env)
+    neethi_exactlyone_t *neethi_exactlyone,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (neethi_exactlyone)
     {
         if (neethi_exactlyone->policy_components)
@@ -91,19 +90,17 @@
 
 AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
 neethi_exactlyone_get_policy_components(
-    neethi_exactlyone_t * neethi_exactlyone,
-    const axutil_env_t * env)
+    neethi_exactlyone_t *neethi_exactlyone,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return neethi_exactlyone->policy_components;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_exactlyone_add_policy_components(
-    neethi_exactlyone_t * exactlyone,
-    axutil_array_list_t * arraylist,
-    const axutil_env_t * env)
+    neethi_exactlyone_t *exactlyone,
+    axutil_array_list_t *arraylist,
+    const axutil_env_t *env)
 {
 
     int size = axutil_array_list_size(arraylist, env);
@@ -125,12 +122,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_exactlyone_add_operator(
-    neethi_exactlyone_t * neethi_exactlyone,
-    const axutil_env_t * env,
-    neethi_operator_t * operator)
+    neethi_exactlyone_t *neethi_exactlyone,
+    const axutil_env_t *env,
+    neethi_operator_t *operator)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     neethi_operator_increment_ref(operator, env);
     axutil_array_list_add(neethi_exactlyone->policy_components, env, operator);
     return AXIS2_SUCCESS;
@@ -138,8 +133,8 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 neethi_exactlyone_is_empty(
-    neethi_exactlyone_t * exactlyone,
-    const axutil_env_t * env)
+    neethi_exactlyone_t *exactlyone,
+    const axutil_env_t *env)
 {
     return axutil_array_list_is_empty(exactlyone->policy_components, env);
 }
@@ -147,9 +142,9 @@
 /*This function is for serializing*/
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_exactlyone_serialize(
-    neethi_exactlyone_t * neethi_exactlyone,
-    axiom_node_t * parent,
-    const axutil_env_t * env)
+    neethi_exactlyone_t *neethi_exactlyone,
+    axiom_node_t *parent,
+    const axutil_env_t *env)
 {
 
     axiom_node_t *exactlyone_node = NULL;
@@ -165,7 +160,6 @@
                              &exactlyone_node);
     if (!exactlyone_node)
     {
-        /*printf("Exactlyone serialization failed\n"); */
         return AXIS2_FAILURE;
     }
     components =
@@ -185,7 +179,6 @@
                     neethi_operator_serialize(operator, env, exactlyone_node);
                 if (status != AXIS2_SUCCESS)
                 {
-                    /*printf("Operator Serializing failed\n"); */
                     return status;
                 }
             }
@@ -196,8 +189,8 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_exactlyone_set_components_null(
-    neethi_exactlyone_t * exactlyone,
-    const axutil_env_t * env)
+    neethi_exactlyone_t *exactlyone,
+    const axutil_env_t *env)
 {
     exactlyone->policy_components = NULL;
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/neethi/src/operator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/operator.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/operator.c (original)
+++ webservices/axis2/trunk/c/neethi/src/operator.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -32,7 +31,7 @@
 
 AXIS2_EXTERN neethi_operator_t *AXIS2_CALL
 neethi_operator_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     neethi_operator_t *neethi_operator = NULL;
 
@@ -45,6 +44,7 @@
     if (neethi_operator == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     neethi_operator->value = NULL;
@@ -56,11 +56,9 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 neethi_operator_free(
-    neethi_operator_t * neethi_operator,
-    const axutil_env_t * env)
+    neethi_operator_t *neethi_operator,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (neethi_operator)
     {
         if (--(neethi_operator->ref) > 0)
@@ -104,7 +102,6 @@
             case OPERATOR_TYPE_UNKNOWN:
                 break;
             }
-            /*AXIS2_FREE(env->allocator,neethi_operator->value); */
         }
         AXIS2_FREE(env->allocator, neethi_operator);
     }
@@ -115,44 +112,37 @@
 
 AXIS2_EXTERN neethi_operator_type_t AXIS2_CALL
 neethi_operator_get_type(
-    neethi_operator_t * neethi_operator,
-    const axutil_env_t * env)
+    neethi_operator_t *neethi_operator,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return neethi_operator->type;
 }
 
 AXIS2_EXTERN void *AXIS2_CALL
 neethi_operator_get_value(
-    neethi_operator_t * neethi_operator,
-    const axutil_env_t * env)
+    neethi_operator_t *neethi_operator,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return neethi_operator->value;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_operator_set_value(
-    neethi_operator_t * neethi_operator,
-    const axutil_env_t * env,
+    neethi_operator_t *neethi_operator,
+    const axutil_env_t *env,
     void *value,
     neethi_operator_type_t type)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     neethi_operator->type = type;
     neethi_operator->value = (void *) value;
-
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_operator_serialize(
-    neethi_operator_t * neethi_operator,
-    const axutil_env_t * env,
-    axiom_node_t * parent)
+    neethi_operator_t *neethi_operator,
+    const axutil_env_t *env,
+    axiom_node_t *parent)
 {
 
     neethi_policy_t *policy = NULL;
@@ -218,8 +208,8 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_operator_set_value_null(
-    neethi_operator_t * neethi_operator,
-    const axutil_env_t * env)
+    neethi_operator_t *neethi_operator,
+    const axutil_env_t *env)
 {
     neethi_operator->value = NULL;
     return AXIS2_SUCCESS;
@@ -227,10 +217,9 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_operator_increment_ref(
-    neethi_operator_t * operator,
-    const axutil_env_t * env)
+    neethi_operator_t *operator,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     operator-> ref++;
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/neethi/src/policy.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/policy.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/policy.c (original)
+++ webservices/axis2/trunk/c/neethi/src/policy.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +21,6 @@
 struct neethi_policy_t
 {
     axutil_array_list_t *policy_components;
-
-/*  axutil_hash_t *attributes_map;*/
     axis2_char_t *name;
     axis2_char_t *id;
     axiom_node_t *root_node;
@@ -43,6 +40,7 @@
     if (neethi_policy == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     neethi_policy->policy_components = NULL;
@@ -52,19 +50,9 @@
     {
         neethi_policy_free(neethi_policy, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
-    /*
-       neethi_policy->attributes_map = NULL;
-
-       neethi_policy->attributes_map = axutil_hash_make(env);
-       if (!(neethi_policy->attributes_map))
-       {
-       neethi_policy_free(neethi_policy, env);
-       AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
-       return NULL;
-       }
-     */
     neethi_policy->name = NULL;
     neethi_policy->id = NULL;
     neethi_policy->root_node = NULL;
@@ -74,14 +62,11 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 neethi_policy_free(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (neethi_policy)
     {
-
         if (neethi_policy->policy_components)
         {
             int i = 0;
@@ -126,21 +111,18 @@
 
 AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
 neethi_policy_get_policy_components(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     return neethi_policy->policy_components;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_policy_add_policy_components(
-    neethi_policy_t * neethi_policy,
-    axutil_array_list_t * arraylist,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    axutil_array_list_t *arraylist,
+    const axutil_env_t *env)
 {
-
     int size = axutil_array_list_size(arraylist, env);
     int i = 0;
 
@@ -160,12 +142,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_policy_add_operator(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env,
-    neethi_operator_t * operator)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env,
+    neethi_operator_t *operator)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     neethi_operator_increment_ref(operator, env);
     axutil_array_list_add(neethi_policy->policy_components, env, operator);
     return AXIS2_SUCCESS;
@@ -173,16 +153,16 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 neethi_policy_is_empty(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env)
 {
     return axutil_array_list_is_empty(neethi_policy->policy_components, env);
 }
 
 AXIS2_EXTERN neethi_exactlyone_t *AXIS2_CALL
 neethi_policy_get_exactlyone(
-    neethi_policy_t * normalized_neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *normalized_neethi_policy,
+    const axutil_env_t *env)
 {
     neethi_exactlyone_t *exactlyone = NULL;
     axutil_array_list_t *list = NULL;
@@ -215,18 +195,10 @@
 
 AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
 neethi_policy_get_alternatives(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env)
 {
-
-    /*neethi_policy_t *normalized = NULL; */
     neethi_exactlyone_t *exactlyone = NULL;
-
-    /*normalized = neethi_engine_get_normalize(env, AXIS2_FALSE, neethi_policy); */
-
-    /*if(!normalized)
-       return NULL; */
-
     exactlyone = neethi_policy_get_exactlyone(neethi_policy, env);
     if (!exactlyone)
         return NULL;
@@ -237,43 +209,36 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 neethi_policy_get_name(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env)
 {
-
-    AXIS2_ENV_CHECK(env, NULL);
     return neethi_policy->name;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_policy_set_name(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env,
-    axis2_char_t * name)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env,
+    axis2_char_t *name)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     neethi_policy->name = name;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 neethi_policy_get_id(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env)
 {
-
-    AXIS2_ENV_CHECK(env, NULL);
     return neethi_policy->id;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_policy_set_id(
-    neethi_policy_t * neethi_policy,
-    const axutil_env_t * env,
-    axis2_char_t * id)
+    neethi_policy_t *neethi_policy,
+    const axutil_env_t *env,
+    axis2_char_t *id)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-    /*neethi_policy->id = id; */
     neethi_policy->id = axutil_strdup(env, id);
     return AXIS2_SUCCESS;
 }
@@ -281,9 +246,9 @@
 /*This function is for serializing*/
 AXIS2_EXTERN axiom_node_t *AXIS2_CALL
 neethi_policy_serialize(
-    neethi_policy_t * neethi_policy,
-    axiom_node_t * parent,
-    const axutil_env_t * env)
+    neethi_policy_t *neethi_policy,
+    axiom_node_t *parent,
+    const axutil_env_t *env)
 {
 
     axiom_node_t *policy_node = NULL;
@@ -299,7 +264,6 @@
                              &policy_node);
     if (!policy_ele)
     {
-        /*printf("Policy element serialization failed.\n"); */
         return NULL;
     }
 
@@ -318,7 +282,6 @@
                 status = neethi_operator_serialize(operator, env, policy_node);
                 if (status != AXIS2_SUCCESS)
                 {
-                    /*printf("Operator Serializing failed\n"); */
                     return NULL;
                 }
             }
@@ -329,8 +292,8 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_policy_set_components_null(
-    neethi_policy_t * policy,
-    const axutil_env_t * env)
+    neethi_policy_t *policy,
+    const axutil_env_t *env)
 {
     policy->policy_components = NULL;
     return AXIS2_SUCCESS;
@@ -338,9 +301,9 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_policy_set_root_node(
-    neethi_policy_t * policy,
-    const axutil_env_t * env,
-    axiom_node_t * root_node)
+    neethi_policy_t *policy,
+    const axutil_env_t *env,
+    axiom_node_t *root_node)
 {
     policy->root_node = root_node;
     return AXIS2_SUCCESS;

Modified: webservices/axis2/trunk/c/neethi/src/reference.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/reference.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/reference.c (original)
+++ webservices/axis2/trunk/c/neethi/src/reference.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,7 +24,7 @@
 
 AXIS2_EXTERN neethi_reference_t *AXIS2_CALL
 neethi_reference_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     neethi_reference_t *neethi_reference = NULL;
 
@@ -38,6 +37,7 @@
     if (neethi_reference == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     neethi_reference->uri = NULL;
@@ -47,11 +47,9 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 neethi_reference_free(
-    neethi_reference_t * neethi_reference,
-    const axutil_env_t * env)
+    neethi_reference_t *neethi_reference,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (neethi_reference)
     {
         AXIS2_FREE(env->allocator, neethi_reference);
@@ -64,33 +62,28 @@
 
 AXIS2_EXTERN axis2_char_t *AXIS2_CALL
 neethi_reference_get_uri(
-    neethi_reference_t * neethi_reference,
-    const axutil_env_t * env)
+    neethi_reference_t *neethi_reference,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     return neethi_reference->uri;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_reference_set_uri(
-    neethi_reference_t * neethi_reference,
-    const axutil_env_t * env,
-    axis2_char_t * uri)
+    neethi_reference_t *neethi_reference,
+    const axutil_env_t *env,
+    axis2_char_t *uri)
 {
-
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     neethi_reference->uri = uri;
     return AXIS2_SUCCESS;
 }
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_reference_serialize(
-    neethi_reference_t * neethi_reference,
-    axiom_node_t * parent,
-    const axutil_env_t * env)
+    neethi_reference_t *neethi_reference,
+    axiom_node_t *parent,
+    const axutil_env_t *env)
 {
-
     axiom_node_t *ref_node = NULL;
     axiom_element_t *ref_ele = NULL;
     axiom_namespace_t *policy_ns = NULL;
@@ -103,7 +96,6 @@
                              &ref_node);
     if (!ref_node)
     {
-        /*printf("Reference serialization failed\n"); */
         return AXIS2_FAILURE;
     }
 

Modified: webservices/axis2/trunk/c/neethi/src/registry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/registry.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/registry.c (original)
+++ webservices/axis2/trunk/c/neethi/src/registry.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,7 +25,7 @@
 
 AXIS2_EXTERN neethi_registry_t *AXIS2_CALL
 neethi_registry_create(
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
     neethi_registry_t *neethi_registry = NULL;
 
@@ -39,6 +38,7 @@
     if (neethi_registry == NULL)
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     neethi_registry->registry = NULL;
@@ -48,6 +48,7 @@
     {
         neethi_registry_free(neethi_registry, env);
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
     neethi_registry->parent = NULL;
@@ -57,8 +58,8 @@
 
 AXIS2_EXTERN neethi_registry_t *AXIS2_CALL
 neethi_registry_create_with_parent(
-    const axutil_env_t * env,
-    neethi_registry_t * parent)
+    const axutil_env_t *env,
+    neethi_registry_t *parent)
 {
     neethi_registry_t *neethi_registry = NULL;
 
@@ -72,11 +73,9 @@
 
 AXIS2_EXTERN void AXIS2_CALL
 neethi_registry_free(
-    neethi_registry_t * neethi_registry,
-    const axutil_env_t * env)
+    neethi_registry_t *neethi_registry,
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (neethi_registry->registry)
     {
         axutil_hash_index_t *hi = NULL;
@@ -97,7 +96,6 @@
     }
     if (neethi_registry->parent)
     {
-        /*neethi_registry_free(neethi_registry->parent, env); */
         neethi_registry->parent = NULL;
     }
     AXIS2_FREE(env->allocator, neethi_registry);
@@ -107,10 +105,10 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 neethi_registry_register(
-    neethi_registry_t * neethi_registry,
-    const axutil_env_t * env,
-    axis2_char_t * key,
-    neethi_policy_t * value)
+    neethi_registry_t *neethi_registry,
+    const axutil_env_t *env,
+    axis2_char_t *key,
+    neethi_policy_t *value)
 {
     axutil_hash_set(neethi_registry->registry, key, AXIS2_HASH_KEY_STRING,
                     value);
@@ -119,9 +117,9 @@
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
 neethi_registry_lookup(
-    neethi_registry_t * neethi_registry,
-    const axutil_env_t * env,
-    axis2_char_t * key)
+    neethi_registry_t *neethi_registry,
+    const axutil_env_t *env,
+    axis2_char_t *key)
 {
     neethi_policy_t *policy = NULL;
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,9 +24,9 @@
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_algorithmsuite_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_algorithmsuite_t *algorithmsuite = NULL;
     axiom_node_t *child_node = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/asymmetric_binding_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL asymmetric_binding_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_asymmetric_binding_t * asymmetric_binding);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_asymmetric_binding_t *asymmetric_binding);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_asymmetric_binding_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_asymmetric_binding_t *asymmetric_binding = NULL;
     neethi_policy_t *policy = NULL;
@@ -99,8 +98,8 @@
 
 axis2_status_t AXIS2_CALL
 asymmetric_binding_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
+    const axutil_env_t *env,
+    neethi_all_t *all,
     rp_asymmetric_binding_t * asymmetric_binding)
 {
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/bootstrap_policy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/bootstrap_policy_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/bootstrap_policy_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/bootstrap_policy_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,9 +24,9 @@
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_bootstrap_policy_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     neethi_policy_t *policy = NULL;
     axiom_node_t *child_node = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/encryption_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/encryption_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/encryption_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/encryption_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,17 +26,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL encryption_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * encryption_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *encryption_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_encryption_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_property_t *encryption_token = NULL;
     neethi_policy_t *policy = NULL;
@@ -100,9 +99,9 @@
 
 axis2_status_t AXIS2_CALL
 encryption_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * encryption_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *encryption_token)
 {
 
     neethi_operator_t *operator = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/https_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,9 +24,9 @@
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_https_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_https_token_t *https_token = NULL;
     neethi_assertion_t *assertion = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,9 +24,9 @@
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_layout_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_layout_t *layout = NULL;
     axiom_node_t *child_node = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/protection_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/protection_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/protection_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/protection_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,17 +26,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL protection_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * protection_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *protection_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_protection_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_property_t *protection_token = NULL;
     neethi_policy_t *policy = NULL;
@@ -100,9 +99,9 @@
 
 axis2_status_t AXIS2_CALL
 protection_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * protection_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *protection_token)
 {
 
     neethi_operator_t *operator = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/qname_matcher.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,17 +19,15 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 rp_match_secpolicy_qname(
-    const axutil_env_t * env,
-    const axis2_char_t * local_name,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    const axis2_char_t *local_name,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
 
     axutil_qname_t *qname = NULL;
     axutil_qname_t *node_qname = NULL;
 
-    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-
     node_qname = axiom_element_get_qname(element, env, node);
 
     if (!node_qname)
@@ -59,17 +56,15 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 rp_match_policy_qname(
-    const axutil_env_t * env,
-    const axis2_char_t * local_name,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    const axis2_char_t *local_name,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
 
     axutil_qname_t *qname = NULL;
     axutil_qname_t *node_qname = NULL;
 
-    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
-
     node_qname = axiom_element_get_qname(element, env, node);
 
     if (!node_qname)
@@ -100,16 +95,14 @@
 
 AXIS2_EXTERN axis2_bool_t AXIS2_CALL
 rp_match_rampart_config_qname(
-    const axutil_env_t * env,
-    const axis2_char_t * local_name,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    const axis2_char_t *local_name,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
 
     axutil_qname_t *qname = NULL;
     axutil_qname_t *node_qname = NULL;
-
-    AXIS2_ENV_CHECK(env, AXIS2_FALSE);
 
     node_qname = axiom_element_get_qname(element, env, node);
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,25 +21,23 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL rp_rampart_config_builder_populate(
-    const axutil_env_t * env,
-    rp_rampart_config_t * rampart_config,
-    axiom_node_t * node,
-    axiom_element_t * element,
-    axis2_char_t * local_name);
+    const axutil_env_t *env,
+    rp_rampart_config_t *rampart_config,
+    axiom_node_t *node,
+    axiom_element_t *element,
+    axis2_char_t *local_name);
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_rampart_config_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * config,
-    axiom_element_t * config_ele)
+    const axutil_env_t *env,
+    axiom_node_t *config,
+    axiom_element_t *config_ele)
 {
     rp_rampart_config_t *rampart_config = NULL;
     axis2_status_t status = AXIS2_SUCCESS;
     axiom_children_iterator_t *children_iter = NULL;
     neethi_assertion_t *assertion = NULL;
 
-    AXIS2_ENV_CHECK(env, NULL);
-
     rampart_config = rp_rampart_config_create(env);
     if (!rampart_config)
     {
@@ -92,14 +89,12 @@
 
 axis2_status_t AXIS2_CALL
 rp_rampart_config_builder_populate(
-    const axutil_env_t * env,
-    rp_rampart_config_t * rampart_config,
-    axiom_node_t * node,
-    axiom_element_t * element,
-    axis2_char_t * local_name)
+    const axutil_env_t *env,
+    rp_rampart_config_t *rampart_config,
+    axiom_node_t *node,
+    axiom_element_t *element,
+    axis2_char_t *local_name)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (axutil_strcmp(local_name, RP_USER) == 0)
     {
         if (rp_match_rampart_config_qname(env, RP_USER, node, element))
@@ -268,7 +263,6 @@
         {
             axis2_char_t *rd_val = NULL;
             rd_val = axiom_element_get_text(element, env, node);
-            /*printf("rd_val = %s", rd_val); */
             rp_rampart_config_set_rd_val(rampart_config, env, rd_val);
             return AXIS2_SUCCESS;
         }

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/recipient_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,17 +26,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL recipient_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * recipient_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *recipient_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_recipient_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_property_t *recipient_token = NULL;
     neethi_policy_t *policy = NULL;
@@ -101,9 +100,9 @@
 
 axis2_status_t AXIS2_CALL
 recipient_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * recipient_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *recipient_token)
 {
 
     neethi_operator_t *operator = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/saml_token_builder.c Wed Apr  2 10:59:17 2008
@@ -18,15 +18,15 @@
 #include <rp_saml_token_builder.h>
 
 axis2_status_t AXIS2_CALL saml_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_saml_token_t * saml_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_saml_token_t *saml_token);
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
     rp_saml_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_saml_token_t *saml_token = NULL;
     axis2_char_t *inclusion_value = NULL;
@@ -101,9 +101,9 @@
 }
 
 axis2_status_t AXIS2_CALL saml_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_saml_token_t * saml_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_saml_token_t *saml_token)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/secpolicy_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,27 +25,24 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL secpolicy_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_secpolicy_t * secpolicy);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_secpolicy_t *secpolicy);
 
 /***********************************/
 
 AXIS2_EXTERN rp_secpolicy_t *AXIS2_CALL
 rp_secpolicy_builder_build(
-    const axutil_env_t * env,
-    neethi_policy_t * policy)
+    const axutil_env_t *env,
+    neethi_policy_t *policy)
 {
     axutil_array_list_t *alternatives = NULL;
     neethi_operator_t *component = NULL;
     neethi_all_t *all = NULL;
     rp_secpolicy_t *secpolicy = NULL;
-    /*neethi_policy_t *normalized_policy = NULL; */
 
     secpolicy = rp_secpolicy_create(env);
 
-    /*normalized_policy = neethi_engine_get_normalize(env, AXIS2_FALSE, policy); */
-
     alternatives = neethi_policy_get_alternatives(policy, env);
 
     component =
@@ -62,9 +58,9 @@
 
 axis2_status_t AXIS2_CALL
 secpolicy_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_secpolicy_t * secpolicy)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_secpolicy_t *secpolicy)
 {
 
     neethi_operator_t *operator = NULL;
@@ -115,7 +111,6 @@
                     neethi_assertion_get_value(assertion, env);
                 if (!asymmetric_binding)
                 {
-                    /*printf("Asymmetric Binding not set\n"); */
                     return AXIS2_FAILURE;
                 }
                 binding = rp_property_create(env);

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/security_context_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,17 +26,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL security_context_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
+    const axutil_env_t *env,
+    neethi_all_t *all,
     rp_security_context_token_t * security_context_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_security_context_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element,
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element,
     axis2_bool_t is_secure_conversation_token)
 {
     rp_security_context_token_t *security_context_token = NULL;
@@ -52,7 +51,6 @@
     axutil_qname_t *qname = NULL;
     neethi_assertion_t *assertion = NULL;
     neethi_policy_t *normalized_policy = NULL;
-    /*axutil_array_list_t *temp = NULL; */
 
     security_context_token = rp_security_context_token_create(env);
     qname = axutil_qname_create(env, RP_INCLUDE_TOKEN, RP_SP_NS, RP_SP_PREFIX);
@@ -137,8 +135,8 @@
 
 axis2_status_t AXIS2_CALL
 security_context_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
+    const axutil_env_t *env,
+    neethi_all_t *all,
     rp_security_context_token_t * security_context_token)
 {
     neethi_operator_t *operator = NULL;
@@ -175,7 +173,7 @@
         }
         else if(type == ASSERTION_TYPE_ISSUER)
         {
-            axis2_char_t* issuer = NULL;
+            axis2_char_t *issuer = NULL;
             issuer = (axis2_char_t *)neethi_assertion_get_value(assertion, env);
             rp_security_context_token_set_issuer(security_context_token, env, issuer);
         }

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signature_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -27,17 +26,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL signature_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * signature_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *signature_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_signature_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_property_t *signature_token = NULL;
     neethi_policy_t *policy = NULL;
@@ -100,9 +99,9 @@
 
 axis2_status_t AXIS2_CALL
 signature_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_property_t * signature_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_property_t *signature_token)
 {
 
     neethi_operator_t *operator = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/signed_encrypted_parts_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -25,21 +24,21 @@
 #include <rp_qname_matcher.h>
 
 rp_header_t *AXIS2_CALL rp_signed_encrypted_parts_builder_build_header(
-    axiom_element_t * element,
-    const axutil_env_t * env);
+    axiom_element_t *element,
+    const axutil_env_t *env);
 
 axis2_status_t AXIS2_CALL rp_signed_encrypted_parts_builder_set_properties(
-    axiom_node_t * node,
-    axiom_element_t * element,
-    axis2_char_t * local_name,
-    rp_signed_encrypted_parts_t * signed_encrypted_parts,
-    const axutil_env_t * env);
+    axiom_node_t *node,
+    axiom_element_t *element,
+    axis2_char_t *local_name,
+    rp_signed_encrypted_parts_t *signed_encrypted_parts,
+    const axutil_env_t *env);
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_signed_encrypted_parts_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * parts,
-    axiom_element_t * parts_ele)
+    const axutil_env_t *env,
+    axiom_node_t *parts,
+    axiom_element_t *parts_ele)
 {
 
     rp_signed_encrypted_parts_t *signed_encrypted_parts = NULL;
@@ -122,14 +121,12 @@
 
 axis2_status_t AXIS2_CALL
 rp_signed_encrypted_parts_builder_set_properties(
-    axiom_node_t * node,
-    axiom_element_t * element,
-    axis2_char_t * local_name,
+    axiom_node_t *node,
+    axiom_element_t *element,
+    axis2_char_t *local_name,
     rp_signed_encrypted_parts_t * signed_encrypted_parts,
-    const axutil_env_t * env)
+    const axutil_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
     if (strcmp(local_name, RP_BODY) == 0)
     {
         if (rp_match_secpolicy_qname(env, RP_BODY, node, element))
@@ -171,14 +168,12 @@
 
 rp_header_t *AXIS2_CALL
 rp_signed_encrypted_parts_builder_build_header(
-    axiom_element_t * element,
-    const axutil_env_t * env)
+    axiom_element_t *element,
+    const axutil_env_t *env)
 {
     rp_header_t *header = NULL;
     axis2_char_t *name = NULL;
     axis2_char_t *nspace = NULL;
-
-    AXIS2_ENV_CHECK(env, NULL);
 
     header = rp_header_create(env);
     if (!header)

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/supporting_tokens_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,21 +25,21 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL supporting_tokens_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_supporting_tokens_t * supporting_tokens);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_supporting_tokens_t *supporting_tokens);
 
 axis2_bool_t AXIS2_CALL is_token_assertion(
-    const axutil_env_t * env,
+    const axutil_env_t *env,
     neethi_assertion_type_t type);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_supporting_tokens_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_supporting_tokens_t *supporting_tokens = NULL;
     neethi_policy_t *policy = NULL;
@@ -135,9 +134,9 @@
 
 axis2_status_t AXIS2_CALL
 supporting_tokens_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_supporting_tokens_t * supporting_tokens)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_supporting_tokens_t *supporting_tokens)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;
@@ -193,10 +192,9 @@
 
 axis2_bool_t AXIS2_CALL
 is_token_assertion(
-    const axutil_env_t * env,
+    const axutil_env_t *env,
     neethi_assertion_type_t type)
 {
-
     if (type == ASSERTION_TYPE_USERNAME_TOKEN)
     {
         return AXIS2_TRUE;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/symmetric_binding_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL symmetric_binding_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_symmetric_binding_t * symmetric_binding);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_symmetric_binding_t *symmetric_binding);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_symmetric_binding_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_symmetric_binding_t *symmetric_binding = NULL;
     neethi_policy_t *policy = NULL;
@@ -99,8 +98,8 @@
 
 axis2_status_t AXIS2_CALL
 symmetric_binding_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
+    const axutil_env_t *env,
+    neethi_all_t *all,
     rp_symmetric_binding_t * symmetric_binding)
 {
 

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -30,9 +29,9 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 rp_token_identifier_set_token(
-    rp_property_t * token,
-    neethi_assertion_t * assertion,
-    const axutil_env_t * env)
+    rp_property_t *token,
+    neethi_assertion_t *assertion,
+    const axutil_env_t *env)
 {
     void *value = NULL;
     neethi_assertion_type_t type;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_binding_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL transport_binding_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_transport_binding_t * transport_binding);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_transport_binding_t *transport_binding);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_transport_binding_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_transport_binding_t *transport_binding = NULL;
     neethi_policy_t *policy = NULL;
@@ -100,9 +99,9 @@
 
 axis2_status_t AXIS2_CALL
 transport_binding_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_transport_binding_t * transport_binding)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_transport_binding_t *transport_binding)
 {
 
     neethi_operator_t *operator = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/trust10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/trust10_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/trust10_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/trust10_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL trust10_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_trust10_t * trust10);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_trust10_t *trust10);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_trust10_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_trust10_t *trust10 = NULL;
     neethi_policy_t *policy = NULL;
@@ -97,9 +96,9 @@
 
 axis2_status_t AXIS2_CALL
 trust10_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_trust10_t * trust10)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_trust10_t *trust10)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/username_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL username_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_username_token_t * username_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_username_token_t *username_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_username_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_username_token_t *username_token = NULL;
     neethi_policy_t *policy = NULL;
@@ -113,9 +112,9 @@
 
 axis2_status_t AXIS2_CALL
 username_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_username_token_t * username_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_username_token_t *username_token)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL wss10_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_wss10_t * wss10);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_wss10_t *wss10);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_wss10_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_wss10_t *wss10 = NULL;
     neethi_policy_t *policy = NULL;
@@ -97,9 +96,9 @@
 
 axis2_status_t AXIS2_CALL
 wss10_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_wss10_t * wss10)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_wss10_t *wss10)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss11_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss11_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss11_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss11_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL wss11_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_wss11_t * wss11);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_wss11_t *wss11);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_wss11_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_wss11_t *wss11 = NULL;
     neethi_policy_t *policy = NULL;
@@ -97,9 +96,9 @@
 
 axis2_status_t AXIS2_CALL
 wss11_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_wss11_t * wss11)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_wss11_t *wss11)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,17 +25,17 @@
 /*private functions*/
 
 axis2_status_t AXIS2_CALL x509_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_x509_token_t * x509_token);
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_x509_token_t *x509_token);
 
 /***********************************/
 
 AXIS2_EXTERN neethi_assertion_t *AXIS2_CALL
 rp_x509_token_builder_build(
-    const axutil_env_t * env,
-    axiom_node_t * node,
-    axiom_element_t * element)
+    const axutil_env_t *env,
+    axiom_node_t *node,
+    axiom_element_t *element)
 {
     rp_x509_token_t *x509_token = NULL;
     neethi_policy_t *policy = NULL;
@@ -49,7 +48,6 @@
     axutil_qname_t *qname = NULL;
     neethi_assertion_t *assertion = NULL;
     neethi_policy_t *normalized_policy = NULL;
-    /*axutil_array_list_t *temp = NULL; */
 
     x509_token = rp_x509_token_create(env);
     qname = axutil_qname_create(env, RP_INCLUDE_TOKEN, RP_SP_NS, RP_SP_PREFIX);
@@ -110,9 +108,9 @@
 
 axis2_status_t AXIS2_CALL
 x509_token_process_alternatives(
-    const axutil_env_t * env,
-    neethi_all_t * all,
-    rp_x509_token_t * x509_token)
+    const axutil_env_t *env,
+    neethi_all_t *all,
+    rp_x509_token_t *x509_token)
 {
     neethi_operator_t *operator = NULL;
     axutil_array_list_t *arraylist = NULL;

Modified: webservices/axis2/trunk/c/neethi/src/util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/util.c?rev=643997&r1=643996&r2=643997&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/util.c (original)
+++ webservices/axis2/trunk/c/neethi/src/util.c Wed Apr  2 10:59:17 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,8 +19,8 @@
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
 neethi_util_create_policy_from_file(
-    const axutil_env_t * env,
-    axis2_char_t * file_name)
+    const axutil_env_t *env,
+    axis2_char_t *file_name)
 {
 
     axiom_xml_reader_t *reader = NULL;
@@ -35,6 +34,7 @@
     {
         AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CREATING_XML_STREAM_READER,
                         AXIS2_FAILURE);
+        AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
         return NULL;
     }
 
@@ -68,8 +68,8 @@
 
 AXIS2_EXTERN neethi_policy_t *AXIS2_CALL
 neethi_util_create_policy_from_om(
-    const axutil_env_t * env,
-    axiom_node_t * root_node)
+    const axutil_env_t *env,
+    axiom_node_t *root_node)
 {
 
     axiom_element_t *root_ele = NULL;



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