From f1d374bb66f3b48f2a14a8d550c4125c04dde7a8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 24 Feb 2014 11:40:49 +0100
Subject: * add default configuration values * add MOA-ID-Auth publicURLPreFix
 as mandatory configuration value * remove ReloadConfiguration serlet * change
 moa-id-lib to use publicURLPreFix * update repository

---
 id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp | 16 ++++++++++++----
 id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'id/ConfigWebTool/src/main/webapp')

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 1bb429afa..de5e4841b 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -33,6 +33,14 @@
 				<s:if test="authUser.isAdmin()">
 								
 					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+							
+							<s:textfield name="moaconfig.publicURLPrefix" 
+								value="%{moaconfig.publicURLPrefix}" 
+								labelposition="left"
+								key="webpages.oaconfig.general.publicURLPreFix"
+								cssClass="textfield_long">
+							</s:textfield>
+					
 				
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3>
@@ -200,12 +208,12 @@
 						
 						<div class="oa_config_block" >
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sso.header", request) %></h3>
-							<s:textfield name="moaconfig.ssoPublicUrl" 
+<%-- 							<s:textfield name="moaconfig.ssoPublicUrl" 
 								value="%{moaconfig.ssoPublicUrl}" 
 								labelposition="left"
 								key="webpages.moaconfig.sso.PublicUrl"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textfield> --%>
 							<s:textfield name="moaconfig.ssoFriendlyName" 
 								value="%{moaconfig.ssoFriendlyName}" 
 								labelposition="left"
@@ -316,12 +324,12 @@
 							<div class="moageneral_protocol_area">
 								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.pvp2.header", request) %></h4>
 									
-									<s:textfield name="moaconfig.pvp2PublicUrlPrefix " 
+<%-- 									<s:textfield name="moaconfig.pvp2PublicUrlPrefix " 
 										value="%{moaconfig.pvp2PublicUrlPrefix}" 
 										labelposition="left"
 										key="webpages.moaconfig.protocols.pvp2.PublicUrlPrefix"
 										cssClass="textfield_long">
-									</s:textfield>
+									</s:textfield> --%>
 									<s:textfield name="moaconfig.pvp2IssuerName" 
 										value="%{moaconfig.pvp2IssuerName}" 
 										labelposition="left"
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index fadf528d1..e182fd805 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -336,12 +336,13 @@
 								</s:checkbox>
 							</s:if>
 					
-							<s:textfield name="ssoOA.singleLogOutURL" 
+<%--TODO: insert if SLO is implemented!!!--%> 
+<%--							<s:textfield name="ssoOA.singleLogOutURL" 
 								value="%{ssoOA.singleLogOutURL}" 
 								labelposition="left"
 								key="webpages.oaconfig.sso.singlelogouturl"
 								cssClass="textfield_long">
-							</s:textfield>
+							</s:textfield> --%>
 						</div>
 					</div>
 
-- 
cgit v1.2.3