aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-05-18 07:58:18 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-05-18 07:58:18 +0200
commitcdc61266b24c65b1f086d6246caa08457b2371bb (patch)
treeacbdf7f1087463593afb5df76037ce60b2ae9360 /id/ConfigWebTool/src/main
parentd196dc527712427d9ca865597f713a342ec01209 (diff)
downloadmoa-id-spss-cdc61266b24c65b1f086d6246caa08457b2371bb.tar.gz
moa-id-spss-cdc61266b24c65b1f086d6246caa08457b2371bb.tar.bz2
moa-id-spss-cdc61266b24c65b1f086d6246caa08457b2371bb.zip
add additional validation information in case of not unique service-provider identifier
Diffstat (limited to 'id/ConfigWebTool/src/main')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java10
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_de.properties2
-rw-r--r--id/ConfigWebTool/src/main/resources/applicationResources_en.properties2
3 files changed, 10 insertions, 4 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
index 5bc17f1ee..5022be915 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/BasicOAAction.java
@@ -305,7 +305,10 @@ public class BasicOAAction extends BasicAction {
if (onlineapplication != null) {
log.info("The OAIdentifier is not unique");
throw new BasicOAActionException(
- LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request),
+ LanguageHelper.getErrorString(
+ "validation.general.oaidentifier.notunique",
+ new Object[]{onlineapplication.getPublicURLPrefix()},
+ request),
Constants.STRUTS_ERROR_VALIDATION);
} else
@@ -328,7 +331,10 @@ public class BasicOAAction extends BasicAction {
if ( (dbOA != null && !dbOA.getHjid().equals(oaid))) {
log.info("The OAIdentifier is not unique");
throw new BasicOAActionException(
- LanguageHelper.getErrorString("validation.general.oaidentifier.notunique", request),
+ LanguageHelper.getErrorString(
+ "validation.general.oaidentifier.notunique",
+ new Object[]{dbOA.getPublicURLPrefix()},
+ request),
Constants.STRUTS_ERROR_VALIDATION);
}
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
index ab404f65b..b77097e70 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_de.properties
@@ -475,7 +475,7 @@ validation.general.identificationnumber.valid=Die Identifikationsnummer f\u00FCr
validation.general.identificationnumber.fn.valid=Die Firmenbuchnummer hat kein g\u00FCltiges Format.
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.oaidentifier.notunique=Der gew\u00E4hlte eindeutige Identifier ist bereits vorhanden (kollision mit {0}). Eine Eintragung der Online-Applikation ist nicht m\u00F6glich.
validation.general.stork.sptarget=Der STORK SP-Target ist leer.
validation.general.stork.sptargetsize=Die Definition von STORK SP-Target ist nicht korrekt: zu viele Buchstaben.
validation.general.bkuselection.filename.valid=Der Dateiname des BKU-Selektion Templates enth\u00E4lt nicht erlaubte Zeichen. Folgende Zeichen sind nicht erlaubt\: {0}
diff --git a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
index 29db35a0e..d62ce3807 100644
--- a/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
+++ b/id/ConfigWebTool/src/main/resources/applicationResources_en.properties
@@ -473,7 +473,7 @@ validation.general.identificationnumber.valid=The identification number for the
validation.general.identificationnumber.fn.valid=The identification number has invalid format.
validation.general.oaidentifier.empty=There is no unique identifier for the Online-Application provided.
validation.general.oaidentifier.valid=The unique identifier for the Online-Application is not valid URL.
-validation.general.oaidentifier.notunique=The selected unique identifier is already available. Registration of the Online-Application was not possible.
+validation.general.oaidentifier.notunique=The selected unique identifier is already available (collision with {0}). Registration of the Online-Application was not possible.
validation.general.stork.sptarget=STORK SP-Target is blank.
validation.general.stork.sptargetsize=The Definition of STORK SP-Target is incorrect: too many characters.
validation.general.bkuselection.filename.valid=The file name of CCE-selection template contains forbidden characters. The following characters are not allowed\: {0}