diff options
-rw-r--r-- | lasso/xml/disco_description.c | 56 | ||||
-rw-r--r-- | lasso/xml/disco_insert_entry.c | 18 | ||||
-rw-r--r-- | lasso/xml/disco_modify.c | 23 | ||||
-rw-r--r-- | lasso/xml/disco_modify.h | 23 | ||||
-rw-r--r-- | lasso/xml/disco_modify_response.c | 32 | ||||
-rw-r--r-- | lasso/xml/disco_options.c | 18 | ||||
-rw-r--r-- | lasso/xml/disco_remove_entry.c | 24 | ||||
-rw-r--r-- | lasso/xml/disco_resource_offering.c | 56 | ||||
-rw-r--r-- | lasso/xml/disco_service_instance.c | 24 |
9 files changed, 137 insertions, 137 deletions
diff --git a/lasso/xml/disco_description.c b/lasso/xml/disco_description.c index 4c93f4c1..2be3785a 100644 --- a/lasso/xml/disco_description.c +++ b/lasso/xml/disco_description.c @@ -26,34 +26,34 @@ #include <lasso/xml/disco_description.h> /* -The schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): - -<xs:complexType name="DescriptionType"> - <xs:sequence> - <xs:element name="SecurityMechID" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded"/> - <xs:element name="CredentialRef" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> - <xs:choice> - <xs:group ref="WsdlRef"/> - <xs:group ref="BriefSoapHttpDescription"/> - </xs:choice> - </xs:sequence> - <xs:attribute name="id" type="xs:ID"/> -</xs:complexType> - -<xs:group name="WsdlRef"> - <xs:sequence> - <xs:element name="WsdlURI" type="xs:anyURI"/> - <xs:element name="ServiceNameRef" type="xs:QName"/> - </xs:sequence> -</xs:group> - -<xs:group name="BriefSoapHttpDescription"> - <xs:sequence> - <xs:element name="Endpoint" type="xs:anyURI"/> - <xs:element name="SoapAction" type="xs:anyURI" minOccurs="0"/> - </xs:sequence> -</xs:group> -*/ + * Schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): + * + * <xs:complexType name="DescriptionType"> + * <xs:sequence> + * <xs:element name="SecurityMechID" type="xs:anyURI" minOccurs="1" maxOccurs="unbounded"/> + * <xs:element name="CredentialRef" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/> + * <xs:choice> + * <xs:group ref="WsdlRef"/> + * <xs:group ref="BriefSoapHttpDescription"/> + * </xs:choice> + * </xs:sequence> + * <xs:attribute name="id" type="xs:ID"/> + * </xs:complexType> + * + * <xs:group name="WsdlRef"> + * <xs:sequence> + * <xs:element name="WsdlURI" type="xs:anyURI"/> + * <xs:element name="ServiceNameRef" type="xs:QName"/> + * </xs:sequence> + * </xs:group> + * + * <xs:group name="BriefSoapHttpDescription"> + * <xs:sequence> + * <xs:element name="Endpoint" type="xs:anyURI"/> + * <xs:element name="SoapAction" type="xs:anyURI" minOccurs="0"/> + * </xs:sequence> + * </xs:group> + */ /*****************************************************************************/ /* private methods */ diff --git a/lasso/xml/disco_insert_entry.c b/lasso/xml/disco_insert_entry.c index cd41e0c1..c41f940b 100644 --- a/lasso/xml/disco_insert_entry.c +++ b/lasso/xml/disco_insert_entry.c @@ -26,15 +26,15 @@ #include <lasso/xml/disco_insert_entry.h> /* -Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): - -<xs:complexType name="InsertEntryType"> - <xs:sequence> - <xs:element ref="ResourceOffering"/> - <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> -</xs:complexType> -*/ + * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): + * + * <xs:complexType name="InsertEntryType"> + * <xs:sequence> + * <xs:element ref="ResourceOffering"/> + * <xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> + * </xs:sequence> + * </xs:complexType> + */ /*****************************************************************************/ /* private methods */ diff --git a/lasso/xml/disco_modify.c b/lasso/xml/disco_modify.c index 24c491ad..35e3c678 100644 --- a/lasso/xml/disco_modify.c +++ b/lasso/xml/disco_modify.c @@ -25,6 +25,29 @@ #include <lasso/xml/disco_modify.h> +/* + * Schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): + * + * <xs:element name="Modify" type="ModifyType"/> + * <xs:complexType name="ModifyType"> + * <xs:sequence> + * <xs:group ref="ResourceIDGroup"/> + * <xs:element name="InsertEntry" type="InsertEntryType" minOccurs="0" maxOccurs="unbounded"/> + * <xs:element name="RemoveEntry" type="RemoveEntryType" minOccurs="0" maxOccurs="unbounded"/> + * </xs:sequence> + * <xs:attribute name="id" type="xs:ID" use="optional"/> + * </xs:complexType> + * + * <xs:group name="ResourceIDGroup"> + * <xs:sequence> + * <xs:choice minOccurs="0" maxOccurs="1"> + * <xs:element ref="ResourceID"/> + * <xs:element ref="EncryptedResourceID"/> + * </xs:choice> + * </xs:sequence> + * </xs:group> + */ + /*****************************************************************************/ /* private methods */ /*****************************************************************************/ diff --git a/lasso/xml/disco_modify.h b/lasso/xml/disco_modify.h index 623ff6bf..0e2e77bd 100644 --- a/lasso/xml/disco_modify.h +++ b/lasso/xml/disco_modify.h @@ -46,29 +46,6 @@ extern "C" { typedef struct _LassoDiscoModify LassoDiscoModify; typedef struct _LassoDiscoModifyClass LassoDiscoModifyClass; -/* -The schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): - -<xs:element name="Modify" type="ModifyType"/> -<xs:complexType name="ModifyType"> - <xs:sequence> - <xs:group ref="ResourceIDGroup"/> - <xs:element name="InsertEntry" type="InsertEntryType" minOccurs="0" maxOccurs="unbounded"/> - <xs:element name="RemoveEntry" type="RemoveEntryType" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> - <xs:attribute name="id" type="xs:ID" use="optional"/> -</xs:complexType> - -<xs:group name="ResourceIDGroup"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="ResourceID"/> - <xs:element ref="EncryptedResourceID"/> - </xs:choice> - </xs:sequence> -</xs:group> -*/ - struct _LassoDiscoModify { LassoNode parent; diff --git a/lasso/xml/disco_modify_response.c b/lasso/xml/disco_modify_response.c index 42f4e6c6..eedfdd41 100644 --- a/lasso/xml/disco_modify_response.c +++ b/lasso/xml/disco_modify_response.c @@ -26,22 +26,22 @@ #include <lasso/xml/disco_modify_response.h> /* -The schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): - -<xs:element name="ModifyResponse" type="ModifyResponseType"/> -<xs:complexType name="ModifyResponseType"> - <xs:sequence> - <xs:element ref="Status"/> - <xs:element ref="Extension" minOccurs="0" maxOccurs="1"/> - </xs:sequence> - <xs:attribute name="id" type="xs:ID" use="optional"/> - <xs:attribute name="newEntryIDs" use="optional"> - <xs:simpleType> - <xs:list itemType="IDReferenceType"/> - </xs:simpleType> - </xs:attribute> -</xs:complexType> -*/ + * Schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): + * + * <xs:element name="ModifyResponse" type="ModifyResponseType"/> + * <xs:complexType name="ModifyResponseType"> + * <xs:sequence> + * <xs:element ref="Status"/> + * <xs:element ref="Extension" minOccurs="0" maxOccurs="1"/> + * </xs:sequence> + * <xs:attribute name="id" type="xs:ID" use="optional"/> + * <xs:attribute name="newEntryIDs" use="optional"> + * <xs:simpleType> + * <xs:list itemType="IDReferenceType"/> + * </xs:simpleType> + * </xs:attribute> + * </xs:complexType> + */ /*****************************************************************************/ /* private methods */ diff --git a/lasso/xml/disco_options.c b/lasso/xml/disco_options.c index 3ffdf5f9..105535ee 100644 --- a/lasso/xml/disco_options.c +++ b/lasso/xml/disco_options.c @@ -26,15 +26,15 @@ #include <lasso/xml/disco_options.h> /* -The schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): - -<xs:element name="Options" type="OptionsType"/> -<xs:complexType name="OptionsType"> - <xs:sequence> - <xs:element name="Option" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/> - </xs:sequence> -</xs:complexType> -*/ + * Schema fragment (liberty-idwsf-disco-svc-1.0-errata-v1.0.xsd): + * + * <xs:element name="Options" type="OptionsType"/> + * <xs:complexType name="OptionsType"> + * <xs:sequence> + * <xs:element name="Option" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded"/> + * </xs:sequence> + * </xs:complexType> + */ /*****************************************************************************/ /* private methods */ diff --git a/lasso/xml/disco_remove_entry.c b/lasso/xml/disco_remove_entry.c index 82c2cabf..d8da72f0 100644 --- a/lasso/xml/disco_remove_entry.c +++ b/lasso/xml/disco_remove_entry.c @@ -26,18 +26,18 @@ #include <lasso/xml/disco_remove_entry.h> /* -Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): - -<xs:complexType name="RemoveEntryType"> - <xs:attribute name="entryID" type="IDReferenceType"/> -</xs:complexType> - -Schema fragment (liberty-idwsf-utility-1.0-errata-v1.0.xsd) - -<xs:simpleType name="IDReferenceType"> - <xs:restriction base="xs:string"/> -</xs:simpleType> -*/ + * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): + * + * <xs:complexType name="RemoveEntryType"> + * <xs:attribute name="entryID" type="IDReferenceType"/> + * </xs:complexType> + * + * Schema fragment (liberty-idwsf-utility-1.0-errata-v1.0.xsd) + * + * <xs:simpleType name="IDReferenceType"> + * <xs:restriction base="xs:string"/> + * </xs:simpleType> + */ /*****************************************************************************/ /* private methods */ diff --git a/lasso/xml/disco_resource_offering.c b/lasso/xml/disco_resource_offering.c index ec59d5ae..3baa2c94 100644 --- a/lasso/xml/disco_resource_offering.c +++ b/lasso/xml/disco_resource_offering.c @@ -26,34 +26,34 @@ #include <lasso/xml/disco_resource_offering.h> /* -Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): - -<xs:element name="ResourceOffering" type="ResourceOfferingType"/> -<xs:complexType name="ResourceOfferingType"> - <xs:sequence> - <xs:group ref="ResourceIDGroup"/> - <xs:element name="ServiceInstance" type="ServiceInstanceType"/> - <xs:element ref="Options" minOccurs="0"/> - <xs:element name="Abstract" type="xs:string" minOccurs="0"/> - </xs:sequence> - <xs:attribute name="entryID" type="IDType" use="optional"/> -</xs:complexType> - -<xs:group name="ResourceIDGroup"> - <xs:sequence> - <xs:choice minOccurs="0" maxOccurs="1"> - <xs:element ref="ResourceID"/> - <xs:element ref="EncryptedResourceID"/> - </xs:choice> - </xs:sequence> -</xs:group> - -Schema fragment (liberty-idwsf-utility-1.0-errata-v1.0.xsd) - -<xs:simpleType name="IDType"> - <xs:restriction base="xs:string"/> -</xs:simpleType> -*/ + * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): + * + * <xs:element name="ResourceOffering" type="ResourceOfferingType"/> + * <xs:complexType name="ResourceOfferingType"> + * <xs:sequence> + * <xs:group ref="ResourceIDGroup"/> + * <xs:element name="ServiceInstance" type="ServiceInstanceType"/> + * <xs:element ref="Options" minOccurs="0"/> + * <xs:element name="Abstract" type="xs:string" minOccurs="0"/> + * </xs:sequence> + * <xs:attribute name="entryID" type="IDType" use="optional"/> + * </xs:complexType> + * + * <xs:group name="ResourceIDGroup"> + * <xs:sequence> + * <xs:choice minOccurs="0" maxOccurs="1"> + * <xs:element ref="ResourceID"/> + * <xs:element ref="EncryptedResourceID"/> + * </xs:choice> + * </xs:sequence> + * </xs:group> + * + * Schema fragment (liberty-idwsf-utility-1.0-errata-v1.0.xsd) + * + * <xs:simpleType name="IDType"> + * <xs:restriction base="xs:string"/> + * </xs:simpleType> + */ /*****************************************************************************/ /* private methods */ diff --git a/lasso/xml/disco_service_instance.c b/lasso/xml/disco_service_instance.c index acb64889..343c5cec 100644 --- a/lasso/xml/disco_service_instance.c +++ b/lasso/xml/disco_service_instance.c @@ -26,18 +26,18 @@ #include <lasso/xml/disco_service_instance.h> /* -Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): - -<xs:complexType name="ServiceInstanceType"> - <xs:sequence> - <xs:element ref="ServiceType"/> - <xs:element name="ProviderID" type="md:entityIDType"/> - <xs:element name="Description" type="DescriptionType" minOccurs="1" maxOccurs="unbounded"/> - </xs:sequence> -</xs:complexType> - -<xs:element name="ServiceType" type="xs:anyURI"/> -*/ + * Schema fragment (liberty-idwsf-disco-svc-v1.0.xsd): + * + * <xs:complexType name="ServiceInstanceType"> + * <xs:sequence> + * <xs:element ref="ServiceType"/> + * <xs:element name="ProviderID" type="md:entityIDType"/> + * <xs:element name="Description" type="DescriptionType" minOccurs="1" maxOccurs="unbounded"/> + * </xs:sequence> + * </xs:complexType> + * + * <xs:element name="ServiceType" type="xs:anyURI"/> + */ /*****************************************************************************/ /* private methods */ |