diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-09-05 09:46:38 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2013-09-05 09:46:38 +0200 |
| commit | e3667b6ccf1ae70a8c93b0af7a5bcf505831b073 (patch) | |
| tree | 85f74fd2bcf1745dfc8537db7c5c7d2468b46a75 /common/src/main/java/at/gv | |
| parent | cf5cf7c5baa823329d38e764ea53efe8f291d367 (diff) | |
| parent | eb33e9afb53314c8ab1e0854c587a808e8605fad (diff) | |
| download | moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.tar.gz moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.tar.bz2 moa-id-spss-e3667b6ccf1ae70a8c93b0af7a5bcf505831b073.zip | |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
Diffstat (limited to 'common/src/main/java/at/gv')
| -rw-r--r-- | common/src/main/java/at/gv/egovernment/moa/util/Constants.java | 7 | ||||
| -rw-r--r-- | common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java index 3b6e8c57d..75ea1534f 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/Constants.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/Constants.java @@ -265,7 +265,7 @@ public interface Constants { /** URI of the XAdES v1.1.1 namespace */ public static final String XADES_1_1_1_NS_URI = "http://uri.etsi.org/01903/v1.1.1#"; - public static final String XADES_1_1_1_NS_PREFIX = "xades"; + public static final String XADES_1_1_1_NS_PREFIX = "xades111"; /** Local location of the XAdES v1.2.2 schema definition */ public static final String XADES_1_2_2_SCHEMA_LOCATION = @@ -273,6 +273,8 @@ public interface Constants { /** URI of the XAdES v1.2.2 namespace */ public static final String XADES_1_2_2_NS_URI = "http://uri.etsi.org/01903/v1.2.2#"; + + public static final String XADES_1_2_2_NS_PREFIX = "xades122"; /** Local location of the XAdES v1.1.1 schema definition */ public static final String XADES_1_3_2_SCHEMA_LOCATION = @@ -280,6 +282,8 @@ public interface Constants { /** URI of the XAdES v1.3.2 namespace */ public static final String XADES_1_3_2_NS_URI = "http://uri.etsi.org/01903/v1.3.2#"; + + public static final String XADES_1_3_2_NS_PREFIX = "xades132"; /** Local location of the XAdES v1.4.1 schema definition */ public static final String XADES_1_4_1_SCHEMA_LOCATION = @@ -288,6 +292,7 @@ public interface Constants { /** URI of the XAdES v1.4.1 namespace */ public static final String XADES_1_4_1_NS_URI = "http://uri.etsi.org/01903/v1.4.1#"; + public static final String XADES_1_4_1_NS_PREFIX = "xades141"; /** URI of the SAML 2.0 namespace. */ public static final String SAML2_NS_URI = "urn:oasis:names:tc:SAML:2.0:assertion"; diff --git a/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java b/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java index 21c41257a..0dfccb034 100644 --- a/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java +++ b/common/src/main/java/at/gv/egovernment/moa/util/XPathUtils.java @@ -385,7 +385,7 @@ public class XPathUtils { * <code>null</code>, if no node matched. * @throws XPathException An error occurred evaluating the XPath expression. */ - private static Node selectSingleNode( + public static Node selectSingleNode( Node contextNode, NamespaceContext nsContext, String exp) |