7 files changed, 85 insertions, 19 deletions
diff --git a/webapp/jsp/dataok.jsp b/webapp/jsp/dataok.jsp
new file mode 100644
index 0000000..7fc1b96
--- /dev/null
+++ b/webapp/jsp/dataok.jsp
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<title>PDF-AS Amtssignaturen</title>
+<link rel="stylesheet" type="text/css" href="/pdf-as/css/styles.css" />
+</head>
+<body>
+<div class="maindiv">
+<h1>PDF-AS Amtssignaturen</h1>
+<div class="mainframe">
+<div class="mainheadline">Daten&auml;nderung</div>
+
+<p>
+Die Daten wurden erfolgreich &uuml;bernommen.
+</p>
+
+</div>
+<%
+  String btlurl = (String)request.getAttribute("btlurl");
+%>
+<a class="big" href="<%=btlurl%>">zur&uuml;ck zur Liste</a>
+</div>
+</body>
+</html>
+\ No newline at end of file
diff --git a/webapp/jsp/error.jsp b/webapp/jsp/error.jsp
index e0e0954..90120b6 100644
--- a/webapp/jsp/error.jsp
+++ b/webapp/jsp/error.jsp
@@ -1,4 +1,8 @@
+<%@ page isErrorPage="true" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.SignServlet" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.exceptions.*" %>
+<%@ page import="java.io.*" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
@@ -7,10 +11,17 @@
 <link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalServerAddress(request,response)%>pdf-as/css/styles.css" />
 </head>
 <body>
-<% 
+<%
+  PresentableException pe = (PresentableException)request.getAttribute("PresentableException");
+  if (exception != null && exception instanceof PresentableException)
+  {
+    pe = (PresentableException)exception;
+    SignServlet.prepareDispatchToErrorPage(pe, request);
+  }
+
   String error = (request.getAttribute("error") == null ? "" : request.getAttribute("error").toString());
   String cause = (request.getAttribute("cause") == null ? "" : request.getAttribute("cause").toString());
- %>
+%>
 <div class="maindiv">
 <h1>PDF-AS Amtssignaturen</h1>
 <div class="mainframe">
@@ -24,5 +35,18 @@
 </div>
 <a class="big" href="<%=LocalRequestHelper.getLocalServerAddress(request,response)%>pdf-as/">Weiter...</a>
 </div>
+<pre style="display:none">
+<%
+  if (pe != null)
+  {
+    StringWriter sw = new StringWriter();
+    PrintWriter pw = new PrintWriter(sw);
+    pe.printStackTrace(pw);
+    sw.close();
+    pw.close();
+    out.print(sw);
+  }
+%>
+</pre>
 </body>
 </html>
 \ No newline at end of file
diff --git a/webapp/jsp/results.jsp b/webapp/jsp/results.jsp
index cffe158..d98fcd3 100644
--- a/webapp/jsp/results.jsp
+++ b/webapp/jsp/results.jsp
@@ -7,6 +7,7 @@
 <%
   List results = (List) request.getAttribute("results");
   Object bb = request.getAttribute("backbutton");
+  String btlurl = (String)request.getAttribute("btlurl");
   boolean backbutton = true;
   if (bb != null && bb.equals("false"))
   {
@@ -88,6 +89,12 @@
 <a class="big" href="<%=LocalRequestHelper.getLocalServerAddress(request,response)%>pdf-as/">zur&uuml;ck</a>
 <%
   }
+  if (btlurl != null)
+  {
+%>
+<a class="big" href="<%=btlurl%>">zur&uuml;ck zur Liste</a>
+<%
+  }
 %>
 
 </div>
diff --git a/webapp/jsp/signpreview.jsp b/webapp/jsp/signpreview.jsp
index 4b9189a..897aec2 100644
--- a/webapp/jsp/signpreview.jsp
+++ b/webapp/jsp/signpreview.jsp
@@ -1,9 +1,10 @@
 <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
-<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionInformation" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.sig.SignatureData" %>
+<%@ page import="at.gv.egiz.pdfas.web.SignSessionInformation" %>
+<%@page import="at.gv.egiz.pdfas.impl.input.TextDataSourceImpl"%>
 <%
-  SessionInformation si = (SessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
+  SignSessionInformation si = (SignSessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
 
   String submit_url = (String)request.getAttribute("submit_url");
   
@@ -12,8 +13,9 @@
   String document_text = null;
   if (si.mode.equals(FormFields.VALUE_MODE_TEXTUAL))
   {
-    SignatureData data = si.iui.signature_data;
-    document_text = new String(data.getData(), data.getCharacterEncoding());
+    SignatureData data = si.si.getSignatureData();
+    TextDataSourceImpl tds = (TextDataSourceImpl)data.getDataSource();
+    document_text = tds.getText();
   }
 %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
diff --git a/webapp/jsp/verifylist.jsp b/webapp/jsp/verifylist.jsp
index b041c02..3d4cf6d 100644
--- a/webapp/jsp/verifylist.jsp
+++ b/webapp/jsp/verifylist.jsp
@@ -1,12 +1,16 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page errorPage="error.jsp" %>
 <%@ page import="java.util.List" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.pdf.SignatureHolder" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
-<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionInformation" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %>
+<%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %>
+<%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%>
 <%
-  SessionInformation si = (SessionInformation) request.getSession(false).getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
+
+  VerifySessionInformation si = (VerifySessionInformation) SessionHelper.getSession(request);
+  
   List signature_holders = si.signature_holders;
   
 %>
@@ -51,9 +55,8 @@
 
 <form action="<%= response.encodeURL(request.getContextPath() + "/VerifyPreview") %>"
       accept-charset="UTF-8"
-      style="float:left;"
       method="get"
-      target="_blank">
+      style="float:left;">
 <input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= i %>" />      
 <input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />      
 
@@ -63,8 +66,7 @@
 <form action="<%= response.encodeURL(request.getContextPath() + "/VerifyPreview") %>"
       accept-charset="UTF-8"
       method="get"
-      style="float:left;"
-      target="_blank">
+      style="float:left;">
 <input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= i %>" />      
 <input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="true" />      
 
diff --git a/webapp/jsp/verifypreview.jsp b/webapp/jsp/verifypreview.jsp
index 480dbf7..13cbd67 100644
--- a/webapp/jsp/verifypreview.jsp
+++ b/webapp/jsp/verifypreview.jsp
@@ -1,12 +1,18 @@
 <%@ page contentType="text/html; charset=UTF-8" %>
+<%@ page errorPage="error.jsp" %>
 <%@ page import="java.util.List" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.pdf.SignatureHolder" %>
+<%@ page import="at.knowcenter.wag.egov.egiz.pdf.TextualSignatureHolder" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.FormFields" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>
-<%@ page import="at.knowcenter.wag.egov.egiz.web.SessionInformation" %>
 <%@ page import="at.knowcenter.wag.egov.egiz.web.servlets.VerifyPreviewServlet" %>
+<%@ page import="at.gv.egiz.pdfas.web.VerifySessionInformation" %>
+<%@ page import="at.gv.egiz.pdfas.web.helper.SessionHelper"%>
 <%
-  SessionInformation si = (SessionInformation) request.getSession(false).getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
+  String btlurl = (String)request.getAttribute("btlurl");
+
+  VerifySessionInformation si = (VerifySessionInformation) SessionHelper.getSession(request);
+
   List signature_holders = si.signature_holders;
   Integer ver_wh = (Integer) request.getAttribute(FormFields.FIELD_VERIFY_WHICH);
   int verify_which = ver_wh.intValue();
@@ -48,7 +54,7 @@
 <input type="hidden" name="<%= FormFields.FIELD_VERIFY_WHICH %>" value="<%= verify_which %>" />
 
 <div>Rekonstruktion der Signaturmarke:</div>
-<textarea class="previewfield" cols="80" rows="14" name="<%= FormFields.FIELD_RAW_DOCUMENT_TEXT %>"><%= signature_holder.getSignedText() %></textarea>
+<textarea class="previewfield" cols="80" rows="14" name="<%= FormFields.FIELD_RAW_DOCUMENT_TEXT %>"><%= ((TextualSignatureHolder)signature_holder).getSignedText() %></textarea>
 
 <%= VerifyPreviewServlet.renderRequiredKeys(signature_holder.getSignatureObject(), "", false) %>
 
@@ -60,13 +66,14 @@
 
 <input class="button" type="submit" value="Werte &uuml;bernehmen und pr&uuml;fen" onclick="document.submitform.verify.value='true'" />
 
-<input class="button" type="submit" value="Abbrechen" onclick="window.close()" />
-
 </div>
 </form>
 
 </div>
-<!--<a class=\"big\" href="/pdf-as" onclick="window.close()">zur&uuml;ck</a>-->
+
+<a class="big" href="/pdf-as">zur&uuml;ck</a>
+<a class="big" href="<%=btlurl%>">zur&uuml;ck zur Liste</a>
+
 </div>
 </body>
 
diff --git a/webapp/jsp/verifyupload.jsp b/webapp/jsp/verifyupload.jsp
index ab63e2f..c12fb25 100644
--- a/webapp/jsp/verifyupload.jsp
+++ b/webapp/jsp/verifyupload.jsp
@@ -20,7 +20,7 @@
 <div class="mainheadline">Dokument Signatur pr&uuml;fen</div>
 
 
-<form name="submitform" enctype="multipart/form-data" method="post" action="/pdf-as/Verify">
+<form name="submitform" enctype="multipart/form-data" method="post" action="/pdf-as/Verify" accept-charset="UTF-8">
 
 <div class="contentsdiv">