Merge branch 'master' of

https://se3.informatik.uni-wuerzburg.de/kieker4dql/KiekerDQLAdapter.git

Conflicts:
	tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/PerformanceMetricsQueryConnectorImpl.java

tools.descartes.dql.connector.kieker/file.xml

-<!DOCTYPE aspectj PUBLIC "-//AspectJ//DTD//EN" "http://www.aspectj.org/dtd/aspectj_1_5_0.dtd">
-<aspectj>
-  <weaver options="">
-    <include within="*..*App*..*"/>
-    <include within="*App*..*"/>
-    <include within="*..*App*"/>
-    <include within="*App*"/>
-    <exclude within="org.apache.commons.logging..*"/>
-    <exclude within="org.slf4j..*"/>
-    <exclude within="java.util.logging..*"/>
-    <exclude within="org.apache.log4j..*"/>
-  </weaver>
-  <aspects>
-    <aspect name="kieker.monitoring.probe.aspectj.flow.operationExecutionObject.FullInstrumentation"/>
-  </aspects>
-</aspectj>

tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/configgenerator/Test.java

 package tools.descartes.dql.connector.kieker.configgenerator;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.InputStreamReader;
 import java.util.ArrayList;
 
 public class Test {
 
 	public static void main(String[] args) {
+		startResourceMonitor();
 		// TODO Auto-generated method stub
 		/*
 		ArrayList<String> includeOptions = new ArrayList<String>(){{
@@ -39,5 +43,47 @@ public class Test {
 			System.out.println("Config generation failed");
 		
 	}
+	static void startResourceMonitor()
+	{
+		String pathToKieker = "C:\\Kieker4DQL\\kieker-1.12";
+		char quotationMarks = '"';
+		Process p;
+		try {
+			
+			String command = "java -cp " 
+			+quotationMarks + pathToKieker +File.separator+ "lib"+File.separator+"*"+quotationMarks+";"
+			+quotationMarks + pathToKieker +File.separator+ "lib"+File.separator+"sigar"+File.separator+"*"+quotationMarks+";"
+			+quotationMarks + pathToKieker +File.separator+ "build"+File.separator+"libs"+File.separator+"*"+quotationMarks+";"
+			+quotationMarks + pathToKieker +File.separator+ "bin"+quotationMarks
+			+" kieker.tools.resourceMonitor.ResourceMonitor";
+			
+			System.out.println("CMD:"+command);
+			p = Runtime.getRuntime()
+					.exec(command);
+			String line;
+			BufferedReader in = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+			while ((line = in.readLine()) != null) {
+				System.out.println(line);
+			}
+			in.close();
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+			e.printStackTrace();
+			throw new IllegalStateException("Could not execute application with kieker");
+		}
+
+		// warten bis timeout
+		try {
+			Thread.sleep(10000);
+			//TODO run directly to avoid having to kill java.exe
+			// Runtime.getRuntime().exec("taskkill /f /im java.exe");
+			// Runtime.getRuntime().exec("taskkill /f /im cmd.exe");
+			p.destroy();
+			//System.out.println("Process destroyed: " + p.toString());
+			//monitor.stopMonitoring();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
 
 }

tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/configgenerator/XMLGenerationManager.java

@@ -21,6 +21,7 @@ public class XMLGenerationManager {
 	final static ArrayList<String> defaultAspectNames = new ArrayList<String>() {
 		{
 			add("kieker.monitoring.probe.aspectj.flow.operationExecutionObject.FullInstrumentation");
+			add("kieker.monitoring.probe.aspectj.operationExecution.OperationExecutionAspectFull");
 		}
 	};