Some minor modifications, mostly for quality reasons.

Kieker.WebGUI/.project

@@ -20,11 +20,6 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -36,6 +31,5 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
 		<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
-		<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
 	</natures>
 </projectDescription>

Kieker.WebGUI/pom.xml

@@ -7,14 +7,25 @@
     <artifactId>Kieker.WebGUI</artifactId>
     <version>1.7-SNAPSHOT</version>
     <packaging>war</packaging>
-
     <name>Kieker.WebGUI</name>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <id>nie</id>
+            <name>Nils Christian Ehmke</name>
+            <email>nie@informatik.uni-kiel.de</email>
+        </developer>
+    </developers>
 
     <properties>
         <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>

Kieker.WebGUI/src/main/java/kieker/webgui/beans/application/GlobalPropertiesBean.java

@@ -42,6 +42,8 @@ import kieker.common.logging.LogFactory;
 @ApplicationScoped
 public final class GlobalPropertiesBean implements Serializable {
 
+	private static final long serialVersionUID = 4253541090603377504L;
+
 	private static final Log LOG = LogFactory.getLog(GlobalPropertiesBean.class);
 
 	private static final String PROPERTIES_FILE_GLOBAL = "global.properties";

Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/CurrentConfigurationBean.java

@@ -39,6 +39,7 @@ import kieker.webgui.beans.application.GlobalPropertiesBean;
 @SessionScoped
 public final class CurrentConfigurationBean implements Serializable {
 
+	private static final long serialVersionUID = 4226402116177851270L;
 	private String lookAndFeel;
 	private String gridColor;
 	private int gridSize;

Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/UserBean.java

@@ -34,6 +34,7 @@ import kieker.webgui.beans.application.GlobalPropertiesBean;
 @SessionScoped
 public final class UserBean implements Serializable {
 
+	private static final long serialVersionUID = 6422563876003638348L;
 	private String userName;
 	private String password;
 

Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml

@@ -28,14 +28,14 @@
 
             <p:layoutUnit position="north" collapsible="false">
                 <h:form>
-                    <p:toolbar>
+                   <p:toolbar>
                         <p:toolbarGroup align="left">
-                            <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentCockpitBean.projectName, 30)}"/>
+                            <h:outputText styleClass="kieker-title" value="Kieker &raquo; #{stringBean.shortenLongName(currentAnalysisEditorBean.projectName, 30)}"/>
                         </p:toolbarGroup>
                         <p:toolbarGroup align="right">
                             <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
                             <p:separator/>
-                            <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor" >
+                            <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor">
                                 <f:param name="projectName" value="#{currentCockpitBean.projectName}" rendered="#{not empty currentCockpitBean.projectName}"/>
                             </p:button>
                             <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="controller">
@@ -45,25 +45,29 @@
                             <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="cockpitEditor">
                                 <f:param name="projectName" value="#{currentCockpitBean.projectName}" rendered="#{not empty currentCockpitBean.projectName}"/>
                             </p:button>
-                            <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" disabled="true"/>
+                            <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" disabled="true">
+                            </p:button>
                         </p:toolbarGroup>
                     </p:toolbar>
-                    <p:menubar>
-                        <p:submenu label="#{localizedMessages.file}">
-                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-gear" value="  #{localizedMessages.settings}"  onclick="settingsDlg.show()" ajax="true"/>
+
+                    <!-- The following is the main menu. -->
+                    <p:menubar> 
+                        <p:submenu label="#{localizedMessages.file}"> 
+                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value="  #{localizedMessages.reloadProject}" ajax="false" url="cockpit?projectName=#{currentCockpitBean.projectName}" disabled="#{empty currentCockpitBean.project}" />
                             <p:separator/>
-                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-circle-close" value="  #{localizedMessages.closeProject}"  action="ProjectOverview.xhtml?faces-redirect=true" ajax="false"/>
+                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value="  #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
+                            <p:separator />
+                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-close" value="  #{localizedMessages.closeProject}" action="ProjectOverviewPage.xhtml?faces-redirect=true" ajax="false"/>
                         </p:submenu>
 
                         <p:submenu label="#{localizedMessages.help}">
-                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-help" value="  #{localizedMessages.userGuide}" ajax="true" disabled="true"/>
+                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-userGuide" value="  #{localizedMessages.userGuide}" ajax="true" disabled="true"/>
                             <p:separator/>
-                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-comment" value="  #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
+                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-about" value="  #{localizedMessages.about}" onclick="aboutDlg.show()" ajax="true"/>
                         </p:submenu>
 
-                        <p:menuitem styleClass="logOutButton" icon="ui-icon-power" value="#{userBean.userName}" ajax="true" url="login"/>
+                        <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="login"/>
                     </p:menubar>
-
                 </h:form>
             </p:layoutUnit>
 

Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml

@@ -50,7 +50,7 @@
                             <p:separator/>
                             <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value="  #{localizedProjectOverviewMessages.refreshProjectsList}" update=":projectsListForm" action="#{currentProjectOverviewBean.updateLists()}" ajax="true"/>
                             <p:separator/>
-                            <p:menuitem styleClass="element-with-witespace" icon="ui-icon-settings" value="  #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
+                            <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-settings" value="  #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
                         </p:submenu>h
 
                         <p:submenu label="#{localizedMessages.help}">

Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml

@@ -101,6 +101,7 @@
         <listener-class>kieker.webgui.common.EnvironmentLoaderListener</listener-class>
     </listener>
     
+    <!-- The following param is necessary for servlet containers which don't provide a correct EL Solver. -->
     <context-param> 
         <param-name>com.sun.faces.expressionFactory</param-name> 
         <param-value>com.sun.el.ExpressionFactoryImpl</param-value>