diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-12-18 12:59:33 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-12-18 12:59:33 +0100 |
| commit | 5abe951ec537b63b0cf70c4be203d96b308e5985 (patch) | |
| tree | 097a08c561e0eb85c99e0d4272bb030e6e0f0d6d | |
| parent | 18e5a374e82b7243a50d371d1a77032db37897d1 (diff) | |
| download | moa-id-spss-5abe951ec537b63b0cf70c4be203d96b308e5985.tar.gz moa-id-spss-5abe951ec537b63b0cf70c4be203d96b308e5985.tar.bz2 moa-id-spss-5abe951ec537b63b0cf70c4be203d96b308e5985.zip | |
fix broken STORK depentencies
3 files changed, 51 insertions, 3 deletions
diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml index 10e031ac4..ed809aee9 100644 --- a/id/server/auth/pom.xml +++ b/id/server/auth/pom.xml @@ -146,11 +146,11 @@ <version>1.0.0-RELEASE</version> </dependency> --> -<!-- Adding stork module dependency automatically adds stork capabilities. + <!-- Adding stork module dependency automatically adds stork capabilities. --> <dependency> <groupId>MOA.id.server.modules</groupId> <artifactId>moa-id-module-stork</artifactId> - </dependency> --> + </dependency> <!-- Adding monitoring module dependency automatically adds monitoring capabilities. --> <dependency> diff --git a/id/server/modules/module-stork/pom.xml b/id/server/modules/module-stork/pom.xml index 234c8d28a..1b2e3f008 100644 --- a/id/server/modules/module-stork/pom.xml +++ b/id/server/modules/module-stork/pom.xml @@ -34,6 +34,50 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>eu.stork</groupId> + <artifactId>oasis-dss-api</artifactId> + <version>1.0.0-RELEASE</version> + <exclusions> + <exclusion> + <groupId>org.apache.commons</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!-- <dependency> + <groupId>eu.stork</groupId> + <artifactId>Commons</artifactId> + <version>1.4.0</version> + </dependency> --> + <dependency> + <groupId>eu.stork</groupId> + <artifactId>SamlEngine</artifactId> + <version>1.5.1</version> + </dependency> + + <dependency> + <groupId>eu.stork</groupId> + <artifactId>DocumentService</artifactId> + <version>0.0.1-SNAPSHOT</version> + <classifier>classes</classifier> + <exclusions> + <exclusion> + <artifactId>axis</artifactId> + <groupId>org.apache.axis</groupId> + </exclusion> + <exclusion> + <artifactId>bcprov-jdk16</artifactId> + <groupId>org.bouncycastle</groupId> + </exclusion> + <exclusion> + <artifactId>jaxws-tools</artifactId> + <groupId>com.sun.xml.ws</groupId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </project> diff --git a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java index 41384690e..ecb568635 100644 --- a/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java +++ b/id/server/modules/module-stork/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKAuthModuleImpl.java @@ -28,7 +28,11 @@ public class STORKAuthModuleImpl implements AuthModule { @Override
public String selectProcess(ExecutionContext context) {
- return StringUtils.isNotBlank((String) context.get("ccc")) ? "STORKAuthentication" : null;
+ if (StringUtils.isNotBlank((String) context.get("ccc")) ||
+ StringUtils.isNotBlank((String) context.get("CCC")))
+ return "STORKAuthentication";
+ else
+ return null;
}
@Override
|