HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2013-10-04 8b9e266f5a9d20f138502d3296e30e2a5c1605c7
Merge branch 'master' of
ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Conflicts:
hsarweb/src/de/hsadmin/web/AbstractModule.java
2 files modified
6 ■■■■ changed files
hsarweb/conf/WEB-INF/web.xml 4 ●●●● patch | view | raw | blame | history
hsarweb/src/de/hsadmin/web/AbstractModule.java 2 ●●● patch | view | raw | blame | history
hsarweb/conf/WEB-INF/web.xml
@@ -57,7 +57,7 @@
        </init-param>
    </filter>
    
<!--
    <filter-mapping>
        <filter-name>CAS Validation Filter</filter-name>
        <url-pattern>/*</url-pattern>
@@ -67,7 +67,7 @@
        <filter-name>CAS Authentication Filter</filter-name>
        <url-pattern>/*</url-pattern>
    </filter-mapping>
 -->
    <servlet>
        <servlet-name>Logout Servlet</servlet-name>
        <servlet-class>de.hsadmin.logout.LogoutServlet</servlet-class>
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("/hasrweb/logout");
                ExternalResource logoutLink = new ExternalResource("/hsarweb/logout");
                application.getMainWindow().open(logoutLink);
            }
        });