diff options
Diffstat (limited to 'id/server/moa-id-commons/src')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/bindings.xjb | 7 | ||||
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 43 |
2 files changed, 25 insertions, 25 deletions
diff --git a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb index 6269e2dbc..bb063a73c 100644 --- a/id/server/moa-id-commons/src/main/resources/config/bindings.xjb +++ b/id/server/moa-id-commons/src/main/resources/config/bindings.xjb @@ -1,10 +1,15 @@ <jaxb:bindings version="1.0" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"> <jaxb:bindings schemaLocation="moaid_config_2.0.xsd" node="/xsd:schema"> <jaxb:globalBindings localScoping="toplevel"> <jaxb:serializable/> + <xjc:simple/> + <xjc:javaType name="java.lang.Boolean" + xmlType="xsd:boolean" + adapter="com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter"/> </jaxb:globalBindings> </jaxb:bindings> </jaxb:bindings>
\ No newline at end of file diff --git a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd index 3a2b8cc62..af827210f 100644 --- a/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd +++ b/id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd @@ -11,16 +11,16 @@ <xsd:restriction base="xsd:NMTOKEN"> <xsd:enumeration value="businessService"/> <xsd:enumeration value="publicService"/> - <xsd:enumeration value="storkService"/> - </xsd:restriction> + <xsd:enumeration value="storkService"/> + </xsd:restriction> </xsd:simpleType> </xsd:attribute> <xsd:attribute name="calculateHPI" type="xsd:boolean" use="optional" default="false"/> <xsd:attribute name="friendlyName" type="xsd:string" use="optional"/> <xsd:attribute name="target" type="xsd:string" use="optional"/> <xsd:attribute name="targetFriendlyName" type="xsd:string" use="optional"/> - <xsd:attribute name="storkSPTargetCountry" type="xsd:string" use="optional"/> - <xsd:attribute name="removeBPKFromAuthBlock" type="xsd:boolean" use="optional" default="false"/> + <xsd:attribute name="storkSPTargetCountry" type="xsd:string" use="optional"/> + <xsd:attribute name="removeBPKFromAuthBlock" type="xsd:boolean" use="optional" default="false"/> </xsd:extension> </xsd:complexContent> </xsd:complexType> @@ -509,6 +509,7 @@ <xsd:complexType> <xsd:sequence> <xsd:element name="Profiles" type="xsd:string"/> + <xsd:element name="ProfileName" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -883,16 +884,12 @@ <xsd:element name="OA_STORK"> <xsd:complexType> <xsd:sequence> - <xsd:element name="StorkLogonEnabled" - type="xsd:boolean" /> - <xsd:element ref="Qaa" minOccurs="0" maxOccurs="1" /> - <xsd:element ref="OAAttributes" minOccurs="0" - maxOccurs="unbounded" /> - <xsd:element name="VidpEnabled" type="xsd:boolean"></xsd:element> - <xsd:element ref="AttributeProviders" - maxOccurs="unbounded" minOccurs="0"> - </xsd:element> - <xsd:element name="requireConsent" type="xsd:boolean" ></xsd:element> + <xsd:element name="StorkLogonEnabled" type="xsd:boolean" default="true"/> + <xsd:element ref="Qaa" minOccurs="0" maxOccurs="1"/> + <xsd:element ref="OAAttributes" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="VidpEnabled" type="xsd:boolean" default="false"/> + <xsd:element ref="AttributeProviders" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="requireConsent" type="xsd:boolean" default="true"/> </xsd:sequence> </xsd:complexType> </xsd:element> @@ -959,16 +956,14 @@ <xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> - - <xsd:complexType name="AttributeProviderPlugin"> - <xsd:sequence> - <xsd:element name="name" type="xsd:string"></xsd:element> - <xsd:element name="url" type="xsd:anyURI"></xsd:element> - <xsd:element name="attributes" type="xsd:string"></xsd:element> - </xsd:sequence> - </xsd:complexType> - - <xsd:element name="AttributeProviders" type="AttributeProviderPlugin"></xsd:element> + <xsd:complexType name="AttributeProviderPlugin"> + <xsd:sequence> + <xsd:element name="name" type="xsd:string"/> + <xsd:element name="url" type="xsd:anyURI"/> + <xsd:element name="attributes" type="xsd:string"/> + </xsd:sequence> + </xsd:complexType> + <xsd:element name="AttributeProviders" type="AttributeProviderPlugin"/> <xsd:element name="Attributes" type="StorkAttribute"/> <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"/> <xsd:complexType name="OAStorkAttribute"> |