chore(core): remove deprecated API calls and fix JavaDoc

25 files changed, 105 insertions, 119 deletions

diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
index 2f96196..86d2e54 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/DOMUtils.java
@@ -315,26 +315,6 @@ public class DOMUtils {
    *
    * @param inputStream                       The <code>InputStream</code>
    *                                          containing the XML document.
-   * @param validating                        If <code>true</code>, parse
-   *                                          validating.
-   * @param externalSchemaLocations           A <code>String</code> containing
-   *                                          namespace URI to schema location
-   *                                          pairs, the same way it is accepted
-   *                                          by the <code>xsi:
-   * schemaLocation</code>                 attribute.
-   * @param externalNoNamespaceSchemaLocation The schema location of the schema
-   *                                          for elements without a namespace,
-   *                                          the same way it is accepted by the
-   *                                          <code>xsi:noNamespaceSchemaLocation</code>
-   *                                          attribute.
-   * @param entityResolver                    An <code>EntityResolver</code> to
-   *                                          resolve external entities (schemas
-   *                                          and DTDs). If <code>null</code>, it
-   *                                          will not be set.
-   * @param errorHandler                      An <code>ErrorHandler</code> to
-   *                                          decide what to do with parsing
-   *                                          errors. If <code>null</code>, it
-   *                                          will not be set.
    * @return The parsed XML document as a DOM tree.
    * @throws SAXException                 An error occurred parsing the document.
    * @throws IOException                  An error occurred reading the document.
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
index f62b82a..94ecc8b 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/KeyStoreUtils.java
@@ -202,7 +202,7 @@ public class KeyStoreUtils {
   /**
    * Loads a keyStore without knowing the keyStore type
    *
-   * @param in       input stream
+   * @param is       input stream
    * @param password Password protecting the keyStore
    * @return keyStore loaded
    * @throws KeyStoreException     thrown if keyStore cannot be loaded
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
index f4acabf..2ab55a2 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOAErrorHandler.java
@@ -113,8 +113,8 @@ public class MOAErrorHandler extends DefaultErrorHandler {
     return new Object[] {
         e.getMessage(),
         e.getSystemId(),
-        new Integer(e.getLineNumber()),
-        new Integer(e.getColumnNumber()) };
+        Integer.valueOf(e.getLineNumber()),
+        Integer.valueOf(e.getColumnNumber()) };
   }
 
 }
\ No newline at end of file
diff --git a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
index 591495a..13133ea 100644
--- a/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
+++ b/moaSig/common/src/main/java/at/gv/egovernment/moaspss/util/MOATimer.java
@@ -70,7 +70,7 @@ public class MOATimer {
    * @param id The action ID.
    */
   public void startTiming(Object id) {
-    timemapstart.put(id, new Long(System.currentTimeMillis()));
+    timemapstart.put(id, Long.valueOf(System.currentTimeMillis()));
   }
 
   /**
@@ -79,7 +79,7 @@ public class MOATimer {
    * @param id The action ID.
    */
   public void stopTiming(Object id) {
-    timemapend.put(id, new Long(System.currentTimeMillis()));
+    timemapend.put(id, Long.valueOf(System.currentTimeMillis()));
   }
 
   /**
diff --git a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
index 34744ef..02fbeb2 100644
--- a/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
+++ b/moaSig/moa-asic/src/main/java/at/gv/egiz/asic/xmlbind/VerifyASICSignatureResponseBuilder.java
@@ -74,8 +74,7 @@ public class VerifyASICSignatureResponseBuilder {
    * element being the XML representation of the given
    * <code>VerifyCMSSignatureResponse</code> API object.
    *
-   * @param response The <code>VerifyCMSSignatureResponse</code> to convert to
-   *                 XML.
+   * @param results The <code>VerifyCMSSignatureResponse</code> to convert to XML.
    * @return A document containing the <code>VerifyCMSSignatureResponse</code> DOM
    *         element.
    * @throws MOAApplicationException An error occurred building the response.
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
index d0be7d5..5d378ce 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/SPSSFactory.java
@@ -316,7 +316,7 @@ public abstract class SPSSFactory {
    * @param profileID The profile ID to resolve during signature creation.
    * @return The <code>CreateSignatureEnvironmentProfile</code> containing the
    *         given profile ID.
-   * 
+   *
    * @pre profileID != null && profileID.length() > 0
    * @post return != null
    */
@@ -398,8 +398,7 @@ public abstract class SPSSFactory {
   /**
    * Create a new <code>SignatureEnvironmentResponse</code> object.
    *
-   * @param signatureEnvironment The signature environment containing the
-   *                             signature.
+   * @param base64value Signature as Base64 encoded data
    * @return The <code>SignatureEnvironmentResponse</code> containing the
    *         <code>signatureEnvironment</code>.
    *
@@ -959,15 +958,15 @@ public abstract class SPSSFactory {
 
   /**
    * Create a new <code>Content</code> object containing location reference data.
-   * 
+   *
    * @param locationReferenceURI a URI pointing to the actual remote location of
    *                             the content.
-   * 
+   *
    * @param referenceURI         An URI identifying the data. May be
    *                             <code>null</code>.
-   * 
+   *
    * @return The <code>Content</code> object containing the data.
-   * 
+   *
    * @pre locationReferenceURI != null
    * @post return != null
    */
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
index 3d5279f..ab73c22 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/CreateSignatureEnvironmentProfileExplicitImpl.java
@@ -32,7 +32,7 @@ import at.gv.egovernment.moa.spss.api.xmlsign.CreateSignatureLocation;
 
 /**
  * Default implementation of
- * <codeCreateSignatureEnvironmentProfileExplicit</code>.
+ * <code>CreateSignatureEnvironmentProfileExplicit</code>.
  *
  * @author Patrick Peck
  * @version $Id$
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
index d1eebca..ed6f449 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/impl/VerifyTransformsDataImpl.java
@@ -30,7 +30,7 @@ import java.util.List;
 import at.gv.egovernment.moa.spss.api.xmlverify.ReferenceInfo;
 
 /**
- * Default implementation of <codeReferenceInfo</code>.
+ * Default implementation of <code>ReferenceInfo</code>.
  *
  * @author Fatemeh Philippi
  * @version $Id$
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
         }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
index bf11240..0f1a57d 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/CRLDistributionPoint.java
@@ -50,18 +50,19 @@ public class CRLDistributionPoint extends DistributionPoint implements
 
     // create the mapping between reason code strings and their integer
     // values
-    RC_MAPPING.put("unused", new Integer(iaik.asn1.structures.DistributionPoint.unused));
-    RC_MAPPING.put("keyCompromise", new Integer(iaik.asn1.structures.DistributionPoint.keyCompromise));
-    RC_MAPPING.put("cACompromise", new Integer(iaik.asn1.structures.DistributionPoint.cACompromise));
-    RC_MAPPING.put("affiliationChanged", new Integer(
+    RC_MAPPING.put("unused", Integer.valueOf(iaik.asn1.structures.DistributionPoint.unused));
+    RC_MAPPING.put("keyCompromise", Integer.valueOf(iaik.asn1.structures.DistributionPoint.keyCompromise));
+    RC_MAPPING.put("cACompromise", Integer.valueOf(iaik.asn1.structures.DistributionPoint.cACompromise));
+    RC_MAPPING.put("affiliationChanged", Integer.valueOf(
         iaik.asn1.structures.DistributionPoint.affiliationChanged));
-    RC_MAPPING.put("superseded", new Integer(iaik.asn1.structures.DistributionPoint.superseded));
+    RC_MAPPING.put("superseded", Integer.valueOf(iaik.asn1.structures.DistributionPoint.superseded));
     RC_MAPPING.put("cessationOfOperation",
-        new Integer(iaik.asn1.structures.DistributionPoint.cessationOfOperation));
-    RC_MAPPING.put("certificateHold", new Integer(iaik.asn1.structures.DistributionPoint.certificateHold));
-    RC_MAPPING.put("privilegeWithdrawn", new Integer(
+        Integer.valueOf(iaik.asn1.structures.DistributionPoint.cessationOfOperation));
+    RC_MAPPING.put("certificateHold", Integer.valueOf(
+        iaik.asn1.structures.DistributionPoint.certificateHold));
+    RC_MAPPING.put("privilegeWithdrawn", Integer.valueOf(
         iaik.asn1.structures.DistributionPoint.privilegeWithdrawn));
-    RC_MAPPING.put("aACompromise", new Integer(iaik.asn1.structures.DistributionPoint.aACompromise));
+    RC_MAPPING.put("aACompromise", Integer.valueOf(iaik.asn1.structures.DistributionPoint.aACompromise));
   }
 
   /**
@@ -76,12 +77,12 @@ public class CRLDistributionPoint extends DistributionPoint implements
 
   /**
    * Create a <code>CRLDistributionPoint</code>.
-   * 
+   *
    * @param issuerName    The name of the CA issuing the CRL referred to by this
    *                      DP.
-   * 
+   *
    * @param uri           The URI of the distribution point.
-   * 
+   *
    * @param reasonCodeStr A list of reason codes (a space-separated enumeration).
    */
   public CRLDistributionPoint(String issuerName, String uri, String reasonCodeStr) {
@@ -101,7 +102,7 @@ public class CRLDistributionPoint extends DistributionPoint implements
   /**
    * Convert a list of reason codes provided as a <code>String</code> to a binary
    * representation.
-   * 
+   *
    * @param reasonCodeStr A <code>String</code> containing a blank-separated,
    *                      textual representation of reason codes.
    * @return int A binary representation of reason codes.
@@ -143,7 +144,7 @@ public class CRLDistributionPoint extends DistributionPoint implements
   /**
    * Return a binary representation of the reason codes of this distribution
    * point.
-   * 
+   *
    * @return The binary representation of the reason codes.
    */
   @Override
@@ -153,7 +154,7 @@ public class CRLDistributionPoint extends DistributionPoint implements
 
   /**
    * Return a <code>String</code> representation of this distribution point.
-   * 
+   *
    * @return The <code>String</code> representation of this distribution point.
    * @see java.lang.Object#toString()
    */
@@ -163,7 +164,7 @@ public class CRLDistributionPoint extends DistributionPoint implements
   }
 
   /**
-   * @see iaik.pki.revocation.CRLDistributionPoint#getIssuerName()
+   * Get CRL issuer-name.
    */
   public String getIssuerName() {
     return issuerName_;
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index ff2f9a5..09ec921 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -581,7 +581,7 @@ public class ConfigurationPartsBuilder {
         entry = new BlackListEntry(host, -1);
         info("config.34", new Object[] { host });
       } else {
-        entry = new BlackListEntry(host, new Integer(port).intValue());
+        entry = new BlackListEntry(host, Integer.valueOf(port).intValue());
         info("config.34", new Object[] { host + ":" + port });
       }
 
@@ -631,7 +631,7 @@ public class ConfigurationPartsBuilder {
         entry = new WhiteListEntry(host, -1);
         info("config.49", new Object[] { host });
       } else {
-        entry = new WhiteListEntry(host, new Integer(port).intValue());
+        entry = new WhiteListEntry(host, Integer.valueOf(port).intValue());
         info("config.49", new Object[] { host + ":" + port });
       }
 
@@ -1522,7 +1522,7 @@ public class ConfigurationPartsBuilder {
    * Returns the JDBC URL for the revocation archive database.
    *
    * @return the JDBC URL for the revocation archive database, or
-   *         <code>null</code, if the corresponding parameter is not set in the
+   *         <code>null</code>, if the corresponding parameter is not set in the
    *         configuration.
    */
   public String getRevocationArchiveJDBCURL() {
@@ -1534,7 +1534,7 @@ public class ConfigurationPartsBuilder {
    * Returns the JDBC driver class name for the revocation archive database.
    *
    * @return the JDBC driver class name for the revocation archive database, or
-   *         <code>null</code, if the corresponding parameter is not set in the
+   *         <code>null</code>, if the corresponding parameter is not set in the
    *         configuration.
    */
   public String getRevocationArchiveJDBCDriverClass() {
@@ -1780,7 +1780,7 @@ public class ConfigurationPartsBuilder {
     while ((modElem = (Element) modIter.nextNode()) != null) {
       final String x509IssuerName = getElementValue(modElem, CONF + "X509IssuerName", null);
       final String i = getElementValue(modElem, CONF + "Interval", null);
-      final Integer interval = new Integer(i);
+      final Integer interval = Integer.valueOf(i);
       map.put(ConfigurationProvider.normalizeX500Names(x509IssuerName), interval);
 
     }
@@ -1880,7 +1880,7 @@ public class ConfigurationPartsBuilder {
       final String x509IssuerName = ConfigurationProvider.normalizeX500Names(
           getElementValue(modElem, CONF + "X509IssuerName", null));
       final String i = getElementValue(modElem, CONF + "ValidityPeriod", null);
-      final Integer interval = new Integer(i);
+      final Integer interval = Integer.valueOf(i);
       map.put(x509IssuerName, interval);
       Logger.debug("Set shortTimePeriodInterval: " + interval + " for Issuer: " + x509IssuerName);
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
index b43ec2f..e5b6025 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/cmssign/CMSSignatureCreationProfileImpl.java
@@ -81,13 +81,20 @@ public class CMSSignatureCreationProfileImpl
   }
 
   /**
-   * Create a new <code>XMLSignatureCreationProfileImpl</code>.
+   * Creates a CMS based signature-creation profile.
    *
-   * @param createProfileCount Provides external information about the number of
-   *                           calls to the signature creation module, using the
-   *                           same request.
-   * @param reservedIDs        The set of IDs that must not be used while
-   *                           generating new IDs.
+   * @param keySet               Set of signing keys
+   * @param digestMethod         Hash algorithm
+   * @param signedProperties     List of signing properties
+   * @param securityLayerConform If <code>true</code> create a CAdES-B signature,
+   *                             otherwise CMS signature
+   * @param includeData          If <code>true</code> create an embedded
+   *                             signature, otherwise a detached
+   * @param mimeType             MimeType to be set
+   * @param isPAdESConform       If <code>true</code> signature fulfill PAdES
+   *                             requirements
+   * @param rsaSsaPss            If <code>true</code> use RSASSA-PSS algorithms,
+   *                             otherwise RSA#1.5
    */
   public CMSSignatureCreationProfileImpl(
       Set keySet,
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
index d1b776b..befeab7 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/CRLRetriever.java
@@ -43,7 +43,6 @@ import iaik.pki.store.revocation.RevocationStoreException;
  * A customized implementation of
  * {@link iaik.pki.store.revocation.RevocationInfoRetriever}. Will be used
  * instead of the default implementation
- * {@link iaik.pki.store.revocation.CRLRetriever} to overcome a classloader
  * problem in connection with the {@link java.net.URL} class in a Tomcat
  * deployment environment.
  *
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
index 22cceeb..0e12f89 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/config/DataBaseArchiveParameterImpl.java
@@ -28,7 +28,6 @@ import iaik.pki.store.revocation.archive.DataBaseArchiveParameters;
 /**
  * An implementation of the <code>DataBaseArchiveParameter</code> interface.
  *
- * @see iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter
  * @author Patrick Peck
  * @version $Id$
  */
@@ -46,9 +45,6 @@ public class DataBaseArchiveParameterImpl implements DataBaseArchiveParameters {
     this.jDBCUrl = jDBCUrl;
   }
 
-  /**
-   * @see iaik.pki.store.revocation.archive.db.DataBaseArchiveParameter#getJDBCUrl()
-   */
   @Override
   public String getJDBCUrl() {
     return jDBCUrl;
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
index 9ef3764..7a036ec 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/iaik/pki/store/truststore/TrustStoreProfileImpl.java
@@ -60,10 +60,9 @@ public class TrustStoreProfileImpl implements TrustStoreProfile {
   /**
    * Create a new <code>TrustStoreProfileImpl</code>.
    *
-   * @param config         The MOA configuration data, from which trust store
-   *                       configuration data is read.
-   * @param trustProfileId The trust profile id on which this
-   *                       <code>TrustStoreProfile</code> is based.
+   * @param trustProfileId  The trust profile id on which this
+   *                        <code>TrustStoreProfile</code> is based.
+   * @param trustProfileUri File path to trust profile
    * @throws MOAApplicationException The <code>trustProfileId</code> could not be
    *                                 found in the MOA configuration.
    */
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
index 19b3a12..7aca40e 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
@@ -248,7 +248,7 @@ public class CMSSignatureVerificationInvoker {
             handlePDFResult(resultObject, responseBuilder, trustProfile);
           }
         } catch (final IndexOutOfBoundsException e) {
-          throw new MOAApplicationException("2249", new Object[] { new Integer(sigIndex) });
+          throw new MOAApplicationException("2249", new Object[] { Integer.valueOf(sigIndex) });
         }
       }
     }
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CreateCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CreateCMSSignatureResponseBuilder.java
index bc5d884..bca9b8e 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CreateCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CreateCMSSignatureResponseBuilder.java
@@ -69,12 +69,12 @@ public class CreateCMSSignatureResponseBuilder {
   /**
    * Add a <code>SignatureEnvironment</code> element to the response.
    *
-   * @param signatureEnvironment The content to put under the
-   *                             <code>SignatureEnvironment</code> element. This
-   *                             should either be a <code>dsig:Signature</code>
-   *                             element (in case of a detached signature) or the
-   *                             signature environment containing the signature
-   *                             (in case of an enveloping signature).
+   * @param base64value The content to put under the
+   *                    <code>SignatureEnvironment</code> element. This should
+   *                    either be a <code>dsig:Signature</code> element (in case
+   *                    of a detached signature) or the signature environment
+   *                    containing the signature (in case of an enveloping
+   *                    signature).
    */
   public void addCMSSignature(String base64value) {
     final CMSSignatureResponse responseElement =
@@ -84,7 +84,7 @@ public class CreateCMSSignatureResponseBuilder {
 
   /**
    * Add a <code>ErrorResponse</code> element to the response.
-   * 
+   *
    * @param errorCode The error code.
    * @param info      Additional information about the error.
    */
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
index 813d28e..79b4c29 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyCMSSignatureResponseBuilder.java
@@ -74,15 +74,26 @@ public class VerifyCMSSignatureResponseBuilder {
   /**
    * Add a verification result to the response.
    *
-   * @param result         The result to add.
-   * @param trustprofile   The actual trustprofile
-   * @param checkQCFromTSL <code>true</code>, if the TSL check verifies the
-   *                       certificate as qualified, otherwise <code>false</code>.
-   * @param checkSSCD      <code>true</code>, if the TSL check verifies the
-   *                       signature based on a SSDC, otherwise
-   *                       <code>false</code>.
-   * @param sscdSourceTSL  <code>true</code>, if the SSCD information comes from
-   *                       the TSL, otherwise <code>false</code>.
+   * @param result                         The result to add.
+   * @param trustProfile                   The actual trustprofile
+   * @param checkQC                        <code>true</code>, if the TSL check
+   *                                       verifies the certificate as qualified,
+   *                                       otherwise <code>false</code>.
+   * @param qcSourceTSL                    <true> if QC info comes from the TSL,
+   *                                       otherwise <code>false</code>.
+   * @param checkSSCD                      <code>true</code>, if the TSL check
+   *                                       verifies the signature based on a SSDC,
+   *                                       otherwise <code>false</code>.
+   * @param sscdSourceTSL                  <code>true</code>, if the SSCD
+   *                                       information comes from the TSL,
+   *                                       otherwise <code>false</code>.
+   * @param issuerCountryCode              TSL issuer country
+   * @param adesResults                    Form validation results
+   * @param extendedCertificateCheckResult Extended validation results
+   * @param tslInfos                       Full TSL validation result
+   * @param extendedVerification           <code>true</code> if extended
+   *                                       validation was used, otherwise
+   *                                       <code>false</code>
    * @throws MOAException
    */
   public void addResult(CMSSignatureVerificationResult result, TrustProfile trustProfile, boolean checkQC,
@@ -150,7 +161,7 @@ public class VerifyCMSSignatureResponseBuilder {
   }
 
   /**
-   * 
+   *
    * @param result
    * @param trustProfile
    * @param checkQC
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
index 7e882ed..25ce8d1 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/VerifyXMLSignatureResponseBuilder.java
@@ -515,7 +515,7 @@ public class VerifyXMLSignatureResponseBuilder {
 
       try {
         if (refInfo.isHashCalculated() && !refInfo.isHashValid()) {
-          failedReferencesList.add(new Integer(i + 1));
+          failedReferencesList.add(Integer.valueOf(i + 1));
         }
       } catch (final HashUnavailableException e) {
         // nothing to do here because we called refInfo.isHashCalculated first
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
index 2973b36..0fb2d82 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
@@ -539,7 +539,7 @@ public class XMLSignatureVerificationInvoker {
         }
 
         if (!found) {
-          final Integer refIndex = new Integer(refData.getReferenceIndex());
+          final Integer refIndex = Integer.valueOf(refData.getReferenceIndex());
           final String logMsg = msg.getMessage("invoker.01", new Object[] { refIndex });
 
           failedReferencesList.add(refIndex);
@@ -581,8 +581,8 @@ public class XMLSignatureVerificationInvoker {
           final int[] failedReferences = new int[] { ref.getReferenceIndex() };
           final ReferencesCheckResultInfo checkInfo = factory.createReferencesCheckResultInfo(null,
               failedReferences);
-          final String logMsg = msg.getMessage("invoker.02", new Object[] { new Integer(ref
-              .getReferenceIndex()) });
+          final String logMsg = msg.getMessage("invoker.02", new Object[] {
+              Integer.valueOf(ref.getReferenceIndex()) });
 
           Logger.debug(new LogMsg(logMsg));
 
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java
index 8e37b1c..8dd2a8b 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/AdESResultUtils.java
@@ -21,8 +21,8 @@ import iaik.server.modules.resultcodes.ResultCodeValid;
 
 public class AdESResultUtils {
 
-  private static final int MAJORRESULTCODESKIPPED = new Integer(3);
-  private static final int MAJORRESULTCODEERROR = new Integer(4);
+  private static final int MAJORRESULTCODESKIPPED = Integer.valueOf(3);
+  private static final int MAJORRESULTCODEERROR = Integer.valueOf(4);
 
   public static Integer getResultCode(Integer adesCode) {
     return adesCode;
@@ -114,9 +114,9 @@ public class AdESResultUtils {
         minorInfo = "UNKNOWN_SUBFILTER";
       } else if (resultCode.getCode().equals(ResultCode.CODE_NO_SIGNER_CERTIFICATE_FOUND)) {
         minorInfo = "NO_SIGNER_CERTIFICATE_FOUND";
-        
-        
-        
+
+
+
         // pdf-as 3.x detection is removed from MOA-SP since 3.1.2
       } else if (resultCode.getCode().equals(ResultCode.PDF_AS_SIGNATURE)) {
         // minorInfo = "PDF_AS_SIGNATURE";
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
index be40a9e..221c361 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ExternalURIVerifier.java
@@ -47,7 +47,7 @@ public class ExternalURIVerifier {
             }

           } else {

             // check host and port

-            final int iport = new Integer(bport).intValue();

+            final int iport = Integer.valueOf(bport).intValue();

             if (ip.startsWith(bhost) && iport == port) {

               Logger.debug(new LogMsg("Blacklist check: " + host + ":" + port + " (" + ip + ":" + port

                   + " blacklisted"));

@@ -75,7 +75,7 @@ public class ExternalURIVerifier {
             }

           } else {

             // check host and port

-            final int iport = new Integer(bport).intValue();

+            final int iport = Integer.valueOf(bport).intValue();

             if (ip.startsWith(bhost) && iport == port) {

               Logger.debug(new LogMsg("Whitelist check: " + host + ":" + port + " (" + ip + ":" + port

                   + " whitelisted"));

diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
index 6127305..49047d7 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/ConfigurationServlet.java
@@ -62,8 +62,6 @@ public class ConfigurationServlet extends HttpServlet {
    * Handle a HTTP GET request, used to indicated that the MOA configuration needs
    * to be updated (reloaded).
    *
-   * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest,
-   *      HttpServletResponse)
    */
   @Override
   @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -125,8 +123,6 @@ public class ConfigurationServlet extends HttpServlet {
   /**
    * Do the same as <code>doGet</code>.
    *
-   * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest,
-   *      HttpServletResponse)
    */
   @Override
   public void doPost(HttpServletRequest request, HttpServletResponse response)
@@ -140,8 +136,6 @@ public class ConfigurationServlet extends HttpServlet {
    *
    * Does an initial load of the MOA configuration to test if a working web
    * service can be provided.
-   *
-   * @see javax.servlet.GenericServlet#init()
    */
   @Override
   public void init() throws ServletException {