kill off pdfover-signator

21 files changed, 35 insertions, 36 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);

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/BKUArgument.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/BKUArgument.java
index 689462b2..e69383f7 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/BKUArgument.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/cliarguments/BKUArgument.java
@@ -16,8 +16,8 @@
 package at.asit.pdfover.gui.cliarguments;
 
 import at.asit.pdfover.gui.exceptions.InitializationException;
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.commons.Messages;
-import at.asit.pdfover.signator.BKUs;
 
 /**
  * CLI Argument to set the BKU to use
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
index 58d2ee43..5c1dad35 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/BKUSelectionComposite.java
@@ -30,11 +30,11 @@ import org.eclipse.swt.widgets.Composite;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.gui.controls.ClickableCanvas;
 import at.asit.pdfover.gui.utils.SWTUtils;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.BKUs;
 
 /**
  * Composite for BKU selection
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java
index ceb0b7bb..12fe2cb9 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/OutputComposite.java
@@ -49,7 +49,7 @@ import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.gui.utils.SWTUtils;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.DocumentSource;
+import at.asit.pdfover.signer.DocumentSource;
 
 /**
  * GUI component for Output State
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
index 7a08f12c..1953a035 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/PositioningComposite.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.gui.utils.SWTUtils;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.SignaturePosition;
 
 /**
  * Composite which allows to position the signature on a preview of the document
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
index dd2275ec..20c8fdfd 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/AdvancedConfigurationComposite.java
@@ -39,6 +39,7 @@ import org.eclipse.swt.widgets.Text;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.commons.Profile;
@@ -53,7 +54,6 @@ import at.asit.pdfover.gui.utils.SWTUtils;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
 import at.asit.pdfover.gui.workflow.config.ConfigurationDataInMemory;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.BKUs;
 
 /**
  * Composite for advanced configuration
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
index 964966da..8437dbc3 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/composites/configuration/SimpleConfigurationComposite.java
@@ -63,7 +63,7 @@ import at.asit.pdfover.gui.utils.SWTUtils;
 import at.asit.pdfover.gui.workflow.config.ConfigurationDataInMemory;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.Emblem;
+import at.asit.pdfover.signer.Emblem;
 import at.asit.pdfover.signer.pdfas.PdfAs4SignatureParameter;
 import at.asit.pdfover.signer.pdfas.PdfAs4SignaturePlaceholder;
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/FileUploadSource.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/FileUploadSource.java
index d556ccae..b0ff16ea 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/FileUploadSource.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/utils/FileUploadSource.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
 
 import org.apache.commons.httpclient.methods.multipart.PartSource;
 
-import at.asit.pdfover.signator.DocumentSource;
+import at.asit.pdfover.signer.DocumentSource;
 
 /**
  *
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java
index a6e6c28a..ba5e5fd5 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/Status.java
@@ -21,11 +21,11 @@ import java.io.File;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.workflow.states.State;
-import at.asit.pdfover.signator.BKUs;
-import at.asit.pdfover.signator.SignResult;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.SignResult;
+import at.asit.pdfover.signer.SignaturePosition;
 import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
 
 public class Status {
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java
index 98a858d1..71cf5567 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationDataInMemory.java
@@ -28,11 +28,11 @@ import org.eclipse.swt.widgets.Display;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.gui.bku.mobile.MobileBKUHelper;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
 import at.asit.pdfover.gui.exceptions.InvalidPortException;
-import at.asit.pdfover.signator.BKUs;
 
 /**
  * Implementation of the configuration container
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java
index 51a01420..ada3970f 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/config/ConfigurationManager.java
@@ -30,6 +30,7 @@ import org.eclipse.swt.graphics.Point;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.gui.bku.mobile.MobileBKUs;
 import at.asit.pdfover.gui.exceptions.InvalidEmblemFile;
@@ -37,7 +38,6 @@ import at.asit.pdfover.gui.exceptions.InvalidPortException;
 import at.asit.pdfover.gui.utils.LocaleSerializer;
 import at.asit.pdfover.gui.workflow.config.ConfigurationDataInMemory.KeyStorePassStorageType;
 import at.asit.pdfover.commons.Messages;
-import at.asit.pdfover.signator.BKUs;
 
 /**
  * Implementation of the configuration provider and manipulator
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java
index 3d2d95b7..a86e68b3 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/BKUSelectionState.java
@@ -23,11 +23,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import at.asit.pdfover.gui.MainWindow.Buttons;
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.gui.MainWindowBehavior;
 import at.asit.pdfover.gui.composites.BKUSelectionComposite;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.signator.BKUs;
 
 /**
  * Decides which BKU to use (preconfigured or let user choose)
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java
index 1d2074c7..54730b10 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/KSState.java
@@ -36,7 +36,7 @@ import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
 import at.asit.pdfover.gui.workflow.config.ConfigurationDataInMemory.KeyStorePassStorageType;
-import at.asit.pdfover.signator.SignatureException;
+import at.asit.pdfover.signer.SignatureException;
 import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
 
 /**
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
index 2d443185..d84d5a50 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/MobileBKUState.java
@@ -23,7 +23,7 @@ import java.util.TimerTask;
 

 // Imports

 import at.asit.pdfover.gui.exceptions.ATrustConnectionException;

-import at.asit.pdfover.signator.SignatureException;

+import at.asit.pdfover.signer.SignatureException;

 import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;

 

 import org.eclipse.swt.SWT;

diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
index 22a93246..082f7277 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/OpenState.java
@@ -42,7 +42,7 @@ import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.SignaturePosition;
 import at.gv.egiz.pdfas.lib.impl.placeholder.SignaturePlaceholderData;
 
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java
index e3ab559c..13b83999 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PositioningState.java
@@ -34,8 +34,8 @@ import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
-import at.asit.pdfover.signator.Emblem;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.Emblem;
+import at.asit.pdfover.signer.SignaturePosition;
 import at.asit.pdfover.signer.pdfas.PdfAs4SignatureParameter;
 import at.asit.pdfover.signer.pdfas.PdfAs4SignaturePlaceholder;
 
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
index 0d006e82..87693c19 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareConfigurationState.java
@@ -44,7 +44,7 @@ import at.asit.pdfover.gui.utils.Zipper;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.SignaturePosition;
 
 /**
  * Starting state of workflow proccess
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java
index 59cb79ba..132a134b 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/PrepareSigningState.java
@@ -32,8 +32,8 @@ import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
 import at.asit.pdfover.gui.workflow.config.ConfigurationManager;
-import at.asit.pdfover.signator.Emblem;
-import at.asit.pdfover.signator.PDFFileDocumentSource;
+import at.asit.pdfover.signer.Emblem;
+import at.asit.pdfover.signer.PDFFileDocumentSource;
 import at.asit.pdfover.signer.pdfas.PdfAs4SignatureParameter;
 import at.asit.pdfover.signer.pdfas.PdfAs4Signer;
 import at.asit.pdfover.signer.pdfas.PdfAs4SigningState;
diff --git a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
index 03afde02..b9bdc917 100644
--- a/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
+++ b/pdf-over-gui/src/main/java/at/asit/pdfover/gui/workflow/states/SigningState.java
@@ -29,7 +29,7 @@ import at.asit.pdfover.gui.controls.ErrorDialog;
 import at.asit.pdfover.commons.Messages;
 import at.asit.pdfover.gui.workflow.StateMachine;
 import at.asit.pdfover.gui.workflow.Status;
-import at.asit.pdfover.signator.SignatureException;
+import at.asit.pdfover.signer.SignatureException;
 import at.asit.pdfover.signer.pdfas.PdfAs4Signer;
 
 /**