diff options
Diffstat (limited to 'id/server/moa-id-commons')
| -rw-r--r-- | id/server/moa-id-commons/pom.xml | 43 | ||||
| -rw-r--r-- | id/server/moa-id-commons/src/main/resources/config/moaid_config_2.0.xsd | 41 |
2 files changed, 73 insertions, 11 deletions
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml index 01e81ce24..ae79990d0 100644 --- a/id/server/moa-id-commons/pom.xml +++ b/id/server/moa-id-commons/pom.xml @@ -62,7 +62,11 @@ <artifactId>hyperjaxb3-ejb-runtime</artifactId> <version>0.5.6</version> </dependency> - + <dependency> + <groupId>org.jvnet.hyperjaxb3</groupId> + <artifactId>maven-hyperjaxb3-plugin</artifactId> + <version>0.5.6</version> +</dependency> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> @@ -186,5 +190,40 @@ </executions> </plugin> </plugins> - </build> + <pluginManagement> + <plugins> + <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> + <plugin> + <groupId>org.eclipse.m2e</groupId> + <artifactId>lifecycle-mapping</artifactId> + <version>1.0.0</version> + <configuration> + <lifecycleMappingMetadata> + <pluginExecutions> + <pluginExecution> + <pluginExecutionFilter> + <groupId> + org.jvnet.hyperjaxb3 + </groupId> + <artifactId> + maven-hyperjaxb3-plugin + </artifactId> + <versionRange> + [0.5.6,) + </versionRange> + <goals> + <goal>generate</goal> + </goals> + </pluginExecutionFilter> + <action> + <ignore></ignore> + </action> + </pluginExecution> + </pluginExecutions> + </lifecycleMappingMetadata> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project>
\ 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 e93cb5cc8..33ad5c990 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 @@ -49,7 +49,7 @@ <xsd:extension base="xsd:string"/> </xsd:simpleContent> </xsd:complexType> - <xsd:element name="AbstractSimpleIdentification" type="AbstractSimpleIdentificationType"> + <xsd:element name="AbstractSimpleIdentification" type="StorkAttribute"> <xsd:annotation> <xsd:documentation>possibility to include common austrian primary keys in human readable way, english translation not available @@ -72,19 +72,17 @@ </xsd:simpleType> <xsd:element name="QualityAuthenticationAssuranceLevel" type="QualityAuthenticationAssuranceLevelType"/> <xsd:element name="AttributeValue" type="xsd:anyType"/> - <xsd:complexType name="RequestedAttributeType"/> - <xsd:element name="RequestedAttribute" type="RequestedAttributeType"/> <xsd:simpleType name="CountryCodeType"> <xsd:restriction base="xsd:token"> <xsd:pattern value="[A-Z]{2}"/> </xsd:restriction> </xsd:simpleType> - <xsd:complexType name="RequestedAttributesType"> + <xsd:complexType name="StorkAttribute"> <xsd:sequence> - <xsd:element name="AttributeValue" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="name" type="xsd:string"></xsd:element> + <xsd:element name="mandatory" type="xsd:boolean"></xsd:element> </xsd:sequence> </xsd:complexType> - <xsd:element name="RequestedAttributes" type="RequestedAttributesType"/> <xsd:simpleType name="LoginType"> <xsd:restriction base="xsd:token"> <xsd:enumeration value="stateless"/> @@ -538,7 +536,7 @@ </xsd:sequence> </xsd:complexType> </xsd:element> - <xsd:element ref="STORK" minOccurs="0"/> + <xsd:element ref="OA_STORK" minOccurs="0"/> <xsd:element name="OA_SSO" minOccurs="0"> <xsd:complexType> <xsd:sequence> @@ -862,8 +860,10 @@ <xsd:element ref="SAMLSigningParameter"/> </xsd:sequence> <xsd:sequence> - <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0"/> - <xsd:element ref="RequestedAttributes"/> + <xsd:element ref="QualityAuthenticationAssuranceLevel" minOccurs="0" /> + </xsd:sequence> + <xsd:sequence> + <xsd:element ref="Attributes" maxOccurs="unbounded" minOccurs="0" /> </xsd:sequence> </xsd:choice> </xsd:complexType> @@ -926,6 +926,16 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <xsd:element name="OA_STORK"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="StorkLogonEnabled" + type="xsd:boolean" /> + <xsd:element ref="Qaa" maxOccurs="1" minOccurs="0"></xsd:element> + <xsd:element ref="OAAttributes" maxOccurs="unbounded" minOccurs="0"></xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element name="Contact"> <xsd:complexType> <xsd:sequence> @@ -987,4 +997,17 @@ <xsd:element name="OnlyMandateLoginAllowed" type="xsd:boolean" default="false" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> + + <xsd:element name="Attributes" type="StorkAttribute"></xsd:element> + + <xsd:element name="Qaa" type="QualityAuthenticationAssuranceLevelType"></xsd:element> + + <xsd:complexType name="OAStorkAttribute"> + <xsd:sequence> + <xsd:element name="mandatory" type="xsd:boolean"></xsd:element> + <xsd:element name="name" type="xsd:string"></xsd:element> + </xsd:sequence> + </xsd:complexType> + + <xsd:element name="OAAttributes" type="OAStorkAttribute"></xsd:element> </xsd:schema> |