From 3f2820537394c7148bafc1fa99648f7929480a95 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 3 Apr 2014 14:40:49 +0200 Subject: removing web interface stork conf --- .../id/configuration/data/oa/OAGeneralConfig.java | 28 +------------ .../struts/action/EditGeneralConfigAction.java | 2 - .../configuration/struts/action/EditOAAction.java | 49 +--------------------- .../validation/oa/OAGeneralConfigValidation.java | 17 +------- 4 files changed, 4 insertions(+), 92 deletions(-) (limited to 'id/ConfigWebTool') diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java index 7510b8932..3483a8453 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OAGeneralConfig.java @@ -59,7 +59,6 @@ public class OAGeneralConfig { private String friendlyName = null; private boolean businessService = false; - private boolean storkService = false; private String target = null; private String target_subsector = null; @@ -71,8 +70,7 @@ public class OAGeneralConfig { private String identificationNumber = null; private String identificationType = null; private static List identificationTypeList = null; - private String storkSPTargetCountry = null; - + private String aditionalAuthBlockText = null; private String mandateProfiles = null; @@ -164,14 +162,6 @@ public class OAGeneralConfig { else businessService = false; - if (dbOAConfig.getType().equals(Constants.MOA_CONFIG_STORKSERVICE)) - storkService = true; - else - storkService = false; - - if (dbOAConfig.getStorkSPTargetCountry() != null) - storkSPTargetCountry = dbOAConfig.getStorkSPTargetCountry(); - AuthComponentOA oaauth = dbOAConfig.getAuthComponentOA(); if (oaauth != null) { @@ -334,14 +324,6 @@ public class OAGeneralConfig { return identificationNumber; } - public String getStorkSPTargetCountry() { - return storkSPTargetCountry; - } - - public void setStorkSPTargetCountry(String storkSPTargetCountry) { - this.storkSPTargetCountry = storkSPTargetCountry; - } - public void setIdentificationNumber(String identificationNumber) { this.identificationNumber = identificationNumber; } @@ -382,14 +364,6 @@ public class OAGeneralConfig { return businessService; } - public boolean isStorkService() { - return storkService; - } - - public void setStorkService(boolean storkService) { - this.storkService = storkService; - } - public void setBusinessService(boolean businessService) { this.businessService = businessService; } diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java index b2bf58f1a..cb3a2a1ff 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java @@ -667,7 +667,6 @@ public class EditGeneralConfigAction extends BasicAction { */ public void setMoaconfig(GeneralMOAIDConfig moaconfig) { this.moaconfig = moaconfig; - log.error("MOA CONFIG SET"); } /** @@ -686,7 +685,6 @@ public class EditGeneralConfigAction extends BasicAction { */ public void setStorkconfig(GeneralStorkConfig storkconfig) { this.storkconfig = storkconfig; - log.error("STORK CONFIG SET"); } /** diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java index 37d23e798..cc2cf3bf0 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java @@ -68,10 +68,8 @@ public class EditOAAction extends BasicAction { private String formID; private boolean onlyBusinessService = false; - private boolean onlyStorkService = false; private boolean subTargetSet = false; private boolean deaktivededBusinessService = false; - private boolean deactivatedStorkService = false; private boolean isMetaDataRefreshRequired = false; private String nextPage; @@ -736,18 +734,7 @@ public class EditOAAction extends BasicAction { dboa.setPublicURLPrefix(generalOA.getIdentifier()); - if (generalOA.isStorkService() || onlyStorkService) { - dboa.setType(Constants.MOA_CONFIG_STORKSERVICE); - dboa.setStorkSPTargetCountry(generalOA.getStorkSPTargetCountry()); - - - IdentificationNumber idnumber = new IdentificationNumber(); - idnumber.setValue(Constants.PREFIX_STORK + "AT+" + generalOA.getStorkSPTargetCountry()); - idnumber.setType(Constants.BUSINESSSERVICENAMES.get(generalOA.getIdentificationType())); - - authoa.setIdentificationNumber(idnumber); - - } else if (generalOA.isBusinessService() || onlyBusinessService) { + if (generalOA.isBusinessService() || onlyBusinessService) { dboa.setType(Constants.MOA_CONFIG_BUSINESSSERVICE); @@ -1085,13 +1072,10 @@ public class EditOAAction extends BasicAction { if (bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_FN) || bpk.startsWith(Constants.IDENIFICATIONTYPE_BASEID_ZVR) || bpk.startsWith(Constants.IDENIFICATIONTYPE_STORK)) { onlyBusinessService = true; generalOA.setBusinessService(true); - } else if (bpk.startsWith(Constants.IDENIFICATIONTYPE_STORK)) { // TODO - onlyStorkService = true; - generalOA.setStorkService(true); } deaktivededBusinessService = true; - deactivatedStorkService = true; + String[] split = bpk.split("\\+"); generalOA.setIdentificationType(split[1].substring(1)); @@ -1218,20 +1202,6 @@ public class EditOAAction extends BasicAction { return onlyBusinessService; } - /** - * @param onlyStorkService the onlyStorkService to set - */ - public void setOnlyStorkService(boolean onlyStorkService) { - this.onlyStorkService = onlyStorkService; - } - - /** - * @return the onlyStorkService - */ - public boolean isOnlyStorkService() { - return onlyStorkService; - } - /** * @param onlyBusinessService the onlyBusinessService to set */ @@ -1261,21 +1231,6 @@ public class EditOAAction extends BasicAction { return deaktivededBusinessService; } - /** - * @return the deactivatedStorkService - */ - public boolean isDeactivatedStorkService() { - return deactivatedStorkService; - } - - /** - * @param deactivatedStorkService the deactivatedStorkService to set - */ - - public void setDeactivatedStorkService(boolean deactivatedStorkService) { - - this.deactivatedStorkService = deactivatedStorkService; - } /** * @param deaktivededBusinessService the deaktivededBusinessService to set diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java index 92bdc2052..7b68f04d8 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAGeneralConfigValidation.java @@ -174,23 +174,8 @@ public class OAGeneralConfigValidation { boolean businessservice = form.isBusinessService(); - boolean storkservice = form.isStorkService(); - if (storkservice) { - check = form.getStorkSPTargetCountry(); - if ((check==null)||(check.length() < 1)) { - log.warn("Stork target country is not known"); - errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget", request)); - } - - if (check.length() > 10) { - log.warn("Incorrect size of Stork target country, too many characters"); - errors.add(LanguageHelper.getErrorString("validation.general.stork.sptargetsize", request)); - } - - - - } else if (businessservice) { + if (businessservice) { //check identification type check = form.getIdentificationType(); -- cgit v1.2.3