From 2ed9109ff4531bdc89b3f6be875aba9294f24494 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Wed, 10 Apr 2013 23:16:17 +0200
Subject: [PATCH] Modified the examples slightly; Added some comments; Modified
the database manager
---
.../Advanced Example/Advanced Example.kax | 4 +-
.../bin/data/Advanced Example/meta.dat | 4 +-
.../Bookstore-Example/Bookstore-Example.kax | 5 +
.../bin/data/Bookstore-Example/meta.dat | 2 +-
Kieker.WebGUI/lib/commons-dbcp.LICENSE | 201 ++++++++++++++++++
Kieker.WebGUI/pom.xml | 154 +-------------
.../src/main/webapp/WEB-INF/faces-config.xml | 3 +-
.../src/main/webapp/WEB-INF/pretty-config.xml | 3 +-
.../webapp/WEB-INF/spring-bean-config.xml | 16 +-
.../webapp/WEB-INF/spring-common-config.xml | 2 +-
.../webapp/WEB-INF/spring-database-config.xml | 13 +-
.../webapp/WEB-INF/spring-security-config.xml | 12 +-
12 files changed, 253 insertions(+), 166 deletions(-)
create mode 100644 Kieker.WebGUI/lib/commons-dbcp.LICENSE
diff --git a/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax b/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
index ffb52be5..112091d1 100644
--- a/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
+++ b/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
@@ -2,7 +2,7 @@
<Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="platform:/resource/Kieker/model/AnalysisMetaModel.ecore" name="AnalysisProject">
<plugins xsi:type="Reader" name="FSReader" classname="kieker.analysis.plugin.reader.filesystem.FSReader">
<properties name="ignoreUnknownRecordTypes" value="true"/>
- <properties name="inputDirs" value="C:/HiWi/Running%20Kieker.WebGUI/bin/data/Bookstore-Example/testdata"/>
+ <properties name="inputDirs" value="data/Bookstore-Example/testdata"/>
<outputPorts name="monitoringRecords" subscribers="//@plugins.1/@inputPorts.0"/>
</plugins>
<plugins xsi:type="Filter" name="StringBufferFilter" classname="kieker.analysis.plugin.filter.forward.StringBufferFilter">
@@ -64,7 +64,7 @@
<inputPorts name="messageTraces"/>
</plugins>
<plugins xsi:type="Filter" name="SystemModel2FileFilter" classname="kieker.tools.traceAnalysis.filter.systemModel.SystemModel2FileFilter">
- <properties name="outputFnHtml" value="out/system-entities.html"/>
+ <properties name="outputFnHtml" value="system-entities.html"/>
<repositories name="systemModelRepository" repository="//@repositories.0"/>
</plugins>
<repositories name="SystemModelRepository" classname="kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository"/>
diff --git a/Kieker.WebGUI/bin/data/Advanced Example/meta.dat b/Kieker.WebGUI/bin/data/Advanced Example/meta.dat
index 27e9ee8b..ff6c9d68 100644
--- a/Kieker.WebGUI/bin/data/Advanced Example/meta.dat
+++ b/Kieker.WebGUI/bin/data/Advanced Example/meta.dat
@@ -1,5 +1,5 @@
#
-#Wed Apr 10 14:08:23 CEST 2013
+#Wed Apr 10 22:37:49 CEST 2013
owner=Kieker-Administrator
-layout=0 -675 -138 192 72;1 -379 -138 312 72;2 -21 -149 276 132;3 287 -137 252 108;4 983 -149 468 96;5 1841 -102 816 144;6 915 110 876 84;7 1837 98 840 120;8 2505 128 288 72;9 2499 -174 360 72;10 2917 -174 348 72;\#1.2 2.6 -191.5 -126.5 -191.5 -101.5;1.2 2.5 -191.5 -126.5 -191.5 -125.5;3.12 6.20 444.5 -137.5 444.5 121.5;4.0 10.R 1384.5 -155.5 1384.5 -256.5 2710.5 -256.5 2710.5 -162.5;4.15 5.16 1384.5 -119.5 1384.5 -90.5;5.1 10.R 2288.5 -132.5 2288.5 -256.5 2710.5 -256.5 2710.5 -162.5;5.17 8.26 2298.5 -96.5 2298.5 139.5;7.2 10.R 2288.5 79.5 2288.5 -93.5 2710.5 -93.5 2710.5 -162.5;8.3 10.R 2710.5 139.5 2710.5 -162.5;
+layout=0 -2087 -780 192 72;1 -1791 -780 312 72;2 -1433 -791 276 132;3 -1125 -779 252 108;4 -429 -791 468 96;5 429 -744 816 144;6 -497 -532 876 84;7 425 -544 840 120;8 1093 -514 288 72;9 1087 -816 360 72;10 1505 -816 348 72;\#1.2 2.6 -1604.5 -769.5 -1604.5 -744.5;1.2 2.5 -1604.5 -769.5 -1604.5 -768.5;3.12 6.20 -968.5 -780.5 -968.5 -521.5;4.0 10.R -28.5 -798.5 -28.5 -899.5 1297.5 -899.5 1297.5 -805.5;4.15 5.16 -28.5 -762.5 -28.5 -733.5;5.1 10.R 875.5 -775.5 875.5 -899.5 1297.5 -899.5 1297.5 -805.5;5.17 8.26 885.5 -739.5 885.5 -503.5;7.2 10.R 875.5 -563.5 875.5 -736.5 1297.5 -736.5 1297.5 -805.5;8.3 10.R 1297.5 -503.5 1297.5 -805.5;
last\ user=Kieker-Administrator
diff --git a/Kieker.WebGUI/bin/data/Bookstore-Example/Bookstore-Example.kax b/Kieker.WebGUI/bin/data/Bookstore-Example/Bookstore-Example.kax
index 719668e2..c73f9b70 100644
--- a/Kieker.WebGUI/bin/data/Bookstore-Example/Bookstore-Example.kax
+++ b/Kieker.WebGUI/bin/data/Bookstore-Example/Bookstore-Example.kax
@@ -39,4 +39,9 @@
</plugins>
<dependencies filePath="BookstoreApplication.jar"/>
<dependencies filePath="commons-cli-1.2.jar"/>
+ <views name="Counter View" description="Shows the available counters">
+ <displayConnectors name="Invalid Counter" display="//@plugins.3/@displays.0"/>
+ <displayConnectors name="Invalid Counter" display="//@plugins.4/@displays.0"/>
+ <displayConnectors name="Global Counter" display="//@plugins.5/@displays.0"/>
+ </views>
</Project>
diff --git a/Kieker.WebGUI/bin/data/Bookstore-Example/meta.dat b/Kieker.WebGUI/bin/data/Bookstore-Example/meta.dat
index 947fe9f9..9bca80a1 100644
--- a/Kieker.WebGUI/bin/data/Bookstore-Example/meta.dat
+++ b/Kieker.WebGUI/bin/data/Bookstore-Example/meta.dat
@@ -1,5 +1,5 @@
#
-#Wed Apr 10 14:08:04 CEST 2013
+#Wed Apr 10 22:34:45 CEST 2013
owner=Kieker-Administrator
layout=0 -675 -155 192 72;1 -59 -167 336 84;2 651 -69 276 72;3 311 -57 276 84;4 311 -197 252 84;5 -403 -155 264 84;6 639 -201 252 72;\#1.2 4.8 140.5 -167.5 140.5 -185.5;1.3 3.5 140.5 -143.5 140.5 -45.5;4.9 6.14 480.5 -197.5 480.5 -189.5;
last\ user=Kieker-Administrator
diff --git a/Kieker.WebGUI/lib/commons-dbcp.LICENSE b/Kieker.WebGUI/lib/commons-dbcp.LICENSE
new file mode 100644
index 00000000..f49a4e16
--- /dev/null
+++ b/Kieker.WebGUI/lib/commons-dbcp.LICENSE
@@ -0,0 +1,201 @@
+ 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:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) 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
+
+ (d) 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
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index 1353c5f5..ab36a142 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -142,6 +142,11 @@
<artifactId>guava</artifactId>
<version>13.0.1</version>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.3</version>
+ </dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
@@ -155,153 +160,8 @@
</dependency>
<dependency>
<groupId>org.primefaces.themes</groupId>
- <artifactId>black-tie</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>blitzer</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>bluesky</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>casablanca</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>cupertino</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>dark-hive</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>dot-luv</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>eggplant</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>excite-bike</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>flick</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>hot-sneaks</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>humanity</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>le-frog</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>midnight</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>mint-choc</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>overcast</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>pepper-grinder</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>redmond</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>rocket</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>sam</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>smoothness</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>south-street</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>start</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>sunny</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>swanky-purse</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>trontastic</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>ui-darkness</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>ui-lightness</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>vader</artifactId>
- <version>${primefaces.themes.version}</version>
- </dependency>
- <dependency>
- <groupId>org.primefaces.themes</groupId>
- <artifactId>glass-x</artifactId>
- <version>${primefaces.themes.version}</version>
+ <artifactId>all-themes</artifactId>
+ <version>1.0.9</version>
</dependency>
<dependency>
<groupId>net.kieker-monitoring</groupId>
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 5807c106..9faddfcf 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
@@ -18,7 +18,8 @@
</variable-resolver>
</application>
- <!-- The following part contains the navigation cases to move from one page to another. -->
+ <!-- The following part contains the navigation cases to move from one page to another. Modify them with care, as this can influence the security part of the
+ application. -->
<navigation-rule>
<navigation-case>
<from-outcome>projectOverview</from-outcome>
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 1301bdbd..3d4e0a38 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
@@ -2,7 +2,8 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://ocpsoft.com/prettyfaces/3.3.2 http://ocpsoft.com/xml/ns/prettyfaces/ocpsoft-pretty-faces-3.3.2.xsd">
- <!-- The following mappings make sure that we have more "pretty" looking urls. -->
+ <!-- The following mappings make sure that we have more "pretty" looking urls. Modify them with care, as this can influence the security part of the
+ application. -->
<url-mapping id="home">
<pattern value="/pages/" />
<view-id value="/faces/pages/ProjectOverviewPage.xhtml" />
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml
index 1d2ceaee..4f6555c9 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml
@@ -4,9 +4,11 @@
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd" xmlns:context="http://www.springframework.org/schema/context">
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd"
+ xmlns:context="http://www.springframework.org/schema/context">
- <!-- The singleton scoped beans. -->
+ <!-- Most of the beans are recognized automatically by Spring. We just have to declare those with specific properties. -->
+
<bean id="globalPropertiesBean" class="kieker.webgui.web.beans.application.GlobalPropertiesBean">
<property name="themeCookieName" value="${kieker.webgui.config.lookAndFeel.cookieName}"/>
<property name="projectOverviewPage" value="${kieker.webgui.page.projectOverview}"/>
@@ -17,16 +19,21 @@
<property name="analysisEditorDefaultGridSize" value="${kieker.webgui.config.analysisEditor.defaultGridSize}"/>
<property name="analysisEditorDefaultGridColor" value="${kieker.webgui.config.analysisEditor.defaultGridColor}"/>
</bean>
+
<bean id="themeSwitcherBean" class="kieker.webgui.web.beans.application.ThemeSwitcherBean">
<!-- This is the map containing the available themes (look and feels). If one wants to add more themes, this is the correct place to do so. -->
<property name="themes">
<map>
+ <entry key="Afterdark" value="afterdark"/>
+ <entry key="Afternoon" value="afternoon"/>
+ <entry key="Afterwork" value="afterwork"/>
<entry key="Aristo" value="aristo"/>
<entry key="Black-Tie" value="black-tie"/>
<entry key="Blitzer" value="blitzer"/>
<entry key="Bluesky" value="bluesky"/>
<entry key="Casablanca" value="casablanca"/>
<entry key="Cupertino" value="cupertino"/>
+ <entry key="Cruze" value="cruze"/>
<entry key="Dark-Hive" value="dark-hive"/>
<entry key="Dot-Luv" value="dot-luv"/>
<entry key="Eggplant" value="eggplant"/>
@@ -34,6 +41,7 @@
<entry key="Flick" value="flick"/>
<entry key="Glass-X" value="glass-x"/>
<entry key="Hot-Sneaks" value="hot-sneaks"/>
+ <entry key="Home" value="home"/>
<entry key="Humanity" value="humanity"/>
<entry key="Le-Frog" value="le-frog"/>
<entry key="Midnight" value="midnight"/>
@@ -42,6 +50,7 @@
<entry key="Pepper-Grinder" value="pepper-grinder"/>
<entry key="Redmond" value="redmond"/>
<entry key="Rocket" value="rocket"/>
+ <entry key="Sam" value="sam"/>
<entry key="Smoothness" value="smoothness"/>
<entry key="South-Street" value="south-street"/>
<entry key="Start" value="start"/>
@@ -55,9 +64,10 @@
</property>
</bean>
+ <!-- Activate the auto scan for the available beans. -->
<context:component-scan base-package="kieker.webgui"/>
- <!-- The enums. -->
+ <!-- Declare the necessary enumerations. -->
<util:constant id="ROLE_GUEST" static-field="kieker.webgui.domain.User.Role.ROLE_GUEST"/>
<util:constant id="ROLE_USER" static-field="kieker.webgui.domain.User.Role.ROLE_USER"/>
<util:constant id="ROLE_ADMIN" static-field="kieker.webgui.domain.User.Role.ROLE_ADMIN"/>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-common-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-common-config.xml
index 3ea30317..ec5e40be 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-common-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-common-config.xml
@@ -13,7 +13,7 @@
</property>
</bean>
- <!-- This is for the properties-files. -->
+ <!-- This loads some properties from the global.properties file. -->
<bean id="globalPropertiesPlaceholder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<list>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-database-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-database-config.xml
index 1f0127a8..6473e3d1 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-database-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-database-config.xml
@@ -2,15 +2,24 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+ xmlns:tx="http://www.springframework.org/schema/tx"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
<!-- The database and the transaction manager. -->
- <bean id="userDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <bean id="userDataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
<property name="driverClassName" value="org.apache.derby.jdbc.EmbeddedDriver" />
<property name="url" value="jdbc:derby:user;create=true" />
</bean>
+ <bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+ <property name="dataSource" ref="userDataSource" />
+ </bean>
+
+ <!-- Enable annotation driven transactions -->
+ <tx:annotation-driven />
+
<jdbc:initialize-database ignore-failures="ALL" data-source="userDataSource">
<jdbc:script location="classpath:sql/tables.sql"/>
<jdbc:script location="classpath:sql/test-data.sql"/>
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 e945b640..1b9b3458 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
@@ -5,6 +5,8 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+ <!-- Edit the following only with care. It influences the security part of the application. Keep also in mind that this is just the security on the URL level.
+ The security on method level is done via annotations. -->
<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="permitAll"/>
@@ -39,17 +41,15 @@
<logout logout-success-url="/login?state=logout" />
</http>
+ <!-- Check for annotations. -->
<global-method-security pre-post-annotations="enabled"/>
<authentication-manager>
<authentication-provider>
<jdbc-user-service data-source-ref="userDataSource"
- users-by-username-query="
- SELECT name, password, isEnabled
- FROM Users WHERE name=?"
-
- authorities-by-username-query="select name, (case when isGuest then 'Guest' else (case when isUser then 'User' else 'Administrator' end) end) as ROLE from users where users.name = ?"
- />
+ users-by-username-query="SELECT name, password, isEnabled FROM Users WHERE name=?"
+ authorities-by-username-query="select name, (case when isGuest then 'Guest' else (case when isUser then 'User' else 'Administrator'
+ end) end) as ROLE from users where users.name = ?"/>
</authentication-provider>
</authentication-manager>
</beans:beans>
\ No newline at end of file
--
GitLab