removing storkservice config

1 files changed, 3 insertions, 28 deletions

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..d43c97aed 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<String> 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) {
@@ -219,7 +209,8 @@ public class OAGeneralConfig {
 						identificationType = split[1];
 						identificationNumber = split[2];
 					} else if (Constants.PREFIX_STORK.startsWith(split[0]) && split.length >= 2) {
-                        identificationType = split[1]; // setting at as iden category ?
+                        //identificationType = split[1]; // setting at as iden category ?
+                        identificationType = Constants.IDENIFICATIONTYPE_STORK;
                         identificationNumber = split[2]; // setting sp country as ident type -> sp ident
                     }
 				}
@@ -334,14 +325,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 +365,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;
 	}