diff options
10 files changed, 188 insertions, 12 deletions
diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java index 7591b3bd..0ca6a491 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java +++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/tasks/AbstractReceiveQualEidTask.java @@ -6,6 +6,15 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang3.StringUtils; +import org.jose4j.base64url.Base64Url; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.JsonNode; + import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext; import at.gv.egiz.eaaf.core.exceptions.EaafAuthenticationException; import at.gv.egiz.eaaf.core.exceptions.EaafStorageException; @@ -27,15 +36,6 @@ import at.gv.egiz.eaaf.modules.auth.sl20.utils.SL20Constants; import at.gv.egiz.eaaf.modules.auth.sl20.utils.SL20JsonExtractorUtils; import at.gv.egiz.eaaf.modules.auth.sl20.utils.SL20ResponseUtils; -import org.apache.commons.lang3.StringUtils; -import org.jose4j.base64url.Base64Url; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; - -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.databind.JsonNode; - public abstract class AbstractReceiveQualEidTask extends AbstractAuthServletTask { private static final Logger log = LoggerFactory.getLogger(AbstractReceiveQualEidTask.class); diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/common/3.1.4-RC1/common-3.1.4-RC1.jar b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/common/3.1.4-RC1/common-3.1.4-RC1.jar Binary files differnew file mode 100644 index 00000000..e1fddffb --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/common/3.1.4-RC1/common-3.1.4-RC1.jar diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/common/3.1.4-RC1/common-3.1.4-RC1.xml b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/common/3.1.4-RC1/common-3.1.4-RC1.xml new file mode 100644 index 00000000..cf0b3f9b --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/common/3.1.4-RC1/common-3.1.4-RC1.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>moaSig</groupId> + <artifactId>common</artifactId> + <version>3.1.4-RC1</version> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.7.30</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.12.0</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.10.6</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.2.0</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/server/moa-sig-lib/3.1.4-RC1/moa-sig-lib-3.1.4-RC1.jar b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/server/moa-sig-lib/3.1.4-RC1/moa-sig-lib-3.1.4-RC1.jar Binary files differnew file mode 100644 index 00000000..75c83313 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/server/moa-sig-lib/3.1.4-RC1/moa-sig-lib-3.1.4-RC1.jar diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/server/moa-sig-lib/3.1.4-RC1/moa-sig-lib-3.1.4-RC1.pom b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/server/moa-sig-lib/3.1.4-RC1/moa-sig-lib-3.1.4-RC1.pom new file mode 100644 index 00000000..151eccc7 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/MOA/spss/server/moa-sig-lib/3.1.4-RC1/moa-sig-lib-3.1.4-RC1.pom @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>MOA.spss.server</groupId> + <artifactId>moa-sig-lib</artifactId> + <version>3.1.4-SNAPSHOT</version> + <dependencies> + <dependency> + <groupId>moaSig</groupId> + <artifactId>common</artifactId> + <version>3.1.4-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.17</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.14</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.axis</groupId> + <artifactId>axis-jaxrpc</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.xerial</groupId> + <artifactId>sqlite-jdbc</artifactId> + <version>3.32.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>2.3.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-core</artifactId> + <version>2.3.0.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + <version>2.3.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>42.2.15.jre7</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox</artifactId> + <version>2.0.21</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-tools</artifactId> + <version>2.0.21</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-app</artifactId> + <version>2.0.21</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>preflight</artifactId> + <version>2.0.21</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>preflight-app</artifactId> + <version>2.0.21</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.11</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + <version>4.5.12</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.62_moa/iaik_jce_full-5.62_moa.jar b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.62_moa/iaik_jce_full-5.62_moa.jar Binary files differnew file mode 100644 index 00000000..382593e4 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.62_moa/iaik_jce_full-5.62_moa.jar diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.62_moa/iaik_jce_full-5.62_moa.pom b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.62_moa/iaik_jce_full-5.62_moa.pom new file mode 100644 index 00000000..5883a370 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_jce_full/5.62_moa/iaik_jce_full-5.62_moa.pom @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>iaik.prod</groupId> + <artifactId>iaik_jce_full</artifactId> + <version>5.62_moa</version> + <description>POM was created from install:install-file</description> +</project> diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.07/iaik_moa-2.07.jar b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.07/iaik_moa-2.07.jar Binary files differnew file mode 100644 index 00000000..b3436eff --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.07/iaik_moa-2.07.jar diff --git a/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.07/iaik_moa-2.07.pom b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.07/iaik_moa-2.07.pom new file mode 100644 index 00000000..c737d787 --- /dev/null +++ b/eaaf_modules/eaaf_module_moa-sig/repository/iaik/prod/iaik_moa/2.07/iaik_moa-2.07.pom @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>iaik.prod</groupId> + <artifactId>iaik_moa</artifactId> + <version>2.07</version> + <description>POM was created from install:install-file</description> +</project> @@ -23,7 +23,7 @@ <at.gv.egiz.components.eventlog-api.version>0.4</at.gv.egiz.components.eventlog-api.version> <at.gv.egiz.components.egiz-spring-api>0.3.1</at.gv.egiz.components.egiz-spring-api> - <MOA.spss.server.moa-sig-lib.version>3.1.3</MOA.spss.server.moa-sig-lib.version> + <MOA.spss.server.moa-sig-lib.version>3.1.4-RC1</MOA.spss.server.moa-sig-lib.version> <MOA.spss.tsl_lib.version>2.0.3</MOA.spss.tsl_lib.version> <!-- IAIK libs --> @@ -33,9 +33,9 @@ <iaik.prod.iaik_eccelerate.version>6.02</iaik.prod.iaik_eccelerate.version> <iaik.prod.iaik_eccelerate_addon.version>6.02</iaik.prod.iaik_eccelerate_addon.version> <iaik.prod.iaik_eccelerate_cms.version>6.02</iaik.prod.iaik_eccelerate_cms.version> - <iaik.prod.iaik_jce_full.version>5.61_moa</iaik.prod.iaik_jce_full.version> + <iaik.prod.iaik_jce_full.version>5.62_moa</iaik.prod.iaik_jce_full.version> <iaik.prod.iaik_jsse.version>4.4</iaik.prod.iaik_jsse.version> - <iaik.prod.iaik_moa.version>2.06</iaik.prod.iaik_moa.version> + <iaik.prod.iaik_moa.version>2.07</iaik.prod.iaik_moa.version> <iaik.prod.iaik_pki_module.version>2.02_moa</iaik.prod.iaik_pki_module.version> <iaik.prod.iaik_sva.version>1.0.3_moa</iaik.prod.iaik_sva.version> <iaik.prod.iaik_tsp.version>2.32_eval</iaik.prod.iaik_tsp.version> |