From 47565187c7f273c49e0347fb5ad34ae4a3d1f616 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 29 Nov 2021 08:56:51 +0100
Subject: add SOAP client to search addresses and add first simple test to
 request address information from real TEST ZMR

---
 .../authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml     | 3 +++
 .../src/main/resources/messages/eidas_connector_message.properties     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources')

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 85b49186..d82ccec5 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -22,6 +22,9 @@
 
   <bean id="zmrClient"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient" />
+        
+  <bean id="zmrAddressClient"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrAddressSoapClient" />
 
   <!-- bean id="ZmrClientForeIDAS"
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.zmr.DummyZmrClient" /-->
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
index f47d0f30..3ccfff19 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/messages/eidas_connector_message.properties
@@ -20,4 +20,4 @@ module.eidasauth.matching.02=Matching failed, because ZMR response contains hist
 module.eidasauth.matching.03=Matching failed in workflow step: {0} with error: {1}
 module.eidasauth.matching.04=An error occurred while loading your data from official registers. Please contact the support.  
 
-module.eidasauth.matching.99=Matching failed, because of an unexpected processing error. Reason: {0}
\ No newline at end of file
+module.eidasauth.matching.99=Matching failed, because of an unexpected processing error. Reason: {0}
-- 
cgit v1.2.3


From a017ebff96d2cc12943801c933e5733b4e827b3b Mon Sep 17 00:00:00 2001
From: Christian Kollmann <christian.kollmann@a-sit.at>
Date: Tue, 7 Dec 2021 09:00:22 +0100
Subject: Use relative paths in templates to enable preview in browser

If Thymeleaf is active (i.e. the template is rendered by the Webapp),
the path gets replaced anyway.
---
 basicConfig/templates/countrySelection.html        |  2 +-
 .../templates/countrySelection_example.html        | 59 +++++++++++-----------
 basicConfig/templates/eidas_node_forward.html      |  2 +-
 basicConfig/templates/error_message.html           | 12 ++---
 basicConfig/templates/other_login_method.html      |  2 +-
 basicConfig/templates/pvp2_post_binding.html       |  4 +-
 basicConfig/templates/residency.html               |  2 +-
 basicConfig/webcontent/autocommit.js               |  5 ++
 basicConfig/webcontent/css/css_error.css           | 26 ++++++++++
 .../main/resources/templates/countrySelection.html | 56 ++++++++++----------
 .../resources/templates/eidas_node_forward.html    |  2 +-
 .../main/resources/templates/error_message.html    | 20 ++++----
 .../resources/templates/other_login_method.html    |  2 +-
 .../resources/templates/pvp2_post_binding.html     |  4 +-
 .../src/main/resources/templates/residency.html    |  6 +--
 .../config/templates/countrySelection.html         |  4 +-
 .../config/templates/eidas_node_forward.html       |  2 +-
 .../src/test/resources/config/templates/error.html |  2 +-
 .../resources/config/templates/error_message.html  | 20 ++++----
 .../config/templates/other_login_method.html       |  2 +-
 .../config/templates/pvp2_post_binding.html        |  4 +-
 .../test/resources/config/templates/residency.html |  2 +-
 .../test/resources/config/webcontent/autocommit.js |  5 ++
 .../resources/config/webcontent/css/css_error.css  | 26 ++++++++++
 .../resources/templates/eidas_node_forward.html    |  2 +-
 25 files changed, 168 insertions(+), 105 deletions(-)
 create mode 100644 basicConfig/webcontent/autocommit.js
 create mode 100644 basicConfig/webcontent/css/css_error.css
 create mode 100644 connector/src/test/resources/config/webcontent/autocommit.js
 create mode 100644 connector/src/test/resources/config/webcontent/css/css_error.css

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources')

diff --git a/basicConfig/templates/countrySelection.html b/basicConfig/templates/countrySelection.html
index 2483030b..bfa30669 100644
--- a/basicConfig/templates/countrySelection.html
+++ b/basicConfig/templates/countrySelection.html
@@ -6,7 +6,7 @@
 <head>
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+  <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
   <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
 <script type="text/javascript">
 </script>
diff --git a/basicConfig/templates/countrySelection_example.html b/basicConfig/templates/countrySelection_example.html
index 2128f14d..abbe0491 100644
--- a/basicConfig/templates/countrySelection_example.html
+++ b/basicConfig/templates/countrySelection_example.html
@@ -7,8 +7,8 @@
 <head>
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-  <script type="text/javascript" src="$contextPath/static/js/js_country.js" th:attr="src=@{/static/js/js_country.js}"></script>
+  <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+  <script type="text/javascript" src="../webcontent/js/js_country.js" th:attr="src=@{/static/js/js_country.js}"></script>
   <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
 </head>
 
@@ -22,7 +22,7 @@
         <div id="country">
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/germany-eu_.png" alt="Germany-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/germany-eu_.png" alt="Germany-eID"
                         th:attr="src=@{/img/countries/germany-eu_.png},alt=#{gui.countryselection.country.de.logo.alt}"/></a>
                 <input type="submit" role="button" value="Deutschland / Germany" th:attr="value=#{gui.countryselection.country.de}" />
                 <input type="hidden" name="selectedCountry" value="DE">
@@ -36,79 +36,79 @@
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
                         th:attr="src=@{img/countries/Belgium-EU_gray.png},alt=#{gui.countryselection.country.be.logo.alt}"/></a>
                 <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Bulgaria-EU_gray.png" alt="Bulgaria-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Bulgaria-EU_gray.png" alt="Bulgaria-eID"
                         th:attr="src=@{/img/countries/Bulgaria-EU_gray.png},alt=#{gui.countryselection.country.bg.logo.alt}"/></a>
                 <input type="submit" value="Bulgaria" th:attr="value=#{gui.countryselection.country.bg}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
                         th:attr="src=@{/img/countries/Croatia-EU_gray.png},alt=#{gui.countryselection.country.hr.logo.alt}"/></a>
                 <input type="submit" value="Croatia" th:attr="value=#{gui.countryselection.country.hr}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
                         th:attr="src=@{/img/countries/Cyprus-EU_gray.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a>
                 <input type="submit" value="Cyprus" th:attr="value=#{gui.countryselection.country.cy}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/CzechRepublic-EU_gray.png" alt="CzechRepublic-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/CzechRepublic-EU_gray.png" alt="CzechRepublic-eID"
                         th:attr="src=@{/img/countries/CzechRepublic-EU_gray.png},alt=#{gui.countryselection.country.cz.logo.alt}"/></a>
                 <input type="submit" value="CzechRepublic" th:attr="value=#{gui.countryselection.country.cz}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
                         th:attr="src=@{/img/countries/Denmark-EU_gray.png},alt=#{gui.countryselection.country.dk.logo.alt}"/></a>
                 <input type="submit" value="Denmark" th:attr="value=#{gui.countryselection.country.dk}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
                         th:attr="src=@{/img/countries/Estonia-EU_gray.png},alt=#{gui.countryselection.country.ee.logo.alt}"/></a>
                 <input type="submit" value="Estonia" th:attr="value=#{gui.countryselection.country.ee}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Finland-EU_gray.png" alt="Finland-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Finland-EU_gray.png" alt="Finland-eID"
                         th:attr="src=@{/img/countries/Finland-EU_gray.png},alt=#{gui.countryselection.country.fi.logo.alt}"/></a>
                 <input type="submit" value="Finland" th:attr="value=#{gui.countryselection.country.fi}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/France-EU_gray.png" alt="France-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/France-EU_gray.png" alt="France-eID"
                         th:attr="src=@{/img/countries/France-EU_gray.png},alt=#{gui.countryselection.country.fr.logo.alt}"/></a>
                 <input type="submit" value="France" th:attr="value=#{gui.countryselection.country.fr}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Greece-EU_gray.png" alt="Greece-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Greece-EU_gray.png" alt="Greece-eID"
                         th:attr="src=@{/img/countries/Greece-EU_gray.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a>
                 <input type="submit" value="Greece" th:attr="value=#{gui.countryselection.country.gr}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
                         th:attr="src=@{/img/countries/Hungary-EU_gray.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a>
                 <input type="submit" value="Hungary" th:attr="value=#{gui.countryselection.country.hu}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
                         th:attr="src=@{/img/countries/Ireland-EU_gray.png},alt=#{gui.countryselection.country.ir.logo.alt}"/></a>
                 <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.ir}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Italy-EU_gray.png" alt="Italy-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Italy-EU_gray.png" alt="Italy-eID"
                         th:attr="src=@{/img/countries/Italy-EU_gray.png},alt=#{gui.countryselection.country.it.logo.alt}"/></a>
                 <input type="submit" value="Italy" th:attr="value=#{gui.countryselection.country.it}">
                 <select id="testEnvironment" name="selectedEnvironment">
@@ -120,55 +120,55 @@
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
                         th:attr="src=@{/img/countries/Latvia-EU_gray.png},alt=#{gui.countryselection.country.lv.logo.alt}"/></a>
                 <input type="submit" value="Latvia" th:attr="value=#{gui.countryselection.country.lv}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Luxembourg-EU_gray.png" alt="Luxembourg-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Luxembourg-EU_gray.png" alt="Luxembourg-eID"
                         th:attr="src=@{/img/countries/Luxembourg-EU_gray.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a>
                 <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Malta-EU_gray.png" alt="Malta-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Malta-EU_gray.png" alt="Malta-eID"
                         th:attr="src=@{/img/countries/Malta-EU_gray.png},alt=#{gui.countryselection.country.mt.logo.alt}"/></a>
                 <input type="submit" value="Malta" th:attr="value=#{gui.countryselection.country.mt}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Poland-EU_gray.png" alt="Poland-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Poland-EU_gray.png" alt="Poland-eID"
                         th:attr="src=@{/img/countries/Poland-EU_gray.png},alt=#{gui.countryselection.country.pl.logo.alt}"/></a>
                 <input type="submit" value="Poland" th:attr="value=#{gui.countryselection.country.pl}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
                         th:attr="src=@{/img/countries/Portugal-EU_gray.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a>
                 <input type="submit" value="Portugal" th:attr="value=#{gui.countryselection.country.pt}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Romania-EU_gray.png" alt="Romania-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Romania-EU_gray.png" alt="Romania-eID"
                         th:attr="src=@{/img/countries/Romania-EU_gray.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a>
                 <input type="submit" value="Romania" th:attr="value=#{gui.countryselection.country.ro}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Slovakia-EU_gray.png" alt="Slovakia-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Slovakia-EU_gray.png" alt="Slovakia-eID"
                         th:attr="src=@{/img/countries/Slovakia-EU_gray.png},alt=#{gui.countryselection.country.sk.logo.alt}"/></a>
                 <input type="submit" value="Slovakia" th:attr="value=#{gui.countryselection.country.sk}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
                         th:attr="src=@{/img/countries/Slovenia-EU_gray.png},alt=#{gui.countryselection.country.si.logo.alt}"/></a>
                 <input type="submit" value="Slovenia" th:attr="value=#{gui.countryselection.country.si}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/Spain-EU_gray.png" alt="Spain-eID"
+                <a><img class="countryimage" src="../webcontent/img/countries/Spain-EU_gray.png" alt="Spain-eID"
                         th:attr="src=@{/img/countries/Spain-EU_gray.png},alt=#{gui.countryselection.country.es.logo.alt}"/></a>
                 <input type="submit" value="Spain" th:attr="value=#{gui.countryselection.country.es}">
                 <select id="testEnvironment" name="selectedEnvironment">
@@ -180,19 +180,20 @@
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
                         th:attr="src=@{/img/countries/Sweden-EU_gray.png},alt=#{gui.countryselection.country.se.logo.alt}"/></a>
                 <input type="submit" value="Sweden" th:attr="value=#{gui.countryselection.country.se}" disabled>
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img class="countryimage" src="$contextPath/img/countries/TheNetherlands-EU_gray.jpg" alt="TheNetherlands-eID"
-                        th:attr="src=@{/img/countries/TheNetherlands-EU_gray.jpg},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>
+                <a><img class="countryimage" src="../webcontent/img/countries/TheNetherlands-EU_gray.png"
+                        alt="TheNetherlands-eID"
+                        th:attr="src=@{/img/countries/TheNetherlands-EU_gray.png},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>
                 <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">
             </form>
 
             <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-                <a><img disabled class="countryimage" src="$contextPath/img/countries/UnitedKingdom-EU_gray.png" alt="UnitedKingdom-eID"
+                <a><img disabled class="countryimage" src="../webcontent/img/countries/UnitedKingdom-EU_gray.png" alt="UnitedKingdom-eID"
                         th:attr="src=@{/img/countries/UnitedKingdom-EU_gray.png},alt=#{gui.countryselection.country.uk.logo.alt}"/></a>
                 <input type="submit" value="United Kingdom" th:attr="value=#{gui.countryselection.country.uk}" disabled>
             </form>
diff --git a/basicConfig/templates/eidas_node_forward.html b/basicConfig/templates/eidas_node_forward.html
index 186937d7..6dffa34b 100644
--- a/basicConfig/templates/eidas_node_forward.html
+++ b/basicConfig/templates/eidas_node_forward.html
@@ -4,7 +4,7 @@
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
 <head>
-  <script src="$contextPath/autocommit.js"
+  <script src="../webcontent/autocommit.js"
           th:attr="src=@{/autocommit.js}"></script>
 </head>
 <body>
diff --git a/basicConfig/templates/error_message.html b/basicConfig/templates/error_message.html
index b1367962..f69d7255 100644
--- a/basicConfig/templates/error_message.html
+++ b/basicConfig/templates/error_message.html
@@ -3,10 +3,10 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
-      
+
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-  <link rel="stylesheet" href="$contextPath/css/css_error.css"  th:href="@{/css/css_error.css}" />
-  
+  <link rel="stylesheet" href="../webcontent/css/css_error.css"  th:href="@{/css/css_error.css}" />
+
   <title th:text="#{gui.errorpage.msg.title}">An error arise ...  </title>
 </head>
 
@@ -14,10 +14,10 @@
   <div id="page">
       <div id="page1" class="case selected-case" role="main">
       <h2 class="OA_header" role="heading">Authentication error arise</h2>
-      
+
       <div class="hell" role="application" >
             <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
-            
+
               <div id="alert_area" class="hell" role="application" >
                 <p th:text="#{gui.errorpage.msg.information}">Error Information</p>
                 <br/>
@@ -25,7 +25,7 @@
                 <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg   :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
               </div>
       </div>
-            
+
 		</div>
 	</div>
 </body>
diff --git a/basicConfig/templates/other_login_method.html b/basicConfig/templates/other_login_method.html
index ea15864e..8f846f84 100644
--- a/basicConfig/templates/other_login_method.html
+++ b/basicConfig/templates/other_login_method.html
@@ -6,7 +6,7 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
     <title th:text="#{gui.otherlogin.title}">eIDAS-Login Other Login Methods</title>
     <style>
         .block {
diff --git a/basicConfig/templates/pvp2_post_binding.html b/basicConfig/templates/pvp2_post_binding.html
index 90858237..06b9b494 100644
--- a/basicConfig/templates/pvp2_post_binding.html
+++ b/basicConfig/templates/pvp2_post_binding.html
@@ -6,7 +6,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-  <script src="$contextPath/autocommit.js"></script>
+  <script src="/autocommit.js"></script>
 </head>
 <body>
 	<noscript>
@@ -21,7 +21,7 @@
 
 	<form action="${action}" method="post" target="_parent">
 		<div>
-			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end 
+			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end
 			#if($SAMLRequest)  <input type="hidden" name="SAMLRequest" value="${SAMLRequest}" />  #end
 			#if($SAMLResponse) <input type="hidden" name="SAMLResponse" value="${SAMLResponse}" /> #end
 		</div>
diff --git a/basicConfig/templates/residency.html b/basicConfig/templates/residency.html
index 7a832aea..4600a26f 100644
--- a/basicConfig/templates/residency.html
+++ b/basicConfig/templates/residency.html
@@ -218,7 +218,7 @@
     </form>
 
     <div>
-        <img id="loading" src="$contextPath/static/img/ajax-loader.gif"
+        <img id="loading" src="../webcontent/img/ajax-loader.gif"
              th:attr="src=@{/static/img/ajax-loader.gif}" style="display: none"/>
     </div>
 
diff --git a/basicConfig/webcontent/autocommit.js b/basicConfig/webcontent/autocommit.js
new file mode 100644
index 00000000..d21a5651
--- /dev/null
+++ b/basicConfig/webcontent/autocommit.js
@@ -0,0 +1,5 @@
+function autoCommmit() {
+  document.forms[0].submit();
+}
+
+document.addEventListener('DOMContentLoaded', autoCommmit);
\ No newline at end of file
diff --git a/basicConfig/webcontent/css/css_error.css b/basicConfig/webcontent/css/css_error.css
new file mode 100644
index 00000000..d772df43
--- /dev/null
+++ b/basicConfig/webcontent/css/css_error.css
@@ -0,0 +1,26 @@
+@charset "utf-8";
+    body {
+        padding-left: 5%;
+                background-color: #F9F9F9;
+    }
+    #page {
+        padding-top: 2%;
+        padding-right: 10%;
+        padding-left: 5%;
+    }
+
+    .OA_header {
+        font-size: 2.1em;
+        padding-top:1%;
+        margin-bottom: 1%;
+        margin-top: 1%;
+        
+    }
+
+    #alert_area {
+        float:left;
+        width: 100%;
+      }
+
+
+
diff --git a/connector/src/main/resources/templates/countrySelection.html b/connector/src/main/resources/templates/countrySelection.html
index e196cd31..dfd00e18 100644
--- a/connector/src/main/resources/templates/countrySelection.html
+++ b/connector/src/main/resources/templates/countrySelection.html
@@ -6,8 +6,8 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <script type="text/javascript" src="$contextPath/static/js/js_country.js"
+    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <script type="text/javascript" src="../../webapp/js/js_country.js"
             th:attr="src=@{/static/js/js_country.js}"></script>
     <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
 </head>
@@ -43,7 +43,7 @@
 
     <div id="country">
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/germany-eu_.png" alt="Germany-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/germany-eu_.png" alt="Germany-eID"
                     th:attr="src=@{/img/countries/germany-eu_.png},alt=#{gui.countryselection.country.de.logo.alt}"/></a>
             <input type="submit" role="button" value="Deutschland / Germany"
                    th:attr="value=#{gui.countryselection.country.de}"/>
@@ -58,81 +58,81 @@
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Belgium-EU_gray.png" alt="Belgium-eID"
                     th:attr="src=@{img/countries/Belgium-EU_gray.png},alt=#{gui.countryselection.country.be.logo.alt}"/></a>
             <input type="submit" value="Belgium" th:attr="value=#{gui.countryselection.country.be}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Bulgaria-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Bulgaria-EU_gray.png"
                     alt="Bulgaria-eID"
                     th:attr="src=@{/img/countries/Bulgaria-EU_gray.png},alt=#{gui.countryselection.country.bg.logo.alt}"/></a>
             <input type="submit" value="Bulgaria" th:attr="value=#{gui.countryselection.country.bg}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Croatia-EU_gray.png" alt="Croatia-eID"
                     th:attr="src=@{/img/countries/Croatia-EU_gray.png},alt=#{gui.countryselection.country.hr.logo.alt}"/></a>
             <input type="submit" value="Croatia" th:attr="value=#{gui.countryselection.country.hr}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Cyprus-EU_gray.png" alt="Cyprus-eID"
                     th:attr="src=@{/img/countries/Cyprus-EU_gray.png},alt=#{gui.countryselection.country.cy.logo.alt}"/></a>
             <input type="submit" value="Cyprus" th:attr="value=#{gui.countryselection.country.cy}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/CzechRepublic-EU_gray.png"
+            <a><img class="countryimage" src="../../webapp/img/countries/CzechRepublic-EU_gray.png"
                     alt="CzechRepublic-eID"
                     th:attr="src=@{/img/countries/CzechRepublic-EU_gray.png},alt=#{gui.countryselection.country.cz.logo.alt}"/></a>
             <input type="submit" value="CzechRepublic" th:attr="value=#{gui.countryselection.country.cz}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Denmark-EU_gray.png" alt="Denmark-eID"
                     th:attr="src=@{/img/countries/Denmark-EU_gray.png},alt=#{gui.countryselection.country.dk.logo.alt}"/></a>
             <input type="submit" value="Denmark" th:attr="value=#{gui.countryselection.country.dk}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Estonia-EU_gray.png" alt="Estonia-eID"
                     th:attr="src=@{/img/countries/Estonia-EU_gray.png},alt=#{gui.countryselection.country.ee.logo.alt}"/></a>
             <input type="submit" value="Estonia" th:attr="value=#{gui.countryselection.country.ee}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Finland-EU_gray.png" alt="Finland-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Finland-EU_gray.png" alt="Finland-eID"
                     th:attr="src=@{/img/countries/Finland-EU_gray.png},alt=#{gui.countryselection.country.fi.logo.alt}"/></a>
             <input type="submit" value="Finland" th:attr="value=#{gui.countryselection.country.fi}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/France-EU_gray.png" alt="France-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/France-EU_gray.png" alt="France-eID"
                     th:attr="src=@{/img/countries/France-EU_gray.png},alt=#{gui.countryselection.country.fr.logo.alt}"/></a>
             <input type="submit" value="France" th:attr="value=#{gui.countryselection.country.fr}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Greece-EU_gray.png" alt="Greece-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Greece-EU_gray.png" alt="Greece-eID"
                     th:attr="src=@{/img/countries/Greece-EU_gray.png},alt=#{gui.countryselection.country.gr.logo.alt}"/></a>
             <input type="submit" value="Greece" th:attr="value=#{gui.countryselection.country.gr}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Hungary-EU_gray.png" alt="Hungary-eID"
                     th:attr="src=@{/img/countries/Hungary-EU_gray.png},alt=#{gui.countryselection.country.hu.logo.alt}"/></a>
             <input type="submit" value="Hungary" th:attr="value=#{gui.countryselection.country.hu}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Ireland-EU_gray.png" alt="Ireland-eID"
                     th:attr="src=@{/img/countries/Ireland-EU_gray.png},alt=#{gui.countryselection.country.ir.logo.alt}"/></a>
             <input type="submit" value="Ireland" th:attr="value=#{gui.countryselection.country.ir}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Italy-EU_gray.png" alt="Italy-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Italy-EU_gray.png" alt="Italy-eID"
                     th:attr="src=@{/img/countries/Italy-EU_gray.png},alt=#{gui.countryselection.country.it.logo.alt}"/></a>
             <input type="submit" value="Italy" th:attr="value=#{gui.countryselection.country.it}">
             <select id="testEnvironment" name="selectedEnvironment">
@@ -144,57 +144,57 @@
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Latvia-EU_gray.png" alt="Latvia-eID"
                     th:attr="src=@{/img/countries/Latvia-EU_gray.png},alt=#{gui.countryselection.country.lv.logo.alt}"/></a>
             <input type="submit" value="Latvia" th:attr="value=#{gui.countryselection.country.lv}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Luxembourg-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Luxembourg-EU_gray.png"
                     alt="Luxembourg-eID"
                     th:attr="src=@{/img/countries/Luxembourg-EU_gray.png},alt=#{gui.countryselection.country.lu.logo.alt}"/></a>
             <input type="submit" value="Luxembourg" th:attr="value=#{gui.countryselection.country.lu}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Malta-EU_gray.png" alt="Malta-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Malta-EU_gray.png" alt="Malta-eID"
                     th:attr="src=@{/img/countries/Malta-EU_gray.png},alt=#{gui.countryselection.country.mt.logo.alt}"/></a>
             <input type="submit" value="Malta" th:attr="value=#{gui.countryselection.country.mt}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Poland-EU_gray.png" alt="Poland-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Poland-EU_gray.png" alt="Poland-eID"
                     th:attr="src=@{/img/countries/Poland-EU_gray.png},alt=#{gui.countryselection.country.pl.logo.alt}"/></a>
             <input type="submit" value="Poland" th:attr="value=#{gui.countryselection.country.pl}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Portugal-EU_gray.png" alt="Portugal-eID"
                     th:attr="src=@{/img/countries/Portugal-EU_gray.png},alt=#{gui.countryselection.country.pt.logo.alt}"/></a>
             <input type="submit" value="Portugal" th:attr="value=#{gui.countryselection.country.pt}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Romania-EU_gray.png" alt="Romania-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Romania-EU_gray.png" alt="Romania-eID"
                     th:attr="src=@{/img/countries/Romania-EU_gray.png},alt=#{gui.countryselection.country.ro.logo.alt}"/></a>
             <input type="submit" value="Romania" th:attr="value=#{gui.countryselection.country.ro}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Slovakia-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Slovakia-EU_gray.png"
                     alt="Slovakia-eID"
                     th:attr="src=@{/img/countries/Slovakia-EU_gray.png},alt=#{gui.countryselection.country.sk.logo.alt}"/></a>
             <input type="submit" value="Slovakia" th:attr="value=#{gui.countryselection.country.sk}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Slovenia-EU_gray.png" alt="Slovenia-eID"
                     th:attr="src=@{/img/countries/Slovenia-EU_gray.png},alt=#{gui.countryselection.country.si.logo.alt}"/></a>
             <input type="submit" value="Slovenia" th:attr="value=#{gui.countryselection.country.si}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/Spain-EU_gray.png" alt="Spain-eID"
+            <a><img class="countryimage" src="../../webapp/img/countries/Spain-EU_gray.png" alt="Spain-eID"
                     th:attr="src=@{/img/countries/Spain-EU_gray.png},alt=#{gui.countryselection.country.es.logo.alt}"/></a>
             <input type="submit" value="Spain" th:attr="value=#{gui.countryselection.country.es}">
             <select id="testEnvironment" name="selectedEnvironment">
@@ -206,20 +206,20 @@
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/Sweden-EU_gray.png" alt="Sweden-eID"
                     th:attr="src=@{/img/countries/Sweden-EU_gray.png},alt=#{gui.countryselection.country.se.logo.alt}"/></a>
             <input type="submit" value="Sweden" th:attr="value=#{gui.countryselection.country.se}" disabled>
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img class="countryimage" src="$contextPath/img/countries/TheNetherlands-EU_gray.jpg"
+            <a><img class="countryimage" src="../../webapp/img/countries/TheNetherlands-EU_gray.jpg"
                     alt="TheNetherlands-eID"
                     th:attr="src=@{/img/countries/TheNetherlands-EU_gray.jpg},alt=#{gui.countryselection.country.nl.logo.alt}"/></a>
             <input type="submit" value="Netherlands" th:attr="value=#{gui.countryselection.country.nl}">
         </form>
 
         <form class="block" method="post" action="$contextPath$submitEndpoint" th:attr="action=@{${submitEndpoint}}">
-            <a><img disabled class="countryimage" src="$contextPath/img/countries/UnitedKingdom-EU_gray.png"
+            <a><img disabled class="countryimage" src="../../webapp/img/countries/UnitedKingdom-EU_gray.png"
                     alt="UnitedKingdom-eID"
                     th:attr="src=@{/img/countries/UnitedKingdom-EU_gray.png},alt=#{gui.countryselection.country.uk.logo.alt}"/></a>
             <input type="submit" value="United Kingdom" th:attr="value=#{gui.countryselection.country.uk}" disabled>
diff --git a/connector/src/main/resources/templates/eidas_node_forward.html b/connector/src/main/resources/templates/eidas_node_forward.html
index 186937d7..3cd30d36 100644
--- a/connector/src/main/resources/templates/eidas_node_forward.html
+++ b/connector/src/main/resources/templates/eidas_node_forward.html
@@ -4,7 +4,7 @@
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
 <head>
-  <script src="$contextPath/autocommit.js"
+  <script src="../../webapp/autocommit.js"
           th:attr="src=@{/autocommit.js}"></script>
 </head>
 <body>
diff --git a/connector/src/main/resources/templates/error_message.html b/connector/src/main/resources/templates/error_message.html
index 86f9d29d..c5f1ebb3 100644
--- a/connector/src/main/resources/templates/error_message.html
+++ b/connector/src/main/resources/templates/error_message.html
@@ -3,10 +3,10 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
-      
+
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-  <link rel="stylesheet" href="$contextPath/css/css_error.css"  th:href="@{/css/css_error.css}" />
-  
+  <link rel="stylesheet" href="../../webapp/css/css_error.css"  th:href="@{/css/css_error.css}" />
+
   <title th:text="#{gui.errorpage.msg.title}">An error arise ...  </title>
 </head>
 
@@ -14,21 +14,21 @@
   <div id="page">
 		<div id="page1" class="case selected-case" role="main">
 			<h2 class="OA_header" role="heading">Authentication error arise</h2>
-	        
+
 	        <div class="hell" role="application" >
             <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
-            
+
               <div id="alert_area" class="hell" role="application" >
                 <p th:text="#{gui.errorpage.msg.information}">Error Information</p>
                   <br/>
-		              <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p> 
+		              <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p>
                   <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg   :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
-	            </div>	
-                                                                                                      <!-- errorMsg -->	
-	        </div>	
+	            </div>
+                                                                                                      <!-- errorMsg -->
+	        </div>
 
 	        <div th:if="${stacktrace}">
-            <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p> 
+            <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>
 	        </div>
 
 		</div>
diff --git a/connector/src/main/resources/templates/other_login_method.html b/connector/src/main/resources/templates/other_login_method.html
index ea15864e..e5f03712 100644
--- a/connector/src/main/resources/templates/other_login_method.html
+++ b/connector/src/main/resources/templates/other_login_method.html
@@ -6,7 +6,7 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
     <title th:text="#{gui.otherlogin.title}">eIDAS-Login Other Login Methods</title>
     <style>
         .block {
diff --git a/connector/src/main/resources/templates/pvp2_post_binding.html b/connector/src/main/resources/templates/pvp2_post_binding.html
index 90858237..06b9b494 100644
--- a/connector/src/main/resources/templates/pvp2_post_binding.html
+++ b/connector/src/main/resources/templates/pvp2_post_binding.html
@@ -6,7 +6,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-  <script src="$contextPath/autocommit.js"></script>
+  <script src="/autocommit.js"></script>
 </head>
 <body>
 	<noscript>
@@ -21,7 +21,7 @@
 
 	<form action="${action}" method="post" target="_parent">
 		<div>
-			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end 
+			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end
 			#if($SAMLRequest)  <input type="hidden" name="SAMLRequest" value="${SAMLRequest}" />  #end
 			#if($SAMLResponse) <input type="hidden" name="SAMLResponse" value="${SAMLResponse}" /> #end
 		</div>
diff --git a/connector/src/main/resources/templates/residency.html b/connector/src/main/resources/templates/residency.html
index 7a832aea..6e266449 100644
--- a/connector/src/main/resources/templates/residency.html
+++ b/connector/src/main/resources/templates/residency.html
@@ -6,8 +6,8 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <script type="text/javascript" src="../webcontent/js/jquery-3.6.0.js"
+    <link rel="stylesheet" href="../../webapp/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <script type="text/javascript" src="../../webapp/js/jquery-3.6.0.js"
             th:attr="src=@{/static/js/jquery-3.6.0.min.js}"></script>
     <title th:text="#{gui.residency.title}">Österreichischer Wohnsitz</title>
     <script type="text/javascript" th:inline="javascript">
@@ -218,7 +218,7 @@
     </form>
 
     <div>
-        <img id="loading" src="$contextPath/static/img/ajax-loader.gif"
+        <img id="loading" src="../../webapp/img/ajax-loader.gif"
              th:attr="src=@{/static/img/ajax-loader.gif}" style="display: none"/>
     </div>
 
diff --git a/connector/src/test/resources/config/templates/countrySelection.html b/connector/src/test/resources/config/templates/countrySelection.html
index e196cd31..bac2bb9c 100644
--- a/connector/src/test/resources/config/templates/countrySelection.html
+++ b/connector/src/test/resources/config/templates/countrySelection.html
@@ -6,8 +6,8 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
-    <script type="text/javascript" src="$contextPath/static/js/js_country.js"
+    <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <script type="text/javascript" src="../webcontent/js/js_country.js"
             th:attr="src=@{/static/js/js_country.js}"></script>
     <title th:text="#{gui.countryselection.title}">eIDAS-Login Länderauswahl</title>
 </head>
diff --git a/connector/src/test/resources/config/templates/eidas_node_forward.html b/connector/src/test/resources/config/templates/eidas_node_forward.html
index 186937d7..6dffa34b 100644
--- a/connector/src/test/resources/config/templates/eidas_node_forward.html
+++ b/connector/src/test/resources/config/templates/eidas_node_forward.html
@@ -4,7 +4,7 @@
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
 <head>
-  <script src="$contextPath/autocommit.js"
+  <script src="../webcontent/autocommit.js"
           th:attr="src=@{/autocommit.js}"></script>
 </head>
 <body>
diff --git a/connector/src/test/resources/config/templates/error.html b/connector/src/test/resources/config/templates/error.html
index e2c605c7..21f589cd 100644
--- a/connector/src/test/resources/config/templates/error.html
+++ b/connector/src/test/resources/config/templates/error.html
@@ -5,7 +5,7 @@
       th:with="lang=${#locale.language}" th:lang="${lang}">
 
 <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-<link rel="stylesheet" href="$contextPath/css/css_error.css" th:href="@{/css/css_error.css}"/>
+<link rel="stylesheet" href="../webcontent/css/css_error.css" th:href="@{/css/css_error.css}"/>
 
 <title th:text="#{gui.errorpage.msg.title}">An error arise ... </title>
 </head>
diff --git a/connector/src/test/resources/config/templates/error_message.html b/connector/src/test/resources/config/templates/error_message.html
index 86f9d29d..caaf7136 100644
--- a/connector/src/test/resources/config/templates/error_message.html
+++ b/connector/src/test/resources/config/templates/error_message.html
@@ -3,10 +3,10 @@
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
-      
+
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-  <link rel="stylesheet" href="$contextPath/css/css_error.css"  th:href="@{/css/css_error.css}" />
-  
+  <link rel="stylesheet" href="../webcontent/css/css_error.css"  th:href="@{/css/css_error.css}" />
+
   <title th:text="#{gui.errorpage.msg.title}">An error arise ...  </title>
 </head>
 
@@ -14,21 +14,21 @@
   <div id="page">
 		<div id="page1" class="case selected-case" role="main">
 			<h2 class="OA_header" role="heading">Authentication error arise</h2>
-	        
+
 	        <div class="hell" role="application" >
             <h2 class="OA_header" role="heading" th:text="#{gui.errorpage.msg.title}">Error Header</h2>
-            
+
               <div id="alert_area" class="hell" role="application" >
                 <p th:text="#{gui.errorpage.msg.information}">Error Information</p>
                   <br/>
-		              <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p> 
+		              <p><b th:text="#{gui.errorpage.msg.errorcode}">Code :</b> <span th:text="${errorCode}"></span></p>
                   <p><b th:text="#{gui.errorpage.msg.errormsg}">Msg   :</b > <span th:text="${#messages.msgWithParams('__${errorCode}__', '__${errorParams}__')}"></span></p>
-	            </div>	
-                                                                                                      <!-- errorMsg -->	
-	        </div>	
+	            </div>
+                                                                                                      <!-- errorMsg -->
+	        </div>
 
 	        <div th:if="${stacktrace}">
-            <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p> 
+            <p><b th:text="#{gui.errorpage.msg.stacktrace}">fullError</b> <span th:text="${stacktrace}"></span></p>
 	        </div>
 
 		</div>
diff --git a/connector/src/test/resources/config/templates/other_login_method.html b/connector/src/test/resources/config/templates/other_login_method.html
index ea15864e..8f846f84 100644
--- a/connector/src/test/resources/config/templates/other_login_method.html
+++ b/connector/src/test/resources/config/templates/other_login_method.html
@@ -6,7 +6,7 @@
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link rel="stylesheet" href="$contextPath/static/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
+    <link rel="stylesheet" href="../webcontent/css/css_country.css" th:href="@{/static/css/css_country.css}"/>
     <title th:text="#{gui.otherlogin.title}">eIDAS-Login Other Login Methods</title>
     <style>
         .block {
diff --git a/connector/src/test/resources/config/templates/pvp2_post_binding.html b/connector/src/test/resources/config/templates/pvp2_post_binding.html
index 90858237..06b9b494 100644
--- a/connector/src/test/resources/config/templates/pvp2_post_binding.html
+++ b/connector/src/test/resources/config/templates/pvp2_post_binding.html
@@ -6,7 +6,7 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-  <script src="$contextPath/autocommit.js"></script>
+  <script src="/autocommit.js"></script>
 </head>
 <body>
 	<noscript>
@@ -21,7 +21,7 @@
 
 	<form action="${action}" method="post" target="_parent">
 		<div>
-			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end 
+			#if($RelayState)   <input type="hidden" name="RelayState" value="${RelayState}"/>     #end
 			#if($SAMLRequest)  <input type="hidden" name="SAMLRequest" value="${SAMLRequest}" />  #end
 			#if($SAMLResponse) <input type="hidden" name="SAMLResponse" value="${SAMLResponse}" /> #end
 		</div>
diff --git a/connector/src/test/resources/config/templates/residency.html b/connector/src/test/resources/config/templates/residency.html
index 79c620ea..9a277a16 100644
--- a/connector/src/test/resources/config/templates/residency.html
+++ b/connector/src/test/resources/config/templates/residency.html
@@ -218,7 +218,7 @@
     </form>
 
     <div>
-        <img id="loading" src="$contextPath/static/img/ajax-loader.gif"
+        <img id="loading" src="../webcontent/img/ajax-loader.gif"
              th:attr="src=@{/static/img/ajax-loader.gif}" style="display: none"/>
     </div>
 
diff --git a/connector/src/test/resources/config/webcontent/autocommit.js b/connector/src/test/resources/config/webcontent/autocommit.js
new file mode 100644
index 00000000..d21a5651
--- /dev/null
+++ b/connector/src/test/resources/config/webcontent/autocommit.js
@@ -0,0 +1,5 @@
+function autoCommmit() {
+  document.forms[0].submit();
+}
+
+document.addEventListener('DOMContentLoaded', autoCommmit);
\ No newline at end of file
diff --git a/connector/src/test/resources/config/webcontent/css/css_error.css b/connector/src/test/resources/config/webcontent/css/css_error.css
new file mode 100644
index 00000000..d772df43
--- /dev/null
+++ b/connector/src/test/resources/config/webcontent/css/css_error.css
@@ -0,0 +1,26 @@
+@charset "utf-8";
+    body {
+        padding-left: 5%;
+                background-color: #F9F9F9;
+    }
+    #page {
+        padding-top: 2%;
+        padding-right: 10%;
+        padding-left: 5%;
+    }
+
+    .OA_header {
+        font-size: 2.1em;
+        padding-top:1%;
+        margin-bottom: 1%;
+        margin-top: 1%;
+        
+    }
+
+    #alert_area {
+        float:left;
+        width: 100%;
+      }
+
+
+
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
index 186937d7..640c1f75 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
@@ -4,7 +4,7 @@
       layout:decorator="fragments/base"
       th:with="lang=${#locale.language}" th:lang="${lang}">
 <head>
-  <script src="$contextPath/autocommit.js"
+  <script src="/autocommit.js"
           th:attr="src=@{/autocommit.js}"></script>
 </head>
 <body>
-- 
cgit v1.2.3