aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2016-11-03 13:27:15 +0100
committerThomas Lenz <thomas.lenz@egiz.gv.at>2016-11-03 13:27:15 +0100
commit56dc88d3335e371483be7d6c8198bbb51dfce018 (patch)
treeb78388bf4c46278bd133c47dfb409cddcba3b61c /id
parentd335958103f67de8cd59d1c537a61a29b4551f37 (diff)
downloadmoa-id-spss-56dc88d3335e371483be7d6c8198bbb51dfce018.tar.gz
moa-id-spss-56dc88d3335e371483be7d6c8198bbb51dfce018.tar.bz2
moa-id-spss-56dc88d3335e371483be7d6c8198bbb51dfce018.zip
fix some more jerry-pick problems
Diffstat (limited to 'id')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java3
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java3
-rw-r--r--id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java3
-rw-r--r--id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java9
4 files changed, 5 insertions, 13 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index b8f9cff0f..ab6c22858 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -580,8 +580,7 @@ public class ConfigurationProvider {
ConfigurationProvider.getInstance().getTrustStoreDirectory(),
null,
"pkix",
- true,
- new String[]{"crl"});
+ true);
httpClient.setCustomSSLTrustStore(metadataurl, protoSocketFactory);
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index 970785bdb..cf02cd49c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -134,8 +134,7 @@ public class OAPVP2ConfigValidation {
ConfigurationProvider.getInstance().getTrustStoreDirectory(),
null,
"pkix",
- true,
- new String[]{"crl"});
+ true);
httpClient.setCustomSSLTrustStore(
form.getMetaDataURL(),
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java
index 00b4ae01e..3c358b85f 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolPVP2XTask.java
@@ -196,8 +196,7 @@ public class ServicesProtocolPVP2XTask extends AbstractTaskValidator implements
MOAIDWebGUIConfiguration.getInstance().getTrustStoreDirectory(),
null,
"pkix",
- true,
- new String[]{"crl"});
+ true);
httpClient.setCustomSSLTrustStore(
metadataURL,
diff --git a/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java b/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java
index c5d2a9553..b538ba3e9 100644
--- a/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java
+++ b/id/server/modules/moa-id-module-elga_mandate_service/src/main/java/at/gv/egovernment/moa/id/auth/modules/elgamandates/utils/ELGAMandateServiceMetadataProvider.java
@@ -53,8 +53,7 @@ import at.gv.egovernment.moa.util.MiscUtil;
*/
@Service("ELGAMandate_MetadataProvider")
-public class ELGAMandateServiceMetadataProvider extends SimpleMOAMetadataProvider
- implements IDestroyableObject {
+public class ELGAMandateServiceMetadataProvider extends SimpleMOAMetadataProvider {
@Autowired AuthConfiguration authConfig;
@@ -276,11 +275,7 @@ public class ELGAMandateServiceMetadataProvider extends SimpleMOAMetadataProvide
}
}
- /* (non-Javadoc)
- * @see at.gv.egovernment.moa.id.auth.IDestroyableObject#fullyDestroy()
- */
- @Override
- public void fullyDestroy() {
+ private void fullyDestroy() {
if (metadataProvider != null) {
metadataProvider.destroy();