aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-saml-engine/src/main/java
diff options
context:
space:
mode:
authorBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-13 12:06:41 +0100
committerBojan Suzic <bojan.suzic@iaik.tugraz.at>2014-02-13 12:06:41 +0100
commit4b3324b88ed5246bb27de86f19f6de49c98f0615 (patch)
treeb17cbecffdd33208537aaace8430b1bcff2083e0 /id/server/stork2-saml-engine/src/main/java
parentb6076468ae4c2fda384d051adece37a351faae31 (diff)
parent713ca50cbcb276254689088ea558401af018ffcd (diff)
downloadmoa-id-spss-4b3324b88ed5246bb27de86f19f6de49c98f0615.tar.gz
moa-id-spss-4b3324b88ed5246bb27de86f19f6de49c98f0615.tar.bz2
moa-id-spss-4b3324b88ed5246bb27de86f19f6de49c98f0615.zip
Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2
Diffstat (limited to 'id/server/stork2-saml-engine/src/main/java')
-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 {