aboutsummaryrefslogtreecommitdiff
path: root/id/ConfigWebTool/src/main
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2013-11-27 14:53:10 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2013-11-27 14:53:10 +0100
commit9b3f7876fe480698d2da970b0b1ca6de0874ec48 (patch)
tree7d82380c03c209322df84b8ea5cb790bb82955ff /id/ConfigWebTool/src/main
parentae9711c0bf2fab5a52c9ed305cc8d020df2f0041 (diff)
downloadmoa-id-spss-9b3f7876fe480698d2da970b0b1ca6de0874ec48.tar.gz
moa-id-spss-9b3f7876fe480698d2da970b0b1ca6de0874ec48.tar.bz2
moa-id-spss-9b3f7876fe480698d2da970b0b1ca6de0874ec48.zip
BugFix:
@ConfigurationTool: - Set identification types in case of businesses applications (Firmenbuchnummer, Vereinsnummer, ERjBnummer) @ MOA-ID: - Set identification types in case of businesses applications if identification type is empty(Firmenbuchnummer, Vereinsnummer, ERjBnummer) - SAML1 Assertion: hide BaseID only if the BaseID is included - STORK Configuration: Nullpointer exception if not STORK config is found.
Diffstat (limited to 'id/ConfigWebTool/src/main')
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java3
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java13
2 files changed, 13 insertions, 3 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
index 9dc49bba8..c5ea0acd1 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/Constants.java
@@ -47,8 +47,11 @@ public class Constants {
public static final String PUBLICSERVICE_URL_POSTFIX = ".gv.at";
public static final String IDENIFICATIONTYPE_FN = "FN";
+ public static final String IDENIFICATIONTYPE_FN_TYPE = "Firmenbuchnummer";
public static final String IDENIFICATIONTYPE_ERSB = "ERSB";
+ public static final String IDENIFICATIONTYPE_ERSB_TYPE = "ERJPZahl";
public static final String IDENIFICATIONTYPE_ZVR = "ZVR";
+ public static final String IDENIFICATIONTYPE_ZVR_TYPE = "Vereinsnummer";
public static final String IDENIFICATIONTYPE_BASEID = "urn:publicid:gv.at:baseid+";
public static final String IDENIFICATIONTYPE_BASEID_FN = IDENIFICATIONTYPE_BASEID + "X" + IDENIFICATIONTYPE_FN;
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
index 04b4da19a..5bde5dd66 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
@@ -747,27 +747,34 @@ ServletResponseAware {
dboa.setType(Constants.MOA_CONFIG_BUSINESSSERVICE);
String num = generalOA.getIdentificationNumber().replaceAll(" ", "");
+ String type = null;
if (num.startsWith(Constants.IDENIFICATIONTYPE_FN)) {
num = num.substring(Constants.IDENIFICATIONTYPE_FN.length());
num = at.gv.egovernment.moa.util.StringUtils.deleteLeadingZeros(num);
//num = StringUtils.leftPad(num, 7, '0');
+ type = Constants.IDENIFICATIONTYPE_FN_TYPE;
}
- if (num.startsWith(Constants.IDENIFICATIONTYPE_ZVR))
+ if (num.startsWith(Constants.IDENIFICATIONTYPE_ZVR)) {
num = num.substring(Constants.IDENIFICATIONTYPE_ZVR.length());
+ type = Constants.IDENIFICATIONTYPE_ZVR_TYPE;
+ }
- if (num.startsWith(Constants.IDENIFICATIONTYPE_ERSB))
+ if (num.startsWith(Constants.IDENIFICATIONTYPE_ERSB)) {
num = num.substring(Constants.IDENIFICATIONTYPE_ERSB.length());
+ type = Constants.IDENIFICATIONTYPE_ERSB_TYPE;
+ }
IdentificationNumber idnumber = new IdentificationNumber();
+ idnumber.setType(type);
idnumber.setValue(
Constants.PREFIX_WPBK +
generalOA.getIdentificationType() +
"+" +
num);
-
+
authoa.setIdentificationNumber(idnumber);
}