aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-saml-engine
diff options
context:
space:
mode:
authorFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-02-25 08:56:03 +0100
committerFlorian Reimair <florian.reimair@iaik.tugraz.at>2014-02-25 08:56:03 +0100
commitf2a3b2a78eab55af0f4ad09a160d3fffcd98a187 (patch)
tree19e7b1ba0b9f47b20205741508c26f84da46e54a /id/server/stork2-saml-engine
parente220daf9bc0eac36c3e20406865f99f4760a30d3 (diff)
parentf1d374bb66f3b48f2a14a8d550c4125c04dde7a8 (diff)
downloadmoa-id-spss-f2a3b2a78eab55af0f4ad09a160d3fffcd98a187.tar.gz
moa-id-spss-f2a3b2a78eab55af0f4ad09a160d3fffcd98a187.tar.bz2
moa-id-spss-f2a3b2a78eab55af0f4ad09a160d3fffcd98a187.zip
merge tlenz into ap
Diffstat (limited to 'id/server/stork2-saml-engine')
-rw-r--r--id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
index 48718242b..e993c0e46 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
@@ -143,12 +143,13 @@ public class SAMLEngine {
LOG.info("SAMLEngine: Initialize OpenSAML");
- try {
- DefaultBootstrap.bootstrap();
- } catch (ConfigurationException e) {
- LOG.error("Problem initializing the OpenSAML library.");
- throw new STORKSAMLEngineRuntimeException(e);
- }
+ //TLenz: MOA-ID uses an own Bootstrap
+// try {
+// DefaultBootstrap.bootstrap();
+// } catch (ConfigurationException e) {
+// LOG.error("Problem initializing the OpenSAML library.");
+// throw new STORKSAMLEngineRuntimeException(e);
+// }
LOG.debug("Read all file configurations. (instances of SAMLEngine)");
try {