diff options
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml | 33 | ||||
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp | 21 |
2 files changed, 32 insertions, 22 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml index 4118c94f4..b94368ac6 100644 --- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml +++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml @@ -27,17 +27,6 @@ <param-value>^.*((/index.action.*)|(/error.action.*)|(/authenticate.action.*)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value> </init-param> </filter> - <filter-mapping> - <filter-name>AuthenicationFiler</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - -<!-- - <filter> - <filter-name>sitemash</filter-name> - <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> - </filter> --> <filter> <filter-name>struts2</filter-name> @@ -105,21 +94,23 @@ <url-pattern>/servlet/sloBackChannel</url-pattern> </servlet-mapping> -<!-- <filter-mapping> - <filter-name>sitemash</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> --> - + +<!-- Set filter order --> <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>*.action</url-pattern> + <filter-name>AuthenicationFiler</filter-name> + <url-pattern>/*</url-pattern> </filter-mapping> - + <filter-mapping> <filter-name>EncodingFilter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> - + </filter-mapping> + + <filter-mapping> + <filter-name>struts2</filter-name> + <url-pattern>*.action</url-pattern> + </filter-mapping> + <session-config> <session-timeout>45</session-timeout> </session-config> 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 a61ce3053..367dc445d 100644 --- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp +++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/OA/targetConfiguration.jsp @@ -112,8 +112,17 @@ </div> </s:if> + <div id="oa_config_foreignbPKArea" class="oa_config_block"> - <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.foreignbpk.header", request) %></h3> + <h3><%=LanguageHelper.getGUIString("webpages.oaconfig.general.neweid.header", request) %></h3> + + <s:checkbox name="targetConfig.eidDemoActive" + value="%{targetConfig.eidDemoActive}" + labelposition="left" + key="webpages.oaconfig.general.neweid.activate" + cssClass="checkbox"> + </s:checkbox> + <s:textarea name="targetConfig.foreignbPKTargets" value="%{targetConfig.foreignbPKTargets}" labelposition="left" @@ -123,6 +132,16 @@ 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> </div> |