Merge branch 'development' into 'feature/issue_73'

# Conflicts:
#   build.gradle
#   pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java

1 files changed, 4 insertions, 5 deletions

diff --git a/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/db/Request.java b/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/db/Request.java
index 54870365..f8a169c3 100644
--- a/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/db/Request.java
+++ b/pdf-as-web-db/src/main/java/at/gv/egiz/pdfas/web/store/db/Request.java
@@ -10,8 +10,7 @@ import javax.persistence.Table;
 
 import org.hibernate.annotations.GenericGenerator;
 
-import at.gv.egiz.pdfas.api.ws.PDFASSignRequest;
-import at.gv.egiz.pdfas.web.stats.StatisticEvent;
+import at.gv.egiz.pdfas.api.processing.PdfasSignRequest;
 
 @Entity
 @Table(name = "requests")
@@ -19,7 +18,7 @@ public class Request {
 
 	private String uuid;	
 	private Date created;
-	private PDFASSignRequest signRequest;
+	private PdfasSignRequest signRequest;
 	
 	@Id
 	@GeneratedValue(generator = "uuid")
@@ -43,11 +42,11 @@ public class Request {
 	}
 	
 	@Column(name = "signRequest", nullable = false, length = 52428800)
-	public PDFASSignRequest getSignRequest() {
+	public PdfasSignRequest getSignRequest() {
 		return this.signRequest;
 	}
 
-	public void setSignRequest(PDFASSignRequest signRequest) {
+	public void setSignRequest(PdfasSignRequest signRequest) {
 		this.signRequest = signRequest;
 	}