From 5812d840b420697b6821080a7cbb0f3c792fc1ac Mon Sep 17 00:00:00 2001 From: tknall Date: Thu, 19 Mar 2009 17:33:16 +0000 Subject: Build script for command line version updated. JavaDoc fixes. Some updates for debugging messages. Parser for MOCCA-CreateXMLSignatureResponses enhanced. Many updates and fixes for the external web app interface. New profile for invisible signatures added. git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@333 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c --- src/main/webapp/jsp/error.jsp | 9 +- src/main/webapp/jsp/redirect_to_parent.jsp | 13 +- .../sitemesh/buergerkarte/pdf-as-template-de.jsp | 140 ------------------ .../sitemesh/buergerkarte/pdf-as-template.jsp | 160 --------------------- .../buergerkarte/test-pdf-as-template-de.jsp | 140 ------------------ .../sitemesh/buergerkarte/test-pdf-as-template.jsp | 160 --------------------- 6 files changed, 19 insertions(+), 603 deletions(-) delete mode 100644 src/main/webapp/sitemesh/buergerkarte/pdf-as-template-de.jsp delete mode 100644 src/main/webapp/sitemesh/buergerkarte/pdf-as-template.jsp delete mode 100644 src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template-de.jsp delete mode 100644 src/main/webapp/sitemesh/buergerkarte/test-pdf-as-template.jsp (limited to 'src/main/webapp') diff --git a/src/main/webapp/jsp/error.jsp b/src/main/webapp/jsp/error.jsp index 4bd49a4..bcac0dc 100644 --- a/src/main/webapp/jsp/error.jsp +++ b/src/main/webapp/jsp/error.jsp @@ -6,6 +6,7 @@ <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %> <%@ page import="org.apache.commons.httpclient.util.EncodingUtil" %> <%@ page import="org.apache.commons.httpclient.NameValuePair" %> +<%@ page import="at.gv.egiz.pdfas.web.helper.SignServletHelper" %> <%@ page import="java.io.*" %> <%@ include file="language.jsp" %> @@ -16,14 +17,19 @@ <fmt:message key="error.title"/> + + + <% - PresentableException pe = (PresentableException)request.getAttribute("PresentableException"); + PresentableException pe; if (exception != null && exception instanceof PresentableException) { pe = (PresentableException)exception; SignServlet.prepareDispatchToErrorPage(pe, request); + } else { + pe = (PresentableException)request.getAttribute("PresentableException"); } String error = request.getParameter("error"); @@ -56,6 +62,7 @@ session.setAttribute(SessionAttributes.PARENT_WEBAPP_REDIRECT_URL, errorUrl); } String redirectHelper = response.encodeRedirectURL(request.getContextPath() + "/jsp/redirect_to_parent.jsp"); + SignServletHelper.disableBrowserCacheForResponse(response); response.sendRedirect(redirectHelper); } diff --git a/src/main/webapp/jsp/redirect_to_parent.jsp b/src/main/webapp/jsp/redirect_to_parent.jsp index 7791109..6bce9f6 100644 --- a/src/main/webapp/jsp/redirect_to_parent.jsp +++ b/src/main/webapp/jsp/redirect_to_parent.jsp @@ -5,7 +5,10 @@ <%@ include file="language.jsp" %> - + + + + <fmt:message key="pleasewait.title"/> <% String query = (String) session.getAttribute(SessionAttributes.PARENT_WEBAPP_REDIRECT_URL); @@ -14,7 +17,13 @@ -
+ +