fix wrong placeholder in default GUI templates

6 files changed, 13 insertions, 15 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
index 36390ba62..d5fc90023 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
@@ -74,7 +74,7 @@ public abstract class AbstractController extends MOAIDAuthConstants {
 	
 	private static final String HTMLTEMPLATESDIR = "htmlTemplates/";
 	private static final String HTMLTEMPLATEFULL = "error_message.html";
-	private static String CONTEXTPATH = "#CONTEXTPATH#";
+	private static String CONTEXTPATH = "contextPath";
 	
 	@Autowired protected StatisticLogger statisticLogger;
 	@Autowired protected IRequestStorage requestStorage;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
index 427bb9464..9397f1132 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/IDPSingleLogOutServlet.java
@@ -111,10 +111,8 @@ public class IDPSingleLogOutServlet extends AbstractController {
 				else
 					context.put("errorMsg", 
 							MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
-
-				context.put(SSOManager.CONTEXTPATH, authURL);
 				
-				ssoManager.printSingleLogOutInfo(context, resp);				
+				ssoManager.printSingleLogOutInfo(context, resp, authURL);				
 					
 			} catch (MOAIDException e) {
 				handleErrorNoRedirect(e, req, resp, false);
@@ -209,7 +207,7 @@ public class IDPSingleLogOutServlet extends AbstractController {
 							MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
 		                	
 					try {
-						ssoManager.printSingleLogOutInfo(context, resp);
+						ssoManager.printSingleLogOutInfo(context, resp, authURL);
 						
 					} catch (MOAIDException e) {
 						e.printStackTrace();
@@ -223,7 +221,7 @@ public class IDPSingleLogOutServlet extends AbstractController {
 		context.put("successMsg",
 				MOAIDMessageProvider.getInstance().getMessage("slo.02", null));
 		try {			
-			ssoManager.printSingleLogOutInfo(context, resp);
+			ssoManager.printSingleLogOutInfo(context, resp, authURL);
 						
 		} catch (MOAIDException e) {
 			e.printStackTrace();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index 73d682c21..a97486097 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -554,8 +554,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		        context.put("redirectURLs", sloReqList);
 		        context.put("timeoutURL", timeOutURL);
 		        context.put("timeout", SLOTIMEOUT);
-		        context.put(SSOManager.CONTEXTPATH, authURL);
-		        ssoManager.printSingleLogOutInfo(context, httpResp);
+		        ssoManager.printSingleLogOutInfo(context, httpResp, authURL);
 				
 								
 			} else {
@@ -575,7 +574,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 			        else
 			        	context.put("errorMsg", 
 			        			MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
-			        ssoManager.printSingleLogOutInfo(context, httpResp);
+			        ssoManager.printSingleLogOutInfo(context, httpResp, authURL);
 										
 				}
 									
@@ -593,7 +592,7 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		        VelocityContext context = new VelocityContext();
 	        	context.put("errorMsg", 
 	        			MOAIDMessageProvider.getInstance().getMessage("slo.01", null));
-		        ssoManager.printSingleLogOutInfo(context, httpResp);
+		        ssoManager.printSingleLogOutInfo(context, httpResp, authURL);
 									
 			}
 			
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
index 856410d7b..3b7c99d5a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
@@ -64,7 +64,7 @@ import at.gv.egovernment.moa.util.MiscUtil;
 public class SSOManager {	
 	private static final String HTMLTEMPLATESDIR = "htmlTemplates/";
 	private static final String HTMLTEMPLATEFULL = "slo_template.html";
-	public static String CONTEXTPATH = "#CONTEXTPATH#";
+	public static String CONTEXTPATH = "contextPath";
 	
 	private static final String SSOCOOKIE = "MOA_ID_SSO";
 	private static final String SSOINTERFEDERATION = "MOA_INTERFEDERATION_SSO";
@@ -313,9 +313,10 @@ public class SSOManager {
 		
 	}
 	
-	public void printSingleLogOutInfo(VelocityContext context, HttpServletResponse httpResp) throws MOAIDException {		
+	public void printSingleLogOutInfo(VelocityContext context, HttpServletResponse httpResp, String authURL) throws MOAIDException {		
 		try {			
 			Logger.trace("Initialize VelocityEngine...");
+			context.put(CONTEXTPATH, authURL);
 			
 			InputStream is = null;
 			String pathLocation = null;
@@ -362,7 +363,7 @@ public class SSOManager {
 		BufferedReader reader = new BufferedReader(new InputStreamReader(is ));
 		
 		//set default elements to velocity context
-		context.put("contextpath", authConfig.getPublicURLPrefix());
+		//context.put(CONTEXTPATH, authConfig.getPublicURLPrefix());
 		
 		StringWriter writer = new StringWriter();			
 		//velocityEngine.evaluate(context, writer, "SLO_Template", reader);			
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/error_message.html b/id/server/idserverlib/src/main/resources/resources/templates/error_message.html
index 6cc8b99e2..4fd4d63cd 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/error_message.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/error_message.html
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
-  <link rel="stylesheet" href="#CONTEXTPATH#/css/buildCSS" />
+  <link rel="stylesheet" href="$contextPath/css/buildCSS" />
   
   <title>An error arise ...  </title>
 </head>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html
index 220dd980a..b3eb18082 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/slo_template.html
@@ -3,7 +3,7 @@
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   
    <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
-  <link rel="stylesheet" href="#CONTEXTPATH#/css/buildCSS" />
+  <link rel="stylesheet" href="$contextPath/css/buildCSS" />
 
 	#if($timeoutURL)
 		<script type="text/javascript">