From b6fd328ba3b493e8cfa1faf38132cbd6906f17ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20F=2E=20D=C3=BCllmann?= Date: Wed, 4 Oct 2017 17:25:02 +0200 Subject: [PATCH] KIEKER-1566: Fixes for AMQP/JMS/Sigar examples, typo fix for userguide, enabled flush for resourceMonitor executable. --- bin/resourceMonitor.bat | 2 +- bin/resourceMonitor.sh | 2 +- .../userguide/Appendix-ch-usingJMS.inc.tex | 2 +- kieker-documentation/userguide/Macros.tex | 2 +- ...race-analysis_Produce_Sequence_Diagram-win.inc.tex | 3 ++- ...h5-trace-analysis_Produce_Sequence_Diagram.inc.tex | 3 ++- kieker-examples/userguide/appendix-AMQP/build.gradle | 11 +++++++++++ kieker-examples/userguide/appendix-JMS/build.gradle | 4 ++-- kieker-examples/userguide/appendix-Sigar/build.gradle | 3 ++- 9 files changed, 23 insertions(+), 9 deletions(-) diff --git a/bin/resourceMonitor.bat b/bin/resourceMonitor.bat index 738bf00ba7..ea59f22f6a 100644 --- a/bin/resourceMonitor.bat +++ b/bin/resourceMonitor.bat @@ -4,7 +4,7 @@ REM @author Nils Christian Ehmke setlocal enabledelayedexpansion -SET JAVAARGS=-Dkieker.common.logging.Log=JDK -Djava.util.logging.config.file=./logging.properties -Xms56m -Xmx1024m +SET JAVAARGS=-Dkieker.monitoring.writer.filesystem.AsciiFileWriter.flush=true -Dkieker.common.logging.Log=JDK -Djava.util.logging.config.file=./logging.properties -Xms56m -Xmx1024m SET MAINCLASSNAME=kieker.tools.resourceMonitor.ResourceMonitor REM Get the directory of this file and change the working directory to it. diff --git a/bin/resourceMonitor.sh b/bin/resourceMonitor.sh index 5629545339..13fe0deace 100755 --- a/bin/resourceMonitor.sh +++ b/bin/resourceMonitor.sh @@ -6,7 +6,7 @@ BINDIR=$(cd "$(dirname "$0")"; pwd)/ -JAVAARGS="-Dkieker.common.logging.Log=JDK -Dkieker.common.logging.Log=JDK -Djava.util.logging.config.file=${BINDIR}/logging.properties -Xms56m -Xmx1024m" +JAVAARGS="-Dkieker.monitoring.writer.filesystem.AsciiFileWriter.flush=true -Dkieker.common.logging.Log=JDK -Dkieker.common.logging.Log=JDK -Djava.util.logging.config.file=${BINDIR}/logging.properties -Xms56m -Xmx1024m" MAINCLASSNAME=kieker.tools.resourceMonitor.ResourceMonitor java ${JAVAARGS} -cp "${BINDIR}/../lib/*":"${BINDIR}/../lib/sigar/*":"${BINDIR}/../build/libs/*":"${BINDIR}" ${MAINCLASSNAME} $* diff --git a/kieker-documentation/userguide/Appendix-ch-usingJMS.inc.tex b/kieker-documentation/userguide/Appendix-ch-usingJMS.inc.tex index 69dec1a228..491fa0e38a 100644 --- a/kieker-documentation/userguide/Appendix-ch-usingJMS.inc.tex +++ b/kieker-documentation/userguide/Appendix-ch-usingJMS.inc.tex @@ -27,7 +27,7 @@ \subsection{Download and Prepare ActiveMQ} Download an ActiveMQ archive from \url{http://activemq.apache.org/download.html} and decompress it to the base directory of the example. Note, that there are two different % -distributions, one for Unix/Linux/Cygwin and another one for Windows. +distributions, one for Unix/Linux/Cygwin and another one for Windows, and that the latest supported version of ActiveMQ compatible with Java 7 is 5.14.5. Under \UnixLikeSystems{}, you'll need to set the executable-bit of the start script: diff --git a/kieker-documentation/userguide/Macros.tex b/kieker-documentation/userguide/Macros.tex index f3c8042a44..d3f4cbd5a0 100644 --- a/kieker-documentation/userguide/Macros.tex +++ b/kieker-documentation/userguide/Macros.tex @@ -22,7 +22,7 @@ \newcommand{\sigarJar}{sigar-1.6.4.jar} \newcommand{\aopConfigFile}{aop.xml} -\newcommand{\binaryFileForDownload}{kieker-\version{}\_bina\-ries.zip} +\newcommand{\binaryFileForDownload}{kieker-\version{}\-bina\-ries.zip} \newcommand{\kiekerMonitoringProperties}{kieker.monitoring.pro\-perties} \newcommand{\kiekerExampleMonitoringProperties}{kieker.monitoring.ex\-am\-ple.pro\-perties} diff --git a/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram-win.inc.tex b/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram-win.inc.tex index 463d6fbf73..766d3e1301 100644 --- a/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram-win.inc.tex +++ b/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram-win.inc.tex @@ -2,5 +2,6 @@ #\lstshellprompt{}# #\textbf{trace-analysis.bat}# #\textbf{--inputdirs}# %temp%\kieker-20100813-121041532-UTC-virus-KIEKER #\textbf{--outputdir}# out\ #\textbf{--plot-Deployment-Sequence-Diagrams}# - #\textbf{--plot-Call-Trees}# + #\textbf{--plot-Call-Trees}# + #\textbf{--short-labels}# \end{lstlisting} diff --git a/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram.inc.tex b/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram.inc.tex index 5c6752ca6a..3b4cef5413 100644 --- a/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram.inc.tex +++ b/kieker-documentation/userguide/ch5-trace-analysis_Produce_Sequence_Diagram.inc.tex @@ -2,5 +2,6 @@ #\lstshellprompt{}# #\textbf{./trace-analysis.sh}# #\textbf{--inputdirs}# /tmp/kieker-20110428-142829399-UTC-Kaapstad-KIEKER #\textbf{--outputdir}# out/ #\textbf{--plot-Deployment-Sequence-Diagrams}# - #\textbf{--plot-Call-Trees}# + #\textbf{--plot-Call-Trees}# + #\textbf{--short-labels}# \end{lstlisting} diff --git a/kieker-examples/userguide/appendix-AMQP/build.gradle b/kieker-examples/userguide/appendix-AMQP/build.gradle index 9f9c2237c8..8619718025 100644 --- a/kieker-examples/userguide/appendix-AMQP/build.gradle +++ b/kieker-examples/userguide/appendix-AMQP/build.gradle @@ -1,11 +1,22 @@ apply plugin: 'application' apply plugin: 'eclipse' +repositories { + mavenCentral() + maven { + url "https://plugins.gradle.org/m2/" + } +} + dependencies { + + compile 'com.google.guava:guava:20.0' // (21.0 and above require java 8) used by StringRegistryCache for amqp reader + compile fileTree('lib') { include "kieker-*.jar" include "commons-logging-*.jar" include "amqp-client-*.jar" + include "slf4j-api-*.jar" } } diff --git a/kieker-examples/userguide/appendix-JMS/build.gradle b/kieker-examples/userguide/appendix-JMS/build.gradle index cd787af8bf..6fd587c7ad 100644 --- a/kieker-examples/userguide/appendix-JMS/build.gradle +++ b/kieker-examples/userguide/appendix-JMS/build.gradle @@ -24,7 +24,7 @@ def monitoringConfiguration = { main = 'kieker.examples.userguide.appendixJMS.BookstoreStarter' classpath = sourceSets.main.runtimeClasspath - jvmArgs = ['-Dlog4j.configuration=META-INF/log4j.properties'] + jvmArgs = ['-Dlog4j.configuration=META-INF/log4j.properties', '-Dorg.apache.activemq.SERIALIZABLE_PACKAGES=*'] } task runMonitoringActiveMQ(type: JavaExec) { @@ -36,7 +36,7 @@ def analysisConfiguration = { main = 'kieker.examples.userguide.appendixJMS.JMSAnalysisStarter' classpath = sourceSets.main.runtimeClasspath - jvmArgs = ['-Dlog4j.configuration=META-INF/log4j.properties'] + jvmArgs = ['-Dlog4j.configuration=META-INF/log4j.properties', '-Dorg.apache.activemq.SERIALIZABLE_PACKAGES=*'] } task runAnalysisActiveMQ(type: JavaExec) { diff --git a/kieker-examples/userguide/appendix-Sigar/build.gradle b/kieker-examples/userguide/appendix-Sigar/build.gradle index c65eb57708..70b36c218f 100644 --- a/kieker-examples/userguide/appendix-Sigar/build.gradle +++ b/kieker-examples/userguide/appendix-Sigar/build.gradle @@ -19,10 +19,11 @@ sourceSets.main.java.srcDirs = ['src'] task runMonitoring(type: JavaExec) { main = 'kieker.examples.userguide.appendixSigar.MonitoringStarter' classpath = sourceSets.main.runtimeClasspath + jvmArgs = ['-Dkieker.monitoring.writer.filesystem.AsciiFileWriter.flush=true'] } task runAnalysis(type: JavaExec) { main = 'kieker.examples.userguide.appendixSigar.AnalysisStarter' classpath = sourceSets.main.runtimeClasspath args = [System.getProperty("analysis.directory", ".")] -} \ No newline at end of file +}