Author: manjula Date: Mon May 28 23:26:04 2007 New Revision: 542422 URL: http://svn.apache.org/viewvc?view=rev&rev=542422 Log: Changing assertion_create function to pass the free function pointer.
Modified: 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/https_token_builder.c webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.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/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/transport_binding_builder.c webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_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/x509_token_builder.c 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/algorithmsuite_builder.c Mon May 28 23:26:04 2007 @@ -56,9 +56,10 @@ if(!algosuite_string) return NULL; rp_algorithmsuite_set_algosuite(algorithmsuite, env, algosuite_string); - assertion = neethi_assertion_create(env); + /*assertion = neethi_assertion_create(env); neethi_assertion_set_value(assertion, env, algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE); - + */ + assertion = neethi_assertion_create_with_args(env, (void *)rp_algorithmsuite_free, algorithmsuite, ASSERTION_TYPE_ALGORITHM_SUITE); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -69,8 +69,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); asymmetric_binding_process_alternatives(env, all, asymmetric_binding); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, asymmetric_binding, ASSERTION_TYPE_ASSYMMETRIC_BINDING); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, asymmetric_binding, ASSERTION_TYPE_ASSYMMETRIC_BINDING);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_asymmetric_binding_free, asymmetric_binding, ASSERTION_TYPE_ASSYMMETRIC_BINDING); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -50,8 +50,9 @@ } else return NULL; } - assertion = neethi_assertion_create(env); + /*assertion = neethi_assertion_create(env); neethi_assertion_set_value(assertion, env, https_token, ASSERTION_TYPE_HTTPS_TOKEN); - + */ + assertion = neethi_assertion_create_with_args(env, (void *)rp_https_token_free, https_token, ASSERTION_TYPE_HTTPS_TOKEN); return assertion; } Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/initiator_token_builder.c Mon May 28 23:26:04 2007 @@ -70,8 +70,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); initiator_token_process_alternatives(env, all, initiator_token); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, initiator_token, ASSERTION_TYPE_INITIATOR_TOKEN); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, initiator_token, ASSERTION_TYPE_INITIATOR_TOKEN);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_property_free, initiator_token, ASSERTION_TYPE_INITIATOR_TOKEN); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/layout_builder.c Mon May 28 23:26:04 2007 @@ -57,8 +57,9 @@ if(!local_name) return NULL; rp_layout_set_value(layout, env, local_name); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, layout, ASSERTION_TYPE_LAYOUT); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, layout, ASSERTION_TYPE_LAYOUT);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_layout_free, layout, ASSERTION_TYPE_LAYOUT); return assertion; } else return NULL; 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -79,8 +79,9 @@ } } } - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion , env, rampart_config, ASSERTION_TYPE_RAMPART_CONFIG); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion , env, rampart_config, ASSERTION_TYPE_RAMPART_CONFIG);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_rampart_config_free, rampart_config, ASSERTION_TYPE_RAMPART_CONFIG); return assertion; } 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -70,8 +70,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); recipient_token_process_alternatives(env, all, recipient_token); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, recipient_token, ASSERTION_TYPE_RECIPIENT_TOKEN); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, recipient_token, ASSERTION_TYPE_RECIPIENT_TOKEN);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_property_free, recipient_token, ASSERTION_TYPE_RECIPIENT_TOKEN); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -105,8 +105,9 @@ } } } - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_signed_encrypted_parts_free, signed_encrypted_parts, ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS); return assertion; } 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -91,8 +91,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); supporting_tokens_process_alternatives(env, all, supporting_tokens); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, supporting_tokens, ASSERTION_TYPE_SUPPORTING_TOKENS); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, supporting_tokens, ASSERTION_TYPE_SUPPORTING_TOKENS);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_supporting_tokens_free, supporting_tokens, ASSERTION_TYPE_SUPPORTING_TOKENS); return assertion; } else return NULL; 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -69,8 +69,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); transport_binding_process_alternatives(env, all, transport_binding); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, transport_binding, ASSERTION_TYPE_TRANSPORT_BINDING); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, transport_binding, ASSERTION_TYPE_TRANSPORT_BINDING);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_transport_binding_free, transport_binding, ASSERTION_TYPE_TRANSPORT_BINDING); return assertion; } else return NULL; Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/transport_token_builder.c Mon May 28 23:26:04 2007 @@ -70,8 +70,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); transport_token_process_alternatives(env, all, transport_token); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, transport_token, ASSERTION_TYPE_TRANSPORT_TOKEN); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, transport_token, ASSERTION_TYPE_TRANSPORT_TOKEN);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_property_free, transport_token, ASSERTION_TYPE_TRANSPORT_TOKEN); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -85,8 +85,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); username_token_process_alternatives(env, all, username_token); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, username_token, ASSERTION_TYPE_USERNAME_TOKEN); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, username_token, ASSERTION_TYPE_USERNAME_TOKEN);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_username_token_free, username_token, ASSERTION_TYPE_USERNAME_TOKEN); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/wss10_builder.c Mon May 28 23:26:04 2007 @@ -69,8 +69,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); wss10_process_alternatives(env, all, wss10); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, wss10, ASSERTION_TYPE_WSS10); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, wss10, ASSERTION_TYPE_WSS10);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_wss10_free, wss10, ASSERTION_TYPE_WSS10); return assertion; } else return 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?view=diff&rev=542422&r1=542421&r2=542422 ============================================================================== --- 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 Mon May 28 23:26:04 2007 @@ -79,8 +79,9 @@ all = (neethi_all_t *)neethi_operator_get_value(component ,env); x509_token_process_alternatives(env, all, x509_token); - assertion = neethi_assertion_create(env); - neethi_assertion_set_value(assertion, env, x509_token, ASSERTION_TYPE_X509_TOKEN); + /*assertion = neethi_assertion_create(env); + neethi_assertion_set_value(assertion, env, x509_token, ASSERTION_TYPE_X509_TOKEN);*/ + assertion = neethi_assertion_create_with_args(env, (void *)rp_x509_token_free, x509_token, ASSERTION_TYPE_X509_TOKEN); return assertion; } else return NULL; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]