diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2005-08-08 15:48:52 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2005-08-08 15:48:52 +0000 |
| commit | 199aa96e1740b732b02122a43ea02dded1ff989a (patch) | |
| tree | d7fbb4f0441a07e2a7fbefbb81fb2fd7db99fcf8 | |
| parent | 261cf967429715a467396209390a2e16c72c4320 (diff) | |
| download | lasso-199aa96e1740b732b02122a43ea02dded1ff989a.tar.gz lasso-199aa96e1740b732b02122a43ea02dded1ff989a.tar.xz lasso-199aa96e1740b732b02122a43ea02dded1ff989a.zip | |
provide resource_offering as argument to not diverge too much from existing
work
| -rw-r--r-- | lasso/id-wsf/discovery.c | 16 | ||||
| -rw-r--r-- | lasso/id-wsf/discovery.h | 2 | ||||
| -rw-r--r-- | swig/Lasso-wsf.i | 2 |
3 files changed, 6 insertions, 14 deletions
diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c index 3c84d53a..0bbf2f1b 100644 --- a/lasso/id-wsf/discovery.c +++ b/lasso/id-wsf/discovery.c @@ -298,16 +298,14 @@ end: /** * lasso_discovery_init_insert * @discovery: a #LassoDiscovery - * @resourceId: the attribute provider resource id - * @serviceInstance: the attribute provider service instance + * @new_offering: the new service offered * * Initializes a disco Modify/InsertEntry * * Return value: 0 on success; or a negative value otherwise. **/ gint -lasso_discovery_init_insert(LassoDiscovery *discovery, - gchar *resourceId, LassoDiscoServiceInstance *serviceInstance) +lasso_discovery_init_insert(LassoDiscovery *discovery, LassoDiscoResourceOffering *new_offering) { LassoDiscoModify *modify; LassoSession *session; @@ -315,6 +313,7 @@ lasso_discovery_init_insert(LassoDiscovery *discovery, LassoDiscoResourceOffering *offering; modify = lasso_disco_modify_new(); + lasso_wsf_profile_init_soap_request(LASSO_WSF_PROFILE(discovery), LASSO_NODE(modify)); /* get discovery service resource id from principal assertion */ offering = lasso_discovery_get_resource_offering_auto(discovery, LASSO_DISCO_HREF); @@ -325,17 +324,10 @@ lasso_discovery_init_insert(LassoDiscovery *discovery, modify->ResourceID = g_object_ref(offering->ResourceID); lasso_node_destroy(LASSO_NODE(offering)); - offering = lasso_disco_resource_offering_new(serviceInstance); - /* XXX: EncryptedResourceID support */ - offering->ResourceID = lasso_disco_resource_id_new(resourceId); - modify->InsertEntry = g_list_append(modify->InsertEntry, - lasso_disco_insert_entry_new(offering)); - + lasso_disco_insert_entry_new(new_offering)); LASSO_WSF_PROFILE(discovery)->request = LASSO_NODE(modify); - fprintf(stderr, "%s\n", lasso_node_dump(LASSO_NODE(modify))); - return 0; } diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h index 989cb8f3..1e7a357c 100644 --- a/lasso/id-wsf/discovery.h +++ b/lasso/id-wsf/discovery.h @@ -101,7 +101,7 @@ LASSO_EXPORT void lasso_discovery_destroy(LassoDiscovery *discovery); LASSO_EXPORT gchar* lasso_discovery_dump(LassoDiscovery *discovery); LASSO_EXPORT gint lasso_discovery_init_insert(LassoDiscovery *discovery, - gchar *resourceId, LassoDiscoServiceInstance *serviceInstance); + LassoDiscoResourceOffering *resourceOffering); LASSO_EXPORT gint lasso_discovery_init_modify(LassoDiscovery *discovery, LassoDiscoResourceOffering *resourceOffering, diff --git a/swig/Lasso-wsf.i b/swig/Lasso-wsf.i index 5ebd2db0..0995fc68 100644 --- a/swig/Lasso-wsf.i +++ b/swig/Lasso-wsf.i @@ -3490,7 +3490,7 @@ typedef struct { /* Methods */ THROW_ERROR - int initInsert(gchar *resourceId, LassoDiscoServiceInstance *serviceInstance); + int initInsert(LassoDiscoResourceOffering *newOffering); END_THROW_ERROR |