aboutsummaryrefslogtreecommitdiff
path: root/moaSig/common/src/main/java/at/gv
diff options
context:
space:
mode:
authortlenz <thomas.lenz@egiz.gv.at>2017-11-02 15:39:15 +0100
committertlenz <thomas.lenz@egiz.gv.at>2017-11-02 15:39:15 +0100
commite1725f9162fb687b1cc38ac8a40d952d71fae2fa (patch)
tree4f769e3c532630ccaa9cfbc6ec0a1036a4845844 /moaSig/common/src/main/java/at/gv
parent09274bac51619e845cc46e1b9ce0b07ef859fbe5 (diff)
parentccb1e1ed1404e0dc1f3ff026e888f4c105e1bc05 (diff)
downloadmoa-sig-e1725f9162fb687b1cc38ac8a40d952d71fae2fa.tar.gz
moa-sig-e1725f9162fb687b1cc38ac8a40d952d71fae2fa.tar.bz2
moa-sig-e1725f9162fb687b1cc38ac8a40d952d71fae2fa.zip
Merge branch 'nightlybuild' of https://gitlab.iaik.tugraz.at/egiz/moa-sig into nightlybuild
Diffstat (limited to 'moaSig/common/src/main/java/at/gv')
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/Constants.java10
-rw-r--r--moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java3
2 files changed, 9 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 549f8e3..395fcf4 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
@@ -83,7 +83,7 @@ public interface Constants {
/** Local location of the MOA XML schema definition. */
public static final String MOA_SCHEMA_LOCATION =
- SCHEMA_ROOT + "MOA-SPSS-3.0.0.xsd";
+ SCHEMA_ROOT + "MOA-SPSS-3.1.0.xsd";
/** URI of the MOA configuration XML namespace. */
public static final String MOA_CONFIG_NS_URI =
@@ -401,6 +401,11 @@ public interface Constants {
public static final String ASIC_SCHEMA_LOCATION =
SCHEMA_ROOT + "asic.xsd";
+ /* Prefix and Schema definition for eIDAS specific SAML2 extensions*/
+ public static final String SAML2_eIDAS_EXTENSIONS_PREFIX = "eidas";
+ public static final String SAML2_eIDAS_EXTENSIONS = "http://eidas.europa.eu/saml-extensions";
+ public static final String SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION = SCHEMA_ROOT + "eIDAS_saml_extensions.xsd";
+
/**
* Contains all namespaces and local schema locations for XML schema
* definitions relevant for MOA. For use in validating XML parsers.
@@ -435,7 +440,8 @@ public interface Constants {
+ (STORKP_NS_URI + " " + STORKP_SCHEMA_LOCATION + " ")
+ (XENC_NS_URI + " " + XENC_SCHEMA_LOCATION + " ")
+ (SAML2_METADATA_URI + " " + SAML2_METADATA_SCHEMA_LOCATION + " ")
- + (ASIC_URI + " " + ASIC_SCHEMA_LOCATION);
+ + (ASIC_URI + " " + ASIC_SCHEMA_LOCATION)
+ + (SAML2_eIDAS_EXTENSIONS + " " + SAML2_eIDAS_EXTENSIONS_SCHEMA_LOCATION);
/** URN prefix for bPK and wbPK. */
public static final String URN_PREFIX = "urn:publicid:gv.at";
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
index 2a907e7..44eba5a 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
@@ -48,7 +48,6 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.xerces.impl.Constants;
import org.apache.xerces.parsers.DOMParser;
import org.apache.xerces.parsers.SAXParser;
import org.apache.xerces.parsers.XMLGrammarPreparser;
@@ -122,7 +121,7 @@ public class DOMUtils {
//Security Manager feature for XERCES XML parser
private static final String SECURITY_MANAGER =
- Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY;
+ org.apache.xerces.impl.Constants.XERCES_PROPERTY_PREFIX + org.apache.xerces.impl.Constants.SECURITY_MANAGER_PROPERTY;
/** Property URI for the Xerces grammar pool. */