diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-04-02 17:31:57 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-04-02 17:31:57 +0200 |
| commit | 449595209b9eef4dc5ac161663593fe4a25a64f1 (patch) | |
| tree | d9484185bdf1ca5cccb7a28ba130fb0e82e9e198 /id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java | |
| parent | 88090f446e0289d5ad303e07ce6ddb48daffff32 (diff) | |
| parent | 5d1bbe135b0d8d9ff0d8934f9d0a4311b61f46fb (diff) | |
| download | moa-id-spss-449595209b9eef4dc5ac161663593fe4a25a64f1.tar.gz moa-id-spss-449595209b9eef4dc5ac161663593fe4a25a64f1.tar.bz2 moa-id-spss-449595209b9eef4dc5ac161663593fe4a25a64f1.zip | |
Add new language selection
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/LanguageHelper.java
Diffstat (limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java')
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java | 12 |
1 files changed, 7 insertions, 5 deletions
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 18b6a2d22..b26f2d9d5 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 @@ -27,6 +27,8 @@ import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.List; +import javax.servlet.http.HttpServletRequest; + import org.apache.log4j.Logger; import at.gv.egovernment.moa.id.configuration.data.oa.OAPVP2Config; @@ -39,7 +41,7 @@ public class OAPVP2ConfigValidation { private static final Logger log = Logger.getLogger(OAPVP2ConfigValidation.class); - public List<String> validate(OAPVP2Config form) { + public List<String> validate(OAPVP2Config form, HttpServletRequest request) { List<String> errors = new ArrayList<String>(); try { @@ -50,13 +52,13 @@ public class OAPVP2ConfigValidation { if (MiscUtil.isNotEmpty(check)) { if (!ValidationHelper.validateURL(check)) { log.info("MetaDataURL has no valid form."); - errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.valid")); + errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.valid", request)); } else { metadata = FileUtils.readURL(check); if (MiscUtil.isEmpty(metadata)) { log.info("Filecontent can not be read form MetaDataURL."); - errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read")); + errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read", request)); } } } @@ -86,11 +88,11 @@ public class OAPVP2ConfigValidation { } catch (CertificateException e) { log.info("Uploaded Certificate can not be found", e); - errors.add(LanguageHelper.getErrorString("validation.pvp2.certificate.notfound")); + errors.add(LanguageHelper.getErrorString("validation.pvp2.certificate.notfound", request)); } catch (IOException e) { log.info("Metadata can not be loaded from URL", e); - errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read")); + errors.add(LanguageHelper.getErrorString("validation.pvp2.metadataurl.read", request)); // } catch (MetadataProviderException e) { // log.info("MetaDate verification failed"); |