Get spec version from policy
diff --git a/samples/rm_echo_1_0/echo_util.c b/samples/rm_echo_1_0/echo_util.c
index 8eab9dd..e0a632e 100644
--- a/samples/rm_echo_1_0/echo_util.c
+++ b/samples/rm_echo_1_0/echo_util.c
@@ -20,15 +20,12 @@
axiom_node_t *
build_om_payload_for_echo_svc(
const axutil_env_t *env,
- axis2_char_t *text,
- axis2_char_t *seq)
+ axis2_char_t *text)
{
axiom_node_t *echo_om_node = NULL;
axiom_element_t* echo_om_ele = NULL;
axiom_node_t* text_om_node = NULL;
axiom_element_t * text_om_ele = NULL;
- axiom_node_t* seq_om_node = NULL;
- axiom_element_t * seq_om_ele = NULL;
axiom_namespace_t *ns1 = NULL;
axis2_char_t *ns = NULL;
@@ -37,9 +34,7 @@
ns1 = axiom_namespace_create (env, ns, "ns1");
echo_om_ele = axiom_element_create(env, NULL, "echoString", ns1, &echo_om_node);
text_om_ele = axiom_element_create(env, echo_om_node, "Text", ns1, &text_om_node);
- seq_om_ele = axiom_element_create(env, echo_om_node, "Sequence", ns1, &seq_om_node);
axiom_element_set_text(text_om_ele, env, text, text_om_node);
- axiom_element_set_text(text_om_ele, env, seq, seq_om_node);
return echo_om_node;
}
diff --git a/samples/rm_echo_1_0/echo_util.h b/samples/rm_echo_1_0/echo_util.h
index 78ceaaa..773ef8f 100644
--- a/samples/rm_echo_1_0/echo_util.h
+++ b/samples/rm_echo_1_0/echo_util.h
@@ -23,7 +23,6 @@
axiom_node_t *
build_om_payload_for_echo_svc(
const axutil_env_t *env,
- axis2_char_t *text,
- axis2_char_t *seq);
+ axis2_char_t *text);
#endif
diff --git a/samples/rm_echo_1_0/rm_echo.c b/samples/rm_echo_1_0/rm_echo.c
index b3e66dc..4beb452 100644
--- a/samples/rm_echo_1_0/rm_echo.c
+++ b/samples/rm_echo_1_0/rm_echo.c
@@ -61,9 +61,7 @@
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
axis2_callback_t *callback1 = NULL;
- axutil_property_t *property = NULL;
axutil_string_t *soap_action = NULL;
- axis2_char_t *seq_key = NULL;
int i = 0;
neethi_policy_t *policy = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -149,34 +147,18 @@
axis2_options_set_soap_version(options, env, AXIOM_SOAP11);
- /* RM Version 1.0 */
- property = axutil_property_create_with_args(env, 3, 0, 0,
- SANDESHA2_SPEC_VERSION_1_0);
- if(property)
- {
- axis2_options_set_property(options, env,
- SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
/* Set service client options */
axis2_svc_client_set_options(svc_client, env, options);
axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
axis2_svc_client_engage_module(svc_client, env, "sandesha2");
- seq_key = axutil_uuid_gen(env);
- property = axutil_property_create_with_args(env, 0, 0, 0, seq_key);
- if(property)
- {
- axis2_options_set_property(options, env, SANDESHA2_CLIENT_SEQ_KEY,
- property);
- }
-
for(i = 1; i < 4; i++)
{
axis2_char_t echo_str[7];
sprintf(echo_str, "%s%d", "echo", i);
- payload = build_om_payload_for_echo_svc(env, echo_str, seq_key);
+ payload = build_om_payload_for_echo_svc(env, echo_str);
callback1 = axis2_callback_create(env);
axis2_callback_set_on_complete(callback1, rm_echo_callback_on_complete);
axis2_callback_set_on_error(callback1, rm_echo_callback_on_error);
@@ -188,7 +170,6 @@
axis2_svc_client_close(svc_client, env);
AXIS2_SLEEP(SANDESHA2_MAX_COUNT);
- AXIS2_FREE(env->allocator, seq_key);
if (svc_client)
{
axis2_svc_client_free(svc_client, env);
diff --git a/samples/rm_echo_1_1/rm_echo_1_1.c b/samples/rm_echo_1_1/rm_echo_1_1.c
index 8859cc5..5a5f2de 100644
--- a/samples/rm_echo_1_1/rm_echo_1_1.c
+++ b/samples/rm_echo_1_1/rm_echo_1_1.c
@@ -62,7 +62,6 @@
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
axis2_callback_t *callback = NULL;
- axutil_property_t *property = NULL;
neethi_policy_t *policy = NULL;
axis2_status_t status = AXIS2_FAILURE;
int i = 0;
@@ -151,13 +150,6 @@
axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
axis2_svc_client_engage_module(svc_client, env, "sandesha2");
- /* RM Version 1.1 */
- property = axutil_property_create_with_args(env, 3, 0, 0, SANDESHA2_SPEC_VERSION_1_1);
- if(property)
- {
- axis2_options_set_property(options, env, SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
-
for(i = 1; i < 4; i++)
{
axis2_char_t echo_str[7];
diff --git a/samples/rm_echo_single_1_0/rm_echo_single.c b/samples/rm_echo_single_1_0/rm_echo_single.c
index 529e3d7..2f826e9 100644
--- a/samples/rm_echo_single_1_0/rm_echo_single.c
+++ b/samples/rm_echo_single_1_0/rm_echo_single.c
@@ -133,15 +133,6 @@
axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
axis2_svc_client_engage_module(svc_client, env, "sandesha2");
- /* RM Version 1.0 */
- property = axutil_property_create_with_args(env, 3, 0, 0,
- SANDESHA2_SPEC_VERSION_1_0);
- if(property)
- {
- axis2_options_set_property(options, env,
- SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
-
property = axutil_property_create_with_args(env, 0, 0, 0, "12");
if(property)
{
diff --git a/samples/rm_echo_single_1_1/rm_echo_single_1_1.c b/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
index 2861f24..5ff45d0 100644
--- a/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
+++ b/samples/rm_echo_single_1_1/rm_echo_single_1_1.c
@@ -44,7 +44,6 @@
const axis2_char_t *client_home = NULL;
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
- axutil_property_t *property = NULL;
axis2_listener_manager_t *listener_manager = NULL;
int i;
axis2_status_t status = AXIS2_FAILURE;
@@ -139,13 +138,6 @@
return AXIS2_FAILURE;
}
- /* RM Version 1.1 */
- property = axutil_property_create_with_args(env, 3, 0, 0, SANDESHA2_SPEC_VERSION_1_1);
- if(property)
- {
- axis2_options_set_property(options, env, SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
-
for(i = 1; i < 4; i++)
{
axis2_char_t echo_str[7];
diff --git a/samples/rm_mtom_1_0/rm_mtom_1_0.c b/samples/rm_mtom_1_0/rm_mtom_1_0.c
index 6658ee8..8d12c05 100644
--- a/samples/rm_mtom_1_0/rm_mtom_1_0.c
+++ b/samples/rm_mtom_1_0/rm_mtom_1_0.c
@@ -134,12 +134,6 @@
axis2_svc_client_engage_module(svc_client, env, AXIS2_MODULE_ADDRESSING);
axis2_svc_client_engage_module(svc_client, env, "sandesha2");
- property = axutil_property_create_with_args(env, 3, 0, 0, SANDESHA2_SPEC_VERSION_1_0);
- if(property)
- {
- axis2_options_set_property(options, env, SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
-
property = axutil_property_create_with_args(env, 0, 0, 0, "12");
if(property)
{
diff --git a/samples/rm_ping_1_0/rm_ping_1_0.c b/samples/rm_ping_1_0/rm_ping_1_0.c
index 194b851..8456e4f 100644
--- a/samples/rm_ping_1_0/rm_ping_1_0.c
+++ b/samples/rm_ping_1_0/rm_ping_1_0.c
@@ -42,7 +42,6 @@
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
axis2_status_t status = AXIS2_FAILURE;
- axutil_property_t *property = NULL;
int ii;
neethi_policy_t *policy = NULL;
@@ -125,13 +124,6 @@
axis2_svc_client_engage_module(svc_client, env, "sandesha2");
- /* RM Version 1.0 */
- property = axutil_property_create_with_args(env, 0, 0, 0, SANDESHA2_SPEC_VERSION_1_0);
- if(property)
- {
- axis2_options_set_property(options, env, SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
-
/* Send request */
for(ii = 0; ii < 4; ii++)
{
diff --git a/samples/rm_ping_1_1/rm_ping_1_1.c b/samples/rm_ping_1_1/rm_ping_1_1.c
index be28b4f..b52c963 100644
--- a/samples/rm_ping_1_1/rm_ping_1_1.c
+++ b/samples/rm_ping_1_1/rm_ping_1_1.c
@@ -42,7 +42,6 @@
const axis2_char_t *client_home = NULL;
axis2_svc_client_t* svc_client = NULL;
axiom_node_t *payload = NULL;
- axutil_property_t *property = NULL;
int i = 0;
neethi_policy_t *policy = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -123,14 +122,6 @@
/* Build the SOAP request message payload using OM API.*/
axis2_svc_client_engage_module(svc_client, env, "sandesha2");
- /* RM Version 1.1 */
- property = axutil_property_create_with_args(env, 0, 0, 0,
- SANDESHA2_SPEC_VERSION_1_1);
- if(property)
- {
- axis2_options_set_property(options, env,
- SANDESHA2_CLIENT_RM_SPEC_VERSION, property);
- }
for(i = 1; i < 4; i++)
{
