Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms...

Peter Hormanns

2013-10-04 19382d873642db2f282204d8658cfa1b14545e65

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

 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>

 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);
            }
        });