diff --git a/.classpath b/.classpath index 7ed6e8b9afcdbeb85ac36c9d50996a594b010866..aa224085d1f64d0696634dbf11d84e2141204be5 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,6 @@ <classpathentry kind="src" path="frameworks/Kieker/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="lib" path="lib/commons-cli-1.2.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/Kieker"/> + <classpathentry kind="lib" path="frameworks/Kieker/lib/kieker-1.11-SNAPSHOT_aspectj.jar"/> <classpathentry kind="output" path="build-eclipse"/> </classpath> diff --git a/build.xml b/build.xml index 06ebece212db954631dc4b59ff3d7a2b8713e56a..99e7b4579184436fbed87e499f1d153979126b23 100644 --- a/build.xml +++ b/build.xml @@ -32,7 +32,7 @@ <target name="compile-kieker" depends="compile"> <path id="compile-classpath"> <fileset dir="frameworks/Kieker/lib/"> - <include name="kieker-1.10-SNAPSHOT_aspectj.jar" /> + <include name="kieker-1.11-SNAPSHOT_aspectj.jar" /> </fileset> </path> <javac source="1.5" target="1.5" destDir="build" debug="true" classpathref="compile-classpath" includeAntRuntime="false"> diff --git a/frameworks/Kieker/Benchmark (Kieker).launch b/frameworks/Kieker/Benchmark (Kieker).launch index 9c93d1d1988f62ba907f07eb8a8b7ecf3598102c..b2f4493cb912b8397637950634a8d53bd2dc1e5d 100644 --- a/frameworks/Kieker/Benchmark (Kieker).launch +++ b/frameworks/Kieker/Benchmark (Kieker).launch @@ -8,7 +8,7 @@ </listAttribute> <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="mooBench.benchmark.Benchmark"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 1000 -o tmp/test.txt -q"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-d 10 -h 1 -m 0 -t 1000000 -o tmp/test.txt -q"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MooBench"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/Kieker/lib/kieker-1.10-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml -Dorg.aspectj.weaver.showWeaveInfo=true -Daj.weaving.verbose=true"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-javaagent:frameworks/Kieker/lib/kieker-1.11-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml -Dorg.aspectj.weaver.showWeaveInfo=true -Daj.weaving.verbose=true -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter"/> </launchConfiguration> diff --git a/frameworks/Kieker/lib/kieker-1.11-SNAPSHOT_aspectj.jar b/frameworks/Kieker/lib/kieker-1.11-SNAPSHOT_aspectj.jar new file mode 100644 index 0000000000000000000000000000000000000000..192820099cfdc80ec00bd52fda1ce177c33fb6a2 Binary files /dev/null and b/frameworks/Kieker/lib/kieker-1.11-SNAPSHOT_aspectj.jar differ