changed disco classes and methods names + make lasso_idwsf2_discovery_process_metadata_register_msg work

16 files changed, 210 insertions, 214 deletions

diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index 8313f6f9..1c0fdb6f 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -98,14 +98,14 @@ gint
 lasso_idwsf2_discovery_init_metadata_register(LassoIdwsf2Discovery *discovery,
 	gchar *service_type, gchar *abstract, gchar *disco_provider_id)
 {
-	LassoDiscoSvcMDRegister *metadata_register;
+	LassoIdwsf2DiscoSvcMDRegister *metadata_register;
 
 	/* Get the providerId of this SP */
 	LassoProvider *provider = LASSO_PROVIDER(LASSO_WSF2_PROFILE(discovery)->server);
 	gchar *sp_provider_id = provider->ProviderID;
 
 	/* Get a MetadataRegister node */
-	metadata_register = lasso_disco_svc_md_register_new(
+	metadata_register = lasso_idwsf2_disco_svc_md_register_new(
 			service_type, abstract, sp_provider_id);
 
 	/* Create request with this xml node */
@@ -115,35 +115,30 @@ lasso_idwsf2_discovery_init_metadata_register(LassoIdwsf2Discovery *discovery,
 	/* FIXME : Get the url of the disco service where we must send the soap request */
 	/* LASSO_WSF2_PROFILE(discovery)->msg_url = g_strdup(disco_provider_id); */
 
-	printf(lasso_node_dump(LASSO_NODE(metadata_register)));
+/* 	printf(lasso_node_dump(LASSO_NODE(metadata_register))); */
 	return 0;
 }
 
 gint
-lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdwsf2Discovery *discovery, const gchar *message)
+lasso_idwsf2_discovery_process_metadata_register_msg(LassoIdwsf2Discovery *discovery,
+	const gchar *message)
 {
-	LassoDiscoSvcMDRegister *request;
+	LassoIdwsf2DiscoSvcMDRegister *request;
 	int res = 0;
 
 	g_return_val_if_fail(LASSO_IS_IDWSF2_DISCOVERY(discovery),
 		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	g_return_val_if_fail(message != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
 
-	res = lasso_wsf2_profile_process_soap_request_msg(LASSO_WSF2_PROFILE(discovery), message,
-		LASSO_IDWSF2_DISCO_HREF);
+	res = lasso_wsf2_profile_process_soap_request_msg(LASSO_WSF2_PROFILE(discovery), message);
 	if (res != 0)
 		return res;
 
-	request = LASSO_DISCO_SVC_MD_REGISTER(LASSO_WSF2_PROFILE(discovery)->request);
-
-	if (request == NULL)
-		printf("\n\nrequest is NULL\n\n"); 
+	request = LASSO_IDWSF2_DISCO_SVC_MD_REGISTER(LASSO_WSF2_PROFILE(discovery)->request);
 
 	/* FIXME : foreach on the list instead */
-	if (request != NULL && request->metadata_list != NULL
-			&& g_list_first(request->metadata_list) != NULL) {
-		discovery->metadata =
-			LASSO_DISCO_SERVICE_METADATA(g_list_first(request->metadata_list));
+	if (request->metadata_list != NULL) {
+		discovery->metadata = LASSO_IDWSF2_DISCO_SVC_METADATA(request->metadata_list->data);
 	}
 
 	return 0;
diff --git a/lasso/id-wsf-2.0/discovery.h b/lasso/id-wsf-2.0/discovery.h
index 4dd2ae2d..6e260230 100644
--- a/lasso/id-wsf-2.0/discovery.h
+++ b/lasso/id-wsf-2.0/discovery.h
@@ -56,7 +56,7 @@ struct _LassoIdwsf2Discovery {
 	LassoWsf2Profile parent;
 
 	/* FIXME : Should be a list */
-	LassoDiscoServiceMetadata *metadata;
+	LassoIdwsf2DiscoSvcMetadata *metadata;
 
 	/*< private >*/
 	LassoIdwsf2DiscoveryPrivate *private_data;
diff --git a/lasso/id-wsf-2.0/wsf2_profile.c b/lasso/id-wsf-2.0/wsf2_profile.c
index cd916a82..06cc4cb2 100644
--- a/lasso/id-wsf-2.0/wsf2_profile.c
+++ b/lasso/id-wsf-2.0/wsf2_profile.c
@@ -60,9 +60,6 @@ lasso_wsf2_profile_build_soap_envelope(const char *refToMessageId, const char *p
 	LassoSoapEnvelope *envelope;
 	LassoSoapHeader *header;
 	LassoSoapBody *body;
-	
-	LassoSoapBindingCorrelation *correlation;
-	gchar *messageId;
 
 	/* Body */
 	body = lasso_soap_body_new();
@@ -140,36 +137,33 @@ lasso_wsf2_profile_build_soap_request_msg(LassoWsf2Profile *profile)
 }
 
 gint
-lasso_wsf2_profile_process_soap_request_msg(LassoWsf2Profile *profile, const gchar *message,
-					   const gchar *service_type)
+lasso_wsf2_profile_process_soap_request_msg(LassoWsf2Profile *profile, const gchar *message)
 {
-	LassoDiscoServiceInstance *si;
-	LassoSoapBindingCorrelation *correlation;
 	LassoSoapEnvelope *envelope = NULL;
-	LassoSoapFault *fault = NULL;
-	gchar *messageId;
 	int res = 0;
-	xmlDoc *doc;
 
 	g_return_val_if_fail(LASSO_IS_WSF2_PROFILE(profile),
 		LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
 	g_return_val_if_fail(message != NULL, LASSO_PARAM_ERROR_INVALID_VALUE);
 
-	si = lasso_server_get_service(profile->server, (char *) service_type);
+	/* Get soap request */
+	envelope = lasso_soap_envelope_new_from_message(message);
 
-	doc = xmlParseMemory(message, strlen(message));
+	profile->soap_envelope_request = envelope;
 
-	/* Get soap request and his message id */
-	envelope = LASSO_SOAP_ENVELOPE(lasso_node_new_from_xmlNode(xmlDocGetRootElement(doc)));
-	
-	profile->request = LASSO_NODE(envelope->Body->any->data);
+	if (envelope != NULL && envelope->Body != NULL && envelope->Body->any != NULL) {
+		profile->request = LASSO_NODE(envelope->Body->any->data);
+	} else {
+		return LASSO_SOAP_ERROR_MISSING_BODY;
+	}
+
+	if (profile->request == NULL)
+		return LASSO_PROFILE_ERROR_MISSING_REQUEST;
 
 	/* Set soap response */
-	envelope = lasso_wsf2_profile_build_soap_envelope(messageId,
+	envelope = lasso_wsf2_profile_build_soap_envelope(NULL,
 		LASSO_PROVIDER(profile->server)->ProviderID);
-	LASSO_WSF2_PROFILE(profile)->soap_envelope_response = envelope;
-
-	xmlFreeDoc(doc);
+	profile->soap_envelope_response = envelope;
 
 	return res;
 }
diff --git a/lasso/id-wsf-2.0/wsf2_profile.h b/lasso/id-wsf-2.0/wsf2_profile.h
index 2cbb5fb3..9cc9a95d 100644
--- a/lasso/id-wsf-2.0/wsf2_profile.h
+++ b/lasso/id-wsf-2.0/wsf2_profile.h
@@ -84,7 +84,7 @@ LASSO_EXPORT LassoSoapEnvelope* lasso_wsf2_profile_build_soap_envelope(const cha
 LASSO_EXPORT gint lasso_wsf2_profile_build_soap_request_msg(LassoWsf2Profile *profile);
 
 LASSO_EXPORT gint lasso_wsf2_profile_process_soap_request_msg(LassoWsf2Profile *profile,
-	const gchar *message, const gchar *service_type);
+	const gchar *message);
 
 #ifdef __cplusplus
 }
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 2b1d6c77..9c133289 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.c
@@ -50,13 +50,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Address", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDiscoEndpointContext, Address) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, Address) },
 	{ "Framework", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoDiscoEndpointContext, Framework) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, Framework) },
 	{ "SecurityMechID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDiscoEndpointContext, SecurityMechID) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, SecurityMechID) },
 	{ "Action", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDiscoEndpointContext, Action) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoEndpointContext, Action) },
 	{ NULL, 0, 0}
 };
 
@@ -65,7 +65,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoDiscoEndpointContext *node)
+instance_init(LassoIdwsf2DiscoEndpointContext *node)
 {
 	node->Address = NULL;
 	node->Framework = NULL;
@@ -74,7 +74,7 @@ instance_init(LassoDiscoEndpointContext *node)
 }
 
 static void
-class_init(LassoDiscoEndpointContextClass *klass)
+class_init(LassoIdwsf2DiscoEndpointContextClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -85,35 +85,35 @@ class_init(LassoDiscoEndpointContextClass *klass)
 }
 
 GType
-lasso_disco_endpoint_context_get_type()
+lasso_idwsf2_disco_endpoint_context_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoDiscoEndpointContextClass),
+			sizeof (LassoIdwsf2DiscoEndpointContextClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoDiscoEndpointContext),
+			sizeof(LassoIdwsf2DiscoEndpointContext),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoDiscoEndpointContext", &this_info, 0);
+				"LassoIdwsf2DiscoEndpointContext", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoDiscoEndpointContext*
-lasso_disco_endpoint_context_new(gchar *address)
+LassoIdwsf2DiscoEndpointContext*
+lasso_idwsf2_disco_endpoint_context_new(gchar *address)
 {
-	LassoDiscoEndpointContext *context;
+	LassoIdwsf2DiscoEndpointContext *context;
 
-	context = g_object_new(LASSO_TYPE_DISCO_ENDPOINT_CONTEXT, NULL);
+	context = g_object_new(LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, NULL);
 
 	context->Address = g_strdup(address);
 	context->Framework = lasso_soap_binding_framework_new("2.0");
diff --git a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
index a58c33bf..37639492 100644
--- a/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_DISCO_ENDPOINT_CONTEXT_H__
-#define __LASSO_DISCO_ENDPOINT_CONTEXT_H__
+#ifndef __LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_H__
+#define __LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,25 +32,25 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include <lasso/xml/id-wsf-2.0/soap_binding_framework.h>
 
-#define LASSO_TYPE_DISCO_ENDPOINT_CONTEXT (lasso_disco_endpoint_context_get_type())
-#define LASSO_DISCO_ENDPOINT_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_ENDPOINT_CONTEXT, \
-				    LassoDiscoEndpointContext))
-#define LASSO_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_ENDPOINT_CONTEXT, \
-				 LassoDiscoEndpointContextClass))
-#define LASSO_IS_DISCO_ENDPOINT_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_ENDPOINT_CONTEXT))
-#define LASSO_IS_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_ENDPOINT_CONTEXT))
-#define LASSO_DISCO_ENDPOINT_CONTEXT_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_ENDPOINT_CONTEXT, \
-				    LassoDiscoEndpointContextClass)) 
+#define LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT (lasso_idwsf2_disco_endpoint_context_get_type())
+#define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
+				    LassoIdwsf2DiscoEndpointContext))
+#define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
+				 LassoIdwsf2DiscoEndpointContextClass))
+#define LASSO_IS_IDWSF2_DISCO_ENDPOINT_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
+#define LASSO_IS_IDWSF2_DISCO_ENDPOINT_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT))
+#define LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_ENDPOINT_CONTEXT, \
+				    LassoIdwsf2DiscoEndpointContextClass)) 
 
-typedef struct _LassoDiscoEndpointContext LassoDiscoEndpointContext;
-typedef struct _LassoDiscoEndpointContextClass LassoDiscoEndpointContextClass;
+typedef struct _LassoIdwsf2DiscoEndpointContext LassoIdwsf2DiscoEndpointContext;
+typedef struct _LassoIdwsf2DiscoEndpointContextClass LassoIdwsf2DiscoEndpointContextClass;
 
-struct _LassoDiscoEndpointContext {
+struct _LassoIdwsf2DiscoEndpointContext {
 	LassoNode parent;
 
 	/* elements */
@@ -60,17 +60,17 @@ struct _LassoDiscoEndpointContext {
 	gchar *Action;
 };
 
-struct _LassoDiscoEndpointContextClass {
+struct _LassoIdwsf2DiscoEndpointContextClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_disco_endpoint_context_get_type(void);
+LASSO_EXPORT GType lasso_idwsf2_disco_endpoint_context_get_type(void);
 
-LASSO_EXPORT LassoDiscoEndpointContext* lasso_disco_endpoint_context_new(
+LASSO_EXPORT LassoIdwsf2DiscoEndpointContext* lasso_idwsf2_disco_endpoint_context_new(
 	gchar *address);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_DISCO_ENDPOINT_CONTEXT_H__ */
+#endif /* __LASSO_IDWSF2_DISCO_ENDPOINT_CONTEXT_H__ */
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 99cf6dd4..5ce3738a 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.c
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.c
@@ -46,11 +46,11 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "ServiceType", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDiscoServiceContext, ServiceType) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoServiceContext, ServiceType) },
 	{ "Options", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoDiscoServiceContext, Options) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoServiceContext, Options) },
 	{ "EndpointContext", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoDiscoServiceContext, EndpointContext) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoServiceContext, EndpointContext) },
 	{ NULL, 0, 0}
 };
 
@@ -59,7 +59,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoDiscoServiceContext *node)
+instance_init(LassoIdwsf2DiscoServiceContext *node)
 {
 	node->ServiceType = NULL;
 	node->Options = NULL;
@@ -67,7 +67,7 @@ instance_init(LassoDiscoServiceContext *node)
 }
 
 static void
-class_init(LassoDiscoServiceContextClass *klass)
+class_init(LassoIdwsf2DiscoServiceContextClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -78,35 +78,35 @@ class_init(LassoDiscoServiceContextClass *klass)
 }
 
 GType
-lasso_disco_service_context_get_type()
+lasso_idwsf2_disco_service_context_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoDiscoServiceContextClass),
+			sizeof (LassoIdwsf2DiscoServiceContextClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoDiscoServiceContext),
+			sizeof(LassoIdwsf2DiscoServiceContext),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoDiscoServiceContext", &this_info, 0);
+				"LassoIdwsf2DiscoServiceContext", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoDiscoServiceContext*
-lasso_disco_service_context_new(gchar *serviceType, LassoDiscoEndpointContext *endpointContext)
+LassoIdwsf2DiscoServiceContext*
+lasso_idwsf2_disco_service_context_new(gchar *serviceType, LassoIdwsf2DiscoEndpointContext *endpointContext)
 {
-	LassoDiscoServiceContext *context;
+	LassoIdwsf2DiscoServiceContext *context;
 
-	context = g_object_new(LASSO_TYPE_DISCO_SERVICE_CONTEXT, NULL);
+	context = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, NULL);
 
 	context->ServiceType = g_strdup(serviceType);
 	context->EndpointContext = g_object_ref(endpointContext);
diff --git a/lasso/xml/id-wsf-2.0/disco_service_context.h b/lasso/xml/id-wsf-2.0/disco_service_context.h
index a1821dfa..d950bb07 100644
--- a/lasso/xml/id-wsf-2.0/disco_service_context.h
+++ b/lasso/xml/id-wsf-2.0/disco_service_context.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_DISCO_SERVICE_CONTEXT_H__
-#define __LASSO_DISCO_SERVICE_CONTEXT_H__
+#ifndef __LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_H__
+#define __LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,44 +33,44 @@ extern "C" {
 #include <lasso/xml/id-wsf-2.0/disco_endpoint_context.h>
 #include <lasso/xml/id-wsf-2.0/disco_options.h>
 
-#define LASSO_TYPE_DISCO_SERVICE_CONTEXT (lasso_disco_service_context_get_type())
-#define LASSO_DISCO_SERVICE_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_SERVICE_CONTEXT, \
-				    LassoDiscoServiceContext))
-#define LASSO_DISCO_SERVICE_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_SERVICE_CONTEXT, \
-				 LassoDiscoServiceContextClass))
-#define LASSO_IS_DISCO_SERVICE_CONTEXT(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_SERVICE_CONTEXT))
-#define LASSO_IS_DISCO_SERVICE_CONTEXT_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_SERVICE_CONTEXT))
-#define LASSO_DISCO_SERVICE_CONTEXT_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_SERVICE_CONTEXT, \
-				    LassoDiscoServiceContextClass)) 
+#define LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT (lasso_idwsf2_disco_service_context_get_type())
+#define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
+				    LassoIdwsf2DiscoServiceContext))
+#define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
+				 LassoIdwsf2DiscoServiceContextClass))
+#define LASSO_IS_IDWSF2_DISCO_SERVICE_CONTEXT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
+#define LASSO_IS_IDWSF2_DISCO_SERVICE_CONTEXT_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT))
+#define LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SERVICE_CONTEXT, \
+				    LassoIdwsf2DiscoServiceContextClass)) 
 
-typedef struct _LassoDiscoServiceContext LassoDiscoServiceContext;
-typedef struct _LassoDiscoServiceContextClass LassoDiscoServiceContextClass;
+typedef struct _LassoIdwsf2DiscoServiceContext LassoIdwsf2DiscoServiceContext;
+typedef struct _LassoIdwsf2DiscoServiceContextClass LassoIdwsf2DiscoServiceContextClass;
 
-struct _LassoDiscoServiceContext {
+struct _LassoIdwsf2DiscoServiceContext {
 	LassoNode parent;
 
 	/* elements */
 	gchar *ServiceType;
 	LassoIdwsf2DiscoOptions *Options;
-	LassoDiscoEndpointContext *EndpointContext;
+	LassoIdwsf2DiscoEndpointContext *EndpointContext;
 };
 
-struct _LassoDiscoServiceContextClass {
+struct _LassoIdwsf2DiscoServiceContextClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_disco_service_context_get_type(void);
+LASSO_EXPORT GType lasso_idwsf2_disco_service_context_get_type(void);
 
-LASSO_EXPORT LassoDiscoServiceContext* lasso_disco_service_context_new(
-	gchar *serviceType, LassoDiscoEndpointContext *endpointContext);
+LASSO_EXPORT LassoIdwsf2DiscoServiceContext* lasso_idwsf2_disco_service_context_new(
+	gchar *serviceType, LassoIdwsf2DiscoEndpointContext *endpointContext);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_DISCO_SERVICE_CONTEXT_H__ */
+#endif /* __LASSO_IDWSF2_DISCO_SERVICE_CONTEXT_H__ */
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 4913a583..b9a6a58d 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
@@ -43,8 +43,8 @@
 /*****************************************************************************/
 
 static struct XmlSnippet schema_snippets[] = {
-	{ "", SNIPPET_LIST_NODES,
-	  G_STRUCT_OFFSET(LassoDiscoSvcMDRegister, metadata_list) },
+	{ "SvcMD", SNIPPET_LIST_NODES,
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMDRegister, metadata_list), "LassoIdwsf2DiscoSvcMetadata" },
 	{ NULL, 0, 0}
 };
 
@@ -53,13 +53,13 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoDiscoSvcMDRegister *node)
+instance_init(LassoIdwsf2DiscoSvcMDRegister *node)
 {
 	node->metadata_list = NULL;
 }
 
 static void
-class_init(LassoDiscoSvcMDRegisterClass *klass)
+class_init(LassoIdwsf2DiscoSvcMDRegisterClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -70,37 +70,37 @@ class_init(LassoDiscoSvcMDRegisterClass *klass)
 }
 
 GType
-lasso_disco_svc_md_register_get_type()
+lasso_idwsf2_disco_svc_md_register_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoDiscoSvcMDRegisterClass),
+			sizeof (LassoIdwsf2DiscoSvcMDRegisterClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoDiscoSvcMDRegister),
+			sizeof(LassoIdwsf2DiscoSvcMDRegister),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoDiscoSvcMDRegister", &this_info, 0);
+				"LassoIdwsf2DiscoSvcMDRegister", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoDiscoSvcMDRegister*
-lasso_disco_svc_md_register_new(gchar *service_type, gchar *abstract, gchar *provider_id)
+LassoIdwsf2DiscoSvcMDRegister*
+lasso_idwsf2_disco_svc_md_register_new(gchar *service_type, gchar *abstract, gchar *provider_id)
 {
-	LassoDiscoSvcMDRegister *metadata_register;
-	LassoDiscoServiceMetadata *metadata;
+	LassoIdwsf2DiscoSvcMDRegister *metadata_register;
+	LassoIdwsf2DiscoSvcMetadata *metadata;
 
-	metadata_register = g_object_new(LASSO_TYPE_DISCO_SVC_MD_REGISTER, NULL);
-	metadata = lasso_disco_service_metadata_new(service_type, abstract, provider_id);
+	metadata_register = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, NULL);
+	metadata = lasso_idwsf2_disco_svc_metadata_new(service_type, abstract, provider_id);
 	metadata_register->metadata_list =
 		g_list_append(metadata_register->metadata_list, metadata);
 
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
index 7b48344c..1f4254c5 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_DISCO_SVC_MD_REGISTER_H__
-#define __LASSO_DISCO_SVC_MD_REGISTER_H__
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,42 +31,45 @@ extern "C" {
 
 #include <lasso/xml/xml.h>
 
-#define LASSO_TYPE_DISCO_SVC_MD_REGISTER (lasso_disco_svc_md_register_get_type())
-#define LASSO_DISCO_SVC_MD_REGISTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_SVC_MD_REGISTER, \
-				    LassoDiscoSvcMDRegister))
-#define LASSO_DISCO_SVC_MD_REGISTER_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_SVC_MD_REGISTER, \
-				 LassoDiscoSvcMDRegisterClass))
-#define LASSO_IS_DISCO_SVC_MD_REGISTER(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_SVC_MD_REGISTER))
-#define LASSO_IS_DISCO_SVC_MD_REGISTER_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_SVC_MD_REGISTER))
-#define LASSO_DISCO_SVC_MD_REGISTER_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_SVC_MD_REGISTER, \
-				    LassoDiscoSvcMDRegisterClass)) 
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER (lasso_idwsf2_disco_svc_md_register_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
+				    LassoIdwsf2DiscoSvcMDRegister))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
+				 LassoIdwsf2DiscoSvcMDRegisterClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER, \
+				    LassoIdwsf2DiscoSvcMDRegisterClass)) 
 
-typedef struct _LassoDiscoSvcMDRegister LassoDiscoSvcMDRegister;
-typedef struct _LassoDiscoSvcMDRegisterClass LassoDiscoSvcMDRegisterClass;
+typedef struct _LassoIdwsf2DiscoSvcMDRegister LassoIdwsf2DiscoSvcMDRegister;
+typedef struct _LassoIdwsf2DiscoSvcMDRegisterClass LassoIdwsf2DiscoSvcMDRegisterClass;
 
-struct _LassoDiscoSvcMDRegister {
+struct _LassoIdwsf2DiscoSvcMDRegister {
 	LassoNode parent;
 
 	/* elements */
 	GList *metadata_list;
 };
 
-struct _LassoDiscoSvcMDRegisterClass {
+struct _LassoIdwsf2DiscoSvcMDRegisterClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_disco_svc_md_register_get_type(void);
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_register_get_type(void);
 
-LASSO_EXPORT LassoDiscoSvcMDRegister* lasso_disco_svc_md_register_new(
+LASSO_EXPORT LassoIdwsf2DiscoSvcMDRegister* lasso_idwsf2_disco_svc_md_register_new(
 	gchar *service_type, gchar *abstract, gchar *provider_id);
 
+LASSO_EXPORT LassoIdwsf2DiscoSvcMDRegister*
+lasso_idwsf2_disco_svc_md_register_new_from_message(const gchar *message);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_DISCO_SVC_MD_REGISTER_H__ */
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_H__ */
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 51a70639..27173e6a 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
@@ -83,7 +83,7 @@ class_init(LassoIdWsf2DiscoSvcMDRegisterResponseClass *klass)
 }
 
 GType
-lasso_disco_svc_md_register_response_get_type()
+lasso_idwsf2_disco_svc_md_register_response_get_type()
 {
 	static GType this_type = 0;
 
@@ -107,14 +107,14 @@ lasso_disco_svc_md_register_response_get_type()
 }
 
 /**
- * lasso_disco_svc_md_register_response_new:
+ * lasso_idwsf2_disco_svc_md_register_response_new:
  *
  * Creates a new #LassoIdWsf2DiscoSvcMDRegisterResponse object.
  *
  * Return value: a newly created #LassoIdWsf2DiscoSvcMDRegisterResponse object
  **/
 LassoNode*
-lasso_disco_svc_md_register_response_new()
+lasso_idwsf2_disco_svc_md_register_response_new()
 {
-	return g_object_new(LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE, NULL);
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, NULL);
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
index 83d0b511..571ef830 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_DISCO_SVC_MD_REGISTER_RESPONSE_H__
-#define __LASSO_DISCO_SVC_MD_REGISTER_RESPONSE_H__
+#ifndef __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_H__
+#define __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,19 +32,19 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include "util_status.h"
 
-#define LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE (lasso_disco_svc_md_register_response_get_type())
-#define LASSO_DISCO_SVC_MD_REGISTER_RESPONSE(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE, \
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE (lasso_idwsf2_disco_svc_md_register_response_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
 				LassoIdWsf2DiscoSvcMDRegisterResponse))
-#define LASSO_DISCO_SVC_MD_REGISTER_RESPONSE_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE, \
+#define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
 				LassoIdWsf2DiscoSvcMDRegisterResponseClass))
-#define LASSO_IS_DISCO_SVC_MD_REGISTER_RESPONSE(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE))
-#define LASSO_IS_DISCO_SVC_MD_REGISTER_RESPONSE_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE))
-#define LASSO_DISCO_SVC_MD_REGISTER_RESPONSE_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_SVC_MD_REGISTER_RESPONSE, \
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE))
+#define LASSO_IS_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE))
+#define LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE, \
 				LassoIdWsf2DiscoSvcMDRegisterResponseClass)) 
 
 typedef struct _LassoIdWsf2DiscoSvcMDRegisterResponse LassoIdWsf2DiscoSvcMDRegisterResponse;
@@ -66,8 +66,8 @@ struct _LassoIdWsf2DiscoSvcMDRegisterResponseClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_disco_svc_md_register_response_get_type(void);
-LASSO_EXPORT LassoNode* lasso_disco_svc_md_register_response_new(void);
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_register_response_get_type(void);
+LASSO_EXPORT LassoNode* lasso_idwsf2_disco_svc_md_register_response_new(void);
 
 
 
@@ -75,4 +75,4 @@ LASSO_EXPORT LassoNode* lasso_disco_svc_md_register_response_new(void);
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_DISCO_SVC_MD_REGISTER_RESPONSE_H__ */
+#endif /* __LASSO_IDWSF2_DISCO_SVC_MD_REGISTER_RESPONSE_H__ */
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 a1fd32e5..12824779 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -1,4 +1,4 @@
-/* $Id: disco_service_metadata.c 2261 2005-01-27 23:41:05 $ 
+/* $Id: disco_svc_metadata.c 2261 2005-01-27 23:41:05 $ 
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -49,13 +49,13 @@
 
 static struct XmlSnippet schema_snippets[] = {
 	{ "Abstract", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDiscoServiceMetadata, Abstract) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, Abstract) },
 	{ "ProviderID", SNIPPET_CONTENT,
-	  G_STRUCT_OFFSET(LassoDiscoServiceMetadata, ProviderID) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, ProviderID) },
 	{ "ServiceContext", SNIPPET_NODE,
-	  G_STRUCT_OFFSET(LassoDiscoServiceMetadata, ServiceContext) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, ServiceContext) },
 	{ "svcMDID", SNIPPET_ATTRIBUTE,
-	  G_STRUCT_OFFSET(LassoDiscoServiceMetadata, id) },
+	  G_STRUCT_OFFSET(LassoIdwsf2DiscoSvcMetadata, id) },
 	{ NULL, 0, 0}
 };
 
@@ -64,7 +64,7 @@ static struct XmlSnippet schema_snippets[] = {
 /*****************************************************************************/
 
 static void
-instance_init(LassoDiscoServiceMetadata *node)
+instance_init(LassoIdwsf2DiscoSvcMetadata *node)
 {
 	node->Abstract = NULL;
 	node->ProviderID = NULL;
@@ -73,7 +73,7 @@ instance_init(LassoDiscoServiceMetadata *node)
 }
 
 static void
-class_init(LassoDiscoServiceMetadataClass *klass)
+class_init(LassoIdwsf2DiscoSvcMetadataClass *klass)
 {
 	LassoNodeClass *nclass = LASSO_NODE_CLASS(klass);
 
@@ -84,42 +84,42 @@ class_init(LassoDiscoServiceMetadataClass *klass)
 }
 
 GType
-lasso_disco_service_metadata_get_type()
+lasso_idwsf2_disco_svc_metadata_get_type()
 {
 	static GType this_type = 0;
 
 	if (!this_type) {
 		static const GTypeInfo this_info = {
-			sizeof (LassoDiscoServiceMetadataClass),
+			sizeof (LassoIdwsf2DiscoSvcMetadataClass),
 			NULL,
 			NULL,
 			(GClassInitFunc) class_init,
 			NULL,
 			NULL,
-			sizeof(LassoDiscoServiceMetadata),
+			sizeof(LassoIdwsf2DiscoSvcMetadata),
 			0,
 			(GInstanceInitFunc) instance_init,
 		};
 
 		this_type = g_type_register_static(LASSO_TYPE_NODE,
-				"LassoDiscoServiceMetadata", &this_info, 0);
+				"LassoIdwsf2DiscoSvcMetadata", &this_info, 0);
 	}
 	return this_type;
 }
 
-LassoDiscoServiceMetadata*
-lasso_disco_service_metadata_new(gchar *service_type, gchar *abstract, gchar *provider_id)
+LassoIdwsf2DiscoSvcMetadata*
+lasso_idwsf2_disco_svc_metadata_new(gchar *service_type, gchar *abstract, gchar *provider_id)
 {
-	LassoDiscoServiceMetadata *metadata;
-	LassoDiscoEndpointContext *endpoint_context;
+	LassoIdwsf2DiscoSvcMetadata *metadata;
+	LassoIdwsf2DiscoEndpointContext *endpoint_context;
 
-	metadata = g_object_new(LASSO_TYPE_DISCO_SERVICE_METADATA, NULL);
+	metadata = g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, NULL);
 
 	metadata->Abstract = g_strdup(abstract);
 	metadata->ProviderID = g_strdup(provider_id);
 
-	endpoint_context = lasso_disco_endpoint_context_new(provider_id);
-	metadata->ServiceContext = lasso_disco_service_context_new(service_type, endpoint_context);
+	endpoint_context = lasso_idwsf2_disco_endpoint_context_new(provider_id);
+	metadata->ServiceContext = lasso_idwsf2_disco_service_context_new(service_type, endpoint_context);
 
 	return metadata;
 }
diff --git a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
index bf73255e..9008793d 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
@@ -1,4 +1,4 @@
-/* $Id: disco_service_metadata.h 2428 2005-03-10 08:13:36Z nclapies $
+/* $Id: disco_svc_metadata.h 2428 2005-03-10 08:13:36Z nclapies $
  *
  * Lasso - A free implementation of the Liberty Alliance specifications.
  *
@@ -22,8 +22,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __LASSO_DISCO_SERVICE_METADATA_H__
-#define __LASSO_DISCO_SERVICE_METADATA_H__
+#ifndef __LASSO_IDWSF2_DISCO_SVC_METADATA_H__
+#define __LASSO_IDWSF2_DISCO_SVC_METADATA_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,47 +32,47 @@ extern "C" {
 #include <lasso/xml/xml.h>
 #include <lasso/xml/id-wsf-2.0/disco_service_context.h>
 
-#define LASSO_TYPE_DISCO_SERVICE_METADATA (lasso_disco_service_metadata_get_type())
-#define LASSO_DISCO_SERVICE_METADATA(obj) \
-	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_DISCO_SERVICE_METADATA, \
-				    LassoDiscoServiceMetadata))
-#define LASSO_DISCO_SERVICE_METADATA_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_DISCO_SERVICE_METADATA, \
-				 LassoDiscoServiceMetadataClass))
-#define LASSO_IS_DISCO_SERVICE_METADATA(obj) \
-	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_DISCO_SERVICE_METADATA))
-#define LASSO_IS_DISCO_SERVICE_METADATA_CLASS(klass) \
-	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_DISCO_SERVICE_METADATA))
-#define LASSO_DISCO_SERVICE_METADATA_GET_CLASS(o) \
-	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_DISCO_SERVICE_METADATA, \
-				    LassoDiscoServiceMetadataClass)) 
+#define LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA (lasso_idwsf2_disco_svc_metadata_get_type())
+#define LASSO_IDWSF2_DISCO_SVC_METADATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
+				    LassoIdwsf2DiscoSvcMetadata))
+#define LASSO_IDWSF2_DISCO_SVC_METADATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_CAST((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
+				 LassoIdwsf2DiscoSvcMetadataClass))
+#define LASSO_IS_IDWSF2_DISCO_SVC_METADATA(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE((obj), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
+#define LASSO_IS_IDWSF2_DISCO_SVC_METADATA_CLASS(klass) \
+	(G_TYPE_CHECK_CLASS_TYPE ((klass), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA))
+#define LASSO_IDWSF2_DISCO_SVC_METADATA_GET_CLASS(o) \
+	(G_TYPE_INSTANCE_GET_CLASS ((o), LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, \
+				    LassoIdwsf2DiscoSvcMetadataClass)) 
 
-typedef struct _LassoDiscoServiceMetadata LassoDiscoServiceMetadata;
-typedef struct _LassoDiscoServiceMetadataClass LassoDiscoServiceMetadataClass;
+typedef struct _LassoIdwsf2DiscoSvcMetadata LassoIdwsf2DiscoSvcMetadata;
+typedef struct _LassoIdwsf2DiscoSvcMetadataClass LassoIdwsf2DiscoSvcMetadataClass;
 
-struct _LassoDiscoServiceMetadata {
+struct _LassoIdwsf2DiscoSvcMetadata {
 	LassoNode parent;
 
 	/* elements */
 	gchar *Abstract;
 	gchar *ProviderID;
-	LassoDiscoServiceContext *ServiceContext;
+	LassoIdwsf2DiscoServiceContext *ServiceContext;
 
 	/* attributes */
 	gchar *id;
 };
 
-struct _LassoDiscoServiceMetadataClass {
+struct _LassoIdwsf2DiscoSvcMetadataClass {
 	LassoNodeClass parent;
 };
 
-LASSO_EXPORT GType lasso_disco_service_metadata_get_type(void);
+LASSO_EXPORT GType lasso_idwsf2_disco_svc_metadata_get_type(void);
 
-LASSO_EXPORT LassoDiscoServiceMetadata* lasso_disco_service_metadata_new(
+LASSO_EXPORT LassoIdwsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new(
 	gchar *service_type, gchar *abstract, gchar *provider_id);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __LASSO_DISCO_SERVICE_METADATA_H__ */
+#endif /* __LASSO_IDWSF2_DISCO_SVC_METADATA_H__ */
diff --git a/lasso/xml/soap_envelope.c b/lasso/xml/soap_envelope.c
index 7852492d..7dc8c2e1 100644
--- a/lasso/xml/soap_envelope.c
+++ b/lasso/xml/soap_envelope.c
@@ -104,8 +104,8 @@ lasso_soap_envelope_new_from_message(const gchar *message)
 
 	g_return_val_if_fail(message != NULL, NULL);
 
-/* 	node = g_object_new(LASSO_TYPE_SOAP_ENVELOPE, NULL); */
-/* 	lasso_node_init_from_message(LASSO_NODE(node), message); */
+	node = g_object_new(LASSO_TYPE_SOAP_ENVELOPE, NULL);
+	lasso_node_init_from_message(LASSO_NODE(node), message);
 
 	node = LASSO_SOAP_ENVELOPE(lasso_node_new_from_dump(message));
 
diff --git a/lasso/xml/xml.c b/lasso/xml/xml.c
index fff437c8..9ed5973f 100644
--- a/lasso/xml/xml.c
+++ b/lasso/xml/xml.c
@@ -1308,6 +1308,10 @@ lasso_node_new_from_xmlNode(xmlNode *xmlnode)
 		prefix = "Samlp2";
 	if (strcmp((char*)xmlnode->ns->href, LASSO_WSSE_HREF) == 0)
 		prefix = "Wsse";
+	if (strcmp((char*)xmlnode->ns->href, LASSO_IDWSF2_DISCO_HREF) == 0)
+		prefix = "Idwsf2Disco";
+	if (strcmp((char*)xmlnode->ns->href, LASSO_IDWSF2_SOAP_BINDING_HREF) == 0)
+		prefix = "SoapBinding";
 	tmp = lasso_get_prefix_for_dst_service_href((char*)xmlnode->ns->href);
 	if (tmp) {
 		prefix = "Dst";