ID-WSF 2.0: add strings for Discovery service Actions

31 files changed, 57 insertions, 52 deletions

diff --git a/lasso/id-ff/profile.c b/lasso/id-ff/profile.c
index a1db007a..9f7a6f63 100644
--- a/lasso/id-ff/profile.c
+++ b/lasso/id-ff/profile.c
@@ -202,7 +202,7 @@ lasso_profile_get_request_type_from_soap_msg(const gchar *soap)
 	} else if (strcmp(name, "Query") == 0) {
 		if (strcmp((char*)ns->href, LASSO_DISCO_HREF) == 0) {
 			type = LASSO_REQUEST_TYPE_DISCO_QUERY;
-		} else if (strcmp((char*)ns->href, LASSO_IDWSF2_DISCO_HREF) == 0) {
+		} else if (strcmp((char*)ns->href, LASSO_IDWSF2_DISCOVERY_HREF) == 0) {
 			type = LASSO_REQUEST_TYPE_IDWSF2_DISCO_QUERY;
 		} else {
 			type = LASSO_REQUEST_TYPE_DST_QUERY;
diff --git a/lasso/id-wsf-2.0/idwsf2_helper.c b/lasso/id-wsf-2.0/idwsf2_helper.c
index 2cd62316..e22a8502 100644
--- a/lasso/id-wsf-2.0/idwsf2_helper.c
+++ b/lasso/id-wsf-2.0/idwsf2_helper.c
@@ -126,8 +126,8 @@ lasso_wsa_endpoint_reference_get_idwsf2_security_context_for_security_mechanism(
 		new_security_mech_id_declaration =
 			lasso_misc_text_node_new_with_string(security_mech_id);
 		new_security_mech_id_declaration->name = "SecurityMechID";
-		new_security_mech_id_declaration->ns_href = LASSO_IDWSF2_DISCO_HREF;
-		new_security_mech_id_declaration->ns_prefix = LASSO_IDWSF2_DISCO_PREFIX;
+		new_security_mech_id_declaration->ns_href = LASSO_IDWSF2_DISCOVERY_HREF;
+		new_security_mech_id_declaration->ns_prefix = LASSO_IDWSF2_DISCOVERY_PREFIX;
 		lasso_list_add_new_gobject (created->SecurityMechID,
 				new_security_mech_id_declaration);
 		lasso_list_add_new_gobject (epr->Metadata->any, created);
diff --git a/lasso/id-wsf-2.0/saml2_login.c b/lasso/id-wsf-2.0/saml2_login.c
index 4dcb3c34..766afee2 100644
--- a/lasso/id-wsf-2.0/saml2_login.c
+++ b/lasso/id-wsf-2.0/saml2_login.c
@@ -93,7 +93,7 @@ lasso_login_idwsf2_add_discovery_bootstrap_epr(LassoLogin *login, const char *ur
 
 	/* Build EndpointReference */
 	epr = lasso_wsa_endpoint_reference_new_for_idwsf2_service(
-			url, LASSO_IDWSF2_DISCO_HREF, server->parent.ProviderID, abstract);
+			url, LASSO_IDWSF2_DISCOVERY_HREF, server->parent.ProviderID, abstract);
 
 	/* Security/Identity token */
 	assertion_identity_token = LASSO_SAML2_ASSERTION(lasso_saml2_assertion_new());
diff --git a/lasso/xml/id-wsf-2.0/disco_abstract.c b/lasso/xml/id-wsf-2.0/disco_abstract.c
index 837f2129..3011a987 100644
--- a/lasso/xml/id-wsf-2.0/disco_abstract.c
+++ b/lasso/xml/id-wsf-2.0/disco_abstract.c
@@ -64,7 +64,7 @@ class_init(LassoIdWsf2DiscoAbstractClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Abstract");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
index 65771ec0..b4d33a30 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -79,7 +79,7 @@ class_init(LassoIdWsf2DiscoEndpointContextClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "EndpointContext");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_keys.c b/lasso/xml/id-wsf-2.0/disco_keys.c
index 4d4365d6..9c7ba5b2 100644
--- a/lasso/xml/id-wsf-2.0/disco_keys.c
+++ b/lasso/xml/id-wsf-2.0/disco_keys.c
@@ -70,7 +70,7 @@ class_init(LassoIdWsf2DiscoKeysClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Keys");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_options.c b/lasso/xml/id-wsf-2.0/disco_options.c
index 2ab40815..bff87685 100644
--- a/lasso/xml/id-wsf-2.0/disco_options.c
+++ b/lasso/xml/id-wsf-2.0/disco_options.c
@@ -68,7 +68,7 @@ class_init(LassoIdWsf2DiscoOptionsClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Options");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_provider_id.c b/lasso/xml/id-wsf-2.0/disco_provider_id.c
index d5f2abbe..66a8e0e4 100644
--- a/lasso/xml/id-wsf-2.0/disco_provider_id.c
+++ b/lasso/xml/id-wsf-2.0/disco_provider_id.c
@@ -64,7 +64,7 @@ class_init(LassoIdWsf2DiscoProviderIDClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "ProviderID");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_query.c b/lasso/xml/id-wsf-2.0/disco_query.c
index af2e0971..5f502b71 100644
--- a/lasso/xml/id-wsf-2.0/disco_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_query.c
@@ -82,7 +82,7 @@ class_init(LassoIdWsf2DiscoQueryClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "Query");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_query_response.c b/lasso/xml/id-wsf-2.0/disco_query_response.c
index 4fd0238b..402ad0e4 100644
--- a/lasso/xml/id-wsf-2.0/disco_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_query_response.c
@@ -85,7 +85,7 @@ class_init(LassoIdWsf2DiscoQueryResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "QueryResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_requested_service.c b/lasso/xml/id-wsf-2.0/disco_requested_service.c
index cc17b0d5..562590ff 100644
--- a/lasso/xml/id-wsf-2.0/disco_requested_service.c
+++ b/lasso/xml/id-wsf-2.0/disco_requested_service.c
@@ -105,7 +105,7 @@ class_init(LassoIdWsf2DiscoRequestedServiceClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "RequestedService");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_security_context.c b/lasso/xml/id-wsf-2.0/disco_security_context.c
index c31e8940..fb89493a 100644
--- a/lasso/xml/id-wsf-2.0/disco_security_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_security_context.c
@@ -78,7 +78,7 @@ class_init(LassoIdWsf2DiscoSecurityContextClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SecurityContext");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.c b/lasso/xml/id-wsf-2.0/disco_service_context.c
index 9f5aca83..8ccf85e6 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -77,7 +77,7 @@ class_init(LassoIdWsf2DiscoServiceContextClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "ServiceContext");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_service_type.c b/lasso/xml/id-wsf-2.0/disco_service_type.c
index feba4c8a..6e611b26 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_type.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_type.c
@@ -64,7 +64,7 @@ class_init(LassoIdWsf2DiscoServiceTypeClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "ServiceType");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
index dc852429..1a880ac0 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.c
@@ -77,7 +77,7 @@ class_init(LassoIdWsf2DiscoSvcMDAssociationAddClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDAssociationAdd");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
index 61afed9e..0285a973 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.c
@@ -78,7 +78,7 @@ class_init(LassoIdWsf2DiscoSvcMDAssociationAddResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDAssociationAddResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
index b6508523..f5a179f7 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.c
@@ -77,7 +77,7 @@ class_init(LassoIdWsf2DiscoSvcMDAssociationDeleteClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDAssociationDelete");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
index 38920e8a..05f875aa 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.c
@@ -78,7 +78,7 @@ class_init(LassoIdWsf2DiscoSvcMDAssociationDeleteResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDAssociationDeleteResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
index 9887f37d..9b00bcb5 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.c
@@ -77,7 +77,7 @@ class_init(LassoIdWsf2DiscoSvcMDAssociationQueryClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDAssociationQuery");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
index 384f5ba6..ab750355 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.c
@@ -81,7 +81,7 @@ class_init(LassoIdWsf2DiscoSvcMDAssociationQueryResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDAssociationQueryResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
index 9c0a6f26..97dcb794 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete.c
@@ -77,7 +77,7 @@ class_init(LassoIdWsf2DiscoSvcMDDeleteClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDDelete");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
index a207493a..95018dc3 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.c
@@ -78,7 +78,7 @@ class_init(LassoIdWsf2DiscoSvcMDDeleteResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDDeleteResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
index 1b90fe34..824a6c9a 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query.c
@@ -79,7 +79,7 @@ class_init(LassoIdWsf2DiscoSvcMDQueryClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDQuery");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
index 0ac7bf96..c1def88b 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.c
@@ -82,7 +82,7 @@ class_init(LassoIdWsf2DiscoSvcMDQueryResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDQueryResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
index dc7430ec..5f67c19d 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.c
@@ -79,7 +79,7 @@ class_init(LassoIdWsf2DiscoSvcMDRegisterClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDRegister");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
index 034d5dea..0e05d852 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.c
@@ -87,7 +87,7 @@ class_init(LassoIdWsf2DiscoSvcMDRegisterResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDRegisterResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
index 19920c01..97d5309e 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace.c
@@ -78,7 +78,7 @@ class_init(LassoIdWsf2DiscoSvcMDReplaceClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDReplace");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
index af007ae6..d0c5e5ff 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.c
@@ -78,7 +78,7 @@ class_init(LassoIdWsf2DiscoSvcMDReplaceResponseClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMDReplaceResponse");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
index f999a138..cc8117e9 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -80,7 +80,7 @@ class_init(LassoIdWsf2DiscoSvcMetadataClass *klass)
 	parent_class = g_type_class_peek_parent(klass);
 	nclass->node_data = g_new0(LassoNodeClassData, 1);
 	lasso_node_class_set_nodename(nclass, "SvcMD");
-	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCO_HREF, LASSO_IDWSF2_DISCO_PREFIX);
+	lasso_node_class_set_ns(nclass, LASSO_IDWSF2_DISCOVERY_HREF, LASSO_IDWSF2_DISCOVERY_PREFIX);
 	lasso_node_class_add_snippets(nclass, schema_snippets);
 }
 
diff --git a/lasso/xml/id-wsf-2.0/idwsf2_strings.h b/lasso/xml/id-wsf-2.0/idwsf2_strings.h
index 19a511a3..9d4dc29f 100644
--- a/lasso/xml/id-wsf-2.0/idwsf2_strings.h
+++ b/lasso/xml/id-wsf-2.0/idwsf2_strings.h
@@ -23,15 +23,6 @@
  *
  */
 
-/*
- * This header file copy part of the SOAP 1.1 specification you can found there:
- * http://www.w3.org/TR/soap12-part1/
- * whom copyright is:
- * Copyright © 2007 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C liability, trademark and
- * document use rules apply.
- */
-
-
 /**
  * SECTION:idwsf2-strings
  * @short_description: Useful string constants
@@ -394,19 +385,41 @@
 /* Discovery Service */
 
 /**
- * LASSO_IDWSF2_DISCO_HREF:
+ * LASSO_IDWSF2_DISCOVERY_HREF:
  *
  * Namespace for ID-WSF 2.0 Discovery service
  *
  */
-#define LASSO_IDWSF2_DISCO_HREF   "urn:liberty:disco:2006-08"
+#define LASSO_IDWSF2_DISCOVERY_HREF   "urn:liberty:disco:2006-08"
 /**
- * LASSO_IDWSF2_DISCO_PREFIX:
+ * LASSO_IDWSF2_DISCOVERY_PREFIX:
  *
  * Preferred prefix for ID-WSF 2.0 Discovery service
  *
  */
-#define LASSO_IDWSF2_DISCO_PREFIX "disco"
+#define LASSO_IDWSF2_DISCOVERY_PREFIX "disco"
+
+/* Discovery Service Type */
+#define LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE	LASSO_IDWSF2_DISCOVERY_HREF
+
+/* Discovery Actions */
+#define LASSO_IDWSF2_DISCOVERY_ACTION_QUERY	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":Query"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_QUERY_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":QueryResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_ASSOCIATION_ADD	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDAssociationAdd"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_ASSOCIATION_ADD_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDAssociationAddResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_ASSOCIATION_QUERY	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDAssociationQuery"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_ASSOCIATION_QUERY_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDAssociationQueryResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_ASSOCIATION_DELETE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDAssociationDelete"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_ASSOCIATION_DELETE_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDAssociationDeleteResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_QUERY	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDQuery"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_QUERY_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDQueryResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_REGISTER	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDRegister"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_REGISTER_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDRegisterResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_REPLACE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDReplace"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_REPLACE_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDReplaceResponse"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_DELETE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDDelete"
+#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_DELETE_RESPONSE	LASSO_IDWSF2_DISCOVERY_SERVICE_TYPE ":SvcMDDeleteResponse"
+
 
 /* Disco Service Status Codes */
 
@@ -464,14 +477,6 @@
 #define LASSO_IDWSF2_DISCOVERY_ELEMENT_SVC_MD_REGISTER "SvcMDRegister"
 #define LASSO_IDWSF2_DISCOVERY_ELEMENT_SVC_MD_REGISTER_RESPONSE "SvcMDRegisterResponse"
 
-/* Message actions */
-
-#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_REGISTER LASSO_IDWSF2_DISCO_HREF ":" \
-	LASSO_IDWSF2_DISCOVERY_ELEMENT_SVC_MD_REGISTER
-
-#define LASSO_IDWSF2_DISCOVERY_ACTION_SVC_MD_REGISTER_RESPONSE LASSO_IDWSF2_DISCO_HREF ":" \
-	LASSO_IDWSF2_DISCOVERY_ELEMENT_SVC_MD_REGISTER_RESPONSE
-
 /* Data Service Template service */
 
 /*
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index e3a2a5dc..c802f937 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1683,7 +1683,7 @@ prefix_from_href_and_nodename(const xmlChar *href, const xmlChar *nodename) {
 		prefix = "WsSec1";
 	else if (strcmp((char*)href, LASSO_WSSE1_HREF) == 0)
 		prefix = "WsSec1";
-	else if (strcmp((char*)href, LASSO_IDWSF2_DISCO_HREF) == 0)
+	else if (strcmp((char*)href, LASSO_IDWSF2_DISCOVERY_HREF) == 0)
 		prefix = "IdWsf2Disco";
 	else if (strcmp((char*)href, LASSO_IDWSF2_SBF_HREF) == 0)
 		prefix = "IdWsf2Sbf";