diff options
29 files changed, 345 insertions, 196 deletions
diff --git a/docs/reference/lasso-sections.txt b/docs/reference/lasso-sections.txt index 41c83092..323a9546 100644 --- a/docs/reference/lasso-sections.txt +++ b/docs/reference/lasso-sections.txt @@ -1030,23 +1030,23 @@ LASSO_DISCOVERY_GET_CLASS </SECTION> <SECTION> -<FILE>profile_service</FILE> -<TITLE>LassoProfileService</TITLE> -LassoProfileService -lasso_profile_service_new -lasso_profile_service_init_query -lasso_profile_service_add_query_item -lasso_profile_service_process_query_msg -lasso_profile_service_build_response_msg -lasso_profile_service_process_query_response_msg -lasso_profile_service_get_answer +<FILE>data_service</FILE> +<TITLE>LassoDataService</TITLE> +LassoDataService +lasso_data_service_new +lasso_data_service_init_query +lasso_data_service_add_query_item +lasso_data_service_process_query_msg +lasso_data_service_build_response_msg +lasso_data_service_process_query_response_msg +lasso_data_service_get_answer <SUBSECTION Standard> -LASSO_PROFILE_SERVICE -LASSO_IS_PROFILE_SERVICE -LASSO_TYPE_PROFILE_SERVICE -lasso_profile_service_get_type -LASSO_PROFILE_SERVICE_CLASS -LASSO_IS_PROFILE_SERVICE_CLASS -LASSO_PROFILE_SERVICE_GET_CLASS +LASSO_DATA_SERVICE +LASSO_IS_DATA_SERVICE +LASSO_TYPE_DATA_SERVICE +lasso_data_service_get_type +LASSO_DATA_SERVICE_CLASS +LASSO_IS_DATA_SERVICE_CLASS +LASSO_DATA_SERVICE_GET_CLASS </SECTION> diff --git a/docs/reference/lasso.sgml b/docs/reference/lasso.sgml index 420e823e..d5f41961 100644 --- a/docs/reference/lasso.sgml +++ b/docs/reference/lasso.sgml @@ -56,6 +56,8 @@ <!ENTITY LassoServer SYSTEM "sgml/server.xml"> <!ENTITY LassoSession SYSTEM "sgml/session.xml"> <!ENTITY LassoStrings SYSTEM "sgml/strings.xml"> +<!ENTITY LassoDiscovery SYSTEM "sgml/discovery.xml"> +<!ENTITY LassoDataService SYSTEM "sgml/data_service.xml"> <!ENTITY version SYSTEM "version.xml"> ]> @@ -189,8 +191,8 @@ the <ulink url="http://lasso.entrouvert.org/license">GNU General Public License< <chapter id="idwsf"> <title>Identity Web Services Framework</title> - <para> - </para> + &LassoDiscovery; + &LassoDataService; </chapter> diff --git a/docs/reference/tmpl/data_service.sgml b/docs/reference/tmpl/data_service.sgml new file mode 100644 index 00000000..c2c49469 --- /dev/null +++ b/docs/reference/tmpl/data_service.sgml @@ -0,0 +1,99 @@ +<!-- ##### SECTION Title ##### --> +LassoDataService + +<!-- ##### SECTION Short_Description ##### --> +ID-WSF Data Service Profile + +<!-- ##### SECTION Long_Description ##### --> +<para> + +</para> + +<!-- ##### SECTION See_Also ##### --> +<para> + +</para> + +<!-- ##### SECTION Stability_Level ##### --> + + +<!-- ##### STRUCT LassoDataService ##### --> +<para> + +</para> + +@parent: +@resource_id: +@encrypted_resource_id: +@resource_data: + +<!-- ##### FUNCTION lasso_data_service_new ##### --> +<para> + +</para> + +@server: +@Returns: + + +<!-- ##### FUNCTION lasso_data_service_init_query ##### --> +<para> + +</para> + +@service: +@select: +@item_id: +@Returns: + + +<!-- ##### FUNCTION lasso_data_service_add_query_item ##### --> +<para> + +</para> + +@service: +@select: +@item_id: +@Returns: + + +<!-- ##### FUNCTION lasso_data_service_process_query_msg ##### --> +<para> + +</para> + +@service: +@message: +@Returns: + + +<!-- ##### FUNCTION lasso_data_service_build_response_msg ##### --> +<para> + +</para> + +@service: +@Returns: + + +<!-- ##### FUNCTION lasso_data_service_process_query_response_msg ##### --> +<para> + +</para> + +@service: +@message: +@Returns: + + +<!-- ##### FUNCTION lasso_data_service_get_answer ##### --> +<para> + +</para> + +@service: +@select: +@Returns: + + diff --git a/docs/reference/tmpl/defederation.sgml b/docs/reference/tmpl/defederation.sgml index e5e89751..42feedff 100644 --- a/docs/reference/tmpl/defederation.sgml +++ b/docs/reference/tmpl/defederation.sgml @@ -14,6 +14,9 @@ Federation Termination Notification Profile </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoDefederation ##### --> <para> diff --git a/docs/reference/tmpl/federation.sgml b/docs/reference/tmpl/federation.sgml index fdb39469..ce462599 100644 --- a/docs/reference/tmpl/federation.sgml +++ b/docs/reference/tmpl/federation.sgml @@ -14,6 +14,9 @@ Principal federation between two providers </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoFederation ##### --> <para> diff --git a/docs/reference/tmpl/identity.sgml b/docs/reference/tmpl/identity.sgml index e681be2d..65e2e63f 100644 --- a/docs/reference/tmpl/identity.sgml +++ b/docs/reference/tmpl/identity.sgml @@ -14,6 +14,9 @@ Principal Identity </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoIdentity ##### --> <para> diff --git a/docs/reference/tmpl/lib_authn_request.sgml b/docs/reference/tmpl/lib_authn_request.sgml index 827d988a..6124dcc9 100644 --- a/docs/reference/tmpl/lib_authn_request.sgml +++ b/docs/reference/tmpl/lib_authn_request.sgml @@ -21,6 +21,9 @@ profile.</para></listitem> </variablelist> </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoLibAuthnRequest ##### --> <para> @ProviderID is the service provider identifier, this field will often be filled diff --git a/docs/reference/tmpl/login.sgml b/docs/reference/tmpl/login.sgml index 2d49f94e..1ac1502b 100644 --- a/docs/reference/tmpl/login.sgml +++ b/docs/reference/tmpl/login.sgml @@ -129,6 +129,9 @@ printf("Location: /\n\nRedirected to site root\n"); </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoLogin ##### --> <para> Single sign-on profile for the current transaction; possibly an diff --git a/docs/reference/tmpl/logout.sgml b/docs/reference/tmpl/logout.sgml index a6418e9e..7f8b27b3 100644 --- a/docs/reference/tmpl/logout.sgml +++ b/docs/reference/tmpl/logout.sgml @@ -14,6 +14,9 @@ Single Logout Profile </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoLogout ##### --> <para> diff --git a/docs/reference/tmpl/name_identifier_mapping.sgml b/docs/reference/tmpl/name_identifier_mapping.sgml index 37e398f0..ead698e0 100644 --- a/docs/reference/tmpl/name_identifier_mapping.sgml +++ b/docs/reference/tmpl/name_identifier_mapping.sgml @@ -14,6 +14,9 @@ Name Identifier Mapping </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoNameIdentifierMapping ##### --> <para> diff --git a/docs/reference/tmpl/name_registration.sgml b/docs/reference/tmpl/name_registration.sgml index ab744050..bb4fe32a 100644 --- a/docs/reference/tmpl/name_registration.sgml +++ b/docs/reference/tmpl/name_registration.sgml @@ -14,6 +14,9 @@ Name Registration </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoNameRegistration ##### --> <para> diff --git a/docs/reference/tmpl/node.sgml b/docs/reference/tmpl/node.sgml index e7e2cf72..aa7f2947 100644 --- a/docs/reference/tmpl/node.sgml +++ b/docs/reference/tmpl/node.sgml @@ -15,6 +15,9 @@ defined in glib. </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoNode ##### --> <para> diff --git a/docs/reference/tmpl/profile.sgml b/docs/reference/tmpl/profile.sgml index 3b8e0267..7438d608 100644 --- a/docs/reference/tmpl/profile.sgml +++ b/docs/reference/tmpl/profile.sgml @@ -14,6 +14,9 @@ Base class for all ID-FF profiles </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### ENUM LassoRequestType ##### --> <para> diff --git a/docs/reference/tmpl/provider.sgml b/docs/reference/tmpl/provider.sgml index 1faf17ba..8b2f667a 100644 --- a/docs/reference/tmpl/provider.sgml +++ b/docs/reference/tmpl/provider.sgml @@ -14,6 +14,9 @@ It holds all the data about a provider. </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoProvider ##### --> <para> diff --git a/docs/reference/tmpl/saml_name_identifier.sgml b/docs/reference/tmpl/saml_name_identifier.sgml index 497522c0..e0d412e5 100644 --- a/docs/reference/tmpl/saml_name_identifier.sgml +++ b/docs/reference/tmpl/saml_name_identifier.sgml @@ -14,6 +14,9 @@ LassoSamlNameIdentifier </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoSamlNameIdentifier ##### --> <para> @NameQualifier is the provider ID of the provider that created the name diff --git a/docs/reference/tmpl/server.sgml b/docs/reference/tmpl/server.sgml index 9f81c2ee..bf444c29 100644 --- a/docs/reference/tmpl/server.sgml +++ b/docs/reference/tmpl/server.sgml @@ -15,6 +15,9 @@ certificates to use, etc. </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoServer ##### --> <para> @@ -34,9 +37,11 @@ certificates to use, etc. @metadata: @private_key: -@secret_key: +@private_key_password: @certificate: @Returns: +<!-- # Unused Parameters # --> +@secret_key: <!-- ##### FUNCTION lasso_server_new_from_dump ##### --> diff --git a/docs/reference/tmpl/session.sgml b/docs/reference/tmpl/session.sgml index e1657369..b4003b86 100644 --- a/docs/reference/tmpl/session.sgml +++ b/docs/reference/tmpl/session.sgml @@ -14,6 +14,9 @@ Principal Session </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### STRUCT LassoSession ##### --> <para> diff --git a/docs/reference/tmpl/strings.sgml b/docs/reference/tmpl/strings.sgml index 332c5ed9..a9ef447d 100644 --- a/docs/reference/tmpl/strings.sgml +++ b/docs/reference/tmpl/strings.sgml @@ -14,6 +14,9 @@ strings </para> +<!-- ##### SECTION Stability_Level ##### --> + + <!-- ##### MACRO LASSO_LIB_NAME_IDENTIFIER_FORMAT_FEDERATED ##### --> <para> </para> diff --git a/lasso/Makefile.am b/lasso/Makefile.am index 1b6286e7..1d704a9c 100644 --- a/lasso/Makefile.am +++ b/lasso/Makefile.am @@ -61,8 +61,9 @@ liblasso_la_LIBADD = \ # Just make damn sure the ABI stays the same between # upgrades. # Obviously if you don't, fixing the situation up again can be painful. -liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ \ - -export-symbols symbols.sym +liblasso_la_LDFLAGS = -no-undefined -version-info @LASSO_VERSION_INFO@ + +#-export-symbols symbols.sym endif .PHONY: types.c symbols.sym diff --git a/lasso/id-ff/providerprivate.h b/lasso/id-ff/providerprivate.h index b7714244..1ff7fdbf 100644 --- a/lasso/id-ff/providerprivate.h +++ b/lasso/id-ff/providerprivate.h @@ -39,7 +39,7 @@ gboolean lasso_provider_load_metadata(LassoProvider *provider, const gchar *meta int lasso_provider_verify_signature(LassoProvider *provider, const char *message, const char *id_attr_name, LassoMessageFormat format); LibertyConformanceLevel lasso_provider_compatibility_level(LassoProvider *provider); -void lasso_provider_load_public_key(LassoProvider *provider); +gboolean lasso_provider_load_public_key(LassoProvider *provider); #ifdef __cplusplus diff --git a/lasso/id-wsf/Makefile.am b/lasso/id-wsf/Makefile.am index 3510cc59..43d4a392 100644 --- a/lasso/id-wsf/Makefile.am +++ b/lasso/id-wsf/Makefile.am @@ -13,11 +13,11 @@ WSF_C_FILES = \ discovery.c \ interaction_profile_service.c \ personal_profile_service.c \ - profile_service.c \ + data_service.c \ wsf_profile.c lasso_private_h_sources = \ - profile_service_private.h + data_service_private.h WSF_H_FILES = \ authentication.h \ @@ -25,7 +25,7 @@ WSF_H_FILES = \ identity.h \ interaction_profile_service.h \ personal_profile_service.h \ - profile_service.h \ + data_service.h \ wsf_profile.h endif diff --git a/lasso/id-wsf/profile_service.c b/lasso/id-wsf/data_service.c index a0301649..17232e39 100644 --- a/lasso/id-wsf/profile_service.c +++ b/lasso/id-wsf/data_service.c @@ -26,8 +26,8 @@ #include <libxml/xpathInternals.h> #include <lasso/id-wsf/discovery.h> -#include <lasso/id-wsf/profile_service.h> -#include <lasso/id-wsf/profile_service_private.h> +#include <lasso/id-wsf/data_service.h> +#include <lasso/id-wsf/data_service_private.h> #include <lasso/xml/dst_query.h> #include <lasso/xml/dst_query_response.h> #include <lasso/xml/dst_modify.h> @@ -35,7 +35,7 @@ #include <lasso/xml/soap_binding_correlation.h> -struct _LassoProfileServicePrivate +struct _LassoDataServicePrivate { gboolean dispose_has_run; LassoDiscoResourceOffering *offering; @@ -47,7 +47,7 @@ struct _LassoProfileServicePrivate LassoDstModification* -lasso_profile_service_add_modification(LassoProfileService *service, const gchar *select) +lasso_data_service_add_modification(LassoDataService *service, const gchar *select) { LassoWsfProfile *profile; LassoDstModification *modification; @@ -66,8 +66,8 @@ lasso_profile_service_add_modification(LassoProfileService *service, const gchar /** - * lasso_profile_service_add_query_item: - * @service: a #LassoProfileService + * lasso_data_service_add_query_item: + * @service: a #LassoDataService * @select: resource selection string (typically a XPath query) * @item_id: query item identifier * @@ -78,7 +78,7 @@ lasso_profile_service_add_modification(LassoProfileService *service, const gchar * be freed by the caller. **/ LassoDstQueryItem* -lasso_profile_service_add_query_item(LassoProfileService *service, +lasso_data_service_add_query_item(LassoDataService *service, const char *select, const char *item_id) { LassoDstQuery *query; @@ -101,8 +101,8 @@ lasso_profile_service_add_query_item(LassoProfileService *service, } /** - * lasso_profile_service_init_query - * @service: a #LassoProfileService + * lasso_data_service_init_query + * @service: a #LassoDataService * @select: resource selection string (typically a XPath query) * @item_id: query item identifier (optional) * @@ -112,7 +112,7 @@ lasso_profile_service_add_query_item(LassoProfileService *service, * Return value: 0 on success; or a negative value otherwise. **/ gint -lasso_profile_service_init_query(LassoProfileService *service, const char *select, +lasso_data_service_init_query(LassoDataService *service, const char *select, const char *item_id) { LassoWsfProfile *profile; @@ -163,8 +163,8 @@ lasso_profile_service_init_query(LassoProfileService *service, const char *selec } /** - * lasso_profile_service_process_query_msg: - * @service: a #LassoProfileService + * lasso_data_service_process_query_msg: + * @service: a #LassoDataService * @message: the dst query message * * Processes a dst:Query message. Rebuilds a request object from the message @@ -173,7 +173,7 @@ lasso_profile_service_init_query(LassoProfileService *service, const char *selec * Return value: 0 on success; or a negative value otherwise. **/ gint -lasso_profile_service_process_query_msg(LassoProfileService *service, const char *message) +lasso_data_service_process_query_msg(LassoDataService *service, const char *message) { LassoDstQuery *query; LassoWsfProfile *profile; @@ -198,15 +198,15 @@ lasso_profile_service_process_query_msg(LassoProfileService *service, const char } /** - * lasso_profile_service_build_response_msg: - * @service: a #LassoProfileService + * lasso_data_service_build_response_msg: + * @service: a #LassoDataService * * Builds a dst:QueryResponse message. * * Return value: 0 on success; or a negative value otherwise. **/ gint -lasso_profile_service_build_response_msg(LassoProfileService *service) +lasso_data_service_build_response_msg(LassoDataService *service) { LassoWsfProfile *profile; LassoDstQuery *query; @@ -259,8 +259,8 @@ lasso_profile_service_build_response_msg(LassoProfileService *service) } /** - * lasso_profile_service_get_answer: - * @service: a #LassoProfileService + * lasso_data_service_get_answer: + * @service: a #LassoDataService * @select: resource selection string (typically a XPath query) * * Returns the answer for the specified @select request. @@ -269,7 +269,7 @@ lasso_profile_service_build_response_msg(LassoProfileService *service) * This xmlnode must be freed by caller. **/ xmlNode* -lasso_profile_service_get_answer(LassoProfileService *service, const char *select) +lasso_data_service_get_answer(LassoDataService *service, const char *select) { LassoDstQueryResponse *response; LassoDstData *data = NULL; @@ -328,8 +328,8 @@ lasso_profile_service_get_answer(LassoProfileService *service, const char *selec } /** - * lasso_profile_service_process_query_response_msg: - * @service: a #LassoProfileService + * lasso_data_service_process_query_response_msg: + * @service: a #LassoDataService * @message: the dst query response message * * Processes a dst:Query message. Rebuilds a request object from the message @@ -338,7 +338,7 @@ lasso_profile_service_get_answer(LassoProfileService *service, const char *selec * Return value: 0 on success; or a negative value otherwise. **/ gint -lasso_profile_service_process_query_response_msg(LassoProfileService *service, const char *message) +lasso_data_service_process_query_response_msg(LassoDataService *service, const char *message) { int rc; LassoDstQueryResponse *response; @@ -355,7 +355,7 @@ lasso_profile_service_process_query_response_msg(LassoProfileService *service, c gint -lasso_profile_service_init_modify(LassoProfileService *service, const gchar *select) +lasso_data_service_init_modify(LassoDataService *service, const gchar *select) { LassoDstModification *modification; LassoWsfProfile *profile; @@ -415,7 +415,7 @@ lasso_profile_service_init_modify(LassoProfileService *service, const gchar *sel gint -lasso_profile_service_process_modify_msg(LassoProfileService *service, const gchar *modify_soap_msg) +lasso_data_service_process_modify_msg(LassoDataService *service, const gchar *modify_soap_msg) { LassoDstModify *modify; LassoWsfProfile *profile; @@ -439,7 +439,7 @@ lasso_profile_service_process_modify_msg(LassoProfileService *service, const gch return 0;} gint -lasso_profile_service_process_modify_response_msg(LassoProfileService *service, +lasso_data_service_process_modify_response_msg(LassoDataService *service, const gchar *soap_msg) { LassoDstModifyResponse *response; @@ -465,7 +465,7 @@ lasso_profile_service_process_modify_response_msg(LassoProfileService *service, static LassoNodeClass *parent_class = NULL; void -lasso_profile_service_set_offering(LassoProfileService *service, +lasso_data_service_set_offering(LassoDataService *service, LassoDiscoResourceOffering *offering) { service->private_data->offering = g_object_ref(offering); @@ -478,7 +478,7 @@ lasso_profile_service_set_offering(LassoProfileService *service, static void dispose(GObject *object) { - LassoProfileService *service = LASSO_PROFILE_SERVICE(object); + LassoDataService *service = LASSO_DATA_SERVICE(object); if (service->private_data->dispose_has_run == TRUE) return; @@ -490,7 +490,7 @@ dispose(GObject *object) static void finalize(GObject *object) { - LassoProfileService *service = LASSO_PROFILE_SERVICE(object); + LassoDataService *service = LASSO_DATA_SERVICE(object); if (service->private_data->offering) { lasso_node_destroy(LASSO_NODE(service->private_data->offering)); service->private_data->offering = NULL; @@ -506,14 +506,14 @@ finalize(GObject *object) /*****************************************************************************/ static void -instance_init(LassoProfileService *service) +instance_init(LassoDataService *service) { service->resource_data = NULL; - service->private_data = g_new0(LassoProfileServicePrivate, 1); + service->private_data = g_new0(LassoDataServicePrivate, 1); } static void -class_init(LassoProfileServiceClass *klass) +class_init(LassoDataServiceClass *klass) { parent_class = g_type_class_peek_parent(klass); @@ -522,43 +522,43 @@ class_init(LassoProfileServiceClass *klass) } GType -lasso_profile_service_get_type() +lasso_data_service_get_type() { static GType this_type = 0; if (!this_type) { static const GTypeInfo this_info = { - sizeof(LassoProfileServiceClass), + sizeof(LassoDataServiceClass), NULL, NULL, (GClassInitFunc) class_init, NULL, NULL, - sizeof(LassoProfileService), + sizeof(LassoDataService), 0, (GInstanceInitFunc) instance_init, }; this_type = g_type_register_static(LASSO_TYPE_WSF_PROFILE, - "LassoProfileService", &this_info, 0); + "LassoDataService", &this_info, 0); } return this_type; } /** - * lasso_profile_service_new: + * lasso_data_service_new: * @server: the #LassoServer * - * Creates a new #LassoProfileService. + * Creates a new #LassoDataService. * - * Return value: a newly created #LassoProfileService object; or NULL if an + * Return value: a newly created #LassoDataService object; or NULL if an * error occured. **/ -LassoProfileService* -lasso_profile_service_new(LassoServer *server) +LassoDataService* +lasso_data_service_new(LassoServer *server) { - LassoProfileService *service; + LassoDataService *service; g_return_val_if_fail(LASSO_IS_SERVER(server) == TRUE, NULL); @@ -568,12 +568,12 @@ lasso_profile_service_new(LassoServer *server) return service; } -LassoProfileService* -lasso_profile_service_new_full(LassoServer *server, LassoDiscoResourceOffering *offering) +LassoDataService* +lasso_data_service_new_full(LassoServer *server, LassoDiscoResourceOffering *offering) { - LassoProfileService *service; + LassoDataService *service; - service = lasso_profile_service_new(server); + service = lasso_data_service_new(server); if (service == NULL) return NULL; diff --git a/lasso/id-wsf/profile_service.h b/lasso/id-wsf/data_service.h index d0768efb..ec6789a0 100644 --- a/lasso/id-wsf/profile_service.h +++ b/lasso/id-wsf/data_service.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __LASSO_PROFILE_SERVICE_H__ -#define __LASSO_PROFILE_SERVICE_H__ +#ifndef __LASSO_DATA_SERVICE_H__ +#define __LASSO_DATA_SERVICE_H__ #ifdef __cplusplus extern "C" { @@ -39,23 +39,23 @@ extern "C" { #include <lasso/xml/disco_resource_offering.h> #include <lasso/xml/xml.h> -#define LASSO_TYPE_PROFILE_SERVICE (lasso_profile_service_get_type()) -#define LASSO_PROFILE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - LASSO_TYPE_PROFILE_SERVICE, LassoProfileService)) -#define LASSO_PROFILE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \ - LASSO_TYPE_PROFILE_SERVICE, LassoProfileServiceClass)) +#define LASSO_TYPE_PROFILE_SERVICE (lasso_data_service_get_type()) +#define LASSO_DATA_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ + LASSO_TYPE_PROFILE_SERVICE, LassoDataService)) +#define LASSO_DATA_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \ + LASSO_TYPE_PROFILE_SERVICE, LassoDataServiceClass)) #define LASSO_IS_PROFILE_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), \ LASSO_TYPE_PROFILE_SERVICE)) #define LASSO_IS_PROFILE_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ LASSO_TYPE_PROFILE_SERVICE)) -#define LASSO_PROFILE_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \ - LASSO_TYPE_PROFILE_SERVICE, LassoProfileServiceClass)) +#define LASSO_DATA_SERVICE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \ + LASSO_TYPE_PROFILE_SERVICE, LassoDataServiceClass)) -typedef struct _LassoProfileService LassoProfileService; -typedef struct _LassoProfileServiceClass LassoProfileServiceClass; -typedef struct _LassoProfileServicePrivate LassoProfileServicePrivate; +typedef struct _LassoDataService LassoDataService; +typedef struct _LassoDataServiceClass LassoDataServiceClass; +typedef struct _LassoDataServicePrivate LassoDataServicePrivate; -struct _LassoProfileService { +struct _LassoDataService { LassoWsfProfile parent; LassoDiscoResourceID *resource_id; @@ -63,52 +63,52 @@ struct _LassoProfileService { xmlNode *resource_data; /*< private >*/ - LassoProfileServicePrivate *private_data; + LassoDataServicePrivate *private_data; }; -struct _LassoProfileServiceClass { +struct _LassoDataServiceClass { LassoWsfProfileClass parent; }; -LASSO_EXPORT GType lasso_profile_service_get_type(void); +LASSO_EXPORT GType lasso_data_service_get_type(void); -LASSO_EXPORT LassoProfileService* lasso_profile_service_new(LassoServer *server); +LASSO_EXPORT LassoDataService* lasso_data_service_new(LassoServer *server); -LASSO_EXPORT LassoProfileService* lasso_profile_service_new_full(LassoServer *server, +LASSO_EXPORT LassoDataService* lasso_data_service_new_full(LassoServer *server, LassoDiscoResourceOffering *offering); -LASSO_EXPORT gint lasso_profile_service_init_query(LassoProfileService *service, +LASSO_EXPORT gint lasso_data_service_init_query(LassoDataService *service, const char *select, const char *item_id); -LASSO_EXPORT LassoDstQueryItem* lasso_profile_service_add_query_item(LassoProfileService *service, +LASSO_EXPORT LassoDstQueryItem* lasso_data_service_add_query_item(LassoDataService *service, const char *select, const char *item_id); -LASSO_EXPORT gint lasso_profile_service_process_query_msg(LassoProfileService *service, +LASSO_EXPORT gint lasso_data_service_process_query_msg(LassoDataService *service, const char *message); -LASSO_EXPORT gint lasso_profile_service_build_response_msg(LassoProfileService *service); +LASSO_EXPORT gint lasso_data_service_build_response_msg(LassoDataService *service); -LASSO_EXPORT gint lasso_profile_service_process_query_response_msg(LassoProfileService *service, +LASSO_EXPORT gint lasso_data_service_process_query_response_msg(LassoDataService *service, const char *message); -LASSO_EXPORT xmlNode* lasso_profile_service_get_answer(LassoProfileService *service, +LASSO_EXPORT xmlNode* lasso_data_service_get_answer(LassoDataService *service, const char *select); -LASSO_EXPORT gint lasso_profile_service_init_modify(LassoProfileService *service, +LASSO_EXPORT gint lasso_data_service_init_modify(LassoDataService *service, const gchar *select); -LASSO_EXPORT LassoDstModification* lasso_profile_service_add_modification( - LassoProfileService *service, const gchar *select); +LASSO_EXPORT LassoDstModification* lasso_data_service_add_modification( + LassoDataService *service, const gchar *select); -LASSO_EXPORT gint lasso_profile_service_process_modify_msg(LassoProfileService *service, +LASSO_EXPORT gint lasso_data_service_process_modify_msg(LassoDataService *service, const gchar *soap_msg); -LASSO_EXPORT gint lasso_profile_service_process_modify_response_msg(LassoProfileService *service, +LASSO_EXPORT gint lasso_data_service_process_modify_response_msg(LassoDataService *service, const gchar *soap_msg); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __LASSO_PROFILE_SERVICE_H__ */ +#endif /* __LASSO_DATA_SERVICE_H__ */ diff --git a/lasso/id-wsf/profile_service_private.h b/lasso/id-wsf/data_service_private.h index b429a5a0..ef2ccc95 100644 --- a/lasso/id-wsf/profile_service_private.h +++ b/lasso/id-wsf/data_service_private.h @@ -22,19 +22,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef __LASSO_PROFILE_SERVICE_PRIVATE_H__ -#define __LASSO_PROFILE_SERVICE_PRIVATE_H__ +#ifndef __LASSO_DATA_SERVICE_PRIVATE_H__ +#define __LASSO_DATA_SERVICE_PRIVATE_H__ #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -void lasso_profile_service_set_offering(LassoProfileService *service, +void lasso_data_service_set_offering(LassoDataService *service, LassoDiscoResourceOffering *offering); #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __LASSO_PROFILE_SERVICE_PRIVATE_H__ */ +#endif /* __LASSO_DATA_SERVICE_PRIVATE_H__ */ diff --git a/lasso/id-wsf/discovery.c b/lasso/id-wsf/discovery.c index c896266d..a4c4459f 100644 --- a/lasso/id-wsf/discovery.c +++ b/lasso/id-wsf/discovery.c @@ -28,7 +28,7 @@ #include <lasso/xml/saml_attribute_value.h> #include <lasso/xml/disco_modify.h> #include <lasso/id-wsf/identity.h> -#include <lasso/id-wsf/profile_service.h> +#include <lasso/id-wsf/data_service.h> #include <lasso/id-wsf/personal_profile_service.h> struct _LassoDiscoveryPrivate @@ -664,19 +664,19 @@ lasso_discovery_process_query_response_msg(LassoDiscovery *discovery, const gcha * @discovery: a #LassoDiscovery * @service_type: the requested service type * - * After a disco:query message, creates a #LassoProfileService instance for the + * After a disco:query message, creates a #LassoDataService instance for the * requested @service_type. * * Return value: a newly created #LAssoProfileService object; or NULL if an * error occured. **/ -LassoProfileService* +LassoDataService* lasso_discovery_get_service(LassoDiscovery *discovery, const char *service_type) { LassoDiscoQueryResponse *response; GList *iter; LassoDiscoResourceOffering *offering = NULL; - LassoProfileService *service; + LassoDataService *service; response = LASSO_DISCO_QUERY_RESPONSE(LASSO_WSF_PROFILE(discovery)->response); iter = response->ResourceOffering; @@ -702,10 +702,10 @@ lasso_discovery_get_service(LassoDiscovery *discovery, const char *service_type) } if (strcmp(offering->ServiceInstance->ServiceType, LASSO_PP_HREF) == 0) { - service = LASSO_PROFILE_SERVICE(lasso_personal_profile_service_new( + service = LASSO_DATA_SERVICE(lasso_personal_profile_service_new( LASSO_WSF_PROFILE(discovery)->server, offering)); } else { - service = lasso_profile_service_new_full(LASSO_WSF_PROFILE(discovery)->server, + service = lasso_data_service_new_full(LASSO_WSF_PROFILE(discovery)->server, offering); } diff --git a/lasso/id-wsf/discovery.h b/lasso/id-wsf/discovery.h index 9642e1fc..7eb4872c 100644 --- a/lasso/id-wsf/discovery.h +++ b/lasso/id-wsf/discovery.h @@ -39,7 +39,7 @@ extern "C" { #include <lasso/xml/disco_requested_service_type.h> #include <lasso/id-wsf/wsf_profile.h> -#include <lasso/id-wsf/profile_service.h> +#include <lasso/id-wsf/data_service.h> #define LASSO_TYPE_DISCOVERY (lasso_discovery_get_type()) #define LASSO_DISCOVERY(obj) \ @@ -118,7 +118,7 @@ LASSO_EXPORT gint lasso_discovery_process_query_msg(LassoDiscovery *discovery, LASSO_EXPORT gint lasso_discovery_process_query_response_msg(LassoDiscovery *discovery, const gchar *message); -LASSO_EXPORT LassoProfileService* lasso_discovery_get_service(LassoDiscovery *discovery, +LASSO_EXPORT LassoDataService* lasso_discovery_get_service(LassoDiscovery *discovery, const char *service_type); LASSO_EXPORT LassoDiscoDescription* lasso_discovery_get_description_auto( diff --git a/lasso/id-wsf/personal_profile_service.c b/lasso/id-wsf/personal_profile_service.c index febf68d4..ec9ad820 100644 --- a/lasso/id-wsf/personal_profile_service.c +++ b/lasso/id-wsf/personal_profile_service.c @@ -23,7 +23,7 @@ */ #include <lasso/id-wsf/personal_profile_service.h> -#include <lasso/id-wsf/profile_service_private.h> +#include <lasso/id-wsf/data_service_private.h> /*****************************************************************************/ @@ -39,7 +39,7 @@ lasso_personal_profile_service_get_email(LassoPersonalProfileService *service) g_return_val_if_fail(LASSO_IS_PERSONAL_PROFILE_SERVICE(service) == TRUE, NULL); - xmlnode = lasso_profile_service_get_answer(LASSO_PROFILE_SERVICE(service), + xmlnode = lasso_data_service_get_answer(LASSO_DATA_SERVICE(service), "/pp:PP/pp:MsgContact"); child = xmlnode->children; @@ -123,7 +123,7 @@ lasso_personal_profile_service_new(LassoServer *server, LassoDiscoResourceOfferi g_return_val_if_fail(LASSO_IS_SERVER(server) == TRUE, NULL); service = g_object_new(LASSO_TYPE_PERSONAL_PROFILE_SERVICE, NULL); - lasso_profile_service_set_offering(LASSO_PROFILE_SERVICE(service), offering); + lasso_data_service_set_offering(LASSO_DATA_SERVICE(service), offering); return service; } diff --git a/lasso/id-wsf/personal_profile_service.h b/lasso/id-wsf/personal_profile_service.h index eda7fbf7..f01575ef 100644 --- a/lasso/id-wsf/personal_profile_service.h +++ b/lasso/id-wsf/personal_profile_service.h @@ -30,7 +30,7 @@ extern "C" { #endif /* __cplusplus */ -#include <lasso/id-wsf/profile_service.h> +#include <lasso/id-wsf/data_service.h> #include <lasso/xml/disco_resource_id.h> #include <lasso/xml/disco_encrypted_resource_id.h> #include <lasso/xml/dst_data.h> @@ -55,11 +55,11 @@ typedef struct _LassoPersonalProfileServiceClass LassoPersonalProfileServiceClas typedef struct _LassoPersonalProfileServicePrivate LassoPersonalProfileServicePrivate; struct _LassoPersonalProfileService { - LassoProfileService parent; + LassoDataService parent; }; struct _LassoPersonalProfileServiceClass { - LassoProfileServiceClass parent; + LassoDataServiceClass parent; }; diff --git a/swig/Lasso-wsf.i b/swig/Lasso-wsf.i index 00e1f8ee..82518234 100644 --- a/swig/Lasso-wsf.i +++ b/swig/Lasso-wsf.i @@ -30,7 +30,7 @@ #include <lasso/id-wsf/discovery.h> #include <lasso/id-wsf/interaction_profile_service.h> #include <lasso/id-wsf/personal_profile_service.h> -#include <lasso/id-wsf/profile_service.h> +#include <lasso/id-wsf/data_service.h> #include <lasso/xml/disco_authenticate_requester.h> #include <lasso/xml/disco_authorize_requester.h> #include <lasso/xml/disco_authenticate_session_context.h> @@ -3539,7 +3539,7 @@ typedef struct { END_THROW_ERROR %newobject getService; - LassoProfileService* getService(const char *service_type = NULL); + LassoDataService* getService(const char *service_type = NULL); } %{ @@ -3964,22 +3964,22 @@ typedef struct { /* Attributes from ProfileService*/ /* EncryptedResourceID */ -#define LassoPersonalProfileService_get_encryptedResourceId(self) get_node(LASSO_PROFILE_SERVICE(self)->encrypted_resource_id) -#define LassoPersonalProfileService_encryptedResourceId_get(self) get_node(LASSO_PROFILE_SERVICE(self)->encrypted_resource_id) -#define LassoPersonalProfileService_set_encryptedResourceId(self, value) set_node((gpointer *) &(LASSO_PROFILE_SERVICE(self))->encrypted_resource_id, (value)) -#define LassoPersonalProfileService_encryptedResourceId_set(self, value) set_node((gpointer *) &(LASSO_PROFILE_SERVICE(self))->encrypted_resource_id, (value)) +#define LassoPersonalProfileService_get_encryptedResourceId(self) get_node(LASSO_DATA_SERVICE(self)->encrypted_resource_id) +#define LassoPersonalProfileService_encryptedResourceId_get(self) get_node(LASSO_DATA_SERVICE(self)->encrypted_resource_id) +#define LassoPersonalProfileService_set_encryptedResourceId(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->encrypted_resource_id, (value)) +#define LassoPersonalProfileService_encryptedResourceId_set(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->encrypted_resource_id, (value)) /* ResourceID */ -#define LassoPersonalProfileService_get_resourceId(self) get_node(LASSO_PROFILE_SERVICE(self)->resource_id) -#define LassoPersonalProfileService_resourceId_get(self) get_node(LASSO_PROFILE_SERVICE(self)->resource_id) -#define LassoPersonalProfileService_set_resourceId(self, value) set_node((gpointer *) &(LASSO_PROFILE_SERVICE(self))->resource_id, (value)) -#define LassoPersonalProfileService_resourceId_set(self, value) set_node((gpointer *) &(LASSO_PROFILE_SERVICE(self))->resource_id, (value)) +#define LassoPersonalProfileService_get_resourceId(self) get_node(LASSO_DATA_SERVICE(self)->resource_id) +#define LassoPersonalProfileService_resourceId_get(self) get_node(LASSO_DATA_SERVICE(self)->resource_id) +#define LassoPersonalProfileService_set_resourceId(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->resource_id, (value)) +#define LassoPersonalProfileService_resourceId_set(self, value) set_node((gpointer *) &(LASSO_DATA_SERVICE(self))->resource_id, (value)) /* resourceData */ -#define LassoPersonalProfileService_get_resourceData(self) get_xml_string(LASSO_PROFILE_SERVICE(self)->resource_data) -#define LassoPersonalProfileService_resourceData_get(self) get_xml_string(LASSO_PROFILE_SERVICE(self)->resource_data) -#define LassoPersonalProfileService_set_resourceData(self, value) set_xml_string(&(LASSO_PROFILE_SERVICE(self))->resource_data, (value)) -#define LassoPersonalProfileService_resourceData_set(self, value) set_xml_string(&(LASSO_PROFILE_SERVICE(self))->resource_data, (value)) +#define LassoPersonalProfileService_get_resourceData(self) get_xml_string(LASSO_DATA_SERVICE(self)->resource_data) +#define LassoPersonalProfileService_resourceData_get(self) get_xml_string(LASSO_DATA_SERVICE(self)->resource_data) +#define LassoPersonalProfileService_set_resourceData(self, value) set_xml_string(&(LASSO_DATA_SERVICE(self))->resource_data, (value)) +#define LassoPersonalProfileService_resourceData_set(self, value) set_xml_string(&(LASSO_DATA_SERVICE(self))->resource_data, (value)) @@ -3993,19 +3993,19 @@ typedef struct { #define LassoPersonalProfileService_buildResponseMsg(self) lasso_wsf_profile_build_soap_response_msg(LASSO_WSF_PROFILE(self)) /* Implementations of methods inherited from ProfileService */ -#define LassoPersonalProfileService_buildResponseMsg lasso_profile_service_build_response_msg -#define LassoPersonalProfileService_addData lasso_profile_service_add_data -#define LassoPersonalProfileService_addModification lasso_profile_service_add_modification -#define LassoPersonalProfileService_addQueryItem lasso_profile_service_add_query_item -#define LassoPersonalProfileService_initModify lasso_profile_service_init_modify -#define LassoPersonalProfileService_initQuery lasso_profile_service_init_query -#define LassoPersonalProfileService_getXmlNode lasso_profile_service_get_xmlNode -#define LassoPersonalProfileService_processModifyMsg lasso_profile_service_process_modify_msg -#define LassoPersonalProfileService_processModifyResponseMsg lasso_profile_service_process_modify_response_msg -#define LassoPersonalProfileService_processQueryMsg lasso_profile_service_process_query_msg -#define LassoPersonalProfileService_processQueryResponseMsg lasso_profile_service_process_query_response_msg -#define LassoPersonalProfileService_validateQuery lasso_profile_service_validate_query -#define LassoPersonalProfileService_getAnswer(self,select) get_xml_string(lasso_profile_service_get_answer(self, select)) +#define LassoPersonalProfileService_buildResponseMsg lasso_data_service_build_response_msg +#define LassoPersonalProfileService_addData lasso_data_service_add_data +#define LassoPersonalProfileService_addModification lasso_data_service_add_modification +#define LassoPersonalProfileService_addQueryItem lasso_data_service_add_query_item +#define LassoPersonalProfileService_initModify lasso_data_service_init_modify +#define LassoPersonalProfileService_initQuery lasso_data_service_init_query +#define LassoPersonalProfileService_getXmlNode lasso_data_service_get_xmlNode +#define LassoPersonalProfileService_processModifyMsg lasso_data_service_process_modify_msg +#define LassoPersonalProfileService_processModifyResponseMsg lasso_data_service_process_modify_response_msg +#define LassoPersonalProfileService_processQueryMsg lasso_data_service_process_query_msg +#define LassoPersonalProfileService_processQueryResponseMsg lasso_data_service_process_query_response_msg +#define LassoPersonalProfileService_validateQuery lasso_data_service_validate_query +#define LassoPersonalProfileService_getAnswer(self,select) get_xml_string(lasso_data_service_get_answer(self, select)) /* Methods implementations */ @@ -4020,11 +4020,11 @@ typedef struct { #ifndef SWIGPHP4 -%rename(ProfileService) LassoProfileService; +%rename(ProfileService) LassoDataService; #endif typedef struct { -} LassoProfileService; -%extend LassoProfileService { +} LassoDataService; +%extend LassoDataService { /* Attributes inherited from WsfProfile */ %immutable msgBody; @@ -4054,9 +4054,9 @@ typedef struct { /* Constructor, Destructor & Static Methods */ - LassoProfileService(LassoServer *server); + LassoDataService(LassoServer *server); - ~LassoProfileService(); + ~LassoDataService(); /* Methods inherited from LassoNode */ @@ -4110,79 +4110,79 @@ typedef struct { /* Attributes inherited from WsfProfile implementations */ /* msgBody */ -#define LassoProfileService_get_msgBody(self) LASSO_WSF_PROFILE(self)->msg_body -#define LassoProfileService_msgBody_get(self) LASSO_WSF_PROFILE(self)->msg_body +#define LassoDataService_get_msgBody(self) LASSO_WSF_PROFILE(self)->msg_body +#define LassoDataService_msgBody_get(self) LASSO_WSF_PROFILE(self)->msg_body /* msgUrl */ -#define LassoProfileService_get_msgUrl(self) LASSO_WSF_PROFILE(self)->msg_url -#define LassoProfileService_msgUrl_get(self) LASSO_WSF_PROFILE(self)->msg_url +#define LassoDataService_get_msgUrl(self) LASSO_WSF_PROFILE(self)->msg_url +#define LassoDataService_msgUrl_get(self) LASSO_WSF_PROFILE(self)->msg_url /* request */ -#define LassoProfileService_get_request(self) get_node(LASSO_WSF_PROFILE(self)->request) -#define LassoProfileService_request_get(self) get_node(LASSO_WSF_PROFILE(self)->request) -#define LassoProfileService_set_request(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->request, (value)) -#define LassoProfileService_request_set(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->request, (value)) +#define LassoDataService_get_request(self) get_node(LASSO_WSF_PROFILE(self)->request) +#define LassoDataService_request_get(self) get_node(LASSO_WSF_PROFILE(self)->request) +#define LassoDataService_set_request(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->request, (value)) +#define LassoDataService_request_set(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->request, (value)) /* response */ -#define LassoProfileService_get_response(self) get_node(LASSO_WSF_PROFILE(self)->response) -#define LassoProfileService_response_get(self) get_node(LASSO_WSF_PROFILE(self)->response) -#define LassoProfileService_set_response(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->response, (value)) -#define LassoProfileService_response_set(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->response, (value)) +#define LassoDataService_get_response(self) get_node(LASSO_WSF_PROFILE(self)->response) +#define LassoDataService_response_get(self) get_node(LASSO_WSF_PROFILE(self)->response) +#define LassoDataService_set_response(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->response, (value)) +#define LassoDataService_response_set(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->response, (value)) /* server */ -#define LassoProfileService_get_server(self) get_node(LASSO_WSF_PROFILE(self)->server) -#define LassoProfileService_server_get(self) get_node(LASSO_WSF_PROFILE(self)->server) -#define LassoProfileService_set_server(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->server, (value)) -#define LassoProfileService_server_set(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->server, (value)) +#define LassoDataService_get_server(self) get_node(LASSO_WSF_PROFILE(self)->server) +#define LassoDataService_server_get(self) get_node(LASSO_WSF_PROFILE(self)->server) +#define LassoDataService_set_server(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->server, (value)) +#define LassoDataService_server_set(self, value) set_node((gpointer *) &LASSO_WSF_PROFILE(self)->server, (value)) /* Attributes */ /* EncryptedResourceID */ -#define LassoProfileService_get_encryptedResourceId(self) get_node((self)->encrypted_resource_id) -#define LassoProfileService_encryptedResourceId_get(self) get_node((self)->encrypted_resource_id) -#define LassoProfileService_set_encryptedResourceId(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value)) -#define LassoProfileService_encryptedResourceId_set(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value)) +#define LassoDataService_get_encryptedResourceId(self) get_node((self)->encrypted_resource_id) +#define LassoDataService_encryptedResourceId_get(self) get_node((self)->encrypted_resource_id) +#define LassoDataService_set_encryptedResourceId(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value)) +#define LassoDataService_encryptedResourceId_set(self, value) set_node((gpointer *) &(self)->encrypted_resource_id, (value)) /* ResourceID */ -#define LassoProfileService_get_resourceId(self) get_node((self)->resource_id) -#define LassoProfileService_resourceId_get(self) get_node((self)->resource_id) -#define LassoProfileService_set_resourceId(self, value) set_node((gpointer *) &(self)->resource_id, (value)) -#define LassoProfileService_resourceId_set(self, value) set_node((gpointer *) &(self)->resource_id, (value)) +#define LassoDataService_get_resourceId(self) get_node((self)->resource_id) +#define LassoDataService_resourceId_get(self) get_node((self)->resource_id) +#define LassoDataService_set_resourceId(self, value) set_node((gpointer *) &(self)->resource_id, (value)) +#define LassoDataService_resourceId_set(self, value) set_node((gpointer *) &(self)->resource_id, (value)) /* resourceData */ -#define LassoProfileService_get_resourceData(self) get_xml_string((self)->resource_data) -#define LassoProfileService_resourceData_get(self) get_xml_string((self)->resource_data) -#define LassoProfileService_set_resourceData(self, value) set_xml_string(&(self)->resource_data, (value)) -#define LassoProfileService_resourceData_set(self, value) set_xml_string(&(self)->resource_data, (value)) +#define LassoDataService_get_resourceData(self) get_xml_string((self)->resource_data) +#define LassoDataService_resourceData_get(self) get_xml_string((self)->resource_data) +#define LassoDataService_set_resourceData(self, value) set_xml_string(&(self)->resource_data, (value)) +#define LassoDataService_resourceData_set(self, value) set_xml_string(&(self)->resource_data, (value)) /* Constructors, destructors & static methods implementations */ -#define new_LassoProfileService lasso_profile_service_new -#define delete_LassoProfileService(self) lasso_node_destroy(LASSO_NODE(self)) +#define new_LassoDataService lasso_data_service_new +#define delete_LassoDataService(self) lasso_node_destroy(LASSO_NODE(self)) /* Implementations of methods inherited from LassoNode */ -#define LassoProfileService_dump(self) lasso_node_dump(LASSO_NODE(self)) +#define LassoDataService_dump(self) lasso_node_dump(LASSO_NODE(self)) /* Implementations of methods inherited from WsfProfile */ -#define LassoProfileService_buildRequestMsg(self) lasso_wsf_profile_build_soap_request_msg(LASSO_WSF_PROFILE(self)) +#define LassoDataService_buildRequestMsg(self) lasso_wsf_profile_build_soap_request_msg(LASSO_WSF_PROFILE(self)) /* Methods implementations */ -#define LassoProfileService_buildResponseMsg lasso_profile_service_build_response_msg -#define LassoProfileService_addData lasso_profile_service_add_data -#define LassoProfileService_addModification lasso_profile_service_add_modification -#define LassoProfileService_addQueryItem lasso_profile_service_add_query_item -#define LassoProfileService_initModify lasso_profile_service_init_modify -#define LassoProfileService_initQuery lasso_profile_service_init_query -#define LassoProfileService_getXmlNode lasso_profile_service_get_xmlNode -#define LassoProfileService_processModifyMsg lasso_profile_service_process_modify_msg -#define LassoProfileService_processModifyResponseMsg lasso_profile_service_process_modify_response_msg -#define LassoProfileService_processQueryMsg lasso_profile_service_process_query_msg -#define LassoProfileService_processQueryResponseMsg lasso_profile_service_process_query_response_msg -#define LassoProfileService_validateQuery lasso_profile_service_validate_query -#define LassoProfileService_getAnswer(self,select) get_xml_string(lasso_profile_service_get_answer(self, select)) +#define LassoDataService_buildResponseMsg lasso_data_service_build_response_msg +#define LassoDataService_addData lasso_data_service_add_data +#define LassoDataService_addModification lasso_data_service_add_modification +#define LassoDataService_addQueryItem lasso_data_service_add_query_item +#define LassoDataService_initModify lasso_data_service_init_modify +#define LassoDataService_initQuery lasso_data_service_init_query +#define LassoDataService_getXmlNode lasso_data_service_get_xmlNode +#define LassoDataService_processModifyMsg lasso_data_service_process_modify_msg +#define LassoDataService_processModifyResponseMsg lasso_data_service_process_modify_response_msg +#define LassoDataService_processQueryMsg lasso_data_service_process_query_msg +#define LassoDataService_processQueryResponseMsg lasso_data_service_process_query_response_msg +#define LassoDataService_validateQuery lasso_data_service_validate_query +#define LassoDataService_getAnswer(self,select) get_xml_string(lasso_data_service_get_answer(self, select)) %} |