Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	pom.xml

5 files changed, 359 insertions, 298 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
index 79c66f37c..6d8421b51 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editMOAConfig.jsp
@@ -69,58 +69,60 @@
 							</s:checkbox>
 						
 				
-				
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3>
-							
-							<s:textfield name="moaconfig.defaultBKUHandy" 
-								value="%{moaconfig.defaultBKUHandy}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.handy"
-								cssClass="textfield_long">
-							</s:textfield>
-	
-							<s:textfield name="moaconfig.defaultBKULocal" 
-								value="%{moaconfig.defaultBKULocal}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.local"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-							<s:textfield name="moaconfig.defaultBKUOnline" 
-								value="%{moaconfig.defaultBKUOnline}" 
-								labelposition="left"
-								key="webpages.oaconfig.general.bku.online"
-								cssClass="textfield_long">
-							</s:textfield>
-						</div>
-						
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.slrequesttemplates.header", request) %></h3>
+						<s:if test="moaconfig.isMoaidMode()">
+							<div class="oa_config_block">
+								<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.defaultbkus.header", request) %></h3>
 								
-							<s:textfield name="moaconfig.SLRequestTemplateHandy" 
-								value="%{moaconfig.SLRequestTemplateHandy}" 
-								labelposition="left"
-								key="webpages.moaconfig.slrequesttemplates.handy"
-								cssClass="textfield_long">
-							</s:textfield>
-	
-							<s:textfield name="moaconfig.SLRequestTemplateLocal" 
-								value="%{moaconfig.SLRequestTemplateLocal}" 
-								labelposition="left"
-								key="webpages.moaconfig.slrequesttemplates.local"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-							<s:textfield name="moaconfig.SLRequestTemplateOnline" 
-								value="%{moaconfig.SLRequestTemplateOnline}" 
-								labelposition="left"
-								key="webpages.moaconfig.slrequesttemplates.online"
-								cssClass="textfield_long">
-							</s:textfield>
+								<s:textfield name="moaconfig.defaultBKUHandy" 
+									value="%{moaconfig.defaultBKUHandy}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.handy"
+									cssClass="textfield_long">
+								</s:textfield>
+		
+								<s:textfield name="moaconfig.defaultBKULocal" 
+									value="%{moaconfig.defaultBKULocal}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.local"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+								<s:textfield name="moaconfig.defaultBKUOnline" 
+									value="%{moaconfig.defaultBKUOnline}" 
+									labelposition="left"
+									key="webpages.oaconfig.general.bku.online"
+									cssClass="textfield_long">
+								</s:textfield>
+							</div>
 							
-						</div>			
-
+							<div class="oa_config_block">
+								<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.slrequesttemplates.header", request) %></h3>
+									
+								<s:textfield name="moaconfig.SLRequestTemplateHandy" 
+									value="%{moaconfig.SLRequestTemplateHandy}" 
+									labelposition="left"
+									key="webpages.moaconfig.slrequesttemplates.handy"
+									cssClass="textfield_long">
+								</s:textfield>
+		
+								<s:textfield name="moaconfig.SLRequestTemplateLocal" 
+									value="%{moaconfig.SLRequestTemplateLocal}" 
+									labelposition="left"
+									key="webpages.moaconfig.slrequesttemplates.local"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+								<s:textfield name="moaconfig.SLRequestTemplateOnline" 
+									value="%{moaconfig.SLRequestTemplateOnline}" 
+									labelposition="left"
+									key="webpages.moaconfig.slrequesttemplates.online"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+							</div>			
+						</s:if>
+						
+						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.certificates.header", request) %></h3>
 							
@@ -156,177 +158,204 @@
 								key="webpages.moaconfig.timeout.assertion"
 								cssClass="textfield_long">
 							</s:textfield>
-							<s:textfield name="moaconfig.timeoutMOASessionCreated" 
-								value="%{moaconfig.timeoutMOASessionCreated}" 
-								labelposition="left"
-								key="webpages.moaconfig.timeout.MOASessionCreated"
-								cssClass="textfield_long">
-							</s:textfield>
-							<s:textfield name="moaconfig.timeoutMOASessionUpdated" 
-								value="%{moaconfig.timeoutMOASessionUpdated}" 
-								labelposition="left"
-								key="webpages.moaconfig.timeout.MOASessionUpdated"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-						</div>
-						
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.moasp.header", request) %></h3>
-							
-							<s:textfield name="moaconfig.moaspssIdlTrustProfile" 
-								value="%{moaconfig.moaspssIdlTrustProfile}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.idltrustprofile"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-							<s:textfield name="moaconfig.moaspssIdlTrustProfileTest" 
-								value="%{moaconfig.moaspssIdlTrustProfileTest}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.idltrustprofile.test"
-								cssClass="textfield_long">
-							</s:textfield>
 							
-<%-- 							<s:textarea name="moaconfig.identityLinkSigners" 
-								value="%{moaconfig.identityLinkSigners}" 
-								labelposition="left"
-								key="webpages.moaconfig.identitylinksigners"
-								cssClass="textfield_large">
-							</s:textarea> --%>
-							
-							<s:textfield name="moaconfig.moaspssAuthTrustProfile" 
-								value="%{moaconfig.moaspssAuthTrustProfile}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.authtrustprofile"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-							<s:textfield name="moaconfig.moaspssAuthTrustProfileTest" 
-								value="%{moaconfig.moaspssAuthTrustProfileTest}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.authtrustprofile.test"
-								cssClass="textfield_long">
-							</s:textfield>
-							
-							
-<%-- 							<s:textarea name="moaconfig.moaspssAuthTransformations" 
-								value="%{moaconfig.moaspssAuthTransformations}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.authblocktransform"
-								cssClass="textfield_large">
-							</s:textarea> --%>
-							<s:textfield name="moaconfig.moaspssAuthTransformations" 
-								value="%{moaconfig.moaspssAuthTransformations}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.authblocktransform"
-								cssClass="textfield_long">
-							</s:textfield>
+							<s:if test="moaconfig.isMoaidMode()">
+								<s:textfield name="moaconfig.timeoutMOASessionCreated" 
+									value="%{moaconfig.timeoutMOASessionCreated}" 
+									labelposition="left"
+									key="webpages.moaconfig.timeout.MOASessionCreated"
+									cssClass="textfield_long">
+								</s:textfield>
+								<s:textfield name="moaconfig.timeoutMOASessionUpdated" 
+									value="%{moaconfig.timeoutMOASessionUpdated}" 
+									labelposition="left"
+									key="webpages.moaconfig.timeout.MOASessionUpdated"
+									cssClass="textfield_long">
+								</s:textfield>
+							</s:if>
+							<s:else>
+								<s:hidden name="moaconfig.timeoutMOASessionCreated" 
+									value="300">
+								</s:hidden>
+								<s:hidden name="moaconfig.timeoutMOASessionUpdated" 
+									value="300">
+								</s:hidden>
+							</s:else>
 							
-<%-- 							<s:textfield name="moaconfig.moaspssURL" 
-								value="%{moaconfig.moaspssURL}" 
-								labelposition="left"
-								key="webpages.moaconfig.moasp.url"
-								cssClass="textfield_long">
-							</s:textfield> --%>
 							
 						</div>
 						
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.services.header", request) %></h3>
-							<s:textarea name="moaconfig.mandateURL" 
-								value="%{moaconfig.mandateURL}" 
-								labelposition="left"
-								key="webpages.moaconfig.services.mandates"
-								cssClass="textfield_long">
-							</s:textarea>
-							<s:textarea name="moaconfig.szrgwURL" 
-								value="%{moaconfig.szrgwURL}" 
-								labelposition="left"
-								key="webpages.moaconfig.services.szrgw"
-								cssClass="textfield_long">
-							</s:textarea>
-							<s:textarea name="moaconfig.elgaMandateServiceURL" 
-								value="%{moaconfig.elgaMandateServiceURL}" 
-								labelposition="left"
-								key="webpages.moaconfig.services.elgamandateservice"
-								cssClass="textfield_long">
-							</s:textarea>
-						</div>
+						<s:if test="moaconfig.isMoaidMode()">
+							<div class="oa_config_block">
+								<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.moasp.header", request) %></h3>
+								
+								<s:textfield name="moaconfig.moaspssIdlTrustProfile" 
+									value="%{moaconfig.moaspssIdlTrustProfile}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.idltrustprofile"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+								<s:textfield name="moaconfig.moaspssIdlTrustProfileTest" 
+									value="%{moaconfig.moaspssIdlTrustProfileTest}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.idltrustprofile.test"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+	<%-- 							<s:textarea name="moaconfig.identityLinkSigners" 
+									value="%{moaconfig.identityLinkSigners}" 
+									labelposition="left"
+									key="webpages.moaconfig.identitylinksigners"
+									cssClass="textfield_large">
+								</s:textarea> --%>
+								
+								<s:textfield name="moaconfig.moaspssAuthTrustProfile" 
+									value="%{moaconfig.moaspssAuthTrustProfile}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.authtrustprofile"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+								<s:textfield name="moaconfig.moaspssAuthTrustProfileTest" 
+									value="%{moaconfig.moaspssAuthTrustProfileTest}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.authtrustprofile.test"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+								
+	<%-- 							<s:textarea name="moaconfig.moaspssAuthTransformations" 
+									value="%{moaconfig.moaspssAuthTransformations}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.authblocktransform"
+									cssClass="textfield_large">
+								</s:textarea> --%>
+								<s:textfield name="moaconfig.moaspssAuthTransformations" 
+									value="%{moaconfig.moaspssAuthTransformations}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.authblocktransform"
+									cssClass="textfield_long">
+								</s:textfield>
+								
+	<%-- 							<s:textfield name="moaconfig.moaspssURL" 
+									value="%{moaconfig.moaspssURL}" 
+									labelposition="left"
+									key="webpages.moaconfig.moasp.url"
+									cssClass="textfield_long">
+								</s:textfield> --%>
+								
+							</div>
+						</s:if>
 						
-						<div class="oa_config_block" >
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sso.header", request) %></h3>
-<%-- 							<s:textfield name="moaconfig.ssoPublicUrl" 
-								value="%{moaconfig.ssoPublicUrl}" 
-								labelposition="left"
-								key="webpages.moaconfig.sso.PublicUrl"
-								cssClass="textfield_long">
-							</s:textfield> --%>
-							<s:textfield name="moaconfig.ssoFriendlyName" 
-								value="%{moaconfig.ssoFriendlyName}" 
-								labelposition="left"
-								key="webpages.moaconfig.sso.FriendlyName"
-								cssClass="textfield_long">
-							</s:textfield>							
-							<s:textfield name="moaconfig.ssoTarget " 
-								value="%{moaconfig.ssoTarget }" 
-								labelposition="left"
-								key="webpages.moaconfig.services.sso.Target"
-								cssClass="textfield_long">
-							</s:textfield>
-							<s:textarea name="moaconfig.ssoSpecialText" 
-								value="%{moaconfig.ssoSpecialText}" 
-								labelposition="left"
-								key="webpages.moaconfig.services.sso.SpecialText"
-								cssClass="textfield_large">
-							</s:textarea>														
-						</div>
 						
 						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
-							<s:select list="storkconfig.allowedLoALevels"
-								value="%{storkconfig.defaultQaa}"
-								name="storkconfig.defaultQaa"
-								key="webpages.moaconfig.stork.qaa.default"
-								labelposition="left" 
-								cssClass="textfield_long" />
-							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
-              <table id="stork_pepslist">
-								<tr><td>Country Shortcode</td><td style="text-align:center;">PEPS URL</td><td>Supports XMLEncryption</td></tr>
-								<s:iterator value="storkconfig.cpepslist" status="stat">
-								  <tr>
-								  	<td style="display:none;"><s:textfield name="storkconfig.cpepslist[%{#stat.index}].hjid" value="%{hjid}" cssStyle="display:none;"/></td>
-								  	<s:if test="%{countryCode == 'CC'}">
-									  	<td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_PEPS_CC"/></td>
-								  	</s:if>
-								  	<s:else>
-								  		<td><s:property value="%{countryCode}" /></td>
-								  	</s:else>
-								    <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
-								    <td><s:checkbox name="storkconfig.cpepslist[%{#stat.index}].supportsXMLSignature" value="%{supportsXMLSignature}" /></td>								    
-								    <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td>
-								  </tr>
-								</s:iterator>
-                     						<s:if test="%{storkconfig.cpepslist == null || storkconfig.cpepslist.isEmpty}">
-                                    <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_PEPS_CC"/></td>
-                                        <td><s:textfield name="storkconfig.cpepslist[0].URL" value="http://" cssClass="textfield_long"/></td>
-                                        <td><s:checkbox name="storkconfig.cpepslist[0].supportsXMLSignature" value="true" /></td>
-                                        <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
-                                </s:if>
-                            </table>
-							<input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
-							<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4>
-							<table id="stork_attributelist">
-								<tr><td><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></td><td><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></td></tr>
-								<s:iterator value="storkconfig.attributes" status="stat">
-									<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td>
-										<td><s:checkbox name="storkconfig.attributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
-										<td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
-								</s:iterator>
-							</table>
-							<input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' />
+							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.services.header", request) %></h3>
+							
+							<s:if test="moaconfig.isMoaidMode()">
+								<s:textarea name="moaconfig.mandateURL" 
+									value="%{moaconfig.mandateURL}" 
+									labelposition="left"
+									key="webpages.moaconfig.services.mandates"
+									cssClass="textfield_long">
+								</s:textarea>
+								<s:textarea name="moaconfig.szrgwURL" 
+									value="%{moaconfig.szrgwURL}" 
+									labelposition="left"
+									key="webpages.moaconfig.services.szrgw"
+									cssClass="textfield_long">
+								</s:textarea>
+								<s:textarea name="moaconfig.elgaMandateServiceURL" 
+									value="%{moaconfig.elgaMandateServiceURL}" 
+									labelposition="left"
+									key="webpages.moaconfig.services.elgamandateservice"
+									cssClass="textfield_long">
+								</s:textarea>
+							</s:if>
+							
+							<s:textarea name="moaconfig.eidSystemServiceURL" 
+									value="%{moaconfig.eidSystemServiceURL}" 
+									labelposition="left"
+									key="webpages.moaconfig.services.eidsystemservice"
+									cssClass="textfield_long">
+							</s:textarea>							
 						</div>
 						
+						<s:if test="moaconfig.isMoaidMode()">
+							<div class="oa_config_block" >
+								<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sso.header", request) %></h3>
+	<%-- 							<s:textfield name="moaconfig.ssoPublicUrl" 
+									value="%{moaconfig.ssoPublicUrl}" 
+									labelposition="left"
+									key="webpages.moaconfig.sso.PublicUrl"
+									cssClass="textfield_long">
+								</s:textfield> --%>
+								<s:textfield name="moaconfig.ssoFriendlyName" 
+									value="%{moaconfig.ssoFriendlyName}" 
+									labelposition="left"
+									key="webpages.moaconfig.sso.FriendlyName"
+									cssClass="textfield_long">
+								</s:textfield>							
+								<s:textfield name="moaconfig.ssoTarget " 
+									value="%{moaconfig.ssoTarget }" 
+									labelposition="left"
+									key="webpages.moaconfig.services.sso.Target"
+									cssClass="textfield_long">
+								</s:textfield>
+								<s:textarea name="moaconfig.ssoSpecialText" 
+									value="%{moaconfig.ssoSpecialText}" 
+									labelposition="left"
+									key="webpages.moaconfig.services.sso.SpecialText"
+									cssClass="textfield_large">
+								</s:textarea>														
+							</div>
+							
+							<div class="oa_config_block">
+								<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.stork.header", request) %></h3>
+								<s:select list="storkconfig.allowedLoALevels"
+									value="%{storkconfig.defaultQaa}"
+									name="storkconfig.defaultQaa"
+									key="webpages.moaconfig.stork.qaa.default"
+									labelposition="left" 
+									cssClass="textfield_long" />
+								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.pepslist", request) %></h4>
+	              <table id="stork_pepslist">
+									<tr><td>Country Shortcode</td><td style="text-align:center;">PEPS URL</td><td>Supports XMLEncryption</td></tr>
+									<s:iterator value="storkconfig.cpepslist" status="stat">
+									  <tr>
+									  	<td style="display:none;"><s:textfield name="storkconfig.cpepslist[%{#stat.index}].hjid" value="%{hjid}" cssStyle="display:none;"/></td>
+									  	<s:if test="%{countryCode == 'CC'}">
+										  	<td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].countryCode" value="%{countryCode}" cssClass="textfield_PEPS_CC"/></td>
+									  	</s:if>
+									  	<s:else>
+									  		<td><s:property value="%{countryCode}" /></td>
+									  	</s:else>
+									    <td><s:textfield name="storkconfig.cpepslist[%{#stat.index}].URL" value="%{URL}" cssClass="textfield_long"/></td>
+									    <td><s:checkbox name="storkconfig.cpepslist[%{#stat.index}].supportsXMLSignature" value="%{supportsXMLSignature}" /></td>								    
+									    <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td>
+									  </tr>
+									</s:iterator>
+	                     						<s:if test="%{storkconfig.cpepslist == null || storkconfig.cpepslist.isEmpty}">
+	                                    <tr><td><s:textfield name="storkconfig.cpepslist[0].countryCode" value="CC" cssClass="textfield_PEPS_CC"/></td>
+	                                        <td><s:textfield name="storkconfig.cpepslist[0].URL" value="http://" cssClass="textfield_long"/></td>
+	                                        <td><s:checkbox name="storkconfig.cpepslist[0].supportsXMLSignature" value="true" /></td>
+	                                        <td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.removepeps", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+	                                </s:if>
+	                            </table>
+								<input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.newpeps", request) %>" onclick='newPeps();' />
+								<h4><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading", request) %></h4>
+								<table id="stork_attributelist">
+									<tr><td><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.name", request) %></td><td><%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.heading.mandatory", request) %></td></tr>
+									<s:iterator value="storkconfig.attributes" status="stat">
+										<tr><td><s:textfield name="storkconfig.attributes[%{#stat.index}].name" value="%{name}"/></td>
+											<td><s:checkbox name="storkconfig.attributes[%{#stat.index}].mandatory" value="%{mandatory}" /></td>
+											<td><input class="button_narrow" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.remove", request) %>" onclick='this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);'/></td></tr>
+									</s:iterator>
+								</table>
+								<input class="oa_buttons" type="button" value="<%=LanguageHelper.getGUIString("webpages.moaconfig.stork.attributes.new", request) %>" onclick='newStorkAttribute();' />
+							</div>
+						</s:if>
+						
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.protocols.header", request) %></h3>
 
@@ -338,18 +367,21 @@
 									key="webpages.moaconfig.protocols.legacy.saml1"
 									cssClass="checkbox">
 								</s:checkbox>
-								<s:checkbox name="moaconfig.protocolActivePVP21" 
-									value="%{moaconfig.protocolActivePVP21}"
-									labelposition="right"
-									key="webpages.moaconfig.protocols.legacy.pvp2"
-									cssClass="checkbox">
-								</s:checkbox>
-								<s:checkbox name="moaconfig.protocolActiveOAuth" 
-									value="%{moaconfig.protocolActiveOAuth}"
-									labelposition="right"
-									key="webpages.moaconfig.protocols.oauth"
-									cssClass="checkbox">
-								</s:checkbox>
+								
+								<s:if test="moaconfig.isMoaidMode()">
+									<s:checkbox name="moaconfig.protocolActivePVP21" 
+										value="%{moaconfig.protocolActivePVP21}"
+										labelposition="right"
+										key="webpages.moaconfig.protocols.legacy.pvp2"
+										cssClass="checkbox">
+									</s:checkbox>
+									<s:checkbox name="moaconfig.protocolActiveOAuth" 
+										value="%{moaconfig.protocolActiveOAuth}"
+										labelposition="right"
+										key="webpages.moaconfig.protocols.oauth"
+										cssClass="checkbox">
+									</s:checkbox>
+								</s:if>
 							</div>
 	
 							<br>
@@ -362,12 +394,15 @@
 									key="webpages.moaconfig.protocols.legacy.saml1"
 									cssClass="checkbox">
 								</s:checkbox>
-								<s:checkbox name="moaconfig.legacy_pvp2" 
-									value="%{moaconfig.legacy_pvp2}"
-									labelposition="right"
-									key="webpages.moaconfig.protocols.legacy.pvp2"
-									cssClass="checkbox">
-								</s:checkbox>
+								
+								<s:if test="moaconfig.isMoaidMode()">
+									<s:checkbox name="moaconfig.legacy_pvp2" 
+										value="%{moaconfig.legacy_pvp2}"
+										labelposition="right"
+										key="webpages.moaconfig.protocols.legacy.pvp2"
+										cssClass="checkbox">
+									</s:checkbox>
+								</s:if>
 							</div>
 							
 							<br>
@@ -461,24 +496,25 @@
 							</div>
 						</div>
 						
-						<div class="oa_config_block">
-							<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sl.transormations.header", request) %></h3>
-							
-							<s:iterator value="%{moaconfig.fileUploadFileName}" var="fileName">
-								<s:label key="webpages.moaconfig.sl.transormations.filename" value="%{fileName}"/>
-						
-								<div id="pvp2_certificate_upload">
-									<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
-								</div>
-							</s:iterator>
+						<s:if test="moaconfig.isMoaidMode()">
+							<div class="oa_config_block">
+								<h3><%=LanguageHelper.getGUIString("webpages.moaconfig.sl.transormations.header", request) %></h3>
+								
+								<s:iterator value="%{moaconfig.fileUploadFileName}" var="fileName">
+									<s:label key="webpages.moaconfig.sl.transormations.filename" value="%{fileName}"/>
 							
-							<s:if test="moaconfig.fileUploadFileName.size() == 0">
 									<div id="pvp2_certificate_upload">
 										<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
-								</div>
-							</s:if>
-							
-						</div>
+									</div>
+								</s:iterator>
+								
+								<s:if test="moaconfig.fileUploadFileName.size() == 0">
+										<div id="pvp2_certificate_upload">
+											<s:file name="moaconfig.fileUpload" key="webpages.moaconfig.sl.transormations.upload" cssClass="textfield_long"></s:file>
+									</div>
+								</s:if>							
+							</div>
+						</s:if>
 						
 						<br>
 						<br>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
index cc4220d0e..feab86593 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/editOAGeneral.jsp
@@ -46,12 +46,14 @@
 		
 					<s:include value="snippets/OA/authentication.jsp"></s:include>
 		
-					<s:include value="snippets/OA/bPKDecryption.jsp"></s:include>
+					<s:if test="authOA.isMoaidMode()">
+						<s:include value="snippets/OA/bPKDecryption.jsp"></s:include>
 					
-					<s:include value="snippets/OA/sso.jsp"></s:include>
+						<s:include value="snippets/OA/sso.jsp"></s:include>
 					
-					<s:include value="snippets/OA/stork.jsp"></s:include>
-							
+						<s:include value="snippets/OA/stork.jsp"></s:include>						
+					</s:if>
+						
 					<div class="oa_config_block">
 						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.protocols.header", request) %></h3>
 						
@@ -64,35 +66,40 @@
 								</button>
 							</s:if>
 							
-							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %>
-						  </button>
-							<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_hidden">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.hidden", request) %>
-						  </button>
-						  
-						  <button type="button" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_show">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.show", request) %>
-						  </button>
-							<button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden">
-								<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
-						  </button>
-							
+							<s:if test="authOA.isMoaidMode()">
+								<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.show", request) %>
+							  	</button>
+								<button type="button" class="oa_buttons" onclick="oaPVP2();" id="button_pvp2_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.pvp2.hidden", request) %>
+							  	</button>
+							  
+							  	<button type="button" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_show">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.show", request) %>
+							  	</button>
+								<button type="button" style="display:none" class="oa_buttons" onclick="oaOAuth20();" id="button_oauth20_hidden">
+									<%=LanguageHelper.getGUIString("webpages.oaconfig.menu.oauth20.hidden", request) %>
+							  	</button>
+							</s:if>
 
 							<s:include value="snippets/OA/saml1.jsp"></s:include>
 
-							<s:include value="snippets/OA/pvp2.jsp">
-								<s:param name="hideBlock">hidden</s:param>
-							</s:include>							
+							<s:if test="authOA.isMoaidMode()">
+								<s:include value="snippets/OA/pvp2.jsp">
+									<s:param name="hideBlock">hidden</s:param>
+								</s:include>							
 						
-							<s:include value="snippets/OA/openIDConnect.jsp"></s:include>				
+								<s:include value="snippets/OA/openIDConnect.jsp"></s:include>
+							</s:if>				
 								  						
 							
 					</div>
 
-					<s:include value="snippets/OA/formCustomization.jsp"></s:include>
+					<s:if test="authOA.isMoaidMode()">
+						<s:include value="snippets/OA/formCustomization.jsp"></s:include>
 
-					<s:include value="snippets/OA/revisionslog.jsp"></s:include>
+						<s:include value="snippets/OA/revisionslog.jsp"></s:include>
+					</s:if>
 										
 					<s:hidden name="formID" 
 							value="%{formID}"></s:hidden>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
index d2668e264..7a54df554 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/authentication.jsp
@@ -3,8 +3,8 @@
 <%@ taglib prefix="s" uri="/struts-tags" %>
 
 <html>
-
-					<s:if test="authUser.isAdmin()">
+				<s:if test="authOA.isMoaidMode()">
+					<s:if test="authUser.isAdmin()">					
 						<div class="oa_config_block">
 							<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.bku.header", request) %></h3>
 						
@@ -167,16 +167,26 @@
 					</div>						
 				
 					<div class="oa_config_block">
-						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.szrgw.header", request) %></h3>
-						
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.szrgw.header", request) %></h3>						
 						<s:select list="authOA.szrgwServicesList"
 											key="webpages.oaconfig.general.szrgw.selected"
 											labelposition="left"
 											cssClass="selectfield_long"
 											value="%{authOA.szrgwServiceSelected}"
 											name="authOA.szrgwServiceSelected">
-						</s:select>
-						
-					</div>	
+						</s:select>						
+					</div>
+				</s:if>
+					
+					<div class="oa_config_block">
+						<h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.eid.header", request) %></h3>						
+						<s:select list="authOA.eidServicesList"
+											key="webpages.oaconfig.general.eid.selected"
+											labelposition="left"
+											cssClass="selectfield_long"
+											value="%{authOA.eidServiceSelected}"
+											name="authOA.eidServiceSelected">
+						</s:select>						
+					</div>		
 				
 </html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
index 367dc445d..dc093fc36 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp
@@ -123,25 +123,29 @@
 								cssClass="checkbox">
 						</s:checkbox>
 						
-						<s:textarea name="targetConfig.foreignbPKTargets" 
-									value="%{targetConfig.foreignbPKTargets}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.foreign.sectors"
-									cssClass="textfield_long"
-									rows="6"								
-									requiredLabel="true"
-									style="height:120px;">								
-						</s:textarea>
-						
-						<s:textarea name="targetConfig.additionalbPKTargets" 
-									value="%{targetConfig.additionalbPKTargets}" 
-									labelposition="left"
-									key="webpages.oaconfig.general.additionalbpks.sectors"
-									cssClass="textfield_long"
-									rows="6"								
-									requiredLabel="true"
-									style="height:120px;">								
-						</s:textarea>
+						<s:if test="authOA.isMoaidMode()">
+							<!-- 
+							<s:textarea name="targetConfig.foreignbPKTargets" 
+										value="%{targetConfig.foreignbPKTargets}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.foreign.sectors"
+										cssClass="textfield_long"
+										rows="6"								
+										requiredLabel="true"
+										style="height:120px;">								
+							</s:textarea>
+							
+							<s:textarea name="targetConfig.additionalbPKTargets" 
+										value="%{targetConfig.additionalbPKTargets}" 
+										labelposition="left"
+										key="webpages.oaconfig.general.additionalbpks.sectors"
+										cssClass="textfield_long"
+										rows="6"								
+										requiredLabel="true"
+										style="height:120px;">								
+							</s:textarea>
+							 -->
+						</s:if>
 					
 					</div>
 					
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
index 95d6de912..f4c377d9c 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -18,10 +18,14 @@
 			</div>
 			
 			<s:if test="authUser.isAdmin()">
-				<div class="menu_element">
-						<s:url action="listallinterfederationidps" var="interfederationConfig" namespace="/secure"/>
-						<a href="<s:property value="#interfederationConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.interfederation", request) %></a>
-				</div>			
+				
+				<s:if test="authOA.isMoaidMode()">
+					<div class="menu_element">
+							<s:url action="listallinterfederationidps" var="interfederationConfig" namespace="/secure"/>
+							<a href="<s:property value="#interfederationConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.interfederation", request) %></a>
+					</div>
+				</s:if>			
+				
 				<div class="menu_element">
 						<s:url action="loadGeneralConfig" var="generalConfig" namespace="/secure"/>
 						<a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a>