Merge branch 'nightlybuild' into 'master'HEAD3.3.0master

Nightlybuild

See merge request egiz/moa-sig!3

3 files changed, 12 insertions, 11 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
index 173ecbf..571977e 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/RequestParserUtils.java
@@ -62,7 +62,7 @@ public class RequestParserUtils {
 
   /**
    * Parse a <code>XMLDataObjectAssociationType</code> kind of DOM element.
-   * 
+   *
    * @param assocElem The <code>XMLDataObjectAssociationType</code> kind of DOM
    *                  elmeent to parse.
    * @return The <code>XMLDataObjectAssociation</code> API object containing the
@@ -79,7 +79,7 @@ public class RequestParserUtils {
 
   /**
    * Parse a <code>MetaInfoType</code> kind of DOM element.
-   * 
+   *
    * @param metaInfoElem The <code>MetaInfoType</code> kind of DOM element.
    * @return The <code>MetaInfo</code> API object containing the data from the
    *         <code>metaInfoElem</code>.
@@ -97,7 +97,7 @@ public class RequestParserUtils {
   /**
    * Parse a <code>ContentOptionalRefType</code> or
    * <code>ContentRequiredRefType</code> kind of DOM element.
-   * 
+   *
    * @param contentParentElem The DOM element being the parent of the content
    *                          element.
    * @return The <code>Content</code> API object containing the data from the
@@ -127,7 +127,7 @@ public class RequestParserUtils {
 
   /**
    * Get the signing time from a Verfiy(CMS|XML)SignatureRequest.
-   * 
+   *
    * @param requestElem   A <code>Verify(CMS|XML)SignatureRequest</code> DOM
    *                      element.
    * @param dateTimeXPath The XPath to lookup the <code>DateTime</code> element
@@ -162,11 +162,12 @@ public class RequestParserUtils {
 
   /**
    * Get the signing time from a Verfiy(CMS|XML)SignatureRequest.
-   * 
-   * @param requestElem   A <code>Verify(CMS|XML)SignatureRequest</code> DOM
-   *                      element.
-   * @param dateTimeXPath The XPath to lookup the <code>DateTime</code> element
-   *                      within the request.
+   *
+   * @param requestElem             A <code>Verify(CMS|XML)SignatureRequest</code>
+   *                                DOM element.
+   * @param extendedValidationXPath The XPath to lookup the <code>DateTime</code>
+   *                                element within the request.
+   * @param defaultValue            Default value if XPath value is null or empty
    * @return Date The date and time corresponding to the <code>DateTime</code>
    *         element in the request. If no <code>DateTime</code> element exists in
    *         the request, <code>null</code> is returned.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
index 1156aa1..daf3802 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/ResponseBuilderUtils.java
@@ -499,7 +499,7 @@ public class ResponseBuilderUtils {
    *                    element.
    * @param elementName The name of the newly created element.
    * @param code        The content of the <code>Code</code> subelement.
-   * @param info        The content of the <code>Info</code> subelement.
+   * @param name        The content of the <code>Info</code> subelement.
    */
   public static void addFormCheckElement(
       Document response,
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
index bcab978..1279d73 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyCMSSignatureRequestParser.java
@@ -171,7 +171,7 @@ public class VerifyCMSSignatureRequestParser {
       // put the signatories into a List
       while (tokenizer.hasMoreTokens()) {
         try {
-          signatoriesList.add(new Integer(tokenizer.nextToken()));
+          signatoriesList.add(Integer.valueOf(tokenizer.nextToken()));
         } catch (final NumberFormatException e) {
           // this cannot occur if the request has been validated
         }