From 8014ca6fb50ce3240bfeb1ef3f4da60461411a92 Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 24 Nov 2012 09:47:52 +0100
Subject: [PATCH] #685;Added guava to the project; Added another example;
Solved a minor problem within the flow editor.
---
.../Advanced Example/Advanced Example.kax | 71 +++++++
.../config/descriptors/descriptor-bin.xml | 66 +++---
.../config/descriptors/descriptor-src.xml | 55 +++--
Kieker.WebGUI/lib/guava-13.0.1.LICENSE | 201 ++++++++++++++++++
Kieker.WebGUI/pom.xml | 5 +
.../persistence/impl/FSProjectDAOImpl.java | 27 +--
.../view/CurrentAnalysisEditorGraphBean.java | 3 +-
.../webapp/WEB-INF/spring-bean-config.xml | 2 +-
.../webapp/pages/AnalysisEditorPage.xhtml | 1 -
9 files changed, 356 insertions(+), 75 deletions(-)
create mode 100644 Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
create mode 100644 Kieker.WebGUI/lib/guava-13.0.1.LICENSE
diff --git a/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax b/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
new file mode 100644
index 00000000..87eaf4a7
--- /dev/null
+++ b/Kieker.WebGUI/bin/data/Advanced Example/Advanced Example.kax
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="platform:/resource/Kieker/model/AnalysisMetaModel.ecore" name="AnalysisProject">
+ <plugins xsi:type="Reader" name="" classname="kieker.analysis.plugin.reader.filesystem.FSReader">
+ <properties name="ignoreUnknownRecordTypes" value="true"/>
+ <properties name="inputDirs" value="C:/HiWi/Running%20Kieker.WebGUI/bin/data/Bookstore-Example/testdata"/>
+ <outputPorts name="monitoringRecords" subscribers="//@plugins.1/@inputPorts.0"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="" classname="kieker.analysis.plugin.filter.forward.StringBufferFilter">
+ <outputPorts name="relayed-events" subscribers="//@plugins.2/@inputPorts.3 //@plugins.2/@inputPorts.2"/>
+ <inputPorts name="received-events"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="" classname="kieker.analysis.plugin.filter.select.TimestampFilter">
+ <properties name="ignoreAfterTimestamp" value="9223372036854775807"/>
+ <properties name="ignoreBeforeTimestamp" value="0"/>
+ <outputPorts name="recordsWithinTimePeriod" subscribers="//@plugins.3/@inputPorts.0"/>
+ <outputPorts name="recordsOutsidePeriod"/>
+ <inputPorts name="monitoringRecordsCombined"/>
+ <inputPorts name="monitoringRecordsAny"/>
+ <inputPorts name="monitoringRecordsFlow"/>
+ <inputPorts name="monitoringRecordsExecution"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="" classname="kieker.analysis.plugin.filter.trace.TraceIdFilter">
+ <properties name="selectedTraceIds" value=""/>
+ <properties name="acceptAllTraces" value="true"/>
+ <outputPorts name="recordsMatchingId" subscribers="//@plugins.4/@inputPorts.0 //@plugins.6/@inputPorts.0"/>
+ <outputPorts name="recordsNotMatchingId"/>
+ <inputPorts name="monitoringRecordsCombined"/>
+ <inputPorts name="monitoringRecordsFlow"/>
+ <inputPorts name="monitoringRecordsExecution"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="Execution record transformation" classname="kieker.tools.traceAnalysis.filter.executionRecordTransformation.ExecutionRecordTransformationFilter">
+ <repositories name="systemModelRepository" repository="//@repositories.0"/>
+ <outputPorts name="transformedExecutions" subscribers="//@plugins.5/@inputPorts.0"/>
+ <inputPorts name="operationExecutionRecords"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="Trace reconstruction (execution records -> execution traces)" classname="kieker.tools.traceAnalysis.filter.traceReconstruction.TraceReconstructionFilter">
+ <properties name="maxTraceDurationMillis" value="600000"/>
+ <properties name="ignoreInvalidTraces" value="false"/>
+ <repositories name="systemModelRepository" repository="//@repositories.0"/>
+ <outputPorts name="messageTraces" subscribers="//@plugins.8/@inputPorts.0"/>
+ <outputPorts name="executionTraces"/>
+ <outputPorts name="invalidExecutionTraces"/>
+ <inputPorts name="executions"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="Trace reconstruction (trace event records -> event record traces)" classname="kieker.analysis.plugin.filter.flow.EventRecordTraceReconstructionFilter">
+ <properties name="maxTraceTimeout" value="9223372036854775807"/>
+ <properties name="maxTraceDuration" value="600000"/>
+ <outputPorts name="validTraces" subscribers="//@plugins.7/@inputPorts.0"/>
+ <outputPorts name="invalidTraces"/>
+ <inputPorts name="traceRecords"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="Trace reconstruction (event record traces -> execution traces)" classname="kieker.tools.traceAnalysis.filter.flow.TraceEventRecords2ExecutionAndMessageTraceFilter">
+ <properties name="enhanceJavaConstructors" value="true"/>
+ <properties name="enhanceCallDetection" value="true"/>
+ <repositories name="systemModelRepository" repository="//@repositories.0"/>
+ <outputPorts name="executionTrace"/>
+ <outputPorts name="messageTrace" subscribers="//@plugins.8/@inputPorts.0"/>
+ <inputPorts name="traceEvents"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="Trace call trees" classname="kieker.tools.traceAnalysis.filter.visualization.callTree.TraceCallTreeFilter">
+ <properties name="shortLabels" value="false"/>
+ <properties name="dotOutputFn" value="C:\HiWi\kieker (working copy)\bin\out\callTree"/>
+ <repositories name="systemModelRepository" repository="//@repositories.0"/>
+ <inputPorts name="messageTraces"/>
+ </plugins>
+ <plugins xsi:type="Filter" name="" classname="kieker.tools.traceAnalysis.filter.systemModel.SystemModel2FileFilter">
+ <properties name="outputFnHtml" value="out/system-entities.html"/>
+ <repositories name="systemModelRepository" repository="//@repositories.0"/>
+ </plugins>
+ <repositories classname="kieker.tools.traceAnalysis.systemModel.repository.SystemModelRepository"/>
+</Project>
diff --git a/Kieker.WebGUI/config/descriptors/descriptor-bin.xml b/Kieker.WebGUI/config/descriptors/descriptor-bin.xml
index 894eb974..986be1ec 100644
--- a/Kieker.WebGUI/config/descriptors/descriptor-bin.xml
+++ b/Kieker.WebGUI/config/descriptors/descriptor-bin.xml
@@ -1,38 +1,52 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>bin</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <includes>
- <include>
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>
Kieker.WebGUI*.war
</include>
- </includes>
- <outputDirectory>/target/</outputDirectory>
- <directory>${project.build.directory}/</directory>
- </fileSet>
- <fileSet>
- <includes>
- <include>
+ </includes>
+ <outputDirectory>/target/</outputDirectory>
+ <directory>${project.build.directory}/</directory>
+ </fileSet>
+ <fileSet>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>
+ bin/*.sh
+ </include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <includes>
+ <include>
lib/**
</include>
- <include>
+ <include>
bin/**
</include>
- <include>
+ <include>
LICENSE
</include>
<include>
README
</include>
- </includes>
- <outputDirectory>/</outputDirectory>
- <directory>${project.basedir}/</directory>
- </fileSet>
- </fileSets>
+ </includes>
+ <excludes>
+ <exclude>
+ bin/*.sh
+ </exclude>
+ </excludes>
+ <outputDirectory>/</outputDirectory>
+ <directory>${project.basedir}/</directory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
diff --git a/Kieker.WebGUI/config/descriptors/descriptor-src.xml b/Kieker.WebGUI/config/descriptors/descriptor-src.xml
index d4ff7be0..e30f65a1 100644
--- a/Kieker.WebGUI/config/descriptors/descriptor-src.xml
+++ b/Kieker.WebGUI/config/descriptors/descriptor-src.xml
@@ -1,25 +1,34 @@
<assembly
- xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
- <id>src</id>
- <formats>
- <format>tar.gz</format>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${project.basedir}</directory>
- <outputDirectory>/</outputDirectory>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <exclude>**/*.log</exclude>
- <exclude>**/${project.build.directory}/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/site/apidocs</directory>
- <outputDirectory>/doc</outputDirectory>
- </fileSet>
- </fileSets>
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <directory>${project.basedir}</directory>
+ <outputDirectory>/</outputDirectory>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/*.log</exclude>
+ <exclude>**/${project.build.directory}/**</exclude>
+ <exclude>bin/*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>
+ bin/*.sh
+ </include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/site/apidocs</directory>
+ <outputDirectory>/doc</outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
diff --git a/Kieker.WebGUI/lib/guava-13.0.1.LICENSE b/Kieker.WebGUI/lib/guava-13.0.1.LICENSE
new file mode 100644
index 00000000..f49a4e16
--- /dev/null
+++ b/Kieker.WebGUI/lib/guava-13.0.1.LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/Kieker.WebGUI/pom.xml b/Kieker.WebGUI/pom.xml
index b7ad5ff9..c03afae1 100644
--- a/Kieker.WebGUI/pom.xml
+++ b/Kieker.WebGUI/pom.xml
@@ -132,6 +132,11 @@
<artifactId>derby</artifactId>
<version>10.9.1.0</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>13.0.1</version>
+ </dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java b/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
index 040a337e..a067fffb 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/persistence/impl/FSProjectDAOImpl.java
@@ -35,7 +35,6 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Service;
@@ -44,6 +43,8 @@ import org.springframework.util.FileSystemUtils;
import org.springframework.util.WeakReferenceMonitor;
import org.springframework.util.WeakReferenceMonitor.ReleaseListener;
+import com.google.common.io.Files;
+
import kieker.analysis.AnalysisController;
import kieker.analysis.model.analysisMetaModel.MIAnalysisMetaModelFactory;
import kieker.analysis.model.analysisMetaModel.MIDependency;
@@ -74,7 +75,7 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
private static final String LIB_EXTENSION = "jar";
private static final String LIB_DIRECTORY = "lib";
private static final String ROOT_DIRECTORY = "data";
- private static final String TEMP_DIRECTORY = "temp";
+
/**
* The library for kieker which is contained in the war-file as a resource.
*/
@@ -101,19 +102,6 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
public void initialize() throws IOException {
// Check for the necessary directories and create them if necessary
this.checkDir(FSProjectDAOImpl.ROOT_DIRECTORY);
- this.checkDir(FSProjectDAOImpl.TEMP_DIRECTORY);
- }
-
- /**
- * This method destroys the object. <b>Do not call this method manually. It will only be accessed by Spring.</b>
- *
- * @throws IOException
- * If something went wrong during the cleaning.
- */
- @PreDestroy
- public void destroy() throws IOException {
- // Try to clear the temporary directory
- FileSystemUtils.deleteRecursively(new File(FSProjectDAOImpl.TEMP_DIRECTORY));
}
/**
@@ -392,14 +380,7 @@ public class FSProjectDAOImpl implements IProjectDAO, ReleaseListener {
* @return A file object pointing to the new temporary directory.
*/
private File createTemporaryDirectory() {
- int counter = 0;
- File tempDir;
- do {
- tempDir = new File(FSProjectDAOImpl.TEMP_DIRECTORY, "temp" + counter);
- counter++;
- } while (!tempDir.mkdir());
-
- return tempDir;
+ return Files.createTempDir();
}
/*
diff --git a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorGraphBean.java b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorGraphBean.java
index 5140ac41..000422a8 100644
--- a/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorGraphBean.java
+++ b/Kieker.WebGUI/src/main/java/kieker/webgui/web/beans/view/CurrentAnalysisEditorGraphBean.java
@@ -114,7 +114,7 @@ public final class CurrentAnalysisEditorGraphBean {
/**
* This is the javascript code to rename a node within the graph.
*/
- private static final String JS_CMD_RENAME_NODE = "graph.getNode(%s).name = '%s';";
+ private static final String JS_CMD_RENAME_NODE = "graph.getNode('%s').name = '%s';";
/**
* This is the javascript code to enable the grid within the graph.
*/
@@ -180,6 +180,7 @@ public final class CurrentAnalysisEditorGraphBean {
*/
public synchronized void initListeners() {
RequestContext.getCurrentInstance().execute(CurrentAnalysisEditorGraphBean.JS_CMD_ADD_CLICK_LISTENER);
+ RequestContext.getCurrentInstance().execute("graph.addListener('onError', function(e){Log.write(e);});");
RequestContext.getCurrentInstance().execute(CurrentAnalysisEditorGraphBean.JS_CMD_ADD_REMOVE_NODE_LISTENER);
RequestContext.getCurrentInstance().execute(CurrentAnalysisEditorGraphBean.JS_CMD_ADD_CREATE_EDGE_LISTENER);
RequestContext.getCurrentInstance().execute(CurrentAnalysisEditorGraphBean.JS_CMD_ADD_REMOVE_EDGE_LISTENER);
diff --git a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml
index 7397f093..1d2ceaee 100644
--- a/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml
+++ b/Kieker.WebGUI/src/main/webapp/WEB-INF/spring-bean-config.xml
@@ -4,7 +4,7 @@
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.1.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd" xmlns:context="http://www.springframework.org/schema/context">
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd" xmlns:context="http://www.springframework.org/schema/context">
<!-- The singleton scoped beans. -->
<bean id="globalPropertiesBean" class="kieker.webgui.web.beans.application.GlobalPropertiesBean">
diff --git a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
index e15d5389..b9ad20d1 100644
--- a/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/pages/AnalysisEditorPage.xhtml
@@ -42,7 +42,6 @@
nodeClickListener = function(node, info, e) {
nodeClickCommand([{name : 'ID', value : node.id}]);
markNode(node, '#FF0000');
- // TODO Selektieren
graph.refresh();
}
--
GitLab