diff options
| author | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-07-09 14:08:32 +0000 |
|---|---|---|
| committer | clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2009-07-09 14:08:32 +0000 |
| commit | d972ac8a363476365077d4f4b7410a33cc321b17 (patch) | |
| tree | 8d6e6f44315aa924f7dbe671d42490147fc6c913 | |
| parent | 44e7ad81fdc87e81017d02e803e907008757a822 (diff) | |
| download | mocca-d972ac8a363476365077d4f4b7410a33cc321b17.tar.gz mocca-d972ac8a363476365077d4f4b7410a33cc321b17.tar.bz2 mocca-d972ac8a363476365077d4f4b7410a33cc321b17.zip | |
conflict resolved?
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@405 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
| -rw-r--r-- | BKUOnline/src/main/webapp/WEB-INF/web.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml index e69c64f1..9b286351 100644 --- a/BKUOnline/src/main/webapp/WEB-INF/web.xml +++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml @@ -29,7 +29,7 @@ <listener> <listener-class>at.gv.egiz.bku.online.webapp.SessionTimeout</listener-class> </listener> - <servlet> + <servlet> <servlet-name>BKUServlet</servlet-name> <servlet-class>at.gv.egiz.bku.online.webapp.BKURequestHandler</servlet-class> </servlet> @@ -54,7 +54,7 @@ <servlet-name>help</servlet-name> <jsp-file>/help.jsp</jsp-file> </servlet> - <servlet-mapping> + <servlet-mapping> <servlet-name>BKUServlet</servlet-name> <url-pattern>/http-security-layer-request</url-pattern> </servlet-mapping> @@ -110,7 +110,7 @@ </servlet-mapping> <!-- End STAL Config --> - <!-- Begin BKU Web Start Config + <!-- Begin BKU Web Start Config | (activate 'include-webstart' profile) --> <servlet> @@ -130,14 +130,14 @@ <servlet-name>JnlpDownloadServlet</servlet-name> <url-pattern>/webstart/*</url-pattern> </servlet-mapping> - + <!-- End BKU Web Start Config --> <welcome-file-list> <welcome-file>index.html</welcome-file> <welcome-file>index.jsp</welcome-file> </welcome-file-list> - <session-config> + <session-config> <session-timeout>5</session-timeout> </session-config> </web-app> |