aboutsummaryrefslogtreecommitdiff
path: root/common/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-01-29 16:39:18 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-01-29 16:39:18 +0100
commitaa8ef6ac6e9f27cde7d009006de639893e0851f3 (patch)
tree9aa2d9b209738d42fc5560e10a1c8b11892df42c /common/src/main/java
parent648510a0769be3ebc4dc3d2e454172d230d3f217 (diff)
parent5ab7e548582a26dd37144df55efb63b7fca4483d (diff)
downloadmoa-id-spss-aa8ef6ac6e9f27cde7d009006de639893e0851f3.tar.gz
moa-id-spss-aa8ef6ac6e9f27cde7d009006de639893e0851f3.tar.bz2
moa-id-spss-aa8ef6ac6e9f27cde7d009006de639893e0851f3.zip
Merge remote-tracking branch 'remotes/origin/moa2_0_kstranacher' into moa2_0_tlenz
Conflicts: common/pom.xml id/server/auth/.settings/org.eclipse.wst.common.component id/server/auth/src/main/webapp/index.html id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl pom.xml spss/handbook/clients/api/pom.xml spss/handbook/clients/pom.xml spss/handbook/clients/referencedData/pom.xml spss/handbook/clients/webservice/pom.xml spss/handbook/pom.xml spss/pom.xml spss/server/pom.xml spss/server/serverlib/pom.xml spss/server/serverws/.settings/org.eclipse.wst.common.component spss/server/serverws/pom.xml spss/server/tools/pom.xml
Diffstat (limited to 'common/src/main/java')
-rw-r--r--common/src/main/java/at/gv/egovernment/moa/util/Constants.java40
1 files changed, 38 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 50fe7cfe5..213eb6242 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
@@ -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-1.5.2.xsd";
+ SCHEMA_ROOT + "MOA-SPSS-2.0.0.xsd";
/** URI of the MOA configuration XML namespace. */
public static final String MOA_CONFIG_NS_URI =
@@ -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-1.5.2.xsd";
+ SCHEMA_ROOT + "MOA-SPSS-config-2.0.0.xsd";
/** Local location of the MOA ID configuration XML schema definition. */
public static final String MOA_ID_CONFIG_SCHEMA_LOCATION =
@@ -337,6 +337,39 @@ public interface Constants {
public static final String STORKP_SCHEMA_LOCATION =
SCHEMA_ROOT + "stork-schema-protocol-1.0.xsd";
+ /** URI of the TSL namespace. */
+ public static final String TSL_NS_URI =
+ "http://uri.etsi.org/02231/v2#";
+
+ /** Prefix used for the TSL namespace */
+ public static final String TSL_PREFIX = "tsl1";
+
+ /** Local location of the TSL schema definition. */
+ public static final String TSL_SCHEMA_LOCATION =
+ SCHEMA_ROOT + "ts_102231v030102_xsd.xsd";
+
+ /** URI of the TSL SIE namespace. */
+ public static final String TSL_SIE_NS_URI =
+ "http://uri.etsi.org/TrstSvc/SvcInfoExt/eSigDir-1999-93-EC-TrustedList/#";
+
+ /** Prefix used for the TSL SIE namespace */
+ public static final String TSL_SIE_PREFIX = "tslsie";
+
+ /** Local location of the TSL SIE schema definition. */
+ public static final String TSL_SIE_SCHEMA_LOCATION =
+ SCHEMA_ROOT + "ts_102231v030102_sie_xsd.xsd";
+
+ /** URI of the TSL additional types namespace. */
+ public static final String TSL_ADDTYPES_NS_URI =
+ "http://uri.etsi.org/02231/v2/additionaltypes#";
+
+ /** Prefix used for the TSL additional types namespace */
+ public static final String TSL_ADDTYPES_PREFIX = "tsltype";
+
+ /** Local location of the TSL additional types schema definition. */
+ public static final String TSL_ADDTYPES_SCHEMA_LOCATION =
+ SCHEMA_ROOT + "ts_102231v030102_additionaltypes_xsd.xsd";
+
/** URI of the XML Encryption namespace. */
public static final String XENC_NS_URI =
"http://www.w3.org/2001/04/xmlenc#";
@@ -373,6 +406,9 @@ public interface Constants {
+ (XADES_1_2_2_NS_URI + " " + XADES_1_2_2_SCHEMA_LOCATION + " ")
+ (XADES_1_3_2_NS_URI + " " + XADES_1_3_2_SCHEMA_LOCATION + " ")
+ (XADES_1_4_1_NS_URI + " " + XADES_1_4_1_SCHEMA_LOCATION + " ")
+ + (TSL_NS_URI + " " + TSL_SCHEMA_LOCATION + " ")
+ + (TSL_SIE_NS_URI + " " + TSL_SIE_SCHEMA_LOCATION + " ")
+ + (TSL_ADDTYPES_NS_URI + " " + TSL_ADDTYPES_SCHEMA_LOCATION + " ")
+ (SAML2_NS_URI + " " + SAML2_SCHEMA_LOCATION + " ")
+ (SAML2P_NS_URI + " " + SAML2P_SCHEMA_LOCATION + " ")
+ (STORK_NS_URI + " " + STORK_SCHEMA_LOCATION + " ")