aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 14:52:57 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-01-27 14:52:57 +0100
commitff1af4decacd8467245a6f4bf0c6c5e6a4649e7f (patch)
tree6e2b55bb00667e152f96d3486c9015c8cc33991d /id/ConfigWebTool/src/main/java
parente01b0fee1d650159561071bdb6027039edc2b76d (diff)
parentc514e19e4915c59f20dd25be1ede953b3d8b02ac (diff)
downloadmoa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.gz
moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.tar.bz2
moa-id-spss-ff1af4decacd8467245a6f4bf0c6c5e6a4649e7f.zip
Merge branch 'eSense_eIDAS_development' into moa-id-3.2_(OPB)
Conflicts: id/server/idserverlib/pom.xml id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/AuthenticationRequest.java id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EidasMetaDataRequest.java id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
Diffstat (limited to 'id/ConfigWebTool/src/main/java')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
index d26fe8a89..3fad65fe5 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OASTORKConfig.java
@@ -41,7 +41,7 @@ import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;
import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser;
import at.gv.egovernment.moa.id.configuration.config.ConfigurationProvider;
import at.gv.egovernment.moa.id.configuration.validation.oa.OASTORKConfigValidation;
-import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
+//import at.gv.egovernment.moa.id.protocols.stork2.AttributeProviderFactory;
public class OASTORKConfig implements IOnlineApplicationData{
@@ -293,7 +293,10 @@ public class OASTORKConfig implements IOnlineApplicationData{
}
public List<String> getAvailableAttributeProviderPlugins() {
- return AttributeProviderFactory.getAvailablePlugins();
+ //TODO: remove in final version
+
+ return new ArrayList<String>();
+ //return AttributeProviderFactory.getAvailablePlugins();
}
public List<AttributeProviderPlugin> getAttributeProviderPlugins() {