aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork-saml-engine/src/main
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-07-08 13:32:23 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2013-07-08 13:32:23 +0200
commit3f9891a9198619568c82220b706a445217335065 (patch)
treef808621885827a38007460601ae32475ab7c1eea /id/server/stork-saml-engine/src/main
parent206f283585a28009bb8276f78e7ea1d95298fd8c (diff)
parent4ebecf480d17550d93165ab17c249cd2caed9e5b (diff)
downloadmoa-id-spss-3f9891a9198619568c82220b706a445217335065.tar.gz
moa-id-spss-3f9891a9198619568c82220b706a445217335065.tar.bz2
moa-id-spss-3f9891a9198619568c82220b706a445217335065.zip
Merge PVP2 and MOA 2.0
Diffstat (limited to 'id/server/stork-saml-engine/src/main')
-rw-r--r--id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/common/STORKBootstrap.java4
-rw-r--r--id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/util/SAMLUtil.java2
2 files changed, 2 insertions, 4 deletions
diff --git a/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/common/STORKBootstrap.java b/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/common/STORKBootstrap.java
index d75a4c2eb..953affdf8 100644
--- a/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/common/STORKBootstrap.java
+++ b/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/common/STORKBootstrap.java
@@ -48,12 +48,12 @@ public class STORKBootstrap extends DefaultBootstrap {
DefaultBootstrap.bootstrap();
- /*SAMLSchemaBuilder.addExtensionSchema("stork-schema-assertion-1.0.xsd");
+ SAMLSchemaBuilder.addExtensionSchema("stork-schema-assertion-1.0.xsd");
SAMLSchemaBuilder.addExtensionSchema("stork-schema-protocol-1.0.xsd");
- initStorkConfig("saml2-stork-config.xml"); */
+ initStorkConfig("saml2-stork-config.xml");
}
diff --git a/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/util/SAMLUtil.java b/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/util/SAMLUtil.java
index a3ab2fb1b..faff5e7bd 100644
--- a/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/util/SAMLUtil.java
+++ b/id/server/stork-saml-engine/src/main/java/eu/stork/vidp/messages/util/SAMLUtil.java
@@ -397,8 +397,6 @@ public class SAMLUtil {
}
}
-
-
return reqAttrList;
}