hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

Merge branch 'master' of

Browse Source 
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Conflicts:
	hsarweb/src/de/hsadmin/web/AbstractModule.java
This commit is contained in:
Peter Hormanns 2013-10-04 20:08:38 +02:00
commit 8b9e266f5a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hsarweb/conf/WEB-INF/web.xml
View File

@ -57,7 +57,7 @@
</init-param> </init-param>
</filter> </filter>
<!--
<filter-mapping> <filter-mapping>
<filter-name>CAS Validation Filter</filter-name> <filter-name>CAS Validation Filter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
@ -67,7 +67,7 @@
<filter-name>CAS Authentication Filter</filter-name> <filter-name>CAS Authentication Filter</filter-name>
<url-pattern>/*</url-pattern> <url-pattern>/*</url-pattern>
</filter-mapping> </filter-mapping>
-->
<servlet> <servlet>
<servlet-name>Logout Servlet</servlet-name> <servlet-name>Logout Servlet</servlet-name>
<servlet-class>de.hsadmin.logout.LogoutServlet</servlet-class> <servlet-class>de.hsadmin.logout.LogoutServlet</servlet-class>

2
hsarweb/src/de/hsadmin/web/AbstractModule.java
View File

@ -130,7 +130,7 @@ public abstract class AbstractModule implements Module, Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Override @Override
public void buttonClick(ClickEvent event) { public void buttonClick(ClickEvent event) {
ExternalResource logoutLink = new ExternalResource("/hasrweb/logout"); ExternalResource logoutLink = new ExternalResource("/hsarweb/logout");
application.getMainWindow().open(logoutLink); application.getMainWindow().open(logoutLink);
} }
}); });