diff --git a/Kieker.WebGUI/lib/spring-security-config-3.1.2-RELEASE.LICENSE b/Kieker.WebGUI/lib/spring-security-config-3.1.2-RELEASE.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7375b7e8ca126ad52c0c6e181a9b79fa92da3ef5
--- /dev/null
+++ b/Kieker.WebGUI/lib/spring-security-config-3.1.2-RELEASE.LICENSE
@@ -0,0 +1,261 @@
+ 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.
+
+=======================================================================
+
+SPRING FRAMEWORK 3.1 SUBCOMPONENTS:
+
+Spring Framework 3.1 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+>>> asm-2.2.3:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2009, OW2 Consortium <http://www.ow2.org/>
+
+=======================================================================
+
+To the extent any open source subcomponents are licensed under the EPL and/or other
+similar licenses that require the source code and/or modifications to
+source code to be made available (as would be noted above), you may obtain a
+copy of the source code corresponding to the binaries for such open source
+components and modifications thereto, if any, (the "Source Files"), by
+downloading the Source Files from http://www.springsource.org/download,
+or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview
+Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All
+such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General
+Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent
+physical medium. This offer to obtain a copy of the Source Files is valid for three
+years from the date you acquired this Software product.
\ No newline at end of file
diff --git a/Kieker.WebGUI/lib/spring-security-taglibs-3.1.2-RELEASE.LICENSE b/Kieker.WebGUI/lib/spring-security-taglibs-3.1.2-RELEASE.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7375b7e8ca126ad52c0c6e181a9b79fa92da3ef5
--- /dev/null
+++ b/Kieker.WebGUI/lib/spring-security-taglibs-3.1.2-RELEASE.LICENSE
@@ -0,0 +1,261 @@
+ 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.
+
+=======================================================================
+
+SPRING FRAMEWORK 3.1 SUBCOMPONENTS:
+
+Spring Framework 3.1 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+>>> asm-2.2.3:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2009, OW2 Consortium <http://www.ow2.org/>
+
+=======================================================================
+
+To the extent any open source subcomponents are licensed under the EPL and/or other
+similar licenses that require the source code and/or modifications to
+source code to be made available (as would be noted above), you may obtain a
+copy of the source code corresponding to the binaries for such open source
+components and modifications thereto, if any, (the "Source Files"), by
+downloading the Source Files from http://www.springsource.org/download,
+or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview
+Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All
+such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General
+Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent
+physical medium. This offer to obtain a copy of the Source Files is valid for three
+years from the date you acquired this Software product.
\ No newline at end of file
diff --git a/Kieker.WebGUI/lib/spring-security-web-3.1.2.RELEASE.LICENSE b/Kieker.WebGUI/lib/spring-security-web-3.1.2.RELEASE.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7375b7e8ca126ad52c0c6e181a9b79fa92da3ef5
--- /dev/null
+++ b/Kieker.WebGUI/lib/spring-security-web-3.1.2.RELEASE.LICENSE
@@ -0,0 +1,261 @@
+ 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.
+
+=======================================================================
+
+SPRING FRAMEWORK 3.1 SUBCOMPONENTS:
+
+Spring Framework 3.1 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+>>> asm-2.2.3:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2009, OW2 Consortium <http://www.ow2.org/>
+
+=======================================================================
+
+To the extent any open source subcomponents are licensed under the EPL and/or other
+similar licenses that require the source code and/or modifications to
+source code to be made available (as would be noted above), you may obtain a
+copy of the source code corresponding to the binaries for such open source
+components and modifications thereto, if any, (the "Source Files"), by
+downloading the Source Files from http://www.springsource.org/download,
+or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview
+Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All
+such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General
+Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent
+physical medium. This offer to obtain a copy of the Source Files is valid for three
+years from the date you acquired this Software product.
\ No newline at end of file
diff --git a/Kieker.WebGUI/lib/spring-webmvc-3.1.2.RELEASE.LICENSE b/Kieker.WebGUI/lib/spring-webmvc-3.1.2.RELEASE.LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..7375b7e8ca126ad52c0c6e181a9b79fa92da3ef5
--- /dev/null
+++ b/Kieker.WebGUI/lib/spring-webmvc-3.1.2.RELEASE.LICENSE
@@ -0,0 +1,261 @@
+ 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.
+
+=======================================================================
+
+SPRING FRAMEWORK 3.1 SUBCOMPONENTS:
+
+Spring Framework 3.1 includes a number of subcomponents with
+separate copyright notices and license terms. The product that
+includes this file does not necessarily use all the open source
+subcomponents referred to below. Your use of the source
+code for these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+>>> asm-2.2.3:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+Copyright (c) 1999-2009, OW2 Consortium <http://www.ow2.org/>
+
+=======================================================================
+
+To the extent any open source subcomponents are licensed under the EPL and/or other
+similar licenses that require the source code and/or modifications to
+source code to be made available (as would be noted above), you may obtain a
+copy of the source code corresponding to the binaries for such open source
+components and modifications thereto, if any, (the "Source Files"), by
+downloading the Source Files from http://www.springsource.org/download,
+or by sending a request, with your name and address to: VMware, Inc., 3401 Hillview
+Avenue, Palo Alto, CA 94304, United States of America or email info@vmware.com. All
+such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General
+Counsel. VMware shall mail a copy of the Source Files to you on a CD or equivalent
+physical medium. This offer to obtain a copy of the Source Files is valid for three
+years from the date you acquired this Software product.
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index 7b5499f6544785aef2467d665fcfcfadc7dd0a4b..cdb29ea662e8139bea29504424e97bd340f5abcc 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -54,6 +54,26 @@
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-web</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-config</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-taglibs</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
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 a1710512b783692b51bb40c194719b7c5d2161cb..956d1b23023dd848b8241f375c7f519ea8915468 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
@@ -24,7 +24,7 @@ import kieker.webgui.beans.application.GlobalPropertiesBean;
/**
* 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>
- * This class is a JSF managed bean with session scope. This means also that it is possible to login the same user multiple times and that is has to implement the
+ * This class is a Spring managed bean with session scope. This means also that it is possible to login the same user multiple times and that is has to implement the
* {@link Serializable} interface.
*
* @author Nils Christian Ehmke
@@ -39,10 +39,10 @@ public final class UserBean implements Serializable {
private GlobalPropertiesBean globalPropertiesBean;
/**
- * Default constructor. <b>Do not use this constructor. This bean is JSF managed.</b>
+ * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
public UserBean() {
- this.userName = "Guest";
+ this.userName = "Kieker-Team";
}
/**
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/package-info.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/package-info.java
index 3330925542f024a98c34ac338de884aad5502e75..ecc09dcefc8c9ef382cc86ca664794b4293531be 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/package-info.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/session/package-info.java
@@ -15,8 +15,9 @@
***************************************************************************/
/**
- * This package contains JSF managed beans with session scope.
+ * This package contains Spring managed beans with session scope.
*
* @author Nils Christian Ehmke
*/
package kieker.webgui.beans.session;
+
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
index cc31c01537bc20f72aac5b3dbe30b73096df8dc7..27a5fe2b84bd0bbfd5486a6f96e4eb42fd166f92 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentAnalysisEditorBean.java
@@ -73,7 +73,7 @@ import org.eclipse.emf.ecore.EObject;
* The {@link CurrentAnalysisEditorBean} contains the necessary data behind an instance of the analysis editor. It provides various methods to manipulate the current
* project, as the analysis editor is the most important part of the whole application. The connection to the graph within the editor is done via another bean (the
* {@link CurrentAnalysisEditorGraphBean}).<br>
- * The class is a JSF managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
+ * The class is a Spring managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
* problems.<br>
* If editing this class as a programmer keep in mind that the class makes excessive use of java reflection (via {@link ClassAndMethodContainer}) to use the correct
* classes within every project. It doesn't really use the classes loaded by the WebGUI-ClassLoader. This results also in some methods which returns elements from
@@ -150,7 +150,7 @@ public final class CurrentAnalysisEditorBean {
private GlobalPropertiesBean globalPropertiesBean;
/**
- * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by JSF.</b>
+ * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by Spring.</b>
*/
public CurrentAnalysisEditorBean() {
// No code necessary
@@ -224,7 +224,7 @@ public final class CurrentAnalysisEditorBean {
/**
* This method initializes the bean by using the current project name to load the project. <b>Do not call this method manually. It will only be accessed by
- * JSF.</b>
+ * Spring.</b>
*/
public void initialize() {
synchronized (this) {
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 68b0e974c822768a080f14048db5d84a4b8f9b56..261574b3ebcde21fa68acc78fd6e02fdc4f0d521 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
@@ -40,7 +40,7 @@ import org.eclipse.emf.ecore.EObject;
/**
* The {@link CurrentAnalysisEditorGraphBean} contains the necessary data behind an graph of the analysis editor. It provides various methods to manipulate the
* current graph.<br>
- * The class is a JSF managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
+ * The class is a Spring managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
* problems.
*
* @author Nils Christian Ehmke
@@ -154,7 +154,7 @@ public final class CurrentAnalysisEditorGraphBean {
private CurrentAnalysisEditorBean currentAnalysisEditorBean;
/**
- * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by JSF.</b>
+ * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by Spring.</b>
*/
public CurrentAnalysisEditorGraphBean() {
// No code necessary
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
index 2f0912281c892a6731b3c2bb529df6a9cff2c4dd..63f68c4ba1e5130f488a5ce8274e9a79614c8d96 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitBean.java
@@ -37,7 +37,7 @@ import kieker.webgui.common.exception.ProjectNotExistingException;
/**
* The {@link CurrentCockpitBean} contains the necessary data behind an instance of the cockpit. It provides methods to read the state of the currently selected
* project.<br>
- * The class is a JSF managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
+ * The class is a Spring managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
* problems.
*
* @author Nils Christian Ehmke
@@ -56,7 +56,7 @@ public final class CurrentCockpitBean {
private ProjectsBean projectsBean;
/**
- * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by JSF.</b>
+ * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by Spring.</b>
*/
public CurrentCockpitBean() {
// No code necessary
@@ -115,7 +115,7 @@ public final class CurrentCockpitBean {
/**
* This method initializes the bean by using the current project name to load the project. <b>Do not call this method manually. It will only be accessed by
- * JSF.</b>
+ * Spring.</b>
*/
public void initalize() {
// TODO Replace the log messages with the localizes messages
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
index e80462aac87c5db604c14de7dd95f8d34a22e87c..9b0faed787fde73f61245ead42a7ebf2bb6e7ad9 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentCockpitEditorBean.java
@@ -61,7 +61,7 @@ import org.primefaces.model.DefaultDashboardModel;
/**
* The {@link CurrentCockpitEditorBean} contains the necessary data behind an instance of the cockpit editor.
- * The class is a JSF managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
+ * The class is a Spring managed bean with view scope to make sure that one user (even in one session) can open multiple projects at a time without causing any
* problems.
*
* @author Nils Christian Ehmke
@@ -91,7 +91,7 @@ public final class CurrentCockpitEditorBean {
private GlobalPropertiesBean globalPropertiesBean;
/**
- * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by JSF.</b>
+ * Creates a new instance of this class. <b>Do not call this constructor manually. It will only be accessed by Spring.</b>
*/
public CurrentCockpitEditorBean() {
this.createDashboard();
@@ -180,7 +180,7 @@ public final class CurrentCockpitEditorBean {
/**
* This method initializes the bean by using the current project name to load the project. <b>Do not call this method manually. It will only be accessed by
- * JSF.</b>
+ * Spring.</b>
*/
public void initalize() {
synchronized (this) {
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
index 7bfc06eead3725b48352356101e3797b3dd5624e..85610df8b52efb0220b13fb80e25e31b4cc52217 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentControllerBean.java
@@ -38,7 +38,7 @@ import kieker.webgui.common.exception.ProjectNotExistingException;
/**
* /**
- * The {@link CurrentControllerBean} contains the necessary data behind an instance of the analysis controller. The class is a JSF managed bean with view scope to
+ * The {@link CurrentControllerBean} contains the necessary data behind an instance of the analysis controller. The class is a Spring managed bean with view scope to
* make sure that one user (even in one session) can open multiple projects at a time without causing any problems.
*
* @author Nils Christian Ehmke
@@ -56,7 +56,7 @@ public final class CurrentControllerBean {
private ProjectsBean projectsBean;
/**
- * Creates a new instance of this class. <b>Do not use this constructor. This bean is JSF managed.</b>
+ * Creates a new instance of this class. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
public CurrentControllerBean() {
// No code necessary
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
index 49fa28e93e0e48859192ccfd19b865387eecebcb..1b31c8f8acf8269007271802ab8a537e749f5b2a 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/CurrentProjectOverviewBean.java
@@ -27,7 +27,7 @@ import org.primefaces.event.SelectEvent;
/**
* The {@link CurrentProjectOverviewBean} contains the necessary data behind an instance of the project overview.<br>
- * The class is a JSF managed bean with view scope.
+ * The class is a Spring managed bean with view scope.
*
* @author Nils Christian Ehmke
*/
@@ -45,7 +45,7 @@ public final class CurrentProjectOverviewBean {
private String projectName;
/**
- * Default constructor. <b>Do not call this constructor manually. It will only be accessed by JSF.</b>
+ * Default constructor. <b>Do not call this constructor manually. It will only be accessed by Spring.</b>
*/
public CurrentProjectOverviewBean() {
// No code necessary
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/package-info.java b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/package-info.java
index 4d24473fd303caca3112dedf2c35aaafe1b5a4c7..1294ccfaea387c1115a5e4fbc6d85776d49071a1 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/package-info.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/beans/view/package-info.java
@@ -15,8 +15,9 @@
***************************************************************************/
/**
- * This package contains JSF managed beans with view scope.
+ * This package contains Spring managed beans with view scope.
*
* @author Nils Christian Ehmke
*/
package kieker.webgui.beans.view;
+
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/ProjectManagerFacade.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/ProjectManagerFacade.java
index 7e43122263fc9651c416af8ce71126337168e8c8..40653c130f0208fe34b446f708c7e04e612fee65 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/ProjectManagerFacade.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/ProjectManagerFacade.java
@@ -59,18 +59,36 @@ public final class ProjectManagerFacade implements IProjectManagerFacade {
@Autowired
private PluginFinder pluginFinder;
+ /**
+ * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
+ */
public ProjectManagerFacade() {
// No code necessary.
}
+ /**
+ * The setter for the property {@link ProjectManagerFacade#acManager}. <b>Do not use this method. This property is Spring managed.</b>
+ *
+ * @param acManager
+ */
public void setAcManager(final ACManager acManager) {
this.acManager = acManager;
}
+ /**
+ * The setter for the property {@link ProjectManagerFacade#fsManager}. <b>Do not use this method. This property is Spring managed.</b>
+ *
+ * @param fsManager
+ */
public void setFsManager(final FSManager fsManager) {
this.fsManager = fsManager;
}
+ /**
+ * The setter for the property {@link ProjectManagerFacade#pluginFinder}. <b>Do not use this method. This property is Spring managed.</b>
+ *
+ * @param pluginFinder
+ */
public void setPluginFinder(final PluginFinder pluginFinder) {
this.pluginFinder = pluginFinder;
}
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ACManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ACManager.java
index f75599f3d9fd41c7361ed91486b5682e2df2b218..6d03d91604565f28818a7c880cf38a53f2f2277d 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ACManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ACManager.java
@@ -42,7 +42,7 @@ public final class ACManager {
private FSManager fsManager;
/**
- * Creates a new instance of this class.
+ * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
public ACManager() {
// No code necessary.
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/FSManager.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/FSManager.java
index 6b77f0b03fe58f00ce47b6d41825738a2e979359..d5716a93c928c82251a11ec714552e74104e9442 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/FSManager.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/FSManager.java
@@ -57,25 +57,11 @@ import org.primefaces.model.UploadedFile;
* @author Nils Christian Ehmke
*/
public final class FSManager {
- /**
- * This is the log object used to log messages, warnings etc.
- */
+
private static final Log LOG = LogFactory.getLog(FSManager.class);
- /**
- * This is the extension of the KAX-files.
- */
private static final String KAX_EXTENSION = "kax";
- /**
- * This is the extension of the library-files.
- */
private static final String LIB_EXTENSION = "jar";
- /**
- * This is the name of the directory for the libraries.
- */
private static final String LIB_DIRECTORY = "lib";
- /**
- * This is the name of the root-directory.
- */
private static final String ROOT_DIRECTORY = "data";
/**
* The library for kieker which is contained in the war-file as a resource.
@@ -85,13 +71,11 @@ public final class FSManager {
* This is the buffer (in bytes) used to copy and upload files.
*/
private static final int BUF_SIZE_BYTES = 1024 * 1024;
- /**
- * This is the factory we will use to create the elements for the projects.
- */
+
private final MIAnalysisMetaModelFactory factory = new MAnalysisMetaModelFactory();
/**
- * Creates a new instance of this class.
+ * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
public FSManager() {
// no code necessary
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java
index 8cba5d047290d381164c8e826a5f407d43fb8eca..8e414cb19c262ad82e9706a1d60eb4ea92777a13 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/PluginFinder.java
@@ -34,7 +34,7 @@ import kieker.webgui.common.ClassAndMethodContainer;
public final class PluginFinder {
/**
- * The default constructor.
+ * Default constructor. <b>Do not use this constructor. This bean is Spring managed.</b>
*/
public PluginFinder() {
// No code necessary
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ViewScope.java b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ViewScope.java
index 0fd597f124c55c6ff9ca8aebe367fa43e7a99091..d16f3ce1bb0ffd1a5fd282c323b1f36ad0177d36 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ViewScope.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/common/util/ViewScope.java
@@ -23,8 +23,14 @@ import javax.faces.context.FacesContext;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.beans.factory.config.Scope;
+/**
+ * The class {@link ViewScope} is necessary as Spring doesn't provide a view scope like JSF. Therefore the view scope has to be implemented by us.
+ *
+ * @author Nils Christian Ehmke
+ */
public class ViewScope implements Scope {
+ @SuppressWarnings("rawtypes")
@Override
public Object get(final String name, final ObjectFactory objectFactory) {
final Map<String, Object> viewMap = FacesContext.getCurrentInstance().getViewRoot().getViewMap();
@@ -50,7 +56,7 @@ public class ViewScope implements Scope {
}
@Override
- public void registerDestructionCallback(final String name, final Runnable callback) {
+ public void registerDestructionCallback(final String name, final Runnable callback) { // NOPMD (Threads are not used)
// Not supported
}
diff --git a/Kieker.WebGUI/src/main/resources/lang/LoginPage_de.properties b/Kieker.WebGUI/src/main/resources/lang/LoginPage_de.properties
index 09a1715fdf0b7f521872fe98f43e4cfa4615557f..beef4292a8be73cc62d7bce5c0264e1b061d4aa6 100644
--- a/Kieker.WebGUI/src/main/resources/lang/LoginPage_de.properties
+++ b/Kieker.WebGUI/src/main/resources/lang/LoginPage_de.properties
@@ -6,8 +6,7 @@
#------------------------------------------------------------------------------
msgWelcomeShort = Willkommen bei der Kieker.WebGUI
-msgWelcome = Dies ist eine fr\u00fche Beta Version der Kieker Web GUI. Deshalb kann diese noch Bugs enthalten und einige Funktionalit\u00e4ten sind m\u00f6glicherweise noch nicht implementiert. Klicken Sie einfach auf "Anmelden" um fortzufahren.
-
+msgWelcome = Dies ist eine fr\u00fche Beta Version der Kieker Web GUI. Deshalb kann diese noch Bugs enthalten und einige Funktionalit\u00e4ten sind m\u00f6glicherweise noch nicht implementiert. Benutzen sie den Benutzer "Kieker-Team" mit dem Passwort "kieker" um sich anzumelden und fortzufahren.
username = Benutzername
password = Passwort
diff --git a/Kieker.WebGUI/src/main/resources/lang/LoginPage_en.properties b/Kieker.WebGUI/src/main/resources/lang/LoginPage_en.properties
index 3147326136f12e779a1dcc383b7ef35faeacee29..153c8a76c5f95639912deaba73856d347053c0d3 100644
--- a/Kieker.WebGUI/src/main/resources/lang/LoginPage_en.properties
+++ b/Kieker.WebGUI/src/main/resources/lang/LoginPage_en.properties
@@ -6,7 +6,7 @@
#------------------------------------------------------------------------------
msgWelcomeShort = Welcome to the Kieker.WebGUI
-msgWelcome = This is an early beta version of the Kieker Web GUI. Therefore it may contain bugs and some functionality may have not been implemented yet. Just click "Login" to continue.
+msgWelcome = This is an early beta version of the Kieker Web GUI. Therefore it may contain bugs and some functionality may have not been implemented yet. Use the user "Kieker-Team" with the password "kieker" to login and continue.
username = Username
password = Password
diff --git a/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml b/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml
new file mode 100644
index 0000000000000000000000000000000000000000..23a728a455abb73f2cdd26108b2c68c6712957b9
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/AccessDeniedPage.xhtml
@@ -0,0 +1,36 @@
+<?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:p="http://primefaces.org/ui"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <!-- 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:body>
+
+ <div align="center" >
+ <img src="./img/kieker-header.jpg"/>
+ </div>
+
+ <div align="center" class="stretch">
+ <p:spacer width="0" height="120"/>
+
+ <h:form>
+ <div class="stretch" align="center">
+ <div align="center">
+ <h:outputText style="font-size: 25px" value="Access Denied!"/>
+ </div>
+ </div>
+ </h:form>
+ </div>
+ </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 2941f2181821503430930e6ff196f5be33e005ca..252ee0c31b87a24e0546559e9f10aeb15356c262 100644
--- a/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/LoginPage.xhtml
@@ -5,6 +5,10 @@
xmlns:p="http://primefaces.org/ui"
xmlns:f="http://java.sun.com/jsf/core">
+ <f:metadata>
+ <f:viewParam id="state" name="state"/>
+ </f:metadata>
+
<!-- Load the localized messages, labels etc. for the login page. -->
<f:loadBundle var="localizedMessages" basename="lang.Common"/>
<f:loadBundle var="localizedLoginMessages" basename="lang.LoginPage"/>
@@ -25,19 +29,24 @@
<div align="center" class="stretch">
<p:spacer width="0" height="120"/>
- <h:form>
+ <form action="#{request.contextPath}/j_spring_security_check" method="post">
<div class="stretch" align="center">
+ <div class="hint-panel">
+ <h:outputText style="color: red" value="#{state == 'logout' ? 'Sie haben sich erfolgreich ausgeloggt.' : 'Anmeldung fehlgeschlagen.'}" rendered="#{not empty state}"/><br/>
+ <p:spacer width="0" height="25" rendered="#{not empty state}"/>
+ </div>
+
<p:panel header="#{localizedLoginMessages.msgWelcomeShort}" styleClass="login-panel">
<h:panelGrid columnClasses="col1 , col2" styleClass="grid" columns="2" cellpadding="5" >
- <h:outputLabel for="username" value="#{localizedLoginMessages.username}:" />
- <p:inputText styleClass="input" id="username" required="true" value="#{userBean.userName}" label="username"/>
+ <h:outputLabel for="j_username" value="#{localizedLoginMessages.username}:" />
+ <p:inputText styleClass="input" id="j_username" required="true" value="#{userBean.userName}" label="username"/>
- <h:outputLabel for="password" value="#{localizedLoginMessages.password}:" />
- <p:password styleClass="input" id="password" required="false" value="#{userBean.password}" label="password" />
+ <h:outputLabel for="j_password" value="#{localizedLoginMessages.password}:" />
+ <p:password styleClass="input" id="j_password" required="false" value="#{userBean.password}" label="password" />
</h:panelGrid>
<hr/>
<div align="right">
- <p:commandButton value="#{localizedLoginMessages.login}" ajax="false" action="#{userBean.login}" />
+ <h:commandButton value="#{localizedLoginMessages.login}" type="submit" />
</div>
</p:panel>
@@ -49,7 +58,7 @@
<p:growl sticky="true" autoUpdate="true" widgetVar="growlComp"/>
</div>
- </h:form>
+ </form>
</div>
</h:body>
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
index 04f30384b318f46077d11c6a0791fb0fa423db77..30715fe05390a897edbc9b60280d69b5e7100dff 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/faces-config.xml
@@ -22,7 +22,7 @@
<navigation-rule>
<navigation-case>
<from-outcome>projectOverview</from-outcome>
- <to-view-id>/ProjectOverviewPage.xhtml</to-view-id>
+ <to-view-id>/pages/ProjectOverviewPage.xhtml</to-view-id>
<redirect>true</redirect>
</navigation-case>
</navigation-rule>
@@ -30,28 +30,28 @@
<navigation-rule>
<navigation-case>
<from-outcome>analysisEditor</from-outcome>
- <to-view-id>/AnalysisEditorPage.xhtml</to-view-id>
+ <to-view-id>/pages/AnalysisEditorPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>cockpitEditor</from-outcome>
- <to-view-id>/CockpitEditorPage.xhtml</to-view-id>
+ <to-view-id>/pages/CockpitEditorPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>cockpit</from-outcome>
- <to-view-id>/CockpitPage.xhtml</to-view-id>
+ <to-view-id>/pages/CockpitPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
<navigation-case>
<from-outcome>controller</from-outcome>
- <to-view-id>/ControllerPage.xhtml</to-view-id>
+ <to-view-id>/pages/ControllerPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
@@ -61,4 +61,11 @@
<to-view-id>/LoginPage.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+
+ <navigation-rule>
+ <navigation-case>
+ <from-outcome>accessDenied</from-outcome>
+ <to-view-id>/AccessDeniedPage.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 81ed73da8d70baa5b4ad4949a96079dd16f6a894..92dcf9f5d4ddfce03f2fed37c1f02018cd35d40d 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/pretty-config.xml
@@ -4,38 +4,42 @@
<!-- The following mappings make sure that we have more "pretty" looking urls. -->
<url-mapping id="home">
- <pattern value="/" />
- <view-id value="/faces/ProjectOverviewPage.xhtml" />
+ <pattern value="/pages/" />
+ <view-id value="/faces/pages/ProjectOverviewPage.xhtml" />
</url-mapping>
<url-mapping id="projectOverview">
- <pattern value="/projectOverview" />
- <view-id value="/faces/ProjectOverviewPage.xhtml" />
+ <pattern value="/pages/projectOverview" />
+ <view-id value="/faces/pages/ProjectOverviewPage.xhtml" />
</url-mapping>
<url-mapping id="analysisEditor">
- <pattern value="/analysisEditor" />
- <view-id value="/faces/AnalysisEditorPage.xhtml" />
+ <pattern value="/pages/analysisEditor" />
+ <view-id value="/faces/pages/AnalysisEditorPage.xhtml" />
</url-mapping>
<url-mapping id="cockpitEditor">
- <pattern value="/cockpitEditor" />
- <view-id value="/faces/CockpitEditorPage.xhtml" />
+ <pattern value="/pages/cockpitEditor" />
+ <view-id value="/faces/pages/CockpitEditorPage.xhtml" />
</url-mapping>
<url-mapping id="controller">
- <pattern value="/controller" />
- <view-id value="/faces/ControllerPage.xhtml" />
+ <pattern value="/pages/controller" />
+ <view-id value="/faces/pages/ControllerPage.xhtml" />
</url-mapping>
<url-mapping id="cockpit">
- <pattern value="/cockpit" />
- <view-id value="/faces/CockpitPage.xhtml" />
+ <pattern value="/pages/cockpit" />
+ <view-id value="/faces/pages/CockpitPage.xhtml" />
</url-mapping>
<url-mapping id="login">
<pattern value="/login" />
<view-id value="/faces/LoginPage.xhtml" />
</url-mapping>
-
+
+ <url-mapping id="accessDenied">
+ <pattern value="/accessDenied" />
+ <view-id value="/faces/AccessDeniedPage.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
new file mode 100644
index 0000000000000000000000000000000000000000..dadc966dade8201c009948d7ded5a551ea16dc51
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-security-config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/security"
+ xmlns:beans="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jdbc="http://www.springframework.org/schema/jdbc"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+ http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.1.xsd
+ http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd">
+
+ <http use-expressions="true" access-denied-page="/accessDenied" >
+ <form-login login-page="/login" default-target-url="/pages/" authentication-failure-url="/login?state=failure"/>
+ <intercept-url pattern="/login" access="true"/>
+ <intercept-url pattern="/pages/**" access="isAuthenticated()"/>
+ <intercept-url pattern="/faces/pages/**" access="isAuthenticated()"/>
+ <intercept-url pattern="/" access="false" />
+ <logout logout-success-url="/login?state=logout" />
+ </http>
+
+ <authentication-manager>
+ <authentication-provider>
+ <user-service>
+ <user name="Kieker-Team" password="kieker" authorities="ROLE_USER, ROLE_ADMIN" />
+ </user-service>
+ </authentication-provider>
+ </authentication-manager>
+</beans:beans>
\ 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 d539f3fbf2299d7cdd6334b8165bc99a924d06ac..733e982572f51dfefa38e90fbaa2b816dfc953c1 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/web.xml
@@ -22,6 +22,15 @@
<param-value>#{currentConfigurationBean.lookAndFeel}</param-value>
</context-param>
+ <filter>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
+ </filter>
+ <filter-mapping>
+ <filter-name>springSecurityFilterChain</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<!-- This filter is necessary for the PrimeFaces file upload. -->
<filter>
<filter-name>PrimeFaces FileUpload Filter</filter-name>
@@ -92,9 +101,9 @@
<!-- The following part is necessary for Spring. -->
<context-param>
<param-name>contextConfigLocation</param-name>
- <param-value>/WEB-INF/spring-config.xml</param-value>
+ <param-value>/WEB-INF/spring-*config.xml</param-value>
</context-param>
-
+
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
diff --git a/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css b/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css
new file mode 100644
index 0000000000000000000000000000000000000000..db3a4dc406a898994b0c68aac9ad932576347fe9
--- /dev/null
+++ b/Kieker.WebGUI/src/main/webapp/css/AccessDeniedPage.css
@@ -0,0 +1,29 @@
+@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%;
+}
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
similarity index 97%
rename from Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml
rename to Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
index 67124a1edceb7069fab0c3a0999aa4bcf5902fa8..75e3640ec9ecec44685c6f58f46cb2fedc6ac79d 100644
--- a/Kieker.WebGUI/src/main/webapp/AnalysisEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
@@ -19,14 +19,14 @@
<h:head>
<title>Kieker.WebGUI</title>
<!-- Load the necessary CSS files. -->
- <link rel="stylesheet" type="text/css" href="./css/FlowEditor.css" />
- <link rel="stylesheet" type="text/css" href="./css/Common.css" />
- <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="./css/AnalysisEditorPage.css" />
+ <link rel="stylesheet" type="text/css" href="../css/FlowEditor.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="../css/AnalysisEditorPage.css" />
<!-- Load the necessary JS files. -->
- <script language="javascript" type="text/javascript" src="./js/jit.js"></script>
- <script language="javascript" type="text/javascript" src="./js/flowEditor.js"></script>
+ <script language="javascript" type="text/javascript" src="../js/jit.js"></script>
+ <script language="javascript" type="text/javascript" src="../js/flowEditor.js"></script>
<script>
nodeClickListener = function(node, info, e) {
@@ -114,7 +114,7 @@
<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="login"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
</p:menubar>
<p:spacer height="5"/>
<p:menubar>
@@ -291,13 +291,13 @@
<p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
- <ui:include src="dialogs/SettingsDialog.xhtml"/>
+ <ui:include src="../dialogs/SettingsDialog.xhtml"/>
<!-- Include the about-dialog. -->
- <ui:include src="dialogs/AboutDialog.xhtml" />
+ <ui:include src="../dialogs/AboutDialog.xhtml" />
<!-- Include the dialog the manage the libraries. -->
- <ui:include src="dialogs/AnalysisEditorPageDialogs.xhtml" />
+ <ui:include src="../dialogs/AnalysisEditorPageDialogs.xhtml" />
</h:body>
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
similarity index 95%
rename from Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml
rename to Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
index d54c29bdca57313f54378881192c5b7d9a1b2e88..76d207666892d884f5abbbaaf52ca11670e48f1a 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitEditorPage.xhtml
@@ -16,9 +16,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="./css/Common.css" />
- <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="./css/CockpitEditorPage.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="../css/CockpitEditorPage.css" />
</h:head>
<h:body>
@@ -68,7 +68,7 @@
<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="login"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
</p:menubar>
</h:form>
</p:layoutUnit>
@@ -145,12 +145,12 @@
<p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
- <ui:include src="dialogs/SettingsDialog.xhtml" />
+ <ui:include src="../dialogs/SettingsDialog.xhtml" />
<!-- Include the dialogs for the views. -->
- <ui:include src="dialogs/CockpitEditorPageDialogs.xhtml" />
+ <ui:include src="../dialogs/CockpitEditorPageDialogs.xhtml" />
<!-- Include the about-dialog. -->
- <ui:include src="dialogs/AboutDialog.xhtml" />
+ <ui:include src="../dialogs/AboutDialog.xhtml" />
</h:body>
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
similarity index 94%
rename from Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml
rename to Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
index a4884fbd6d17feba300d4cb60516303053850ff3..a9f11fc737e1071967642a4aea551f5827a489be 100644
--- a/Kieker.WebGUI/src/main/webapp/CockpitPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/CockpitPage.xhtml
@@ -16,9 +16,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="./css/Common.css" />
- <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="./css/CockpitPage.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="../css/CockpitPage.css" />
</h:head>
<h:body>
@@ -66,7 +66,7 @@
<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="login"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
</p:menubar>
</h:form>
</p:layoutUnit>
@@ -106,10 +106,10 @@
<p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
- <ui:include src="dialogs/SettingsDialog.xhtml" />
+ <ui:include src="../dialogs/SettingsDialog.xhtml" />
<!-- Include the about-dialog. -->
- <ui:include src="dialogs/AboutDialog.xhtml" />
+ <ui:include src="../dialogs/AboutDialog.xhtml" />
</h:body>
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
similarity index 86%
rename from Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml
rename to Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
index b31a1e297335f66a20fb218a3a9f21618449aeef..3a39a76e8a29af581c9f2bac8d355e70ecb88633 100644
--- a/Kieker.WebGUI/src/main/webapp/ControllerPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ControllerPage.xhtml
@@ -15,9 +15,9 @@
<h:head>
<title>Kieker.WebGUI</title>
- <link rel="stylesheet" type="text/css" href="./css/Common.css" />
- <link rel="stylesheet" type="text/css" href="./css/Icons.css" />
- <link rel="stylesheet" type="text/css" href="./css/ControllerPage.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="../css/ControllerPage.css" />
</h:head>
<h:body>
@@ -61,7 +61,7 @@
<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="login"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
</p:menubar>
</h:form>
@@ -98,17 +98,17 @@
<hr/>
<h:form id="ledsForm">
<div align="center">
- <h:graphicImage id="iconLEDRed1" url="./img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisNotAvailable()}"/>
- <h:graphicImage id="iconLEDRed1_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisNotAvailable()}"/>
+ <h:graphicImage id="iconLEDRed1" url="../img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisNotAvailable()}"/>
+ <h:graphicImage id="iconLEDRed1_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisNotAvailable()}"/>
<p:spacer height="0" width="15px"/>
- <h:graphicImage id="iconLEDYellow" url="./img/LEDs/Icon_LED_Yellow.png" height="50px" rendered="#{currentControllerBean.isAnalysisReady()}"/>
- <h:graphicImage id="iconLEDYellow_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisReady()}"/>
+ <h:graphicImage id="iconLEDYellow" url="../img/LEDs/Icon_LED_Yellow.png" height="50px" rendered="#{currentControllerBean.isAnalysisReady()}"/>
+ <h:graphicImage id="iconLEDYellow_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisReady()}"/>
<p:spacer height="0" width="15px"/>
- <h:graphicImage id="iconLEDGreen" url="./img/LEDs/Icon_LED_Green.png" height="50px" rendered="#{currentControllerBean.isAnalysisRunning()}"/>
- <h:graphicImage id="iconLEDGreen_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisRunning()}"/>
+ <h:graphicImage id="iconLEDGreen" url="../img/LEDs/Icon_LED_Green.png" height="50px" rendered="#{currentControllerBean.isAnalysisRunning()}"/>
+ <h:graphicImage id="iconLEDGreen_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not currentControllerBean.isAnalysisRunning()}"/>
<p:spacer height="0" width="15px"/>
- <h:graphicImage id="iconLEDRed2" url="./img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed()}"/>
- <h:graphicImage id="iconLEDRed2_2" url="./img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not (currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed())}"/>
+ <h:graphicImage id="iconLEDRed2" url="../img/LEDs/Icon_LED_Red.png" height="50px" rendered="#{currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed()}"/>
+ <h:graphicImage id="iconLEDRed2_2" url="../img/LEDs/Icon_LED_Gray.png" height="50px" rendered="#{not (currentControllerBean.isAnalysisTerminated() or currentControllerBean.isAnalysisFailed())}"/>
<p:tooltip for="iconLEDRed1" value="#{localizedControllerPageMessages.analysisControllerMsgNotInstantiated}"/>
<p:tooltip for="iconLEDYellow" value="#{localizedControllerPageMessages.analysisControllerMsgReady}"/>
@@ -127,10 +127,10 @@
<p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the dialog for the configuration. -->
- <ui:include src="dialogs/SettingsDialog.xhtml" />
+ <ui:include src="../dialogs/SettingsDialog.xhtml" />
<!-- Include the about-dialog. -->
- <ui:include src="dialogs/AboutDialog.xhtml" />
+ <ui:include src="../dialogs/AboutDialog.xhtml" />
</h:body>
diff --git a/Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
similarity index 94%
rename from Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml
rename to Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
index 8ff32633f7c09502043476ea05375b2f5b751052..d8a7d2ceff3e3ba70792fc192ebec6254b74b2da 100644
--- a/Kieker.WebGUI/src/main/webapp/ProjectOverviewPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/ProjectOverviewPage.xhtml
@@ -5,15 +5,15 @@
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" />
+ <link rel="stylesheet" type="text/css" href="../css/Common.css" />
+ <link rel="stylesheet" type="text/css" href="../css/Icons.css" />
+ <link rel="stylesheet" type="text/css" href="../css/ProjectOverviewPage.css" />
</h:head>
<h:body>
@@ -59,7 +59,7 @@
<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="login"/>
+ <p:menuitem styleClass="logOutButton element-with-whitespace" icon="ui-icon-logout" value=" #{userBean.userName}" ajax="true" url="j_spring_security_logout"/>
</p:menubar>
</h:form>
</p:layoutUnit>
@@ -108,11 +108,11 @@
<p:growl id="messages" life="1500" showDetail="true" autoUpdate="false" sticky="true"/>
<!-- Include the about-dialog. -->
- <ui:include src="dialogs/AboutDialog.xhtml" />
+ <ui:include src="../dialogs/AboutDialog.xhtml" />
<!-- Include the dialogs for the project managment. -->
- <ui:include src="dialogs/ProjectOverviewPageDialogs.xhtml" />
+ <ui:include src="../dialogs/ProjectOverviewPageDialogs.xhtml" />
<!-- Include the dialog for the configuration. -->
- <ui:include src="dialogs/SettingsDialog.xhtml" />
+ <ui:include src="../dialogs/SettingsDialog.xhtml" />
</h:body>
</html>
\ No newline at end of file