From 8ae6a68908c3e089dbd5c6d7ac8f87c18cba5985 Mon Sep 17 00:00:00 2001 From: Klaus Stranacher Date: Sun, 19 Jan 2014 21:33:02 +0100 Subject: Update TSL library (Constants.HR added) TSL schema added to MOA-SPSS schema pool --- .../java/at/gv/egovernment/moa/util/Constants.java | 36 +++ .../ts_102231v030102_additionaltypes_xsd.xsd | 35 +++ .../resources/schemas/ts_102231v030102_sie_xsd.xsd | 81 +++++ .../resources/schemas/ts_102231v030102_xsd.xsd | 331 +++++++++++++++++++++ pom.xml | 10 +- repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar | Bin 0 -> 558131 bytes repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom | 251 ++++++++++++++++ spss/server/serverws/.classpath | 41 --- spss/server/serverws/.project | 7 +- .../.settings/org.eclipse.wst.common.component | 90 +----- 10 files changed, 751 insertions(+), 131 deletions(-) create mode 100644 common/src/main/resources/resources/schemas/ts_102231v030102_additionaltypes_xsd.xsd create mode 100644 common/src/main/resources/resources/schemas/ts_102231v030102_sie_xsd.xsd create mode 100644 common/src/main/resources/resources/schemas/ts_102231v030102_xsd.xsd create mode 100644 repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar create mode 100644 repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom delete mode 100644 spss/server/serverws/.classpath 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 75ea1534f..d78e5f79d 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 @@ -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 + " ") diff --git a/common/src/main/resources/resources/schemas/ts_102231v030102_additionaltypes_xsd.xsd b/common/src/main/resources/resources/schemas/ts_102231v030102_additionaltypes_xsd.xsd new file mode 100644 index 000000000..5f1c646a7 --- /dev/null +++ b/common/src/main/resources/resources/schemas/ts_102231v030102_additionaltypes_xsd.xsd @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/src/main/resources/resources/schemas/ts_102231v030102_sie_xsd.xsd b/common/src/main/resources/resources/schemas/ts_102231v030102_sie_xsd.xsd new file mode 100644 index 000000000..1b3bed4b7 --- /dev/null +++ b/common/src/main/resources/resources/schemas/ts_102231v030102_sie_xsd.xsd @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + Please first try to use the CriteriaList before doing the OtherCriteria extension point. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/src/main/resources/resources/schemas/ts_102231v030102_xsd.xsd b/common/src/main/resources/resources/schemas/ts_102231v030102_xsd.xsd new file mode 100644 index 000000000..5ee04ec36 --- /dev/null +++ b/common/src/main/resources/resources/schemas/ts_102231v030102_xsd.xsd @@ -0,0 +1,331 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index d7e107a2d..b1f0faf97 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ common spss - id + @@ -64,12 +64,12 @@ false maven-assembly-plugin - 2.2-beta-1 + 2.3 moa - id/assembly-auth.xml - id/assembly-proxy.xml + spss/assembly.xml spss/assembly-lib.xml @@ -342,7 +342,7 @@ iaik.prod iaik_tsl - 0.0.2-SNAPSHOT + 1.0 iaik.prod diff --git a/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar new file mode 100644 index 000000000..2d661e8d6 Binary files /dev/null and b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar differ diff --git a/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom new file mode 100644 index 000000000..e7cd54c8d --- /dev/null +++ b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom @@ -0,0 +1,251 @@ + + 4.0.0 + iaik.prod + iaik_tsl + jar + 1.0 + TSL_library + + + UTF-8 + UTF-8 + ${project.build.directory}/endorsed + + + + + + + true + src/main/resources + + + + ${project.artifactId} + + + + maven-dependency-plugin + + + copy-dependencies + validate + + copy-dependencies + + + ${endorsed.dir} + true + jaxb-api,jaxb-impl + + + + + + + maven-resources-plugin + 2.5 + + UTF-8 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + + + ${endorsed.dir} + + ${java.version} + ${java.version} + true + ${java.version} + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.2 + + + enforce-versions + + enforce + + + + + 1.5 + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-dependency-plugin + [2.0,) + + copy-dependencies + + + + + + + + + + + + + + + + + profile-for-jdk1.6 + + false + [1.6,) + + + 1.6 + jdk${java.version} + + + ${project.artifactId}-${project.version}-${envClassifier} + + + + + javax.xml.bind + jaxb-api + 2.2.6 + + + com.sun.xml.bind + jaxb-impl + 2.2.6 + + + + + + profile-for-jdk1.5 + + true + (,1.5] + + + 1.5 + jdk${java.version} + + + ${project.artifactId}-${project.version}-${envClassifier} + + + + + javax.xml.bind + jaxb-api + 2.2.4 + + + com.sun.xml.bind + jaxb-impl + 2.2.4-1 + + + + + + + + + iaik + iaik_xsect_eval + 1.1709142 + + + iaik + iaik_ecc_signed + 2.19 + + + iaik + iaik_jce_eval_signed + 3.181 + + + iaik + iaik_pki_module + 1.0 + + + iaik + iaik_javax_crypto + 1.0 + + + iaik + iaik_util + + 0.23 + + + iaik + iaik_jsse + 4.4 + + + iaik + iaik_ssl + 4.4 + + + iaik + w3c_http + 1.0 + + + org.xerial + sqlite-jdbc + 3.7.2 + + + + + javax.activation + activation + 1.1.1 + + + stax + stax-api + 1.0.1 + + + xerces + xercesImpl + 2.7.1 + + + + \ No newline at end of file diff --git a/spss/server/serverws/.classpath b/spss/server/serverws/.classpath deleted file mode 100644 index 070ce9946..000000000 --- a/spss/server/serverws/.classpath +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/spss/server/serverws/.project b/spss/server/serverws/.project index 5e27a2fda..7b8e89662 100644 --- a/spss/server/serverws/.project +++ b/spss/server/serverws/.project @@ -23,17 +23,16 @@ - org.maven.ide.eclipse.maven2Builder + org.eclipse.m2e.core.maven2Builder - org.eclipse.jdt.core.javanature - org.maven.ide.eclipse.maven2Nature + org.eclipse.m2e.core.maven2Nature org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature org.eclipse.wst.common.modulecore.ModuleCoreNature org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.jsdt.core.jsNature diff --git a/spss/server/serverws/.settings/org.eclipse.wst.common.component b/spss/server/serverws/.settings/org.eclipse.wst.common.component index 24b595218..35e6b5187 100644 --- a/spss/server/serverws/.settings/org.eclipse.wst.common.component +++ b/spss/server/serverws/.settings/org.eclipse.wst.common.component @@ -1,88 +1,16 @@ - - + + + uses + + + uses + + - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - - uses - - \ No newline at end of file + -- cgit v1.2.3