Merge branch 'nightlyBuild' of gitlab.iaik.tugraz.at:egiz/eaaf_components into nightlyBuild

2 files changed, 9 insertions, 6 deletions

diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
index cf411af8..2e70770e 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/data/ExtendedPvpAttributeDefinitions.java
@@ -46,6 +46,9 @@ public interface ExtendedPvpAttributeDefinitions extends PvpAttributeDefinitions
   String EID_AUTHBLOCK_SIGNED_NAME = "urn:eidgvat:attributes.authblock.signed";
   String EID_AUTHBLOCK_SIGNED_FRIENDLY_NAME = "userAuthBlock";
 
+  String EID_TRANSACTION_ID_NAME = "urn:eidgvat:attributes.transactionId";
+  String EID_TRANSACTION_ID_FRIENDLY_NAME = "transactionId";
+  
   String EID_MIS_MANDATE_NAME = "urn:eidgvat:attributes.mis.mandate";
   String EID_MIS_MANDATE_FRIENDLY_NAME = "mandate";
 
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java
index ddc051b0..e7c968b5 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/exceptions/PendingReqIdValidationException.java
@@ -15,10 +15,10 @@ public class PendingReqIdValidationException extends EaafException {
    * Pending-Request Id validation error.
    *
    * @param internalPendingReqId Internal Pending-Request Id
-   * @param reason               error-message
+   * @param errorId               Detailed Id of the error
    */
-  public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String reason) {
-    super("process.99", new Object[] { internalPendingReqId, reason });
+  public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String errorId) {
+    super(errorId, new Object[] { internalPendingReqId});
     this.invalidInternalPendingReqId = internalPendingReqId;
 
   }
@@ -27,12 +27,12 @@ public class PendingReqIdValidationException extends EaafException {
    * Pending-Request Id validation error.
    *
    * @param internalPendingReqId Internal Pending-Request Id
-   * @param reason               error-message
+   * @param errorId              Detailed Id of the error
    * @param e                    error
    */
-  public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String reason,
+  public PendingReqIdValidationException(final String internalPendingReqId, @Nonnull final String errorId,
       final Throwable e) {
-    super("process.99", new Object[] { internalPendingReqId, reason }, e);
+    super(errorId, new Object[] { internalPendingReqId, errorId }, e);
     this.invalidInternalPendingReqId = internalPendingReqId;
   }