From 093efae850418289ef2ff84eb08d9567960df123 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 24 Oct 2012 17:19:40 +0200
Subject: [PATCH] Added the JSF taglib for Spring Security; Removed the
login-"logic" from the UserBean and moved it to the Spring Framework; Started
with the usage of templates for the existing pages; Started with the page for
the user management; Added more security patters; Added another user for test
purposes
---
.../lib/spring-faces-2.3.1-RELEASE.LICENSE | 59 +++++++
Kieker.WebGUI/nb-configuration.xml | 1 +
Kieker.WebGUI/pom.xml | 5 +
.../kieker/webgui/beans/session/UserBean.java | 44 ++---
.../view/CurrentAnalysisEditorGraphBean.java | 6 +-
.../lang/AccessDeniedPage_de.properties | 8 +
.../lang/AccessDeniedPage_en.properties | 8 +
.../src/main/webapp/AccessDeniedPage.xhtml | 39 ++---
Kieker.WebGUI/src/main/webapp/LoginPage.xhtml | 60 +++----
.../src/main/webapp/WEB-INF/faces-config.xml | 7 +
.../src/main/webapp/WEB-INF/pretty-config.xml | 5 +
.../webapp/WEB-INF/spring-security-config.xml | 16 +-
.../webapp/WEB-INF/spring-security-taglib.xml | 31 ++++
Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml | 5 +
.../src/main/webapp/css/AccessDeniedPage.css | 29 +---
Kieker.WebGUI/src/main/webapp/css/Common.css | 9 +
.../src/main/webapp/css/DefaultTemplate.css | 31 ++++
Kieker.WebGUI/src/main/webapp/css/Icons.css | 6 +
.../src/main/webapp/dialogs/AboutDialog.xhtml | 2 +-
.../src/main/webapp/img/AccessDenied.png | Bin 0 -> 10395 bytes
.../main/webapp/img/icons/UserManagment.png | Bin 0 -> 693 bytes
.../src/main/webapp/pages/CockpitPage.xhtml | 157 +++++++-----------
.../webapp/pages/ProjectOverviewPage.xhtml | 117 +++++--------
.../webapp/pages/admin/UserManagment.xhtml | 67 ++++++++
.../webapp/templates/CommonTemplate.xhtml | 41 +++++
.../webapp/templates/DefaultTemplate.xhtml | 33 ++++
.../main/webapp/templates/PagesTemplate.xhtml | 83 +++++++++
27 files changed, 584 insertions(+), 285 deletions(-)
create mode 100644 Kieker.WebGUI/lib/spring-faces-2.3.1-RELEASE.LICENSE
create mode 100644 Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_de.properties
create mode 100644 Kieker.WebGUI/src/main/resources/lang/AccessDeniedPage_en.properties
create mode 100644 Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-taglib.xml
create mode 100644 Kieker.WebGUI/src/main/webapp/css/DefaultTemplate.css
create mode 100644 Kieker.WebGUI/src/main/webapp/img/AccessDenied.png
create mode 100644 Kieker.WebGUI/src/main/webapp/img/icons/UserManagment.png
create mode 100644 Kieker.WebGUI/src/main/webapp/pages/admin/UserManagment.xhtml
create mode 100644 Kieker.WebGUI/src/main/webapp/templates/CommonTemplate.xhtml
create mode 100644 Kieker.WebGUI/src/main/webapp/templates/DefaultTemplate.xhtml
create mode 100644 Kieker.WebGUI/src/main/webapp/templates/PagesTemplate.xhtml
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 00000000..c851c25c
--- /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 1d0c9935..7b4b9bd0 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 ea6b99f7..4acc4574 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 956d1b23..ae25e107 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 261574b3..ca3f6c43 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 00000000..f7f3558b
--- /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 00000000..92ac93e9
--- /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 23a728a4..ebd57720 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 6301ff42..0a9c6946 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 30715fe0..9ebb72b9 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 cad9b0ea..969bb9c8 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 f9f3e288..0186d4b7 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 00000000..1669c4ce
--- /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 3a295ec3..96f3c344 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 db3a4dc4..7eac351d 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 182addb7..6cf1da11 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 00000000..e1616250
--- /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 5349a4a1..f735976a 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 96ae706e..c37c126e 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
GIT binary patch
literal 10395
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
literal 0
HcmV?d00001
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
GIT binary patch
literal 693
zcmV;m0!safP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0007fNkl<Zc-p1Y
zT}V@57zgnGIcIZciq4NTiE0;O$S%xcW+fyNWg?0fR&-$o)=gm~WFn*&T2T~a=|z-e
zD3N0LMdC+7D@w~`s12n}x2);hG@Z6HJ;$AMdP@kzG@%FHi}!=y^Soaa{xhicCLTRC
zrElG~tEA(NWuUFI{la+9Wnt4m{J~7+rNSD=t3E#L!^mft`s;J$uN99s4d`>yA~NC|
z?5zfia=>bX<a%*UvR4)V6Nv5Fofa3Xt8z_<!K%))tYc7vkHh1jT@80cXG6h;fZx#o
zg|;+m%<6RQl;&voO-4a}UVvqO5&q6wiQJ5_$7?yI@{fMT{}rI3m1^Zf&A1R45ROq1
z;m#NcwRxDgnxT#8PBk<qT+wQLNi)Wly4T(2?BjQrrPW)ARH#rEW@NOiPBilf^6W)$
zXCd5Eb|mk2psAz}=<NXJJ*YHDnHTHPvgQo7=Oo^@AF}0PQHI`LiqPp~EN~oB_YI*~
ze;d@43G%3fd+(8---_}zfWF}56Vnkx&eB^6@q7`qOBt9az`3MmWJOkhn)X6Ad-1@C
zo9A0m^ao)2={?jIs?0~LQ!pB;z?cu16Tvtlps=N*?(iT|{9b~h1<VZq?GDuDHsbUO
zkj)07L}^#C-XMXeA#*{%j{pLY*(m}!eK_GsK}}p6_~BUyq=@V9aJ9S_H&%cHYz!(R
zKQR&yh3p~M=7Z!_18&l0B~&LwF=xVQ3hwWuKLL5t4QULpenDfC4OtYz7&R$ZM<|kh
z^&?>@u-r&Omx}kY;6zf<H-PgHNQS%s`B*hV*8NPsB1FR|7d&DtS)}?susVUTLxZ6W
bfz8BEY<~%!M{LAn00000NkvXXu0mjfvxG(*
literal 0
HcmV?d00001
diff --git a/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index d0b761c6..a7d8fea5 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 d450ca00..20ab1c30 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 00000000..b7c36b81
--- /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 00000000..45bad11d
--- /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 00000000..ec309415
--- /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 00000000..17726d2f
--- /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>
--
GitLab