From 3d982813b34f6f230baf4a467cdc37ec92a77595 Mon Sep 17 00:00:00 2001 From: netconomy Date: Fri, 17 Aug 2007 06:10:56 +0000 Subject: Performance git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@167 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- webapp/WEB-INF/web.xml | 7 +++++-- webapp/dataok.html | 20 -------------------- webapp/jsp/dataok.jsp | 24 ++++++++++++++++++++++++ webapp/jsp/error.jsp | 28 ++++++++++++++++++++++++++-- webapp/jsp/results.jsp | 7 +++++++ webapp/jsp/signpreview.jsp | 10 ++++++---- webapp/jsp/verifylist.jsp | 14 ++++++++------ webapp/jsp/verifypreview.jsp | 19 +++++++++++++------ webapp/jsp/verifyupload.jsp | 2 +- 9 files changed, 90 insertions(+), 41 deletions(-) delete mode 100644 webapp/dataok.html create mode 100644 webapp/jsp/dataok.jsp (limited to 'webapp') diff --git a/webapp/WEB-INF/web.xml b/webapp/WEB-INF/web.xml index fb8d6f2..7c96b42 100644 --- a/webapp/WEB-INF/web.xml +++ b/webapp/WEB-INF/web.xml @@ -10,13 +10,13 @@ PDF-AS

- - override this in your context file (pdf-as.xml) The working directory of PDF-AS. Points to a directory on the local file system where templates, config files, certificates etc. are found. If empty, the base of the web application will be chosen. + + override this in your context file (pdf-as.xml)

@@ -114,6 +114,9 @@ /AsynchronousRedirectResponder + + 1 + \ No newline at end of file diff --git a/webapp/dataok.html b/webapp/dataok.html deleted file mode 100644 index 372e148..0000000 --- a/webapp/dataok.html +++ /dev/null @@ -1,20 +0,0 @@ - - - -PDF-AS Amtssignaturen - - - -

PDF-AS Amtssignaturen

Datenänderung

- -

-Die Daten wurden erfolgreich übernommen. -

- -

- - \ No newline at end of file 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 @@ + + + +PDF-AS Amtssignaturen + + + +

PDF-AS Amtssignaturen

Datenänderung

+ +

+Die Daten wurden erfolgreich übernommen. +

+ +

+<% + String btlurl = (String)request.getAttribute("btlurl"); +%> +zurück zur Liste +

+ + \ 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.*" %> @@ -7,10 +11,17 @@ -<% +<% + 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()); - %> +%>

PDF-AS Amtssignaturen

@@ -24,5 +35,18 @@

Weiter...

+<%
+  if (pe != null)
+  {
+    StringWriter sw = new StringWriter();
+    PrintWriter pw = new PrintWriter(sw);
+    pe.printStackTrace(pw);
+    sw.close();
+    pw.close();
+    out.print(sw);
+  }
+%>
+

\ 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")) { @@ -86,6 +87,12 @@ { %> zurück +<% + } + if (btlurl != null) + { +%> +zurück zur Liste <% } %> 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(); } %> 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 @@

" accept-charset="UTF-8" - style="float:left;" method="get" - target="_blank"> + style="float:left;"> @@ -63,8 +66,7 @@ " accept-charset="UTF-8" method="get" - style="float:left;" - target="_blank"> + style="float:left;"> 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 @@

Rekonstruktion der Signaturmarke:

- + <%= VerifyPreviewServlet.renderRequiredKeys(signature_holder.getSignatureObject(), "", false) %> @@ -60,13 +66,14 @@ - -

- + +zurück +zurück zur Liste + 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 @@

Dokument Signatur prüfen