Web-Application: Configuration may be declared via system property "pdf-as.work-dir" or via Servlet-Init-Parameter "work-dir".

Bug fixed in RetrieveSignatureDataServlet: Response header didn't contain a content length attribute. The ITS Mac BKU rejects those requests.
Workaround for ITS Mac BKU integrated. A redirect via response does only work if the response contains a valid SL request (e.g. a NullOperationRequest).
API: The configuration folder may be omitted at instantiating the api. Configuration may be set via system property "pdf-as.work-dir". If no configuration is given at all, the current user's home directory is searched for a folder "PDF-AS". If not found a default configuration is created.
If the configuration is explicitely given than the temporary folder is located within the given directory otherwise within the user's temporary directory.
Declaring the configuration folder, replacements for system properties like "${catalina.base}/conf/pdfas" may be used.
Web-Application: Session is now being invalidated after download of the signed pdf file.
Web-Application: Every hardcoded context "pdf-as" has been replaced.


git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@277 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

15 files changed, 31 insertions, 27 deletions

diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index 0b4f656..b27ca81 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -2,8 +2,8 @@
 <Context path="/pdf-as" cookies="false" reloadable="false">

 	<Manager pathname="" />

 	

-	<!-- Use system property "pdf-as.work-dir" instead. -->

+	<!-- Use system property "pdf-as.work-dir" or web.xml parameter "work-dir" instead. -->

 	<!--

-		<Parameter name="work-dir" value="D:/dev/proj/PDF-AS/work" override="false"/>

+		<Parameter name="work-dir" value="${catalina.base}/conf/pdf-as" override="false"/>

 	-->

 </Context>

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index f9903a6..6d675b4 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -4,20 +4,22 @@
     xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"

     version="2.4">

 

-    <description>

-      EGIZ PDF-AS

-    </description>

+    <description>EGIZ PDF-AS</description>

     <display-name>PDF-AS</display-name>

-    

+

+    <!--    

     <context-param>

       <description>

         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.

+        Alternatively the configuration can be declared by system property "pdf-as.work-dir"

+        (which is the recommended way) or servlet init parameter "work-dir" in context descriptor

+        file "pdf-as.xml".

       </description>

-      <param-name></param-name>

-      <param-value>override this in your context file (pdf-as.xml)</param-value>

+      <param-name>work-dir</param-name>

+      <param-value>REPLACE_WITH_PATH_TO_PDFAS_CONFIGURATION</param-value>

     </context-param>

+    -->

 

     <filter>

         <filter-name>sitemesh</filter-name>

diff --git a/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp b/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp
index 3264093..3b48294 100644
--- a/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp
+++ b/src/main/webapp/jsp/SIGNATURBLOCK_DE.jsp
@@ -15,7 +15,7 @@
 		</td>

 	</tr>

 	<tr>

-		<td rowspan="6"><img src="/pdf-as/images/signatur-logo_de-100.png" width="100" alt="Signatur-Logo"/></td>

+		<td rowspan="6"><img src="<%= request.getContextPath() %>/images/signatur-logo_de-100.png" width="100" alt="Signatur-Logo"/></td>

 		<td class="pdfaslabel" nowrap="nowrap">Unterzeichner</td>

 		<td class="pdfasvalue"><input type="text" name="signer" value="&lt;wird aus dem Zertifikat extrahiert&gt;" readonly="readonly" disabled="disabled" size="40" maxlength="255"/></td>

 	</tr>

diff --git a/src/main/webapp/jsp/dataok.jsp b/src/main/webapp/jsp/dataok.jsp
index 7fc1b96..c77fb46 100644
--- a/src/main/webapp/jsp/dataok.jsp
+++ b/src/main/webapp/jsp/dataok.jsp
@@ -2,7 +2,7 @@
 <html>

 <head>

 <title>PDF-AS Amtssignaturen</title>

-<link rel="stylesheet" type="text/css" href="/pdf-as/css/styles.css" />

+<link rel="stylesheet" type="text/css" href="<%= request.getContextPath() %>/css/styles.css" />

 </head>

 <body>

 <div class="maindiv">

diff --git a/src/main/webapp/jsp/download.jsp b/src/main/webapp/jsp/download.jsp
index 62a5417..841f1d0 100644
--- a/src/main/webapp/jsp/download.jsp
+++ b/src/main/webapp/jsp/download.jsp
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>

 

 <%@ page import="at.knowcenter.wag.egov.egiz.web.SessionAttributes" %>

+<%@ page import="at.knowcenter.wag.egov.egiz.web.LocalRequestHelper" %>

 

 <%

   String downloadURL = (String) session.getAttribute(SessionAttributes.DOWNLOAD_URL_FOR_SIGNED_PDF_DOCUMENT);

@@ -23,6 +24,7 @@
 				}

 			-->

 		</script>

+		<base href="<%= LocalRequestHelper.getLocalContextAddress(request, response) %>/"/>

 	</head>

 

 	<body>

@@ -34,7 +36,7 @@
 			<input type="submit" id="SendRequestButton" value="Signiertes Dokument herunterladen" onclick="return hitButton();"/>

 		</form>

 		<div class="pdfasverticalspace"></div>

-		<a href="/pdf-as/">zur&uuml;ck</a>

+		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>

 	</body>

 

 </html>

diff --git a/src/main/webapp/jsp/error.jsp b/src/main/webapp/jsp/error.jsp
index 48a7f50..0ec94d8 100644
--- a/src/main/webapp/jsp/error.jsp
+++ b/src/main/webapp/jsp/error.jsp
@@ -9,7 +9,7 @@
 

 	<head>

 		<title>PDF-Signaturen Resultat</title>

-		<base href="http://www.buergerkarte.at/pdf-as/"/>

+		<base href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"/>

 	</head>

 

 <%

@@ -30,7 +30,7 @@
 		<div class="pdfasnote"><%= error %></div>

 		<div class="pdfasnote">Ursache: <strong><%= cause %></strong></div>

 		<div class="pdfasverticalspace"></div>

-		<a href="<%=LocalRequestHelper.getLocalServerAddress(request,response)%>pdf-as/">zur&uuml;ck</a>

+		<a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/">zur&uuml;ck</a>

 		<pre style="display:none">

 		<%

 		  if (pe != null) {

diff --git a/src/main/webapp/jsp/error_verify.jsp b/src/main/webapp/jsp/error_verify.jsp
index 3e8421d..3b82a32 100644
--- a/src/main/webapp/jsp/error_verify.jsp
+++ b/src/main/webapp/jsp/error_verify.jsp
@@ -9,7 +9,7 @@
 

 	<head>

 		<title>PDF-Signaturen Resultat</title>

-		<base href="http://www.buergerkarte.at/pdf-as/"/>

+		<base href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/"/>

 	</head>

 

 <%

@@ -30,7 +30,7 @@
 		<div class="pdfasnote"><%= error %></div>

 		<div class="pdfasnote">Ursache: <strong><%= cause %></strong></div>

 		<div class="pdfasverticalspace"></div>

-		<a href="<%=LocalRequestHelper.getLocalServerAddress(request,response)%>pdf-as/jsp/verifyupload.jsp">zur&uuml;ck</a>

+		<a href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/jsp/verifyupload.jsp">zur&uuml;ck</a>

 		<pre style="display:none">

 		<%

 		  if (pe != null) {

diff --git a/src/main/webapp/jsp/null_request_page.jsp b/src/main/webapp/jsp/null_request_page.jsp
index 89df7cf..5773f63 100644
--- a/src/main/webapp/jsp/null_request_page.jsp
+++ b/src/main/webapp/jsp/null_request_page.jsp
@@ -35,7 +35,7 @@
 			<input type="submit" id="SendRequestButton" value="Absenden..." />

 		</form>

 		<div class="pdfasverticalspace"></div>

-		<a href="/pdf-as/">zur&uuml;ck</a>

+		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>

 		<script language="javascript" type="text/javascript">

 			<!--

 				window.setTimeout("hitButton()", 800);

diff --git a/src/main/webapp/jsp/results.jsp b/src/main/webapp/jsp/results.jsp
index 990e33e..faabc27 100644
--- a/src/main/webapp/jsp/results.jsp
+++ b/src/main/webapp/jsp/results.jsp
@@ -69,7 +69,7 @@
 		%>

 		<div class="pdfasverticalspace"></div>

 		<% if (backbutton) { %>

-			<a href="/pdf-as/jsp/verifyupload.jsp">zur&uuml;ck</a>

+			<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zur&uuml;ck</a>

 		<% } %>

 		<% if (btlurl != null) { %>

 			<a href="<%=btlurl%>">zur&uuml;ck zur Liste</a>

diff --git a/src/main/webapp/jsp/signpreview.jsp b/src/main/webapp/jsp/signpreview.jsp
index a1e6349..6ff6da6 100644
--- a/src/main/webapp/jsp/signpreview.jsp
+++ b/src/main/webapp/jsp/signpreview.jsp
@@ -62,7 +62,7 @@
 		  }

 		%>

 		<div class="pdfasverticalspace"></div>

-		<a href="/pdf-as/">zur&uuml;ck</a>

+		<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>

 	</body>

 

 </html>

diff --git a/src/main/webapp/jsp/signupload.jsp b/src/main/webapp/jsp/signupload.jsp
index 6293564..e6c243f 100644
--- a/src/main/webapp/jsp/signupload.jsp
+++ b/src/main/webapp/jsp/signupload.jsp
@@ -15,7 +15,7 @@
       enctype="multipart/form-data"

       accept-charset="UTF-8"

       method="post"

-      action="/pdf-as/Sign">

+      action="<%= request.getContextPath() %>/Sign">

 	<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">

 		<tr>

 			<td nowrap="nowrap"><label>PDF Datei:</label></td>

@@ -57,7 +57,7 @@
 	<div class="pdfasnote">Das Erscheinungsbild der Signaturmarke kann abh&auml;ngig vom Signatur Typ, vom Signatur Modus, von der verwendeten B&uuml;rgerkarte, sowie von der verwendeten B&uuml;rgerkartenumgebung variieren.</div>

 	<div>

 		<!-- =============================================== Start BKU-Erkennung -->

-		<iframe src="/pdf-as/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

+		<iframe src="<%= request.getContextPath() %>/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

 		<!-- ================================================ Stop BKU-Erkennung -->

 	</div>

 	<input type="submit" value="Signatur erstellen" />

diff --git a/src/main/webapp/jsp/verifylist.jsp b/src/main/webapp/jsp/verifylist.jsp
index 22a2a4e..fac5755 100644
--- a/src/main/webapp/jsp/verifylist.jsp
+++ b/src/main/webapp/jsp/verifylist.jsp
@@ -68,6 +68,6 @@
 			<input type="submit" value="Alle pr&uuml;fen" />

 		</form>

 		<div class="pdfasverticalspace"></div>

-		<a href="/pdf-as/jsp/verifyupload.jsp">zur&uuml;ck</a>

+		<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zur&uuml;ck</a>

 	</body>

 </html>

diff --git a/src/main/webapp/jsp/verifypreview.jsp b/src/main/webapp/jsp/verifypreview.jsp
index 975b5ce..1b0adfa 100644
--- a/src/main/webapp/jsp/verifypreview.jsp
+++ b/src/main/webapp/jsp/verifypreview.jsp
@@ -49,7 +49,7 @@
 	<input type="submit" value="Werte &uuml;bernehmen und pr&uuml;fen" onclick="document.submitform.verify.value='true'" />

 </form>

 <div class="pdfasverticalspace"></div>

-<a href="/pdf-as/jsp/verifyupload.jsp">zur&uuml;ck</a>

+<a href="<%= request.getContextPath() %>/jsp/verifyupload.jsp">zur&uuml;ck</a>

 <a href="<%=btlurl%>">zur&uuml;ck zur Liste</a>

 	<script language="javascript" type="text/javascript">

 		<!--

diff --git a/src/main/webapp/jsp/verifyupload.jsp b/src/main/webapp/jsp/verifyupload.jsp
index 97cdcde..54823f5 100644
--- a/src/main/webapp/jsp/verifyupload.jsp
+++ b/src/main/webapp/jsp/verifyupload.jsp
@@ -9,7 +9,7 @@
 <h1>PDF-Signaturen</h1>

 <h2>Dokument Signatur pr&uuml;fen</h2>

 <div class="pdfasnote">Hier bitte den vollst&auml;ndigen Dokumenttext samt Signaturblock eingeben.<br/></div>

-<form name="submitform" enctype="multipart/form-data" method="post" action="/pdf-as/Verify" accept-charset="UTF-8">

+<form name="submitform" enctype="multipart/form-data" method="post" action="<%= request.getContextPath() %>/Verify" accept-charset="UTF-8">

 	<textarea class="pdfaspreviewfield" rows="14" name="<%= FormFields.FIELD_UPLOAD %>"></textarea>

 	<table border="0" cellspacing="0" cellpadding="4" id="pdfasupperformtable">

 		<tr>

@@ -24,7 +24,7 @@
 

 	<div>

 		<!-- =============================================== Start BKU-Erkennung -->

-		<iframe src="/pdf-as/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

+		<iframe src="<%= request.getContextPath() %>/bku-erkennung/bku-erkennung_iframe.html" width="152" height="57" id="sep_iframe" scrolling="no" marginheight="0" marginwidth="0" frameborder="0" allowtransparency="true"></iframe>

 		<!-- ================================================ Stop BKU-Erkennung -->

 	</div>

 	<input type="hidden" name="<%= FormFields.FIELD_PREVIEW %>" value="false" />

@@ -33,6 +33,6 @@
 	

 </form>

 <div class="pdfasverticalspace"></div>

-<a href="/pdf-as/">zur&uuml;ck</a>

+<a href="<%= request.getContextPath() %>/">zur&uuml;ck</a>

 </body>

 </html>
\ No newline at end of file
diff --git a/src/main/webapp/parentpage/standalone.jsp b/src/main/webapp/parentpage/standalone.jsp
index 716ab00..691857f 100644
--- a/src/main/webapp/parentpage/standalone.jsp
+++ b/src/main/webapp/parentpage/standalone.jsp
@@ -9,7 +9,7 @@
 

 	<head>

 		<decorator:head/>

-		<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalServerAddress(request,response)%>pdf-as/css/pdfas-styles.css" />

+		<link rel="stylesheet" type="text/css" href="<%=LocalRequestHelper.getLocalContextAddress(request,response)%>/css/pdfas-styles.css" />

 	</head>

 

 	<body><decorator:body/></body>