fill profile->request in init_metadata_register + added soap_endpoint parameter

8 files changed, 25 insertions, 13 deletions

diff --git a/lasso/id-ff/identity.c b/lasso/id-ff/identity.c
index d625c108..7b146d65 100644
--- a/lasso/id-ff/identity.c
+++ b/lasso/id-ff/identity.c
@@ -387,7 +387,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 					t2 = t2->next;
 					continue;
 				}
-				svcMD = lasso_idwsf2_disco_svc_metadata_new(NULL, NULL, NULL);
+				svcMD = lasso_idwsf2_disco_svc_metadata_new();
 				LASSO_NODE_GET_CLASS(svcMD)->init_from_xml(LASSO_NODE(svcMD), t2);
 				identity->private_data->svcMD = g_list_append(
 					identity->private_data->svcMD, svcMD);
diff --git a/lasso/id-ff/server.c b/lasso/id-ff/server.c
index 1133d3b4..89fbf9f3 100644
--- a/lasso/id-ff/server.c
+++ b/lasso/id-ff/server.c
@@ -372,7 +372,7 @@ init_from_xml(LassoNode *node, xmlNode *xmlnode)
 					t2 = t2->next;
 					continue;
 				}
-				svcMD = lasso_idwsf2_disco_svc_metadata_new(NULL, NULL, NULL);
+				svcMD = lasso_idwsf2_disco_svc_metadata_new();
 				LASSO_NODE_GET_CLASS(svcMD)->init_from_xml(LASSO_NODE(svcMD), t2);
 				server->private_data->svc_metadatas = g_list_append(
 					server->private_data->svc_metadatas, svcMD);
diff --git a/lasso/id-wsf-2.0/discovery.c b/lasso/id-wsf-2.0/discovery.c
index 879f6281..b2f9f9eb 100644
--- a/lasso/id-wsf-2.0/discovery.c
+++ b/lasso/id-wsf-2.0/discovery.c
@@ -79,7 +79,7 @@ lasso_idwsf2_discovery_destroy(LassoIdWsf2Discovery *discovery)
 
 gint
 lasso_idwsf2_discovery_init_metadata_register(LassoIdWsf2Discovery *discovery,
-	gchar *service_type, gchar *abstract, gchar *disco_provider_id)
+	gchar *service_type, gchar *abstract, gchar *disco_provider_id, gchar *soap_endpoint)
 {
 	LassoIdWsf2DiscoSvcMDRegister *metadata_register;
 	LassoWsf2Profile *profile = LASSO_WSF2_PROFILE(discovery);
@@ -95,7 +95,7 @@ lasso_idwsf2_discovery_init_metadata_register(LassoIdWsf2Discovery *discovery,
 
 	/* Get a MetadataRegister node */
 	metadata_register = lasso_idwsf2_disco_svc_md_register_new(
-			service_type, abstract, sp_provider_id);
+			service_type, abstract, sp_provider_id, soap_endpoint);
 
 	if (profile->request)
 		lasso_node_destroy(LASSO_NODE(profile->request));
diff --git a/lasso/id-wsf-2.0/discovery.h b/lasso/id-wsf-2.0/discovery.h
index 3269e96b..9e5cf917 100644
--- a/lasso/id-wsf-2.0/discovery.h
+++ b/lasso/id-wsf-2.0/discovery.h
@@ -74,7 +74,7 @@ LASSO_EXPORT LassoIdWsf2Discovery* lasso_idwsf2_discovery_new(LassoServer *serve
 LASSO_EXPORT void lasso_idwsf2_discovery_destroy(LassoIdWsf2Discovery *discovery);
 
 LASSO_EXPORT gint lasso_idwsf2_discovery_init_metadata_register(LassoIdWsf2Discovery *discovery,
-	gchar *service_type, gchar *abstract, gchar *disco_provider_id);
+	gchar *service_type, gchar *abstract, gchar *disco_provider_id, gchar *soap_endpoint);
 
 LASSO_EXPORT gint lasso_idwsf2_discovery_process_metadata_register_msg(
 	LassoIdWsf2Discovery *discovery, const gchar *message);
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 fdab258e..374d16e3 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
@@ -94,13 +94,15 @@ lasso_idwsf2_disco_svc_md_register_get_type()
 }
 
 LassoIdWsf2DiscoSvcMDRegister*
-lasso_idwsf2_disco_svc_md_register_new(gchar *service_type, gchar *abstract, gchar *provider_id)
+lasso_idwsf2_disco_svc_md_register_new(gchar *service_type, gchar *abstract, gchar *provider_id,
+	gchar *soap_endpoint)
 {
 	LassoIdWsf2DiscoSvcMDRegister *metadata_register;
 	LassoIdWsf2DiscoSvcMetadata *metadata;
 
 	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 = lasso_idwsf2_disco_svc_metadata_new_full(service_type, abstract, provider_id,
+		soap_endpoint);
 	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 d60d6d86..bfad05a8 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
@@ -63,7 +63,7 @@ struct _LassoIdWsf2DiscoSvcMDRegisterClass {
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_md_register_get_type(void);
 
 LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister* lasso_idwsf2_disco_svc_md_register_new(
-	gchar *service_type, gchar *abstract, gchar *provider_id);
+	gchar *service_type, gchar *abstract, gchar *provider_id, gchar *soap_endpoint);
 
 LASSO_EXPORT LassoIdWsf2DiscoSvcMDRegister*
 lasso_idwsf2_disco_svc_md_register_new_from_message(const gchar *message);
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 415e2072..61f2ece4 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.c
@@ -108,7 +108,14 @@ lasso_idwsf2_disco_svc_metadata_get_type()
 }
 
 LassoIdWsf2DiscoSvcMetadata*
-lasso_idwsf2_disco_svc_metadata_new(gchar *service_type, gchar *abstract, gchar *provider_id)
+lasso_idwsf2_disco_svc_metadata_new()
+{
+	return g_object_new(LASSO_TYPE_IDWSF2_DISCO_SVC_METADATA, NULL);
+}
+
+LassoIdWsf2DiscoSvcMetadata*
+lasso_idwsf2_disco_svc_metadata_new_full(gchar *service_type, gchar *abstract, gchar *provider_id,
+	gchar *soap_endpoint)
 {
 	LassoIdWsf2DiscoSvcMetadata *metadata;
 	LassoIdWsf2DiscoEndpointContext *endpoint_context;
@@ -118,8 +125,9 @@ lasso_idwsf2_disco_svc_metadata_new(gchar *service_type, gchar *abstract, gchar
 	metadata->Abstract = g_strdup(abstract);
 	metadata->ProviderID = g_strdup(provider_id);
 
-	endpoint_context = lasso_idwsf2_disco_endpoint_context_new(provider_id);
-	metadata->ServiceContext = lasso_idwsf2_disco_service_context_new(service_type, endpoint_context);
+	endpoint_context = lasso_idwsf2_disco_endpoint_context_new(soap_endpoint);
+	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 506108b1..2101d40c 100644
--- a/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
+++ b/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
@@ -68,9 +68,11 @@ struct _LassoIdWsf2DiscoSvcMetadataClass {
 
 LASSO_EXPORT GType lasso_idwsf2_disco_svc_metadata_get_type(void);
 
-LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new(
-	gchar *service_type, gchar *abstract, gchar *provider_id);
+LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new();
 
+LASSO_EXPORT LassoIdWsf2DiscoSvcMetadata* lasso_idwsf2_disco_svc_metadata_new_full(
+	gchar *service_type, gchar *abstract, gchar *provider_id, gchar *soap_endpoint);
+	
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */