aboutsummaryrefslogtreecommitdiff
path: root/id/server/stork2-saml-engine/src/main/java/eu
diff options
context:
space:
mode:
authorAndreas Reiter <andreas.reiter@iaik.tugraz.at>2014-02-28 13:53:30 +0100
committerAndreas Reiter <andreas.reiter@iaik.tugraz.at>2014-02-28 13:53:30 +0100
commit9138fc3cf75f4fff39262c304a5834fc8aaf6cf7 (patch)
tree6f925b7b9f2b4b4e7d7beee52ded05989322c551 /id/server/stork2-saml-engine/src/main/java/eu
parent0a69374bc8c126ebe9659eebe33673169321a106 (diff)
parenta04189917f59dcc532e088ad366da67e31f62ffd (diff)
downloadmoa-id-spss-9138fc3cf75f4fff39262c304a5834fc8aaf6cf7.tar.gz
moa-id-spss-9138fc3cf75f4fff39262c304a5834fc8aaf6cf7.tar.bz2
moa-id-spss-9138fc3cf75f4fff39262c304a5834fc8aaf6cf7.zip
Merge remote-tracking branch 'remotes/origin/ap' into moa2_0_tlenz_bs_3_ar
Conflicts: id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
Diffstat (limited to 'id/server/stork2-saml-engine/src/main/java/eu')
-rw-r--r--id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
index e485827c8..da6a8ab27 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
@@ -50,13 +50,11 @@ public class CustomAttributeQueryImpl extends SubjectQueryImpl implements Custom
return Collections.unmodifiableList(children);
}
- @Override
public String getAssertionConsumerServiceURL() {
// TODO Auto-generated method stub
return this.serviceURL;
}
- @Override
public void setAssertionConsumerServiceURL(String newServiceUrl) {
// TODO Auto-generated method stub
this.serviceURL = newServiceUrl;