diff options
author | pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-10-19 10:04:39 +0000 |
---|---|---|
committer | pdanner <pdanner@d688527b-c9ab-4aba-bd8d-4036d912da1d> | 2007-10-19 10:04:39 +0000 |
commit | 6f2ee1010dac8d42aba52d33a716a91a50f1f136 (patch) | |
tree | d3a6f9eba2e4f287c52d522de5935280b5d05d1b /id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id | |
parent | 04c84754f2898848a0ac61f4bf2d4412b6600d19 (diff) | |
download | moa-id-spss-6f2ee1010dac8d42aba52d33a716a91a50f1f136.tar.gz moa-id-spss-6f2ee1010dac8d42aba52d33a716a91a50f1f136.tar.bz2 moa-id-spss-6f2ee1010dac8d42aba52d33a716a91a50f1f136.zip |
Changed language of mandate SAML-attributes
git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1026 d688527b-c9ab-4aba-bd8d-4036d912da1d
Diffstat (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id')
3 files changed, 18 insertions, 18 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index bf5bd70bd..bac66eeab 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -1096,7 +1096,7 @@ public class AuthenticationServer implements MOAIDAuthConstants { boolean keepAssertion = false; try { String boolStr = AuthConfigurationProvider.getInstance().getGenericConfigurationParameter("AuthenticationServer.KeepAssertion"); - if ((null!=boolStr && boolStr.equalsIgnoreCase("true"))) keepAssertion = true;//Only allowed for debug purposes!!! + if (null!=boolStr && boolStr.equalsIgnoreCase("true")) keepAssertion = true;//Only allowed for debug purposes!!! } catch (ConfigurationException ex) { throw new AuthenticationException("1205", new Object[] { samlArtifact, ex.toString()}); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java index 80ef7c304..bfbbaede6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepInputProcessorImpl.java @@ -185,7 +185,7 @@ public class ParepInputProcessorImpl implements ParepInputProcessor{ }
if (!ParepUtils.isEmpty(locErrortext)) error = error + locErrortext;
if (!ParepUtils.isEmpty(error)) {
- error = "<div class=\"errortext\"> <img alt=\" Angabe bitte ergänzen oder richtig stellen! \" src=\"img/rufezeichen.gif\" width=\"10\" height=\"16\" /> " + error + "</div>";
+ error = "<div class=\"errortext\"> <img alt=\"Rufezeichen\" src=\"img/rufezeichen.gif\" width=\"10\" height=\"16\" /> " + error + "</div>";
}
form = loadForm(physical, familyName, givenName, dateOfBirth, streetName, buildingNumber, unit, postalCode, municipality, cbFullName, cbIdentificationType, cbIdentificationValue, error);
if (form == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java index cfe84dbc2..30a8da50c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/ParepValidator.java @@ -64,7 +64,7 @@ public class ParepValidator implements InfoboxValidator { private String form = null;
/** unspecified error of parep-validator (must not know more about)*/
- private final static String COMMON_ERROR = "Es ist ein Fehler bei der Überprüfung für berufliche Parteienvetretung aufgetreten";
+ private final static String COMMON_ERROR = "Es ist ein Fehler bei der Überprüfung für berufsmäßige Parteienvetretung aufgetreten";
/** Default class to gather remaining mandator data. */
public final static String PAREP_INPUT_PROCESSOR = "at.gv.egovernment.moa.id.auth.validator.parep.ParepInputProcessorImpl";
@@ -73,17 +73,17 @@ public class ParepValidator implements InfoboxValidator { public final static String PAREP_INPUT_TEMPLATE = "/resources/templates/ParepMinTemplate.html";
/** kind of representation text in AUTH block*/
- public final static String STANDARD_REPRESENTATION_TEXT = "beruflicher Parteienvertreter";
+ public final static String STANDARD_REPRESENTATION_TEXT = "berufsmäßige(r) Parteienvertreter(in)";
/** Names of the produced SAML-attributes. */
- public final static String EXT_SAML_MANDATE_RAW = "Vollmacht";
- public final static String EXT_SAML_MANDATE_NAME = "MachtgeberName";
- public final static String EXT_SAML_MANDATE_DOB = "MachtgeberGeburtsdatum";
- public final static String EXT_SAML_MANDATE_WBPK = "MachtgeberWbpk";
- public final static String EXT_SAML_MANDATE_REPRESENTATIONTYPE = "VertretungsArt";
+ public final static String EXT_SAML_MANDATE_RAW = "Mandate";
+ public final static String EXT_SAML_MANDATE_NAME = "MandatorName";
+ public final static String EXT_SAML_MANDATE_DOB = "MandatorDateOfBirth";
+ public final static String EXT_SAML_MANDATE_WBPK = "MandatorWbpk";
+ public final static String EXT_SAML_MANDATE_REPRESENTATIONTYPE = "RepresentationType";
/** register and register number for non physical persons - the domain identifier for business applications*/
- public final static String EXT_SAML_MANDATE_CB_BASE_ID = "MachtgeberRegisternummer";
+ public final static String EXT_SAML_MANDATE_CB_BASE_ID = "MandatorDomainIdentifier";
/**
* Parses the XML configuration element and creates the validators configuration
@@ -112,7 +112,7 @@ public class ParepValidator implements InfoboxValidator { InfoboxValidationResultImpl validationResult = new InfoboxValidationResultImpl(false, null, null);
try {
- Logger.debug("Starte Organwalter-/berufliche Parteienvertreterprüfung.");
+ Logger.debug("Starte Organwalter-/berufsmäßige Parteienvertreterprüfung.");
this.params = params;
Element mandate = extractPrimaryToken(this.params.getInfoboxTokenList());
@@ -160,7 +160,7 @@ public class ParepValidator implements InfoboxValidator { Configure(this.params.getApplicationSpecificParams());
// check if we have a configured party representative for that
if (!parepConfiguration.isPartyRepresentative(representationID)) {
- Logger.info("Kein beruflicher Parteienvertreter für MandateID \"" + representationID + "\" konfiguriert.");
+ Logger.info("Kein berufsmäßiger Parteienvertreter für MandateID \"" + representationID + "\" konfiguriert.");
validationResult.setErrorMessage("Die standardisierte Vollmacht wird von diesem Server nicht akzeptiert.");
return validationResult;
}
@@ -271,7 +271,7 @@ public class ParepValidator implements InfoboxValidator { public InfoboxValidationResult validate(Map parameters) throws ValidateException {
InfoboxValidationResultImpl validationResult = new InfoboxValidationResultImpl(false, null, null);
- Logger.debug("Intermediate processing von Organwalter-/beruflicher Parteienvertreterprüfung");
+ Logger.debug("Intermediate processing von Organwalter-/berufsmäßige Parteienvertreterprüfung");
Logger.debug("Prüfe im Formular ausgefüllte Daten...");
if (PAREP_DEBUG) Logger.debug("Got parameters from user input form: " + parameters.toString());
@@ -282,11 +282,11 @@ public class ParepValidator implements InfoboxValidator { validationResult.setErrorMessage(ParepValidator.COMMON_ERROR);
return validationResult;
}
- extendedSamlAttributes.clear();
+
addAuthBlockExtendedSamlAttributes();
validationResult.setExtendedSamlAttributes(getExtendedSamlAttributes());
validationResult.setValid(true);
- Logger.debug("Intermediate processing von Organwalter-/beruflicher Parteienvertreterprüfung erfolgreich beendet");
+ Logger.debug("Intermediate processing von Organwalter-/berufsmäßige Parteienvertreterprüfung erfolgreich beendet");
return validationResult;
}
@@ -298,7 +298,7 @@ public class ParepValidator implements InfoboxValidator { public InfoboxValidationResult validate(Element samlAssertion) throws ValidateException {
InfoboxValidationResultImpl validationResult = new InfoboxValidationResultImpl(false, null, null);
- Logger.debug("Post processing von Organwalter-/beruflicher Parteienvertreterprüfung");
+ Logger.debug("Post processing von Organwalter-/berufsmäßige Parteienvertreterprüfung");
this.form = "";
try {
@@ -375,7 +375,7 @@ public class ParepValidator implements InfoboxValidator { validationResult.setExtendedSamlAttributes(getExtendedSamlAttributes());
validationResult.setValid(true);
- Logger.debug("Post processing von Organwalter-/beruflicher Parteienvertreterprüfung erfolgreich beendet");
+ Logger.debug("Post processing von Organwalter-/berufsmäßige Parteienvertreterprüfung erfolgreich beendet");
} else {
String errorMsg = "Fehler " + response.getResultCode() + " bei Stammzahlenregister-Gateway Anfrage";
String responseInfo = response.getInfo();
@@ -548,9 +548,9 @@ public class ParepValidator implements InfoboxValidator { * name of the mandator has to be set
*/
private void addAuthBlockExtendedSamlAttributes() {
+ extendedSamlAttributes.clear();
extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(ParepValidator.EXT_SAML_MANDATE_REPRESENTATIONTYPE, parepConfiguration.getRepresentationText(representationID), SZRGWConstants.MANDATE_NS, ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY));
Element mandator = request.getMandator();
- extendedSamlAttributes.clear();
// Name
String name = ParepUtils.extractMandatorName(mandator);
extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(ParepValidator.EXT_SAML_MANDATE_NAME, name, SZRGWConstants.MANDATE_NS, ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY));
|