Merge pull request #3 from softvis-research/development

merge development into master
softvis-research · Oct 14, 2019 · a2056c5 · a2056c5
2 parents 7d12ce9 + 69a6eb8
commit a2056c5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
     <parent>
         <groupId>org.jqassistant.contrib.common</groupId>
         <artifactId>parent</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
     </parent>
 
     <groupId>org.jqassistant.contrib.plugin.kieker</groupId>
     <artifactId>jqa-kieker-plugin</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>0.0.1</version>
 
     <name>jQAssistant Kieker Plugin</name>
     <description>The jQAssistant plugin to scan and to analyze Kieker trace logs.</description>
@@ -29,6 +29,13 @@
         </developer>
     </developers>
 
+    <scm>
+        <connection>scm:git:git@github.com:softvis-research/jqa-kieker-plugin.git</connection>
+        <developerConnection>scm:git:git@github.com:/softvis-research/jqa-kieker-plugin.git</developerConnection>
+        <url>https://github.com//softvis-research/jqa-kieker-plugin</url>
+        <tag>HEAD</tag>
+    </scm>
+
     <licenses>
         <license>
             <name>GNU General Public License, v3</name>

diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallEventDescriptor.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/CallEventDescriptor.java
@@ -9,12 +9,12 @@
  */
 @Label("Call")
 public interface CallEventDescriptor extends EventDescriptor, Descriptor {
-    @Relation("CALLER")
+    @Relation("CALLED_BY")
     MethodDescriptor getCaller();
 
     void setCaller(MethodDescriptor caller);
 
-    @Relation("CALLEE")
+    @Relation("CALLS")
     MethodDescriptor getCallee();
 
     void setCallee(MethodDescriptor callee);

diff --git a/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/ExecutionEventDescriptor.java b/src/main/java/org/jqassistant/contrib/plugin/kieker/api/model/ExecutionEventDescriptor.java
@@ -9,7 +9,7 @@
  */
 @Label("Execution")
 public interface ExecutionEventDescriptor extends EventDescriptor, Descriptor {
-    @Relation("EXECUTION")
+    @Relation("EXECUTES")
     MethodDescriptor getExecutedMethod();
 
     void setExecutedMethod(MethodDescriptor executedMethod);

diff --git a/src/main/resources/META-INF/jqassistant-rules/kieker.xml b/src/main/resources/META-INF/jqassistant-rules/kieker.xml
@@ -9,7 +9,7 @@
         </description>
         <cypher><![CDATA[
              MATCH
-                (e:Execution)-[:EXECUTION]->(m:Method)
+                (e:Execution)-[:EXECUTES]->(m:Method)
              WITH
                 m, SUM(e.afterTimestamp - e.beforeTimestamp) AS duration
              SET
@@ -23,9 +23,9 @@
         </description>
         <cypher><![CDATA[
              MATCH
-                (c:Call)-[:CALLER]->(caller:Method)
+                (c:Call)-[:CALLED_BY]->(caller:Method)
              MATCH
-                (c:Call)-[:CALLEE]->(callee:Method)
+                (c:Call)-[:CALLS]->(callee:Method)
              MERGE
                (caller)-[calls:CALLS]->(callee)
              RETURN