kill off pdfover-signator

41 files changed, 89 insertions, 141 deletions

diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BKUs.java b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/BKUs.java
index be3eec4f..bcba609e 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BKUs.java
+++ b/pdf-over-commons/src/main/java/at/asit/pdfover/commons/BKUs.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.commons;
 
 /**
  * Enumeration of available BKU types
diff --git a/pdf-over-gui/pom.xml b/pdf-over-gui/pom.xml
index 671f2967..ed0e5c82 100644
--- a/pdf-over-gui/pom.xml
+++ b/pdf-over-gui/pom.xml
@@ -28,11 +28,6 @@
 		</dependency>
 		<dependency>
 			<groupId>at.a-sit</groupId>
-			<artifactId>pdf-over-signator</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>at.a-sit</groupId>
 			<artifactId>pdf-over-signer</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
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;
 
 /**
diff --git a/pdf-over-gui/src/main/resources/installer-windows/PDF-Over.aip b/pdf-over-gui/src/main/resources/installer-windows/PDF-Over.aip
index b8e619bb..b1cea354 100644
--- a/pdf-over-gui/src/main/resources/installer-windows/PDF-Over.aip
+++ b/pdf-over-gui/src/main/resources/installer-windows/PDF-Over.aip
@@ -607,7 +607,6 @@
     <ROW File="pdfboxtools2.0.25.jar" Component_="activation1.1.1.jar" FileName="PDFBOX~3.JAR|pdfbox-tools-2.0.25.jar" Attributes="0" SourcePath="lib\pdfbox-tools-2.0.25.jar" SelfReg="false" NextFile="pdfview1.0.5.1katjas.jar"/>
     <ROW File="pdfovercommons4.4.0.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~1.JAR|pdf-over-commons-4.4.0.jar" Attributes="0" SourcePath="lib\pdf-over-commons-4.4.0.jar" SelfReg="false" NextFile="pdfovergui4.4.0.jar"/>
     <ROW File="pdfovergui4.4.0.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~2.JAR|pdf-over-gui-4.4.0.jar" Attributes="0" SourcePath="lib\pdf-over-gui-4.4.0.jar" SelfReg="false" NextFile="pdfoversignator4.4.0.jar"/>
-    <ROW File="pdfoversignator4.4.0.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~3.JAR|pdf-over-signator-4.4.0.jar" Attributes="0" SourcePath="lib\pdf-over-signator-4.4.0.jar" SelfReg="false" NextFile="pdfoversigpdfas44.4.0.jar"/>
     <ROW File="pdfoversigpdfas44.4.0.jar" Component_="activation1.1.1.jar" FileName="PDF-OV~4.JAR|pdf-over-sigpdfas4-4.4.0.jar" Attributes="0" SourcePath="lib\pdf-over-sigpdfas4-4.4.0.jar" SelfReg="false" NextFile="pdfbox2.0.24.jar"/>
     <ROW File="pdfview1.0.5.1katjas.jar" Component_="activation1.1.1.jar" FileName="PDFVIE~1.JAR|pdfview-1.0.5.1-katjas.jar" Attributes="0" SourcePath="lib\pdfview-1.0.5.1-katjas.jar" SelfReg="false" NextFile="preflight2.0.25.jar"/>
     <ROW File="pkcs11cryptotoken.md" Component_="ADDITIONAL_LICENSE_INFO_74" FileName="PKCS11~1.MD|pkcs11cryptotoken.md" Attributes="0" SourcePath="jre\legal\jdk.crypto.cryptoki\pkcs11cryptotoken.md" SelfReg="false" NextFile="pkcs11wrapper.md"/>
diff --git a/pdf-over-signator/pom.xml b/pdf-over-signator/pom.xml
deleted file mode 100644
index 0641f889..00000000
--- a/pdf-over-signator/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>pdf-over</artifactId>
-		<groupId>at.a-sit</groupId>
-		<version>4.4.3-SNAPSHOT</version>
-		<relativePath>..</relativePath>
-	</parent>
-	<artifactId>pdf-over-signator</artifactId>
-	<name>PDF-Over Signator</name>
-	<properties>
-		<pdfover-build.root-dir>${project.basedir}/..</pdfover-build.root-dir>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-			<version>1.2.10</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.glassfish.jaxb</groupId>
-			<artifactId>jaxb-runtime</artifactId>
-			<version>2.4.0-b180830.0438</version>
-		</dependency>
-		<dependency>
-			<groupId>at.a-sit</groupId>
-			<artifactId>pdf-over-commons</artifactId>
-			<version>${project.parent.version}</version>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-</project>
diff --git a/pdf-over-signer/pom.xml b/pdf-over-signer/pom.xml
index 0988ada4..cf277d74 100644
--- a/pdf-over-signer/pom.xml
+++ b/pdf-over-signer/pom.xml
@@ -14,11 +14,6 @@
 	</properties>
     <dependencies>
 		<dependency>
-			<groupId>at.a-sit</groupId>
-			<artifactId>pdf-over-signator</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
 			<groupId>at.gv.egiz.pdfas</groupId>
 			<artifactId>pdf-as-lib</artifactId>
 			<version>${pdfover-build.pdfas-version}</version>
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BkuSlConnector.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/BkuSlConnector.java
index 002c457c..d91e8466 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/BkuSlConnector.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/BkuSlConnector.java
@@ -1,30 +1,32 @@
-/*

- * Copyright 2012 by A-SIT, Secure Information Technology Center Austria

- *

- * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by

- * the European Commission - subsequent versions of the EUPL (the "Licence");

- * You may not use this work except in compliance with the Licence.

- * You may obtain a copy of the Licence at:

- * http://joinup.ec.europa.eu/software/page/eupl

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the Licence is distributed on an "AS IS" basis,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the Licence for the specific language governing permissions and

- * limitations under the Licence.

- */

-package at.asit.pdfover.signator;

-

-// Imports

-

-/**

- *

- */

-public interface BkuSlConnector {

-	/**

-	 * @param request

-	 * @return SL Response

-	 * @throws SignatureException

-	 */

-	public String handleSLRequest(PdfAs4SLRequest request) throws SignatureException;

-}

+/*
+ * Copyright 2012 by A-SIT, Secure Information Technology Center Austria
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://joinup.ec.europa.eu/software/page/eupl
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ */
+package at.asit.pdfover.signer;
+
+import at.asit.pdfover.signer.pdfas.PdfAs4SLRequest;
+
+// Imports
+
+/**
+ *
+ */
+public interface BkuSlConnector {
+	/**
+	 * @param request
+	 * @return SL Response
+	 * @throws SignatureException
+	 */
+	public String handleSLRequest(PdfAs4SLRequest request) throws SignatureException;
+}
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/ByteArrayDocumentSource.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/ByteArrayDocumentSource.java
index d0fb6cfe..024722cc 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/ByteArrayDocumentSource.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/ByteArrayDocumentSource.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 //Imports
 import java.io.ByteArrayInputStream;
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/DocumentSource.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/DocumentSource.java
index 3c94f104..2276c257 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/DocumentSource.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/DocumentSource.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/Emblem.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/Emblem.java
index 7f2e305c..c045169a 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/Emblem.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/Emblem.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 // Imports
 import at.asit.pdfover.commons.Constants;
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/PDFFileDocumentSource.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/PDFFileDocumentSource.java
index ea9fe5fb..7dc5ef6a 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/PDFFileDocumentSource.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/PDFFileDocumentSource.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 // Imports
 import java.io.File;
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignResult.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/SignResult.java
index 91bce421..d9aa5075 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignResult.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/SignResult.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 //Imports
 import java.security.cert.X509Certificate;
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureException.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/SignatureException.java
index 0ac6534b..87b37dfe 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignatureException.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/SignatureException.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 //Imports
 
diff --git a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignaturePosition.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/SignaturePosition.java
index 5d0f0457..81871506 100644
--- a/pdf-over-signator/src/main/java/at/asit/pdfover/signator/SignaturePosition.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/SignaturePosition.java
@@ -13,7 +13,7 @@
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
  */
-package at.asit.pdfover.signator;
+package at.asit.pdfover.signer;
 
 //Imports
 
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
index 4c87542d..533a0487 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4BKUSLConnector.java
@@ -22,8 +22,8 @@ import javax.xml.bind.JAXBException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-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.exceptions.PdfAs4SLRequestException;
 import at.gv.egiz.pdfas.common.exceptions.PDFIOException;
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
index a41f2378..45dc2724 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Helper.java
@@ -21,7 +21,7 @@ import java.io.File;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.asit.pdfover.signator.SignatureException;
+import at.asit.pdfover.signer.SignatureException;
 import at.gv.egiz.pdfas.lib.api.PdfAs;
 import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
 
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
index 20c919f2..785d6089 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SLRequest.java
@@ -15,8 +15,7 @@
  */
 package at.asit.pdfover.signer.pdfas;
 
-// Imports
-import at.asit.pdfover.signator.ByteArrayDocumentSource;
+import at.asit.pdfover.signer.ByteArrayDocumentSource;
 import at.asit.pdfover.signer.pdfas.exceptions.PdfAs4SLRequestException;
 
 /**
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
index 745f10ea..e45de3fa 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SignatureParameter.java
@@ -28,14 +28,14 @@ import java.util.Locale;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import at.asit.pdfover.signator.BKUs;
-import at.asit.pdfover.signator.DocumentSource;
-import at.asit.pdfover.signator.Emblem;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.DocumentSource;
+import at.asit.pdfover.signer.Emblem;
+import at.asit.pdfover.signer.SignaturePosition;
 import at.gv.egiz.pdfas.lib.api.Configuration;
 import at.gv.egiz.pdfas.lib.api.PdfAs;
 import at.gv.egiz.pdfas.lib.api.PdfAsFactory;
 import at.gv.egiz.pdfas.lib.api.sign.SignParameter;
+import at.asit.pdfover.commons.BKUs;
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.commons.Profile;
 
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
index e0790dfc..80a7e14d 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4Signer.java
@@ -7,10 +7,10 @@ import javax.activation.DataSource;
 
 import at.asit.pdfover.commons.Constants;
 import at.asit.pdfover.commons.Profile;
-import at.asit.pdfover.signator.ByteArrayDocumentSource;
-import at.asit.pdfover.signator.SignResult;
-import at.asit.pdfover.signator.SignatureException;
-import at.asit.pdfover.signator.SignaturePosition;
+import at.asit.pdfover.signer.ByteArrayDocumentSource;
+import at.asit.pdfover.signer.SignResult;
+import at.asit.pdfover.signer.SignatureException;
+import at.asit.pdfover.signer.SignaturePosition;
 import at.gv.egiz.pdfas.common.exceptions.PDFASError;
 import at.gv.egiz.pdfas.common.exceptions.PdfAsException;
 import at.gv.egiz.pdfas.lib.api.ByteArrayDataSource;
diff --git a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
index 2192f380..3ff0f75a 100644
--- a/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
+++ b/pdf-over-signer/src/main/java/at/asit/pdfover/signer/pdfas/PdfAs4SigningState.java
@@ -18,8 +18,8 @@ package at.asit.pdfover.signer.pdfas;
 //Imports
 import java.io.ByteArrayOutputStream;
 
-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.gv.egiz.pdfas.common.exceptions.PDFASError;
 import at.gv.egiz.pdfas.lib.api.sign.IPlainSigner;
 import at.gv.egiz.pdfas.lib.api.sign.SignParameter;
diff --git a/pom.xml b/pom.xml
index 3b373236..1038d658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,6 @@
 	<modules>
 		<module>pdf-over-commons</module>
 		<module>pdf-over-gui</module>
-		<module>pdf-over-signator</module>
 		<module>pdf-over-signer</module>
 	</modules>