diff --git a/Kieker.WebGUI/lib/spring-faces-2.3.1-RELEASE.LICENSE b/Kieker.WebGUI/lib/spring-faces-2.3.1-RELEASE.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..c851c25c3bbcb80103957882eb7fb58fadb1e2d5
--- /dev/null
+++ b/Kieker.WebGUI/lib/spring-faces-2.3.1-RELEASE.LICENSE
@@ -0,0 +1,59 @@
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/Kieker.WebGUI/nb-configuration.xml b/Kieker.WebGUI/nb-configuration.xml
index 1d0c993533666497fbca9a8c4395aac4fceab81c..7b4b9bd047aadc8b331869bb2fe83786737d683d 100644
--- a/Kieker.WebGUI/nb-configuration.xml
+++ b/Kieker.WebGUI/nb-configuration.xml
@@ -22,6 +22,7 @@ Any value defined here will override the pom.xml file value but is only applicab
<spring-data xmlns="http://www.netbeans.org/ns/spring-data/1">
<config-files>
<config-file>src/main/webapp/WEB-INF/spring-config.xml</config-file>
+ <config-file>src/main/webapp/WEB-INF/spring-security-taglib.xml</config-file>
</config-files>
<config-file-groups/>
</spring-data>
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index ea6b99f7ac0029413696d8c65f1b103cadb801fc..4acc45748a20dadb648b92d13739836c2ebca8ef 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -68,6 +68,11 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-taglibs</artifactId>
<version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.webflow</groupId>
+ <artifactId>spring-faces</artifactId>
+ <version>2.3.1.RELEASE</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
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 956d1b23023dd848b8241f375c7f519ea8915468..ae25e107afc8f828a7877692b5ce3082f7a628f8 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
@@ -17,10 +17,14 @@
package kieker.webgui.beans.session;
import java.io.Serializable;
+import java.util.Map;
+import javax.faces.context.FacesContext;
import org.springframework.beans.factory.annotation.Autowired;
import kieker.webgui.beans.application.GlobalPropertiesBean;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
/**
* This bean contains information about the user of this session (like user name and authorization). It provides methods to perform a login into the application.<br>
@@ -32,8 +36,6 @@ import kieker.webgui.beans.application.GlobalPropertiesBean;
public final class UserBean implements Serializable {
private static final long serialVersionUID = 6422563876003638348L;
- private String userName;
- private String password;
@Autowired
private GlobalPropertiesBean globalPropertiesBean;
@@ -42,7 +44,7 @@ public final class UserBean implements Serializable {
* Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
public UserBean() {
- this.userName = "Kieker-Team";
+ // No code necessary
}
/**
@@ -51,36 +53,12 @@ public final class UserBean implements Serializable {
* @return The user name.
*/
public String getUserName() {
- return this.userName;
- }
-
- /**
- * Sets the new user name of the current session.
- *
- * @param name
- * The new user name.
- */
- public void setUserName(final String name) {
- this.userName = name;
- }
-
- /**
- * Delivers the stored password.
- *
- * @return The password.
- */
- public String getPassword() {
- return this.password;
- }
-
- /**
- * Sets the password which should be stored in this bean.
- *
- * @param password
- * The new value for the password.
- */
- public void setPassword(final String password) {
- this.password = password;
+ Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ UserDetails userDetails = null;
+ if (principal instanceof UserDetails) {
+ userDetails = (UserDetails) principal;
+ }
+ return userDetails.getUsername();
}
/**
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 261574b3ebcde21fa68acc78fd6e02fdc4f0d521..ca3f6c4345c14e7286e3d207e889227417e7c140 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
@@ -165,9 +165,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/resources/lang/AccessDeniedPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_de.properties
new file mode 100644
index 0000000000000000000000000000000000000000..f7f3558b0abf293866dc641c3e6ef30b7b0a72d8
--- /dev/null
+++ b/Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_de.properties
@@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+#
+# Diese Datei beinhaltet sämtliche Nachrichten, Buttonbeschriftungen etc.,
+# welche innerhalb der Zugriff-Verweigert-Seite benutzt werden.
+#
+#------------------------------------------------------------------------------
+
+accessDenied = Zugriff verweigert!
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_en.properties
new file mode 100644
index 0000000000000000000000000000000000000000..92ac93e9774772d7c62298e2f1f8f3e882880abf
--- /dev/null
+++ b/Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_en.properties
@@ -0,0 +1,8 @@
+#------------------------------------------------------------------------------
+#
+# This file contains all messages, button captions etc. which are used within
+# the access denied page.
+#
+#------------------------------------------------------------------------------
+
+accessDenied = Access Denied!
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml b/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml
index 23a728a455abb73f2cdd26108b2c68c6712957b9..ebd577205243e1535bede844575fa201e0f04465 100644
--- a/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml
@@ -2,35 +2,26 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<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:ui="http://java.sun.com/jsf/facelets">
- <!-- Load the localized messages, labels etc. for the login page. -->
- <f:loadBundle var="localizedMessages" basename="lang.Common"/>
-
- <h:head>
- <title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="./css/Common.css" />
- <link rel="stylesheet" type="text/css" href="./css/AccessDeniedPage.css" />
- </h:head>
+ <h:head/>
<h:body>
+ <ui:composition template="#{root}/templates/DefaultTemplate.xhtml">
+ <ui:define name="bundleIncludes">
+ <f:loadBundle var="localizedAccessDeniedMessages" basename="lang.AccessDeniedPage"/>
+ </ui:define>
- <div align="center" >
- <img src="./img/kieker-header.jpg"/>
- </div>
-
- <div align="center" class="stretch">
- <p:spacer width="0" height="120"/>
+ <ui:define name="additionalCssIncludes">
+ <link rel="stylesheet" type="text/css" href="#{root}/css/AccessDeniedPage.css" />
+ </ui:define>
- <h:form>
- <div class="stretch" align="center">
- <div align="center">
- <h:outputText style="font-size: 25px" value="Access Denied!"/>
- </div>
- </div>
- </h:form>
- </div>
+ <ui:define name="inner-content">
+ <img src="#{root}/img/AccessDenied.png"/><br/>
+ <h:outputText styleClass="hint-label" value="#{localizedAccessDeniedMessages.accessDenied}"/>
+ </ui:define>
+ </ui:composition>
</h:body>
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
index 6301ff42560ba97681c8d96d3f192563f28046e0..0a9c6946e3e371f649198eeac7822009070af34c 100644
--- a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
@@ -2,43 +2,47 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<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:ui="http://java.sun.com/jsf/facelets"
+ xmlns:p="http://primefaces.org/ui"
xmlns:c="http://java.sun.com/jsp/jstl/core">
- <f:metadata>
- <f:viewParam id="state" name="state"/>
- </f:metadata>
+ <h:head/>
- <!-- Load the localized messages, labels etc. for the login page. -->
- <f:loadBundle var="localizedMessages" basename="lang.Common"/>
- <f:loadBundle var="localizedLoginMessages" basename="lang.LoginPage"/>
+ <h:body>
+ <ui:composition template="#{root}/templates/DefaultTemplate.xhtml">
+ <ui:define name="metadata">
+ <f:metadata>
+ <f:viewParam id="state" name="state"/>
+ </f:metadata>
+ </ui:define>
- <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" />
- </h:head>
+ <ui:define name="bundleIncludes">
+ <f:loadBundle var="localizedLoginMessages" basename="lang.LoginPage"/>
+ </ui:define>
- <!-- 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'});">
+ <ui:define name="additionalCssIncludes">
+ <link rel="stylesheet" type="text/css" href="#{root}/css/LoginPage.css" />
+ </ui:define>
- <div align="center" >
- <img src="./img/kieker-header.jpg"/>
- </div>
+ <ui:define name="js">
+ <!-- This javascript code will be executed in the onload-part of the body and shows a localized welcome message via the growl-component. -->
+ <script>
+ bodyLoaded = function() {
+ msgs.renderMessage({summary : '#{localizedLoginMessages.msgWelcomeShort}', detail : '#{localizedLoginMessages.msgWelcome}', severity: 'info'});
+ }
+ </script>
+ </ui:define>
- <div align="center" class="stretch">
- <p:spacer width="0" height="120"/>
-
- <form action="#{request.contextPath}/j_spring_security_check" method="post">
- <div class="stretch" align="center">
+ <ui:define name="inner-content">
+ <form id="loginForm" action="#{root}/j_spring_security_check" method="post">
<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}:" />
- <p:inputText styleClass="input" id="j_username" required="true" value="#{userBean.userName}" label="username"/>
+ <p:inputText styleClass="input" id="j_username" required="true" label="username" />
<h:outputLabel for="j_password" value="#{localizedLoginMessages.password}:" />
- <p:password styleClass="input" id="j_password" required="false" value="#{userBean.password}" label="password" />
+ <p:password styleClass="input" id="j_password" required="false" label="password" />
</h:panelGrid>
<hr/>
<div align="right">
@@ -65,11 +69,9 @@
<div class="hint-panel">
<h:outputText value="#{localizedLoginMessages.hint}"/>
</div>
-
- <p:growl sticky="true" autoUpdate="true" widgetVar="growlComp"/>
- </div>
- </form>
- </div>
+ </form>
+ </ui:define>
+ </ui:composition>
</h:body>
</html>
\ No newline at end of file
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 30715fe05390a897edbc9b60280d69b5e7100dff..9ebb72b9a1f6beaca4f5b3c40cc9c549ed123dd7 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
@@ -68,4 +68,11 @@
<to-view-id>/AccessDeniedPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+
+ <navigation-rule>
+ <navigation-case>
+ <from-outcome>userManagment</from-outcome>
+ <to-view-id>/pages/admin/UserManagment.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 cad9b0ea2927c3e344479b21a77652f733f7d909..969bb9c85a7ddddfe6a333ed10426cf20657fe56 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
@@ -48,4 +48,9 @@
<pattern value="/accessDenied" />
<view-id value="/faces/AccessDeniedPage.xhtml" />
</url-mapping>
+
+ <url-mapping id="userManagment">
+ <pattern value="/pages/admin/userManagment" />
+ <view-id value="/faces/pages/admin/UserManagment.xhtml" />
+ </url-mapping>
</pretty-config>
\ No newline at end of file
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 f9f3e288ef2e2251df0756d35aaf622aaa81606a..0186d4b7ebf05590b4b32607bfabfa2517abb3ce 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
@@ -9,10 +9,23 @@
<http use-expressions="true" access-denied-page="/accessDenied" >
<form-login login-page="/login" default-target-url="/pages/" authentication-failure-url="/login?state=fail"/>
- <intercept-url pattern="/login" access="true"/>
+ <intercept-url pattern="/login" access="permitAll"/>
+ <intercept-url pattern="/faces/pages/LoginPage.xhtml" access="permitAll"/>
+
+ <!-- Intercept some patterns which are not allowed for anyone. -->
+ <intercept-url pattern="/dialogs/**" access="denyAll"/>
+ <intercept-url pattern="/templates/**" access="denyAll"/>
+
+ <!-- The admin area is only accessible by administrators. -->
+ <intercept-url pattern="/pages/admin/**" access="hasRole('ROLE_ADMIN')"/>
+ <intercept-url pattern="/faces/pages/admin/**" access="hasRole('ROLE_ADMIN')"/>
+
+ <!-- The is the usual user area. -->
<intercept-url pattern="/pages/**" access="isAuthenticated()"/>
<intercept-url pattern="/faces/pages/**" access="isAuthenticated()"/>
+ <!-- The root will be redirected to home via prettyfaces. -->
<intercept-url pattern="/" access="isAuthenticated()" />
+
<logout logout-success-url="/login?state=logout" />
</http>
@@ -20,6 +33,7 @@
<authentication-provider>
<user-service>
<user name="Kieker-Team" password="kieker" authorities="ROLE_USER, ROLE_ADMIN" />
+ <user name="Kieker-User" password="kieker" authorities="ROLE_USER" />
</user-service>
</authentication-provider>
</authentication-manager>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-taglib.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-taglib.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1669c4cee397316c184dc77ee47eaff80b5027a9
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-taglib.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE facelet-taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+ "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib>
+ <namespace>http://www.springframework.org/security/tags</namespace>
+ <tag>
+ <tag-name>authorize</tag-name>
+ <handler-class>org.springframework.faces.security.FaceletsAuthorizeTagHandler</handler-class>
+ </tag>
+ <function>
+ <function-name>areAllGranted</function-name>
+ <function-class>org.springframework.faces.security.FaceletsAuthorizeTagUtils</function-class>
+ <function-signature>boolean areAllGranted(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <function-name>areAnyGranted</function-name>
+ <function-class>org.springframework.faces.security.FaceletsAuthorizeTagUtils</function-class>
+ <function-signature>boolean areAnyGranted(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <function-name>areNotGranted</function-name>
+ <function-class>org.springframework.faces.security.FaceletsAuthorizeTagUtils</function-class>
+ <function-signature>boolean areNotGranted(java.lang.String)</function-signature>
+ </function>
+ <function>
+ <function-name>isAllowed</function-name>
+ <function-class>org.springframework.faces.security.FaceletsAuthorizeTagUtils</function-class>
+ <function-signature>boolean isAllowed(java.lang.String, java.lang.String)</function-signature>
+ </function>
+</facelet-taglib>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
index 3a295ec316974a8d6e5de379009de45667ce631f..96f3c344dc94415e427cdd843225b2725a49b2af 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
@@ -22,6 +22,11 @@
<param-value>#{currentConfigurationBean.lookAndFeel}</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.FACELETS_LIBRARIES</param-name>
+ <param-value>/WEB-INF/spring-security-taglib.xml</param-value>
+ </context-param>
+
<filter>
<filter-name>springSecurityFilterChain</filter-name>
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
diff --git a/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css b/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css
index db3a4dc406a898994b0c68aac9ad932576347fe9..7eac351d2d1fb9c299bbb5c6e655d89544ee197b 100644
--- a/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css
+++ b/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css
@@ -1,29 +1,6 @@
@charset "UTF-8";
-.ui-growl {
- width: 500px
-}
-
-.ui-growl-message {
- width: 400px;
- text-align: justify;
-}
-
-html {
- height: 100%;
-}
-
-body {
- background-color: #f1f1f1;
- margin: 0;
- padding: 0;
- height: 100%;
-}
-
-div.stretch {
- background: #ffffff;
- padding: 0 0 0 0;
- margin: auto;
- width: 1000px;
- min-height: 100%;
+.hint-label {
+ font-size: 25px;
+ color: red;
}
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/css/Common.css b/Kieker.WebGUI/src/main/webapp/css/Common.css
index 182addb7ea7b6e77176c3820e969c0041c56c69b..6cf1da116c6c6b858067ca4c0ef2302eb0a2c61c 100644
--- a/Kieker.WebGUI/src/main/webapp/css/Common.css
+++ b/Kieker.WebGUI/src/main/webapp/css/Common.css
@@ -1,5 +1,14 @@
@charset "UTF-8";
+.ui-growl {
+ width: 500px
+}
+
+.ui-growl-message {
+ width: 400px;
+ text-align: justify;
+}
+
/*
* The following style modifications make sure that the menu bar is visible.
*/
diff --git a/Kieker.WebGUI/src/main/webapp/css/DefaultTemplate.css b/Kieker.WebGUI/src/main/webapp/css/DefaultTemplate.css
new file mode 100644
index 0000000000000000000000000000000000000000..e16162507deeaabebc9e58c2950c3b134ff91d77
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/css/DefaultTemplate.css
@@ -0,0 +1,31 @@
+@charset "UTF-8";
+/*
+ Document : DefaultTemplate
+ Created on : 24.10.2012, 15:14:21
+ Author : Nils Christian Ehmke
+ Description:
+ Purpose of the stylesheet follows.
+*/
+
+root {
+ display: block;
+}
+
+html {
+ height: 100%;
+}
+
+body {
+ background-color: #f1f1f1;
+ margin: 0;
+ padding: 0;
+ height: 100%;
+}
+
+div.background {
+ background: #ffffff;
+ padding: 0 0 0 0;
+ margin: auto;
+ width: 1000px;
+ min-height: 100%;
+}
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/css/Icons.css b/Kieker.WebGUI/src/main/webapp/css/Icons.css
index 5349a4a1c572782027d541cdf41927a8fbb649bb..f735976ad6fe26b698f63c8e314d507cc1efa78c 100644
--- a/Kieker.WebGUI/src/main/webapp/css/Icons.css
+++ b/Kieker.WebGUI/src/main/webapp/css/Icons.css
@@ -108,6 +108,12 @@
width:16px;
}
+.ui-icon-userManagment {
+ background: url('../img/icons/UserManagment.png') no-repeat !important;
+ height:16px;
+ width:16px;
+}
+
.ui-icon-analysis {
background: url('../img/icons/Analysis.png') no-repeat !important;
height:16px;
diff --git a/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml b/Kieker.WebGUI/src/main/webapp/dialogs/AboutDialog.xhtml
index 96ae706ef38e5ad76d0aa1e6355ce10ceedef50e..c37c126e962ec765ff4a9814c950441ad1dc6a6c 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="#{root}/img/kieker-logo-transparent.png" alt="Kieker-Logo" width="491" height="150" />
<hr/>
<h:outputText value="Kieker.WebGUI" />
<br />
diff --git a/Kieker.WebGUI/src/main/webapp/img/AccessDenied.png b/Kieker.WebGUI/src/main/webapp/img/AccessDenied.png
new file mode 100644
index 0000000000000000000000000000000000000000..13af8f983c653544cacbfc78f61e7376fc1968ba
Binary files /dev/null and b/Kieker.WebGUI/src/main/webapp/img/AccessDenied.png differ
diff --git a/Kieker.WebGUI/src/main/webapp/img/icons/UserManagment.png b/Kieker.WebGUI/src/main/webapp/img/icons/UserManagment.png
new file mode 100644
index 0000000000000000000000000000000000000000..36ebc88ff34b2f0f79f6f47e097a36ebc794ed92
Binary files /dev/null and b/Kieker.WebGUI/src/main/webapp/img/icons/UserManagment.png differ
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index d0b761c6a1cbfd11a42ba06832d4ffc4eb03bacf..a7d8fea53e5b74ba17b9283a9af2a9c398028241 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
@@ -3,76 +3,46 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:p="http://primefaces.org/ui">
+ xmlns:p="http://primefaces.org/ui"
+ xmlns:f="http://java.sun.com/jsf/core">
- <f:metadata>
- <f:viewParam name="projectName" value="#{currentCockpitBean.projectName}"/>
- <f:event type="preRenderView" listener="#{currentCockpitBean.initalize()}" />
- </f:metadata>
-
- <f:loadBundle var="localizedMessages" basename="lang.Common"/>
- <f:loadBundle var="localizedCockpitPageMessages" basename="lang.CockpitPage"/>
-
- <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" />
- </h:head>
+ <h:head/>
<h:body>
- <!-- This is the layout for the whole page. -->
- <p:layout id="layout" fullPage="true">
-
- <p:layoutUnit position="north" collapsible="false">
- <h:form>
- <p:toolbar>
- <p:toolbarGroup align="left">
- <h:outputText styleClass="kieker-title" value="Kieker » #{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">
- <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">
- <f:param name="projectName" value="#{currentCockpitBean.projectName}" rendered="#{not empty currentCockpitBean.projectName}"/>
- </p:button>
- <p:separator/>
- <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>
- </p:toolbarGroup>
- </p:toolbar>
-
- <!-- 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-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-userGuide" value=" #{localizedMessages.userGuide}" ajax="true" disabled="true"/>
- <p:separator/>
- <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="#{request.contextPath}/j_spring_security_logout"/>
- </p:menubar>
- </h:form>
- </p:layoutUnit>
-
-
- <p:layoutUnit position="center" id="centerLayout">
+ <ui:composition template="#{root}/templates/PagesTemplate.xhtml">
+
+ <ui:param name="projectName" value="#{currentCockpitBean.projectName}"/>
+ <ui:param name="pagename" value="cockpit"/>
+ <ui:param name="showProjectName" value="true"/>
+
+ <ui:define name="metaData">
+ <f:metadata>
+ <f:viewParam name="projectName" value="#{currentCockpitBean.projectName}"/>
+ <f:event type="preRenderView" listener="#{currentCockpitBean.initalize()}" />
+ </f:metadata>
+ </ui:define>
+
+ <ui:define name="bundleIncludes">
+ <f:loadBundle var="localizedCockpitPageMessages" basename="lang.CockpitPage"/>
+ </ui:define>
+
+ <ui:define name="cssIncludes">
+ <link rel="stylesheet" type="text/css" href="../css/CockpitPage.css" />
+ </ui:define>
+
+ <!-- Those are the menu bar entries left from the help-submenu. -->
+ <ui:define name="furtherMenuBarEntries">
+ <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-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>
+ </ui:define>
+
+ <ui:define name="centerContent">
<h:form id="centerForm">
<ui:repeat value="#{currentCockpitBean.activeView.displayConnectors}" var="dispConnector">
<p:panel header="#{dispConnector.name}">
@@ -80,36 +50,31 @@
</p:panel>
</ui:repeat>
</h:form>
- </p:layoutUnit>
-
- <p:layoutUnit position="west" size="300" header="Views" resizable="true" collapsible="true">
- <h:form id="viewForm">
- <p:poll interval="1" update=":centerForm"/>
- <p:dataList value="#{currentCockpitBean.project.views}" var="currView">
- <p:commandLink style="#{currView == currentCockpitBean.activeView ? 'font-weight:bold' : ''}" value="#{currView.name}" action="#{currentCockpitBean.setActiveView(currView)}" id="viewLink" update=":viewForm"/>
- <p:tooltip for="viewLink">
- <b><h:outputText value="#{currView.name}"/></b>
- <br/>
- <h:outputText value="#{currView.description}" rendered="#{not empty currView.description}"/>
- <h:outputText value="No description available." rendered="#{empty currView.description}"/>
- <br/><br/>
- <b><h:outputText value="Displays"/></b>
- <p:dataList value="#{currView.displayConnectors}" var="connector">
- #{connector.getName()}
- </p:dataList>
- </p:tooltip>
- </p:dataList>
- </h:form>
- </p:layoutUnit>
- </p:layout>
-
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
-
- <!-- Include the dialog for the configuration. -->
- <ui:include src="../dialogs/SettingsDialog.xhtml" />
-
- <!-- Include the about-dialog. -->
- <ui:include src="../dialogs/AboutDialog.xhtml" />
+ </ui:define>
+
+ <ui:define name="furtherLayoutUnits">
+ <p:layoutUnit position="west" size="300" header="Views" resizable="true" collapsible="true">
+ <h:form id="viewForm">
+ <p:poll interval="1" update=":centerForm"/>
+ <p:dataList value="#{currentCockpitBean.project.views}" var="currView">
+ <p:commandLink style="#{currView == currentCockpitBean.activeView ? 'font-weight:bold' : ''}" value="#{currView.name}" action="#{currentCockpitBean.setActiveView(currView)}" id="viewLink" update=":viewForm"/>
+ <p:tooltip for="viewLink">
+ <b><h:outputText value="#{currView.name}"/></b>
+ <br/>
+ <h:outputText value="#{currView.description}" rendered="#{not empty currView.description}"/>
+ <h:outputText value="No description available." rendered="#{empty currView.description}"/>
+ <br/><br/>
+ <b><h:outputText value="Displays"/></b>
+ <p:dataList value="#{currView.displayConnectors}" var="connector">
+ #{connector.getName()}
+ </p:dataList>
+ </p:tooltip>
+ </p:dataList>
+ </h:form>
+ </p:layoutUnit>
+ </ui:define>
+
+ </ui:composition>
</h:body>
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
index d450ca0013cd37c05800b66ae226753c095f081e..20ab1c30998e564cc611871a47ad2c670bbe7e67 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
@@ -5,67 +5,38 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui"
xmlns:f="http://java.sun.com/jsf/core">
-
- <f:loadBundle var="localizedMessages" basename="lang.Common"/>
- <f:loadBundle var="localizedProjectOverviewMessages" basename="lang.ProjectOverviewPage"/>
- <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" />
- </h:head>
+ <h:head/>
<h:body>
- <p:layout fullPage="true">
- <p:layoutUnit position="north">
- <h:form id="menuForm">
- <p:toolbar>
- <p:toolbarGroup align="left">
- <h:outputText styleClass="kieker-title" value="Kieker"/>
- </p:toolbarGroup>
- <p:toolbarGroup align="right">
- <p:button styleClass="perspective-button" icon="ui-icon-home" disabled="true" />
- <p:separator/>
- <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" style="white-space: none" outcome="analysisEditor" >
- <f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
- </p:button>
- <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" style="white-space: none" outcome="controller">
- <f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
- </p:button>
- <p:separator/>
- <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" style="white-space: none" outcome="cockpitEditor">
- <f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
- </p:button>
- <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" style="white-space: none" outcome="cockpit">
- <f:param name="projectName" value="#{currentProjectOverviewBean.projectName}" rendered="#{not empty currentProjectOverviewBean.projectName}"/>
- </p:button>
- </p:toolbarGroup>
- </p:toolbar>
-
- <p:menubar>
- <p:submenu label="#{localizedMessages.file}">
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newProject" value=" #{localizedProjectOverviewMessages.newProject}" onclick="newProjectDialog.show()" ajax="true"/>
- <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-importProject" value=" #{localizedProjectOverviewMessages.importProject}" ajax="true" disabled="true"/>
- <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-whitespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
- </p:submenu>h
-
- <p:submenu label="#{localizedMessages.help}">
- <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-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="#{request.contextPath}/j_spring_security_logout"/>
- </p:menubar>
- </h:form>
- </p:layoutUnit>
- <!-- Abstand zu Icons -->
- <p:layoutUnit position="center">
+ <ui:composition template="/templates/PagesTemplate.xhtml">
+
+ <ui:param name="projectName" value="#{currentProjectOverviewBean.projectName}"/>
+ <ui:param name="pagename" value="projectOverview"/>
+ <ui:param name="showProjectName" value="false"/>
+
+ <ui:define name="bundleIncludes">
+ <f:loadBundle var="localizedProjectOverviewMessages" basename="lang.ProjectOverviewPage"/>
+ </ui:define>
+
+ <ui:define name="cssIncludes">
+ <link rel="stylesheet" type="text/css" href="/css/ProjectOverviewPage.css" />
+ </ui:define>
+
+ <!-- Those are the menu bar entries left from the help-submenu. -->
+ <ui:define name="furtherMenuBarEntries">
+ <p:submenu label="#{localizedMessages.file}">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newProject" value=" #{localizedProjectOverviewMessages.newProject}" onclick="newProjectDialog.show()" ajax="true"/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-importProject" value=" #{localizedProjectOverviewMessages.importProject}" ajax="true" disabled="true"/>
+ <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-whitespace" icon="ui-icon-settings" value=" #{localizedMessages.settings}" onclick="settingsDlg.show()" ajax="true"/>
+ </p:submenu>
+ </ui:define>
+
+ <ui:define name="centerContent">
<h:form id="projectsListForm">
<p:dataTable emptyMessage="#{localizedMessages.noRecordsFound}" rows="15" paginator="true" paginatorPosition="both" var="project" rowsPerPageTemplate="5,10,15,25,50" value="#{currentProjectOverviewBean.projects}" paginatorTemplate="{CurrentPageReport} {FirstPageLink} {PreviousPageLink} {PageLinks} {NextPageLink} {LastPageLink} {RowsPerPageDropdown}" selection="#{currentProjectOverviewBean.projectName}" rowKey="#{project}" selectionMode="single">
<!-- Makes sure that rows are selected instantaneously. -->
@@ -75,12 +46,19 @@
<p:commandLink id="dynaButton" value="#{project}"/>
<p:menu overlay="true" trigger="dynaButton" my="left top" at="left bottom" style="width:210px">
- <p:menuitem icon="ui-icon-analysisEditor" id="openButton" value=" #{localizedMessages.analysisEditor}" styleClass="element-with-whitespace" ajax="false" url="analysisEditor?projectName=#{project}"/>
- <p:menuitem icon="ui-icon-analysis" id="controlAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.analysis}" ajax="false" url="controller?projectName=#{project}" />
+ <p:menuitem icon="ui-icon-analysisEditor" id="openButton" value=" #{localizedMessages.analysisEditor}" styleClass="element-with-whitespace" ajax="false" outcome="analysisEditor">
+ <f:param name="projectName" value="#{project}"/>
+ </p:menuitem>
+ <p:menuitem icon="ui-icon-analysis" id="controlAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.analysis}" ajax="false" outcome="controller">
+ <f:param name="projectName" value="#{project}"/>
+ </p:menuitem>
<p:separator/>
-
- <p:menuitem icon="ui-icon-cockpitEditor" id="editAnalysisViews" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpitEditor}" ajax="false" url="cockpitEditor?projectName=#{project}" />
- <p:menuitem icon="ui-icon-cockpit" id="showAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpit}" ajax="false" url="cockpit?projectName=#{project}" />
+ <p:menuitem icon="ui-icon-cockpitEditor" id="editAnalysisViews" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpitEditor}" ajax="false" outcome="cockpitEditor" >
+ <f:param name="projectName" value="#{project}"/>
+ </p:menuitem>
+ <p:menuitem icon="ui-icon-cockpit" id="showAnalysis" styleClass="element-with-whitespace" value=" #{localizedMessages.cockpit}" ajax="false" outcome="cockpit">
+ <f:param name="projectName" value="#{project}"/>
+ </p:menuitem>
<p:separator/>
<p:menuitem id="copyButton" icon="ui-icon-copy" styleClass="element-with-whitespace" value=" #{localizedProjectOverviewMessages.copyProject}" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="copyProjectDialog.show()"/>
<p:menuitem id="renameButton" icon="ui-icon-edit" styleClass="element-with-whitespace" value=" #{localizedProjectOverviewMessages.renameProject}" action="#{currentProjectOverviewBean.setProjectName(project)}" onclick="renameProjectDialog.show()" disabled="true"/>
@@ -101,18 +79,13 @@
</p:dataTable>
</h:form>
- </p:layoutUnit>
-
- </p:layout>
+ </ui:define>
- <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
+ <ui:define name="furtherDialogIncludes">
+ <ui:include src="../dialogs/ProjectOverviewPageDialogs.xhtml" />
+ </ui:define>
- <!-- Include the about-dialog. -->
- <ui:include src="../dialogs/AboutDialog.xhtml" />
- <!-- Include the dialogs for the project managment. -->
- <ui:include src="../dialogs/ProjectOverviewPageDialogs.xhtml" />
- <!-- Include the dialog for the configuration. -->
- <ui:include src="../dialogs/SettingsDialog.xhtml" />
+ </ui:composition>
</h:body>
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml
new file mode 100644
index 0000000000000000000000000000000000000000..b7c36b8144369a367206946e943c35d723d059df
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml
@@ -0,0 +1,67 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:p="http://primefaces.org/ui">
+
+ <f:loadBundle var="localizedMessages" basename="lang.Common"/>
+
+ <h:head>
+ <title>Kieker.WebGUI</title>
+ <link rel="stylesheet" type="text/css" href="#{request.contextPath}/css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="#{request.contextPath}/css/Icons.css" />
+ </h:head>
+
+ <h:body>
+
+ <p:layout fullPage="true">
+ <p:layoutUnit position="north">
+ <h:form id="menuForm">
+ <p:toolbar>
+ <p:toolbarGroup align="left">
+ <h:outputText styleClass="kieker-title" value="Kieker"/>
+ </p:toolbarGroup>
+ <p:toolbarGroup align="right">
+ <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" />
+ </p:toolbarGroup>
+ </p:toolbar>
+
+ <p:menubar>
+ <p:submenu label="#{localizedMessages.file}">
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-newProject" value=" Neuer Benutzer"/>
+ <p:separator/>
+ <p:menuitem styleClass="element-with-whitespace" icon="ui-icon-reload" value=" Benutzerliste Aktualisieren" ajax="true"/>
+ <p:separator/>
+ <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}">
+ <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-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="#{request.contextPath}/j_spring_security_logout"/>
+ </p:menubar>
+ </h:form>
+ </p:layoutUnit>
+
+ <!-- Abstand zu Icons -->
+ <p:layoutUnit position="center">
+
+ </p:layoutUnit>
+
+ </p:layout>
+
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
+
+ <!-- Include the dialog for the configuration. -->
+ <ui:include src="#{request.contextPath}/dialogs/SettingsDialog.xhtml" />
+
+ <!-- Include the about-dialog. -->
+ <ui:include src="#{request.contextPath}/dialogs/AboutDialog.xhtml" />
+
+ </h:body>
+</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/templates/CommonTemplate.xhtml b/Kieker.WebGUI/src/main/webapp/templates/CommonTemplate.xhtml
new file mode 100644
index 0000000000000000000000000000000000000000..45bad11dbf3740bc1d03678892ca6e29acdf6c5c
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/templates/CommonTemplate.xhtml
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+ <c:set var="root" value="#{request.contextPath}"/>
+
+ <f:loadBundle var="localizedMessages" basename="lang.Common"/>
+ <ui:insert name="metaData"/>
+ <ui:insert name="bundleIncludes"/>
+
+ <h:head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+
+ <title>Kieker.WebGUI</title>
+ <link rel="stylesheet" type="text/css" href="#{root}/css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="#{root}/css/Icons.css" />
+
+ <ui:insert name="cssIncludes"/>
+ <ui:insert name="jsIncludes"/>
+
+ <ui:insert name="js">
+ <script>
+ bodyLoaded = function() {
+ // Do nothing
+ }
+ </script>
+ </ui:insert>
+ </h:head>
+
+ <h:body onload="bodyLoaded();">
+ <ui:insert name="content"/>
+
+ <p:growl id="messages" life="1500" showDetail="true" autoUpdate="true" sticky="true" widgetVar="msgs"/>
+ </h:body>
+
+</html>
diff --git a/Kieker.WebGUI/src/main/webapp/templates/DefaultTemplate.xhtml b/Kieker.WebGUI/src/main/webapp/templates/DefaultTemplate.xhtml
new file mode 100644
index 0000000000000000000000000000000000000000..ec309415503d094a0229b7e1acd9f2f463aeca68
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/templates/DefaultTemplate.xhtml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:p="http://primefaces.org/ui">
+
+ <h:head/>
+
+ <h:body>
+ <ui:composition template="/templates/CommonTemplate.xhtml">
+ <ui:define name="cssIncludes">
+ <link rel="stylesheet" type="text/css" href="#{root}/css/DefaultTemplate.css" />
+ <ui:insert name="additionalCssIncludes"/>
+ </ui:define>
+
+ <ui:define name="content">
+
+ <div align="center" >
+ <img src="#{root}/img/kieker-header.jpg"/>
+ </div>
+
+ <div align="center" class="background">
+ <p:spacer width="0" height="120"/>
+ <div align="center">
+ <ui:insert name="inner-content"/>
+ </div>
+ </div>
+ </ui:define>
+ </ui:composition>
+ </h:body>
+
+</html>
diff --git a/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml b/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml
new file mode 100644
index 0000000000000000000000000000000000000000..17726d2f3a8e41d51db65a43f65c880981c6bae8
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:p="http://primefaces.org/ui"
+ xmlns:sec="http://www.springframework.org/security/tags"
+ xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <h:head/>
+
+ <h:body>
+ <ui:composition template="#{root}/templates/CommonTemplate.xhtml">
+ <ui:define name="content">
+
+ <p:layout id="layout" fullPage="true">
+
+ <p:layoutUnit position="north" collapsible="false">
+ <h:form id="menuForm">
+ <p:toolbar>
+ <p:toolbarGroup align="left">
+ <h:outputText styleClass="kieker-title" value="Kieker #{showProjectName ? '»' : ''} #{showProjectName ? stringBean.shortenLongName(projectName, 30) : ''}"/>
+ </p:toolbarGroup>
+ <p:toolbarGroup align="right">
+ <p:button styleClass="perspective-button" icon="ui-icon-home" outcome="projectOverview" disabled="#{pagename == 'projectOverview'}" />
+ <f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
+ <p:separator/>
+ <p:button styleClass="perspective-button" icon="ui-icon-analysisEditor" value="#{localizedMessages.analysisEditor}" outcome="analysisEditor" disabled="#{pagename == 'analysisEditor'}">
+ <f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
+ </p:button>
+ <p:button styleClass="perspective-button" icon="ui-icon-analysis" value="#{localizedMessages.analysis}" outcome="controller" disabled="#{pagename == 'controller'}">
+ <f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
+ </p:button>
+ <p:separator/>
+ <p:button styleClass="perspective-button" icon="ui-icon-cockpitEditor" value="#{localizedMessages.cockpitEditor}" outcome="cockpitEditor" disabled="#{pagename == 'cockpitEditor'}">
+ <f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
+ </p:button>
+ <p:button styleClass="perspective-button" icon="ui-icon-cockpit" value="#{localizedMessages.cockpit}" outcome="cockpit" disabled="#{pagename == 'cockpit'}">
+ <f:param name="projectName" value="#{projectName}" rendered="#{not empty projectName}"/>
+ </p:button>
+ <c:if test="#{sec:areAnyGranted('ROLE_ADMIN')}">
+ <p:separator/>
+ <p:button styleClass="perspective-button" icon="ui-icon-userManagment" value="User Managment" outcome="userManagment" disabled="#{pagename == 'userManagment'}" />
+ </c:if>
+ </p:toolbarGroup>
+ </p:toolbar>
+
+ <p:menubar>
+
+ <ui:insert name="furtherMenuBarEntries"/>
+
+ <p:submenu label="#{localizedMessages.help}">
+ <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-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="#{request.contextPath}/j_spring_security_logout"/>
+ </p:menubar>
+ </h:form>
+ </p:layoutUnit>
+
+
+ <p:layoutUnit position="center" id="centerLayout">
+ <ui:insert name="centerContent"/>
+ </p:layoutUnit>
+
+ <ui:insert name="furtherLayoutUnits"/>
+
+ </p:layout>
+
+ <!-- Include the about-dialog. -->
+ <ui:include src="../dialogs/AboutDialog.xhtml" />
+ <!-- Include the dialog for the configuration. -->
+ <ui:include src="../dialogs/SettingsDialog.xhtml" />
+
+ <ui:insert name="furtherDialogIncludes"/>
+ </ui:define>
+ </ui:composition>
+ </h:body>
+
+</html>