A lot of moa sig stuff

1 files changed, 10 insertions, 15 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
index bc949fa..2109b35 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/xmlbind/VerifyXMLSignatureResponseBuilder.java
@@ -32,9 +32,9 @@ import org.w3c.dom.DocumentFragment;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import at.gv.egovernment.moa.util.Base64Utils;
-import at.gv.egovernment.moa.util.Constants;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moaspss.logging.Logger;
+import at.gv.egovernment.moaspss.util.Base64Utils;
+import at.gv.egovernment.moaspss.util.Constants;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.MOASystemException;
 import at.gv.egovernment.moa.spss.api.common.Content;
@@ -137,23 +137,18 @@ public class VerifyXMLSignatureResponseBuilder {
 		ResponseBuilderUtils.addCodeInfoElement(responseDoc, responseElem, "CertificateCheck",
 				response.getCertificateCheck().getCode(), response.getCertificateCheck().getInfo());
 
-		try {
-			if (ConfigurationProvider.getInstance().getAdesFormResults() && response.getAdESFormResults() != null) {
+		if (response.getAdESFormResults() != null) {
 
-				Iterator formIterator = response.getAdESFormResults().iterator();
+			Iterator formIterator = response.getAdESFormResults().iterator();
 
-				while (formIterator.hasNext()) {
-					AdESFormResults adESFormResult = (AdESFormResults) formIterator.next();
-					// add the CertificateCheck
-					ResponseBuilderUtils.addFormCheckElement(responseDoc, responseElem, "FormCheckResult",
-							adESFormResult.getCode().intValue(), adESFormResult.getName());
+			while (formIterator.hasNext()) {
+				AdESFormResults adESFormResult = (AdESFormResults) formIterator.next();
+				// add the CertificateCheck
+				ResponseBuilderUtils.addFormCheckElement(responseDoc, responseElem, "FormCheckResult",
+						adESFormResult.getCode().intValue(), adESFormResult.getName());
 
-				}
 			}
-		} catch (ConfigurationException e) {
-			Logger.warn("Failed to access configuration to determine if we should return AdES Form Results");
 		}
-
 		return responseDoc;
 	}