diff --git a/Kieker.WebGUI/bin/Kieker.WebGUI.bat b/Kieker.WebGUI/bin/Kieker.WebGUI.bat
index 38e5062faf537059090d45e34d2aaf2133dcae0b..43f71488b2da89bcdde43e37458b041da34f96de 100644
--- a/Kieker.WebGUI/bin/Kieker.WebGUI.bat
+++ b/Kieker.WebGUI/bin/Kieker.WebGUI.bat
@@ -1,6 +1,6 @@
@echo off
REM @author Nils Christian Ehmke
-java -jar ..\lib\jetty-runner-*.jar ..\target\Kieker.WebGUI-*.war
+java -jar ..\lib\jetty-runner-*.jar --path /Kieker.WebGUI ..\target\Kieker.WebGUI-*.war
@echo on
\ No newline at end of file
diff --git a/Kieker.WebGUI/bin/Kieker.WebGUI.sh b/Kieker.WebGUI/bin/Kieker.WebGUI.sh
index 7bc0a824f8d4b7d0db6223779a511e539d862bc4..82a5cab62eab62d8d24ddbda06baca277d9fbe74 100644
--- a/Kieker.WebGUI/bin/Kieker.WebGUI.sh
+++ b/Kieker.WebGUI/bin/Kieker.WebGUI.sh
@@ -2,4 +2,4 @@
# @author Nils Christian Ehmke
-java -jar ../lib/jetty-runner-*.jar ../target/Kieker.WebGUI-*.war
\ No newline at end of file
+java -jar ../lib/jetty-runner-*.jar --path /Kieker.WebGUI ../target/Kieker.WebGUI-*.war
\ No newline at end of file
diff --git a/Kieker.WebGUI/nb-configuration.xml b/Kieker.WebGUI/nb-configuration.xml
index b8e9f2780636cfaf4e0b80d113250ca731ed0b40..3e1840f86953bff823f259b37d36e350fda36ce7 100644
--- a/Kieker.WebGUI/nb-configuration.xml
+++ b/Kieker.WebGUI/nb-configuration.xml
@@ -6,6 +6,9 @@ The configuration is intended to be shared among all the users of project and
therefore it is assumed to be part of version control checkout.
Without this configuration present, some functionality in the IDE may be limited or fail altogether.
-->
+ <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
+ <word>xml</word>
+ </spellchecker-wordlist>
<properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
<!--
Properties that influence various parts of the IDE, especially code formatting and the like.
@@ -14,8 +17,6 @@ That way multiple projects can share the same settings (useful for formatting ru
Any value defined here will override the pom.xml file value but is only applicable to the current project.
-->
<netbeans.compile.on.save>all</netbeans.compile.on.save>
+ <org-netbeans-modules-projectapi.jsf_2e_language>Facelets</org-netbeans-modules-projectapi.jsf_2e_language>
</properties>
- <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
- <word>xml</word>
- </spellchecker-wordlist>
</project-shared-configuration>
diff --git a/Kieker.WebGUI/nbactions.xml b/Kieker.WebGUI/nbactions.xml
index 83c07bc949ef02efe2913b7d905adcdc0d8d8eca..cada5c04fa77a448dbb9f51e877875b39de56fdc 100644
--- a/Kieker.WebGUI/nbactions.xml
+++ b/Kieker.WebGUI/nbactions.xml
@@ -4,7 +4,6 @@
<actionName>run</actionName>
<goals>
<goal>jetty:run</goal>
-
</goals>
</action>
</actions>
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index a6f3ea9a470c2a369e871e52e501f72082a6fc64..c669e8905dda2bf0229fbeec367ac4c321e9598a 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -14,6 +14,7 @@
<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<kieker.jar>kieker-1.6_emf.jar</kieker.jar>
+ <netbeans.hint.deploy.server>gfv3ee6</netbeans.hint.deploy.server>
</properties>
<repositories>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
index 2a540050df5ba48b66d1fba9edd6e4cc49223715..c1e8774c9a29b2055f7cc41aaccab15d0a4243e1 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java
@@ -17,6 +17,7 @@
package kieker.webgui.beans.application;
import java.io.IOException;
+import java.io.Serializable;
import java.util.Properties;
import java.util.ResourceBundle;
@@ -39,7 +40,7 @@ import kieker.common.logging.LogFactory;
*/
@ManagedBean
@ApplicationScoped
-public final class GlobalPropertiesBean {
+public final class GlobalPropertiesBean implements Serializable {
private static final Log LOG = LogFactory.getLog(GlobalPropertiesBean.class);
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java
index 02994fee3e7091a92d7bb6f66effa55a35f9d15c..d178c9c9809fe90e445aec4b44ab3161f1e87e6b 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java
@@ -16,6 +16,7 @@
package kieker.webgui.beans.session;
+import java.io.Serializable;
import java.util.Map;
import javax.annotation.PostConstruct;
@@ -36,7 +37,7 @@ import kieker.webgui.beans.application.GlobalPropertiesBean;
*/
@ManagedBean
@SessionScoped
-public final class CurrentConfigurationBean {
+public final class CurrentConfigurationBean implements Serializable {
private String lookAndFeel;
private String gridColor;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
index 6a718e063748028eb2d558a07de3200a5827d013..65656549435d1eee8cc0b74c7753663be3455750 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java
@@ -16,6 +16,8 @@
package kieker.webgui.beans.session;
+import java.io.Serializable;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.ManagedProperty;
import javax.faces.bean.SessionScoped;
@@ -30,7 +32,7 @@ import kieker.webgui.beans.application.GlobalPropertiesBean;
*/
@ManagedBean
@SessionScoped
-public final class UserBean {
+public final class UserBean implements Serializable {
private String userName;
private String password;
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorGraphBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorGraphBean.java
index bb3d0bd55473384ef3704e866eeff8de6ded0fcf..9907337d720044c8390b75d4ca9922073bc3b99f 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorGraphBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorGraphBean.java
@@ -169,9 +169,9 @@ public final class CurrentAnalysisEditorGraphBean {
*/
public void declareGraph() {
RequestContext.getCurrentInstance().execute(CurrentAnalysisEditorGraphBean.JS_CMD_CREATE_GRAPH_VAR);
- RequestContext.getCurrentInstance().execute("graph.setNodeIcon('Filter', '../img/graphIcons/FilterIcon.png');");
- RequestContext.getCurrentInstance().execute("graph.setNodeIcon('Reader', '../img/graphIcons/ReaderIcon.png');");
- RequestContext.getCurrentInstance().execute("graph.setNodeIcon('Repository', '../img/graphIcons/RepositoryIcon.png');");
+ RequestContext.getCurrentInstance().execute("graph.setNodeIcon('Filter', './img/graphIcons/FilterIcon.png');");
+ RequestContext.getCurrentInstance().execute("graph.setNodeIcon('Reader', './img/graphIcons/ReaderIcon.png');");
+ RequestContext.getCurrentInstance().execute("graph.setNodeIcon('Repository', './img/graphIcons/RepositoryIcon.png');");
}
/**
diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml
index 2c6db586212e06f7c9a58e7a838a8f0b8b65fe96..67124a1edceb7069fab0c3a0999aa4bcf5902fa8 100644
--- a/Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml
@@ -19,14 +19,14 @@
<h:head>
<title>Kieker.WebGUI</title>
<!-- Load the necessary CSS files. -->
- <link rel="stylesheet" type="text/css" href="../css/FlowEditor.css" />
- <link rel="stylesheet" type="text/css" href="../css/Common.css" />
- <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="../css/AnalysisEditorPage.css" />
+ <link rel="stylesheet" type="text/css" href="./css/FlowEditor.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="./css/AnalysisEditorPage.css" />
<!-- Load the necessary JS files. -->
- <script language="javascript" type="text/javascript" src="../js/jit.js"></script>
- <script language="javascript" type="text/javascript" src="../js/flowEditor.js"></script>
+ <script language="javascript" type="text/javascript" src="./js/jit.js"></script>
+ <script language="javascript" type="text/javascript" src="./js/flowEditor.js"></script>
<script>
nodeClickListener = function(node, info, e) {
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml
index 8bf9df8044a239fe6b425a5d105291493772c1f4..c6b6908f4f36901a28fe2078ca932d2931a4e453 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml
@@ -16,9 +16,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="../css/Common.css" />
- <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="../css/CockpitEditorPage.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="./css/CockpitEditorPage.css" />
</h:head>
<h:body>
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml
index b23ccda28038cc3b8d7e0bc1e5f5296d1f7031c1..16f15e87dcc90f2e9b1807331cf2e3fc06792479 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml
@@ -16,9 +16,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="../css/Common.css" />
- <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="../css/CockpitPage.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="./css/CockpitPage.css" />
</h:head>
<h:body>
diff --git a/Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml b/Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml
index a822a4545896a723cc919451310b21f854acbcc5..b31a1e297335f66a20fb218a3a9f21618449aeef 100644
--- a/Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml
@@ -15,9 +15,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="../css/Common.css" />
- <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="../css/ControllerPage.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="./css/ControllerPage.css" />
</h:head>
<h:body>
@@ -98,17 +98,17 @@
<hr/>
<h:form id="ledsForm">
<div align="center">
- <h:graphicImage id="iconLEDRed1" url="../img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisNotAvailable()}"/>
- <h:graphicImage id="iconLEDRed1_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisNotAvailable()}"/>
+ <h:graphicImage id="iconLEDRed1" url="./img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisNotAvailable()}"/>
+ <h:graphicImage id="iconLEDRed1_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisNotAvailable()}"/>
<p:spacer height="0" width="15px"/>
- <h:graphicImage id="iconLEDYellow" url="../img/LEDs/Icon_LED_Yellow.png" height="50px" rendered="#{currentControllerBean.isAnalysisReady()}"/>
- <h:graphicImage id="iconLEDYellow_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisReady()}"/>
+ <h:graphicImage id="iconLEDYellow" url="./img/LEDs/Icon_LED_Yellow.png" height="50px" rendered="#{currentControllerBean.isAnalysisReady()}"/>
+ <h:graphicImage id="iconLEDYellow_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisReady()}"/>
<p:spacer height="0" width="15px"/>
- <h:graphicImage id="iconLEDGreen" url="../img/LEDs/Icon_LED_Green.png" height="50px" rendered="#{currentControllerBean.isAnalysisRunning()}"/>
- <h:graphicImage id="iconLEDGreen_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisRunning()}"/>
+ <h:graphicImage id="iconLEDGreen" url="./img/LEDs/Icon_LED_Green.png" height="50px" rendered="#{currentControllerBean.isAnalysisRunning()}"/>
+ <h:graphicImage id="iconLEDGreen_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisRunning()}"/>
<p:spacer height="0" width="15px"/>
- <h:graphicImage id="iconLEDRed2" url="../img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed()}"/>
- <h:graphicImage id="iconLEDRed2_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not (currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed())}"/>
+ <h:graphicImage id="iconLEDRed2" url="./img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed()}"/>
+ <h:graphicImage id="iconLEDRed2_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not (currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed())}"/>
<p:tooltip for="iconLEDRed1" value="#{localizedControllerPageMessages.analysisControllerMsgNotInstantiated}"/>
<p:tooltip for="iconLEDYellow" value="#{localizedControllerPageMessages.analysisControllerMsgReady}"/>
diff --git a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
index 6837dde8198c75888fdef7412dcb7b69089ded5c..2941f2181821503430930e6ff196f5be33e005ca 100644
--- a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
@@ -11,15 +11,15 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="../css/Common.css" />
- <link rel="stylesheet" type="text/css" href="../css/LoginPage.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="./css/LoginPage.css" />
</h:head>
<!-- The javascript code in the onload-part of the body shows a localized welcome message via the growl-component. -->
<h:body onload="growlComp.renderMessage({summary : '#{localizedLoginMessages.msgWelcomeShort}', detail : '#{localizedLoginMessages.msgWelcome}', severity: 'info'});">
<div align="center" >
- <img src="../img/kieker-header.jpg"/>
+ <img src="./img/kieker-header.jpg"/>
</div>
<div align="center" class="stretch">
diff --git a/Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml
index 5afba6b398cf9726ac8c05261861318970279270..b1bc5d09a3066697dc2e9104c87b7b727bfd1464 100644
--- a/Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml
@@ -11,9 +11,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="../css/Common.css" />
- <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="../css/ProjectOverviewPage.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="./css/ProjectOverviewPage.css" />
</h:head>
<h:body>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
index 195b7785b77c73ac47b5105ddf0e3fbf8db4c7df..1dd24bc6c8fbd0e9dddb0713f43f9357eb14dcf5 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
@@ -15,42 +15,42 @@
<navigation-rule>
<navigation-case>
<from-outcome>projectOverview</from-outcome>
- <to-view-id>ProjectOverviewPage.xhtml</to-view-id>
+ <to-view-id>/ProjectOverviewPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>analysisEditor</from-outcome>
- <to-view-id>AnalysisEditorPage.xhtml</to-view-id>
+ <to-view-id>/AnalysisEditorPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>cockpitEditor</from-outcome>
- <to-view-id>CockpitEditorPage.xhtml</to-view-id>
+ <to-view-id>/CockpitEditorPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>cockpit</from-outcome>
- <to-view-id>CockpitPage.xhtml</to-view-id>
+ <to-view-id>/CockpitPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>controller</from-outcome>
- <to-view-id>ControllerPage.xhtml</to-view-id>
+ <to-view-id>/ControllerPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>login</from-outcome>
- <to-view-id>LoginPage.xhtml</to-view-id>
+ <to-view-id>/LoginPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
</faces-config>
\ No newline at end of file
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 cec5a14ca86ad9ad7c3c0a64b8d284c063b9e0bb..ed35f3fee6424e347c165542926b7829c198a15d 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
@@ -3,37 +3,37 @@
xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
<url-mapping id="home">
- <pattern value="/Kieker.WebGUI/" />
+ <pattern value="/" />
<view-id value="/faces/ProjectOverviewPage.xhtml" />
</url-mapping>
<url-mapping id="projectOverview">
- <pattern value="/Kieker.WebGUI/projectOverview" />
+ <pattern value="/projectOverview" />
<view-id value="/faces/ProjectOverviewPage.xhtml" />
</url-mapping>
<url-mapping id="analysisEditor">
- <pattern value="/Kieker.WebGUI/analysisEditor" />
+ <pattern value="/analysisEditor" />
<view-id value="/faces/AnalysisEditorPage.xhtml" />
</url-mapping>
<url-mapping id="cockpitEditor">
- <pattern value="/Kieker.WebGUI/cockpitEditor" />
+ <pattern value="/cockpitEditor" />
<view-id value="/faces/CockpitEditorPage.xhtml" />
</url-mapping>
<url-mapping id="controller">
- <pattern value="/Kieker.WebGUI/controller" />
+ <pattern value="/controller" />
<view-id value="/faces/ControllerPage.xhtml" />
</url-mapping>
<url-mapping id="cockpit">
- <pattern value="/Kieker.WebGUI/cockpit" />
+ <pattern value="/cockpit" />
<view-id value="/faces/CockpitPage.xhtml" />
</url-mapping>
<url-mapping id="login">
- <pattern value="/Kieker.WebGUI/login" />
+ <pattern value="/login" />
<view-id value="/faces/LoginPage.xhtml" />
</url-mapping>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
index c58433e5778e0a833deae87be2ed771a431fc9d8..eb8547655b5daa4e5463f785c96d6acec7800b5e 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
@@ -56,13 +56,13 @@
</session-config>
<welcome-file-list>
- <welcome-file>faces/ProjectOverview.xhtml</welcome-file>
+ <welcome-file>faces/ProjectOverviewPage.xhtml</welcome-file>
</welcome-file-list>
<listener>
<listener-class>com.sun.faces.config.ConfigureListener</listener-class>
</listener>
-
+
<!-- This filter will be used by Pretty Filter.-->
<filter>
<filter-name>Pretty Filter</filter-name>
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
index 7e93862ec82f7e2aff419e7dbcdc472bbc591a78..96ae706ef38e5ad76d0aa1e6355ce10ceedef50e 100644
--- a/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
@@ -8,7 +8,7 @@
<p:dialog header="#{localizedMessages.about}" resizable="false" modal="true" widgetVar="aboutDlg">
<h:form>
- <img src="../img/kieker-logo-transparent.png" alt="Kieker-Logo" width="491" height="150" />
+ <img src="./img/kieker-logo-transparent.png" alt="Kieker-Logo" width="491" height="150" />
<hr/>
<h:outputText value="Kieker.WebGUI" />
<br />