From 2a9896057ee6e42a6a07bcf2ec3eae13c582e290 Mon Sep 17 00:00:00 2001 From: Bojan Suzic Date: Thu, 20 Mar 2014 15:01:17 +0100 Subject: correcting the error when defining new stork applicaiton --- id/ConfigWebTool/ConfigurationInterface.iml | 149 +++++++++++++++++---- .../validation/oa/OAGeneralConfigValidation.java | 14 +- .../main/resources/applicationResources.properties | 2 +- id/server/auth/moa-id-auth.iml | 44 +++--- id/server/idserverlib/moa-id-lib.iml | 60 ++++----- id/server/proxy/moa-id-proxy.iml | 44 +++--- 6 files changed, 210 insertions(+), 103 deletions(-) diff --git a/id/ConfigWebTool/ConfigurationInterface.iml b/id/ConfigWebTool/ConfigurationInterface.iml index af31724ca..10f5ffc26 100644 --- a/id/ConfigWebTool/ConfigurationInterface.iml +++ b/id/ConfigWebTool/ConfigurationInterface.iml @@ -39,54 +39,153 @@ - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - 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 d3a2241d3..4297492e8 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 @@ -172,14 +172,22 @@ public class OAGeneralConfigValidation { boolean businessservice = form.isBusinessService(); - - if (businessservice) { + boolean storkservice = form.isStorkService(); + + if (storkservice) { + check = form.getStorkSPTargetCountry(); + if (check.length() < 1) { + log.warn("Stork target country is not known"); + errors.add(LanguageHelper.getErrorString("")); + } + + } else if (businessservice) { //check identification type check = form.getIdentificationType(); if (!form.getIdentificationTypeList().contains(check)) { log.info("IdentificationType is not known."); - errors.add(LanguageHelper.getErrorString("validation.general.identificationtype.valid")); + errors.add(LanguageHelper.getErrorString("validation.general.stork.sptarget")); } //check identification number diff --git a/id/ConfigWebTool/src/main/resources/applicationResources.properties b/id/ConfigWebTool/src/main/resources/applicationResources.properties index 18d19c06b..1c455b287 100644 --- a/id/ConfigWebTool/src/main/resources/applicationResources.properties +++ b/id/ConfigWebTool/src/main/resources/applicationResources.properties @@ -406,7 +406,7 @@ validation.general.identificationnumber.fn.valid=Die Firmenbuchnummer hat kein g validation.general.oaidentifier.empty=Es wurde kein eindeutiger Identifier f\u00FCr die Online-Applikation angegeben. validation.general.oaidentifier.valid=Der eindeutige Identifier f\u00FCr die Online-Applikation ist keine g\u00FCltige URL. validation.general.oaidentifier.notunique=Der gew\u00E4hlte eindeutige Identifier ist bereits vorhanden. Eine Eintragung der Online-Applikation ist nicht m\u00F6glich. - +validation.general.stork.sptarget=Der STORK SP-Target ist leer. validation.general.bkuselection.filename.valid=Der Dateiname des BKU-Selektion Templates enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0} validation.general.bkuselection.file.valid=Das BKU-Selektion Templates konnte nicht geladen werden. validation.general.bkuselection.file.selected=Es kann nur EIN BKU-Selektion Template angegeben werden. diff --git a/id/server/auth/moa-id-auth.iml b/id/server/auth/moa-id-auth.iml index a82e8089d..67a88ff74 100644 --- a/id/server/auth/moa-id-auth.iml +++ b/id/server/auth/moa-id-auth.iml @@ -14,8 +14,8 @@ - - + + @@ -77,26 +77,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -114,6 +94,7 @@ + @@ -150,6 +131,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/id/server/idserverlib/moa-id-lib.iml b/id/server/idserverlib/moa-id-lib.iml index 7d8f0ec07..893a98579 100644 --- a/id/server/idserverlib/moa-id-lib.iml +++ b/id/server/idserverlib/moa-id-lib.iml @@ -1,8 +1,8 @@ - - + + @@ -13,37 +13,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -63,7 +38,13 @@ + + + + + + @@ -101,6 +82,25 @@ + + + + + + + + + + + + + + + + + + + diff --git a/id/server/proxy/moa-id-proxy.iml b/id/server/proxy/moa-id-proxy.iml index f22728405..a1bb63801 100644 --- a/id/server/proxy/moa-id-proxy.iml +++ b/id/server/proxy/moa-id-proxy.iml @@ -13,8 +13,8 @@ - - + + @@ -74,26 +74,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -111,6 +91,7 @@ + @@ -147,6 +128,25 @@ + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3