diff --git a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
index 252ee0c31b87a24e0546559e9f10aeb15356c262..6301ff42560ba97681c8d96d3f192563f28046e0 100644
--- a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
@@ -3,7 +3,8 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:p="http://primefaces.org/ui"
- xmlns:f="http://java.sun.com/jsf/core">
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core">
<f:metadata>
<f:viewParam id="state" name="state"/>
@@ -31,11 +32,6 @@
<form action="#{request.contextPath}/j_spring_security_check" method="post">
<div class="stretch" align="center">
- <div class="hint-panel">
- <h:outputText style="color: red" value="#{state == 'logout' ? 'Sie haben sich erfolgreich ausgeloggt.' : 'Anmeldung fehlgeschlagen.'}" rendered="#{not empty state}"/><br/>
- <p:spacer width="0" height="25" rendered="#{not empty state}"/>
- </div>
-
<p:panel header="#{localizedLoginMessages.msgWelcomeShort}" styleClass="login-panel">
<h:panelGrid columnClasses="col1 , col2" styleClass="grid" columns="2" cellpadding="5" >
<h:outputLabel for="j_username" value="#{localizedLoginMessages.username}:" />
@@ -46,12 +42,26 @@
</h:panelGrid>
<hr/>
<div align="right">
- <h:commandButton value="#{localizedLoginMessages.login}" type="submit" />
+ <button type="submit" class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <span class="ui-button-text">#{localizedLoginMessages.login}</span>
+ </button>
</div>
</p:panel>
- <p:spacer width="0" height="40"/>
+ <c:if test="#{state == 'logout'}">
+ <div class="hint-panel">
+ <p:spacer width="0" height="25"/>
+ <h:outputText value="Sie haben sich erfolgreich ausgeloggt."/><br/>
+ </div>
+ </c:if>
+ <c:if test="#{state == 'fail'}">
+ <div class="hint-panel">
+ <p:spacer width="0" height="25" />
+ <h:outputText style="color: red" value="Anmeldung fehlgeschlagen."/><br/>
+ </div>
+ </c:if>
+ <p:spacer width="0" height="40"/>
<div class="hint-panel">
<h:outputText value="#{localizedLoginMessages.hint}"/>
</div>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
index 92dcf9f5d4ddfce03f2fed37c1f02018cd35d40d..cad9b0ea2927c3e344479b21a77652f733f7d909 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
@@ -8,6 +8,12 @@
<view-id value="/faces/pages/ProjectOverviewPage.xhtml" />
</url-mapping>
+ <!-- The following mapping is very important! It makes sure that no one can access the root directory of the application. -->
+ <url-mapping id="home-redirect">
+ <pattern value="/" />
+ <view-id value="/faces/pages/ProjectOverviewPage.xhtml" />
+ </url-mapping>
+
<url-mapping id="projectOverview">
<pattern value="/pages/projectOverview" />
<view-id value="/faces/pages/ProjectOverviewPage.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
index dadc966dade8201c009948d7ded5a551ea16dc51..f9f3e288ef2e2251df0756d35aaf622aaa81606a 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
@@ -8,11 +8,11 @@
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
<http use-expressions="true" access-denied-page="/accessDenied" >
- <form-login login-page="/login" default-target-url="/pages/" authentication-failure-url="/login?state=failure"/>
+ <form-login login-page="/login" default-target-url="/pages/" authentication-failure-url="/login?state=fail"/>
<intercept-url pattern="/login" access="true"/>
<intercept-url pattern="/pages/**" access="isAuthenticated()"/>
<intercept-url pattern="/faces/pages/**" access="isAuthenticated()"/>
- <intercept-url pattern="/" access="false" />
+ <intercept-url pattern="/" access="isAuthenticated()" />
<logout logout-success-url="/login?state=logout" />
</http>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
index 733e982572f51dfefa38e90fbaa2b816dfc953c1..3a295ec316974a8d6e5de379009de45667ce631f 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
@@ -65,10 +65,6 @@
</session-timeout>
</session-config>
- <welcome-file-list>
- <welcome-file>faces/ProjectOverviewPage.xhtml</welcome-file>
- </welcome-file-list>
-
<listener>
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
diff --git a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
index 75e3640ec9ecec44685c6f58f46cb2fedc6ac79d..aee8aa6eac3f027887d33fbab18d88db3b21ba74 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
@@ -114,7 +114,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
</p:menubar>
<p:spacer height="5"/>
<p:menubar>
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
index 112c0b41f32ba26002b62acc816a7474d6655f61..a201c9f874c8064638e212a9687a2cbf0bf8f6ef 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
@@ -68,7 +68,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
</p:menubar>
</h:form>
</p:layoutUnit>
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index a9f11fc737e1071967642a4aea551f5827a489be..d0b761c6a1cbfd11a42ba06832d4ffc4eb03bacf 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
@@ -66,7 +66,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
</p:menubar>
</h:form>
</p:layoutUnit>
diff --git a/Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
index 3a39a76e8a29af581c9f2bac8d355e70ecb88633..30c45b94e999b4e6a2bbd4a88bfdf7964ce2bcc5 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
@@ -61,7 +61,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
</p:menubar>
</h:form>
diff --git a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
index d8a7d2ceff3e3ba70792fc192ebec6254b74b2da..d450ca0013cd37c05800b66ae226753c095f081e 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
@@ -59,7 +59,7 @@
<p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value=" #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
</p:submenu>
- <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="#{request.contextPath}/j_spring_security_logout"/>
</p:menubar>
</h:form>
</p:layoutUnit>