diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-10-29 14:06:00 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-10-29 14:06:00 +0100 |
| commit | 08e1d59be7c555a49f75988b050a43e0431ce9be (patch) | |
| tree | fa00dbb1fe13779decdb13aefe8b46e848371b6e /id/server/moa-id-commons/src/main/resources | |
| parent | 41b1942dc69f1284894270e724ef517fb689f075 (diff) | |
| parent | b9e2c8e57097ab446264a4e5f42765c5ed67dceb (diff) | |
| download | moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.tar.gz moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.tar.bz2 moa-id-spss-08e1d59be7c555a49f75988b050a43e0431ce9be.zip | |
Merge branch 'ISA-1.18-action' into moa-2.1-Snapshot
Conflicts:
id/server/idserverlib/pom.xml
Diffstat (limited to 'id/server/moa-id-commons/src/main/resources')
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 12 |
1 files changed, 11 insertions, 1 deletions
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 f2f1949cc..d4686bd5e 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 @@ -481,10 +481,18 @@ </xsd:element> </xsd:sequence> </xsd:complexType> + <xsd:complexType name="InterfederationGatewayType"> + <xsd:sequence> + <xsd:element name="forwardIDPIdentifier" type="xsd:string" minOccurs="1" maxOccurs="1"/> + <xsd:element name="forwardProtocolIdentifer" type="xsd:string" minOccurs="1" maxOccurs="1"/> + </xsd:sequence> + </xsd:complexType> <xsd:complexType name="InterfederationIDPType"> <xsd:sequence> <xsd:element name="attributeQueryURL" type="xsd:string" minOccurs="0" maxOccurs="1"/> <xsd:element name="storeSSOSession" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/> + <xsd:element name="performPassivRequest" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/> + <xsd:element name="performLocalAuthenticationOnError" type="xsd:boolean" default="true" minOccurs="1" maxOccurs="1"/> </xsd:sequence> <xsd:attribute name="inboundSSO" type="xsd:boolean" default="true"/> <xsd:attribute name="outboundSSO" type="xsd:boolean" default="true"/> @@ -502,6 +510,8 @@ <xsd:element name="isAdminRequired" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> <xsd:element name="isInterfederationIDP" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> <xsd:element name="InterfederationIDP" type="InterfederationIDPType" minOccurs="0" maxOccurs="1"/> + <xsd:element name="isInterfederationGateway" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> + <xsd:element name="InterfederationGateway" type="InterfederationGatewayType" minOccurs="0" maxOccurs="1"/> <xsd:element name="AuthComponent_OA" minOccurs="0"> <xsd:annotation> <xsd:documentation>enthält Parameter über die OA, die die @@ -581,7 +591,7 @@ </xsd:sequence> </xsd:complexType> </xsd:element> - </xsd:sequence> + </xsd:sequence> </xsd:complexType> </xsd:element> <xsd:complexType name="ConnectionParameterServerAuthType"> |