diff options
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java')
| -rw-r--r-- | id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java index 0c5a50393..762669a70 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java @@ -82,7 +82,7 @@ public class BuildFromLegacyConfig { private static final String GENERIC_CONFIG_PARAM_SOURCEID = "AuthenticationServer.SourceID"; - public static MOAIDConfiguration build(String fileName, String rootConfigFileDir, Properties properies) throws ConfigurationException { + public static MOAIDConfiguration build(File fileName, String rootConfigFileDir) throws ConfigurationException { InputStream stream = null; Element configElem; ConfigurationBuilder builder; @@ -435,20 +435,21 @@ public class BuildFromLegacyConfig { //OA_PVP2 OAPVP2 oa_pvp2 = new OAPVP2(); oa_auth.setOAPVP2(oa_pvp2); - oa_pvp2.setMetadataURL("TODO!!!"); - //TODO: is only a workaround!!!! - Properties props = getGeneralPVP2ProperiesConfig(properies); - File dir = new File(props.getProperty("idp.truststore")); - File[] files = dir.listFiles(); - if (files.length > 0) { - FileInputStream filestream = new FileInputStream(files[0]); - X509Certificate signerCertificate = new X509Certificate(filestream); - oa_pvp2.setCertificate(signerCertificate.getEncoded()); - - } else { - oa_pvp2.setCertificate(null); - } +// oa_pvp2.setMetadataURL("empty"); +// +// //TODO: is only a workaround!!!! +// Properties props = getGeneralPVP2ProperiesConfig(properies); +// File dir = new File(props.getProperty("idp.truststore")); +// File[] files = dir.listFiles(); +// if (files.length > 0) { +// FileInputStream filestream = new FileInputStream(files[0]); +// X509Certificate signerCertificate = new X509Certificate(filestream); +// oa_pvp2.setCertificate(signerCertificate.getEncoded()); +// +// } else { +// oa_pvp2.setCertificate(null); +// } //moa_oas.add(moa_oa); ConfigurationDBUtils.save(moa_oa); |