From 19382d873642db2f282204d8658cfa1b14545e65 Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Fri, 04 Oct 2013 20:19:34 +0200
Subject: [PATCH] Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

---
 hsarweb/src/de/hsadmin/web/AbstractModule.java |    2 +-
 hsarweb/conf/WEB-INF/web.xml                   |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/hsarweb/conf/WEB-INF/web.xml b/hsarweb/conf/WEB-INF/web.xml
index 2acd982..a35e4e3 100644
--- a/hsarweb/conf/WEB-INF/web.xml
+++ b/hsarweb/conf/WEB-INF/web.xml
@@ -57,7 +57,6 @@
 		</init-param>
 	</filter>
 	
-
     <filter-mapping>
         <filter-name>CAS Validation Filter</filter-name>
 		<url-pattern>/*</url-pattern>
diff --git a/hsarweb/src/de/hsadmin/web/AbstractModule.java b/hsarweb/src/de/hsadmin/web/AbstractModule.java
index 85890fd..66e8d59 100644
--- a/hsarweb/src/de/hsadmin/web/AbstractModule.java
+++ b/hsarweb/src/de/hsadmin/web/AbstractModule.java
@@ -130,7 +130,7 @@
 			private static final long serialVersionUID = 1L;
 			@Override
 			public void buttonClick(ClickEvent event) {
-				ExternalResource logoutLink = new ExternalResource("/logout");
+				ExternalResource logoutLink = new ExternalResource("/hsarweb/logout");
 				application.getMainWindow().open(logoutLink);
 			}
 		});

--
Gitblit v1.9.0-SNAPSHOT