diff options
| author | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-09-30 14:24:16 +0200 |
|---|---|---|
| committer | Jakob Heher <jakob.heher@iaik.tugraz.at> | 2022-09-30 14:24:16 +0200 |
| commit | 9a513d43b310f2e6283fa195a8aa11493a7dcb2c (patch) | |
| tree | 2038e303e454004ed719cfebe2dfb554571b86b5 /pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku | |
| parent | 96ba5fe6185cfdeb326ae3148ce88f299e41ef25 (diff) | |
| download | pdf-over-9a513d43b310f2e6283fa195a8aa11493a7dcb2c.tar.gz pdf-over-9a513d43b310f2e6283fa195a8aa11493a7dcb2c.tar.bz2 pdf-over-9a513d43b310f2e6283fa195a8aa11493a7dcb2c.zip | |
kill off pdfover-signator
Diffstat (limited to 'pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku')
3 files changed, 13 insertions, 14 deletions
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java index 5aeea741..ffd924f6 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/LocalBKUConnector.java @@ -32,8 +32,8 @@ import org.slf4j.LoggerFactory; import at.asit.pdfover.commons.Constants;
import at.asit.pdfover.gui.utils.FileUploadSource;
-import at.asit.pdfover.signator.BkuSlConnector;
-import at.asit.pdfover.signator.SignatureException;
+import at.asit.pdfover.signer.BkuSlConnector;
+import at.asit.pdfover.signer.SignatureException;
import at.asit.pdfover.signer.pdfas.PdfAs4SLRequest;
/**
@@ -69,15 +69,14 @@ public class LocalBKUConnector implements BkuSlConnector { HttpClient client = BKUHelper.getHttpClient();
PostMethod method = new PostMethod(Constants.LOCAL_BKU_URL);
- String sl_request = request.getRequest();
- if (request.getSignatureData() == null) {
+ String sl_request = request.request;
+ if (request.signatureData == null) {
method.addParameter("XMLRequest", sl_request);
} else {
StringPart xmlpart = new StringPart(
"XMLRequest", sl_request, "UTF-8");
- FilePart filepart = new FilePart("fileupload",
- new FileUploadSource(request.getSignatureData()));
+ FilePart filepart = new FilePart("fileupload", new FileUploadSource(request.signatureData));
Part[] parts = { xmlpart, filepart };
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java index 2fa5a8e5..c17451ed 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/MobileBKUConnector.java @@ -23,8 +23,8 @@ import at.asit.pdfover.commons.Constants; import at.asit.pdfover.gui.bku.mobile.ATrustHandler;
import at.asit.pdfover.gui.bku.mobile.ATrustStatus;
import at.asit.pdfover.gui.workflow.states.MobileBKUState;
-import at.asit.pdfover.signator.BkuSlConnector;
-import at.asit.pdfover.signator.SignatureException;
+import at.asit.pdfover.signer.BkuSlConnector;
+import at.asit.pdfover.signer.SignatureException;
import at.asit.pdfover.signer.pdfas.PdfAs4SLRequest;
import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
@@ -48,7 +48,7 @@ public class MobileBKUConnector implements BkuSlConnector { }
/** (non-Javadoc)
- * @see at.asit.pdfover.signator.BkuSlConnector#handleSLRequest(java.lang.String)
+ * @see at.asit.pdfover.signer.BkuSlConnector#handleSLRequest(java.lang.String)
*/
@Override
public String handleSLRequest(PdfAs4SLRequest request) throws SignatureException {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java index e639323d..8697399d 100644 --- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java +++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/bku/mobile/ATrustHandler.java @@ -293,21 +293,21 @@ public class ATrustHandler { PostMethod post = new PostMethod(mobileBKUUrl);
String sl_request;
- if (request.getSignatureData() != null) {
- sl_request = request.getRequest();
+ if (request.signatureData != null) {
+ sl_request = request.request;
StringPart xmlpart = new StringPart(
"XMLRequest", sl_request, "UTF-8");
FilePart filepart = new FilePart("fileupload",
- new FileUploadSource(request.getSignatureData()),
+ new FileUploadSource(request.signatureData),
"application/pdf", "UTF-8");
Part[] parts = { xmlpart, filepart };
post.setRequestEntity(new MultipartRequestEntity(parts, post
.getParams()));
- } else { /* TODO is this ever false? */
- sl_request = request.getRequest();
+ } else {
+ sl_request = request.request;
post.addParameter("XMLRequest", sl_request);
}
log.trace("SL Request: " + sl_request);
|