diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2017-01-02 16:35:43 +0100 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2017-01-02 16:35:43 +0100 |
commit | 8574f931c169248c67c3a5946351f9072628af46 (patch) | |
tree | 56ac39e631af4cd11058c4ba1193180af9d2e1fe /moaSig/common/src | |
parent | aabb36836ebfca9fe8cdc70dff13c0be7e5e761c (diff) | |
download | moa-sig-8574f931c169248c67c3a5946351f9072628af46.tar.gz moa-sig-8574f931c169248c67c3a5946351f9072628af46.tar.bz2 moa-sig-8574f931c169248c67c3a5946351f9072628af46.zip |
first untested beta version with new TSL lib
Diffstat (limited to 'moaSig/common/src')
-rw-r--r-- | moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java | 2 | ||||
-rw-r--r-- | moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-config-3.0.0.xsd | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java index 4953581..549f8e3 100644 --- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java +++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java @@ -101,7 +101,7 @@ public interface Constants { /** Local location of the MOA configuration XML schema definition. */ public static final String MOA_CONFIG_SCHEMA_LOCATION = - SCHEMA_ROOT + "MOA-SPSS-config-2.0.1.xsd"; + SCHEMA_ROOT + "MOA-SPSS-config-3.0.0.xsd"; /** Local location of the MOA ID configuration XML schema definition. */ public static final String MOA_ID_CONFIG_SCHEMA_LOCATION = diff --git a/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-config-3.0.0.xsd b/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-config-3.0.0.xsd index 716f9d4..1a1b74b 100644 --- a/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-config-3.0.0.xsd +++ b/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-config-3.0.0.xsd @@ -189,9 +189,9 @@ <xs:element name="EUTSL" minOccurs="0"> <xs:complexType> <xs:sequence> - <xs:element name="CountrySelection" type="xs:string" minOccurs="0"/> - <xs:element name="AllowedTSPStatus" type="xs:string" minOccurs="0"/> - <xs:element name="AllowedTSPServiceTypes" type="xs:string" minOccurs="0"/> + <xs:element name="CountrySelection" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="AllowedTSPStatus" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="AllowedTSPServiceTypes" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> @@ -328,6 +328,14 @@ </xs:complexType> </xs:element> <xs:element name="WorkingDirectory" type="xs:anyURI" minOccurs="0"/> + <xs:element name="Evaluation" minOccurs="1" maxOccurs="1"> + <xs:complexType> + <xs:sequence> + <xs:element name="QCQualifier" type="xs:string" minOccurs="1" maxOccurs="1"/> + <xs:element name="SSCDQualifier" type="xs:string" minOccurs="1" maxOccurs="1"/> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:sequence> </xs:complexType> </xs:element> |