You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/11/27 17:06:11 UTC
svn commit: r1771608 - in /jmeter/trunk: ./ bin/ res/maven/
src/core/org/apache/jmeter/images/ src/core/org/apache/jmeter/resources/
src/core/org/apache/jmeter/samplers/ src/core/org/apache/jmeter/save/
src/protocol/http/org/apache/jmeter/protocol/http...
Author: pmouawad
Date: Sun Nov 27 17:06:10 2016
New Revision: 1771608
URL: http://svn.apache.org/viewvc?rev=1771608&view=rev
Log:
Bug 60423 - Drop Monitor Results listener Part 1
Bugzilla Id: 60423
Removed:
jmeter/trunk/res/maven/ApacheJMeter_monitors.pom
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-active.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-blue-legend.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-dead.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-green-legend.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-healthy.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-legend.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-0.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-1.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-10.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-2.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-3.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-4.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-5.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-6.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-7.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-8.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-load-9.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-orange-legend.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-red-legend.gif
jmeter/trunk/src/core/org/apache/jmeter/images/monitor-warning.gif
Modified:
jmeter/trunk/bin/saveservice.properties
jmeter/trunk/bin/upgrade.properties
jmeter/trunk/build.xml
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/saveservice.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/bin/saveservice.properties (original)
+++ jmeter/trunk/bin/saveservice.properties Sun Nov 27 17:06:10 2016
@@ -63,7 +63,8 @@
# 2.8 = 2.13
# 2.9 = 2.14
# 3.1 = 3.1
-_version=3.1
+# 3.2 = 3.2
+_version=3.2
#
#
# Character set encoding used to read and write JMeter XML files and CSV results
@@ -230,7 +231,10 @@ ModuleController=org.apache.jmeter.contr
ModuleControllerGui=org.apache.jmeter.control.gui.ModuleControllerGui
MongoScriptSampler=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler
MongoSourceElement=org.apache.jmeter.protocol.mongodb.config.MongoSourceElement
+
+# removed in 3.2, class was deleted in r
MonitorHealthVisualizer=org.apache.jmeter.visualizers.MonitorHealthVisualizer
+
NamePanel=org.apache.jmeter.gui.NamePanel
ObsoleteGui=org.apache.jmeter.config.gui.ObsoleteGui
OnceOnlyController=org.apache.jmeter.control.OnceOnlyController
@@ -374,6 +378,8 @@ httpSample=org.apache.jmeter.protocol.ht
statSample=org.apache.jmeter.samplers.StatisticalSampleResult
testResults=org.apache.jmeter.save.TestResultWrapper
assertionResult=org.apache.jmeter.assertions.AssertionResult
+
+# removed in 3.2, class was deleted in r
monitorStats=org.apache.jmeter.visualizers.MonitorStats
sampleEvent=org.apache.jmeter.samplers.SampleEvent
#
Modified: jmeter/trunk/bin/upgrade.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/upgrade.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/bin/upgrade.properties (original)
+++ jmeter/trunk/bin/upgrade.properties Sun Nov 27 17:06:10 2016
@@ -112,3 +112,7 @@ org.apache.jmeter.protocol.http.modifier
org.apache.jmeter.visualizers.SplineVisualizer=org.apache.jmeter.config.gui.ObsoleteGui
# removed in 3.1 class was deleted in r
org.apache.jmeter.visualizers.DistributionGraphVisualizer=org.apache.jmeter.config.gui.ObsoleteGui
+
+# removed in 3.2 class was deleted in r
+org.apache.jmeter.visualizers.MonitorStats=org.apache.jmeter.config.ConfigTestElement
+org.apache.jmeter.visualizers.MonitorHealthVisualizer=org.apache.jmeter.config.gui.ObsoleteGui
\ No newline at end of file
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Nov 27 17:06:10 2016
@@ -159,7 +159,6 @@
<class location="${dest.jar}/ApacheJMeter_junit.jar"/>
<class location="${dest.jar}/ApacheJMeter_ldap.jar"/>
<class location="${dest.jar}/ApacheJMeter_mail.jar"/>
- <class location="${dest.jar}/ApacheJMeter_monitors.jar"/>
<class location="${dest.jar}/ApacheJMeter_native.jar"/>
<class location="${dest.jar}/ApacheJMeter_mongodb.jar"/>
<class location="${dest.jar}/ApacheJMeter_tcp.jar"/>
@@ -523,20 +522,20 @@
<pathelement location="${lib.dir}/${xstream.jar}"/>
<!-- Generated jars -->
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
- <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
+ <fileset dir="${lib.dir}" includes="ApacheJMeter_slf4j_logkit.jar"/>
<!-- API-only jars-->
<fileset dir="${lib.api}" includes="*.jar"/>
<!-- Optional jars -->
<fileset dir="${lib.opt}" includes="*.jar"/>
</path>
-
+
<path id="slf4j_logkit_classpath">
<!-- Externally produced jars -->
<pathelement location="${lib.dir}/${logkit.jar}"/>
<pathelement location="${lib.dir}/${slf4j-api.jar}"/>
</path>
-
+
<!-- Anakia classpath -->
<path id="anakia.classpath">
<pathelement location="${lib.doc}/${velocity.jar}"/>
@@ -590,7 +589,7 @@
</target>
<target name="ant-version" depends="_check_ant-version">
- <echo level="info">ant.version = ${ant.version}</echo>
+ <echo level="info">ant.version = ${ant.version}</echo>
</target>
<target name="_check_ant-version">
@@ -603,7 +602,7 @@
</condition>
</fail>
</target>
-
+
<target name="init-docs" depends="report-anakia-missing">
<echo level="info">eclipse.anakia = ${eclipse.anakia}</echo>
</target>
@@ -862,15 +861,15 @@
</classpath>
</javac>
</target>
-
+
<target name="compile-slf4j_logkit" description="Compile JMeter slf4j LogKit bootstrap classes.">
<mkdir dir="${build.slf4j_logkit}"/>
<javac srcdir="${src.slf4j_logkit}" destdir="${build.slf4j_logkit}" source="${src.java.version}" optimize="${optimize}" debug="on" target="${target.java.version}"
includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
<classpath>
- <path refid="slf4j_logkit_classpath"/>
- </classpath>
+ <path refid="slf4j_logkit_classpath"/>
+ </classpath>
</javac>
</target>
@@ -1162,16 +1161,6 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${src.tcp}" includes="**/*.properties" />
</jar>
- <!-- monitor -->
- <jar jarfile="${dest.jar}/ApacheJMeter_monitors.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
- <zipfileset file="${resources.meta-inf}/default.notice"
- fullpath="META-INF/NOTICE" />
- <zipfileset file="${resources.meta-inf}/default.license"
- fullpath="META-INF/LICENSE" />
- <fileset dir="${build.monitor.model}" includes="**/*.class" />
- <fileset dir="${build.monitor.components}" includes="**/*.class" />
- </jar>
-
<!-- jms -->
<!-- Ensure that build dir exists, even if JMS has not been built -->
<mkdir dir="${build.jms}"/>
@@ -1371,7 +1360,7 @@ run JMeter unless all the JMeter jars ar
<include name="${dest.jar}/"/>
<include name="${lib.dir}/bshclient.jar"/>
<include name="${lib.dir}/jorphan.jar"/>
- <include name="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"/>
+ <include name="${lib.dir}/ApacheJMeter_slf4j_logkit.jar"/>
<include name="${lib.dir}/junit/test.jar"/>
<include name="${dest.jar.jmeter}/ApacheJMeter.jar"/>
<!-- Help documentation, binary files -->
@@ -2074,7 +2063,6 @@ run JMeter unless all the JMeter jars ar
<deployfile stem="ApacheJMeter_ldap"/>
<deployfile stem="ApacheJMeter_mail"/>
<deployfile stem="ApacheJMeter_mongodb"/>
- <deployfile stem="ApacheJMeter_monitors"/>
<deployfile stem="ApacheJMeter_native"/>
<deployfile stem="ApacheJMeter_tcp"/>
</target>
@@ -2698,13 +2686,13 @@ run JMeter unless all the JMeter jars ar
<antcall target="batchtest">
<param name="batchtest.name" value="HTMLParserTestFile_2"/>
</antcall>
- <!-- Disable Test which seems wrong -->
- <!--
+ <!-- Disable Test which seems wrong -->
+ <!--
<antcall target="batchtest">
Using the same module controller name in command line mode causes NPE
<param name="batchtest.name" value="Bug47165"/>
</antcall>
- -->
+ -->
<antcall target="batchtest">
<!-- variable in IPSource failed HTTP request if "Concurrent Pool Size" is enabled -->
<!-- N.B. requires access to jmeter.apache.org -->
@@ -3306,7 +3294,7 @@ run JMeter unless all the JMeter jars ar
<pathelement location="${lib.opt}/${rat-tasks.jar}"/>
</classpath>
</taskdef>
- <mkdir dir="${basedir}/reports/" />
+ <mkdir dir="${basedir}/reports/" />
<rat:report reportfile="reports/rat-report.txt">
<fileset dir="." excludesfile="rat-excludes.txt"/>
</rat:report>
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sun Nov 27 17:06:10 2016
@@ -676,31 +676,6 @@ modtest=Modification test
module_controller_module_to_run=Module To Run
module_controller_title=Module Controller
module_controller_warning=Could not find module:
-monitor_equation_active=Active: (busy/max) > 25%
-monitor_equation_dead=Dead: no response
-monitor_equation_healthy=Healthy: (busy/max) < 25%
-monitor_equation_load=Load: ( (busy / max) * 50) + ( (used memory / max memory) * 50)
-monitor_equation_warning=Warning: (busy/max) > 67%
-monitor_health_tab_title=Health
-monitor_health_title=Monitor Results (DEPRECATED)
-monitor_is_title=Use as Monitor (DEPRECATED)
-monitor_label_left_bottom=0 %
-monitor_label_left_middle=50 %
-monitor_label_left_top=100 %
-monitor_label_prefix=Connection Prefix
-monitor_label_right_active=Active
-monitor_label_right_dead=Dead
-monitor_label_right_healthy=Healthy
-monitor_label_right_warning=Warning
-monitor_legend_health=Health
-monitor_legend_load=Load
-monitor_legend_memory_per=Memory % (used/total)
-monitor_legend_thread_per=Thread % (busy/max)
-monitor_load_factor_mem=50
-monitor_load_factor_thread=50
-monitor_performance_servers=Servers
-monitor_performance_tab_title=Performance
-monitor_performance_title=Performance Graph
name=Name\:
new=New
newdn=New distinguished name
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties Sun Nov 27 17:06:10 2016
@@ -330,24 +330,6 @@ modtest=\u00C4nderungs-Test
module_controller_module_to_run=Auszurufendes Modul
module_controller_title=Modul-Controller
module_controller_warning=Konnte Modul nicht finden\:
-monitor_equation_active=Aktiv\: (aktiv/maximum) > 25%
-monitor_equation_dead=Abgestoben\: keine Antwort
-monitor_equation_healthy=Gut\: (aktiv/maximum) < 25%
-monitor_equation_load=Last\: ((aktiv/mamimum)*50) + ((genutzer Speicher/maximaler Speicher)*50)
-monitor_equation_warning=Warnung\: (aktiv/maximum) > 67%
-monitor_health_tab_title=Gut
-monitor_health_title=Ergebnisse \u00DCberwachen
-monitor_is_title=Als \u00DCberwacher (Monitor) benutzen
-monitor_label_right_active=Aktiv
-monitor_label_right_dead=Abgestorben
-monitor_label_right_healthy=Gut
-monitor_label_right_warning=Warnung
-monitor_legend_health=Gut
-monitor_legend_load=Last
-monitor_legend_memory_per=Speicher % (genutzt/gesamt)
-monitor_legend_thread_per=Thread % (aktiv/maimum)
-monitor_performance_servers=Server
-monitor_performance_title=Performance-Graph
new=Neu
newdn=Neuer DN (distinguished name)
no=Norwegisch
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties Sun Nov 27 17:06:10 2016
@@ -492,31 +492,6 @@ modtest=Prueba de Modificaci\u00F3n
module_controller_module_to_run=M\u00F3dulo a ejecutar
module_controller_title=Controlador de M\u00F3dulo
module_controller_warning=No pudo encontrar el m\u00F3dulo\:
-monitor_equation_active=Activo\: (ocupado/m\u00E1x) > 25%
-monitor_equation_dead=Muerto\: no hay respuesta
-monitor_equation_healthy=Sano. (ocupado/m\u00E1x) < 25%
-monitor_equation_load=Carga\: ((ocupado/m\u00E1x) * 50) + ((memoria usada/memoria m\u00E1x) * 50)
-monitor_equation_warning=Aviso\: (ocupado/m\u00E1x) > 67%
-monitor_health_tab_title=Salud
-monitor_health_title=Resultados del Monitor
-monitor_is_title=Utilizar como Monitor
-monitor_label_left_bottom=0 %
-monitor_label_left_middle=50 %
-monitor_label_left_top=100 %
-monitor_label_prefix=Prefijo de conexi\u00F3n
-monitor_label_right_active=Activo
-monitor_label_right_dead=Muerto
-monitor_label_right_healthy=Sano
-monitor_label_right_warning=Aviso
-monitor_legend_health=Salud
-monitor_legend_load=Carga
-monitor_legend_memory_per=Memoria % (usada/total)
-monitor_legend_thread_per=Hilo % (ocupado/m\u00E1x)
-monitor_load_factor_mem=50
-monitor_load_factor_thread=50
-monitor_performance_servers=Servidores
-monitor_performance_tab_title=Rendimiento
-monitor_performance_title=Gr\u00E1fico de Rendimiento
name=Nombre\:
new=Nuevo
newdn=Nuevo distinghuised name
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Sun Nov 27 17:06:10 2016
@@ -666,26 +666,6 @@ modtest=Modification
module_controller_module_to_run=Module \u00E0 ex\u00E9cuter \:
module_controller_title=Contr\u00F4leur Module
module_controller_warning=Ne peut pas trouver le module \:
-monitor_equation_active=Activit\u00E9 \: (occup\u00E9e/max) > 25%
-monitor_equation_dead=Mort \: pas de r\u00E9ponse
-monitor_equation_healthy=Sant\u00E9 \: (occup\u00E9e/max) < 25%
-monitor_equation_load=Charge \: ((occup\u00E9e / max) * 50) + ((m\u00E9moire utilis\u00E9e / m\u00E9moire maximum) * 50)
-monitor_equation_warning=Attention \: (occup\u00E9/max) > 67%
-monitor_health_tab_title=Sant\u00E9
-monitor_health_title=Moniteur de connecteurs (DEPRECATED)
-monitor_is_title=Utiliser comme moniteur (DEPRECATED)
-monitor_label_prefix=Pr\u00E9fixe de connecteur \:
-monitor_label_right_active=Actif
-monitor_label_right_dead=Mort
-monitor_label_right_healthy=Sant\u00E9
-monitor_label_right_warning=Attention
-monitor_legend_health=Sant\u00E9
-monitor_legend_load=Charge
-monitor_legend_memory_per=M\u00E9moire % (utilis\u00E9e/total)
-monitor_legend_thread_per=Unit\u00E9 % (occup\u00E9/max)
-monitor_performance_servers=Serveurs
-monitor_performance_tab_title=Performance
-monitor_performance_title=Graphique de performance
name=Nom \:
new=Nouveau
newdn=Nouveau DN
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_ja.properties Sun Nov 27 17:06:10 2016
@@ -262,14 +262,6 @@ modification_controller_title=\u5909\u66
modification_manager_title=\u5909\u66F4\u30DE\u30CD\u30FC\u30B8\u30E3
modify_test=\u30C6\u30B9\u30C8\u306E\u5909\u66F4
module_controller_title=\u30E2\u30B8\u30E5\u30FC\u30EB\u30B3\u30F3\u30C8\u30ED\u30FC\u30E9
-monitor_equation_dead=Dead\: \u5FDC\u7B54\u306A\u3057
-monitor_health_title=\u30E2\u30CB\u30BF\u7D50\u679C
-monitor_is_title=\u30E2\u30CB\u30BF\u3068\u3057\u3066\u4F7F\u7528
-monitor_legend_memory_per=\u30E1\u30E2\u30EA % (used/total)
-monitor_legend_thread_per=\u30B9\u30EC\u30C3\u30C9 % (busy/max)
-monitor_performance_servers=\u30B5\u30FC\u30D0
-monitor_performance_tab_title=\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9
-monitor_performance_title=\u30D1\u30D5\u30A9\u30FC\u30DE\u30F3\u30B9\u30B0\u30E9\u30D5
name=\u540D\u524D\:
new=\u65B0\u898F
no=\u30CE\u30EB\u30A6\u30A7\u30FC\u8A9E
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties Sun Nov 27 17:06:10 2016
@@ -463,26 +463,6 @@ modtest=Teste de Modifica\u00E7\u00E3o
module_controller_module_to_run=M\u00F3dulo a ser executado
module_controller_title=Controlador de M\u00F3dulo
module_controller_warning=N\u00E3o foi poss\u00EDvel encontrar o m\u00F3dulo\:
-monitor_equation_active=Ativo\: (ocupado / max) > 25%
-monitor_equation_dead=Morto\: sem resposta
-monitor_equation_healthy=Saud\u00E1vel\: (ocupado / max) < 25%
-monitor_equation_load=Carga\: ((ocupado / max) * 50) + ((mem\u00F3ria utilizada / max mem\u00F3ria) * 50)
-monitor_equation_warning=Alerta\: (ocupado / max) > 67%
-monitor_health_tab_title=Sa\u00FAde
-monitor_health_title=Monitorar Resultados
-monitor_is_title=Usar como Monitor
-monitor_label_prefix=Prefixo de Conex\u00E3o
-monitor_label_right_active=Ativo
-monitor_label_right_dead=Morto
-monitor_label_right_healthy=Saud\u00E1vel
-monitor_label_right_warning=Alerta
-monitor_legend_health=Sa\u00FAde
-monitor_legend_load=Carga
-monitor_legend_memory_per=Mem\u00F3ria % (usada / total)
-monitor_legend_thread_per=Thread % (ocupado / max)
-monitor_performance_servers=Servidores
-monitor_performance_tab_title=Desempenho
-monitor_performance_title=Gr\u00E1fico de Desempenho
name=Nome\:
new=Novo
newdn=Novo nome distingu\u00EDvel
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Sun Nov 27 17:06:10 2016
@@ -444,25 +444,6 @@ modtest=De\u011Fi\u015Fiklik testi
module_controller_module_to_run=\u00C7al\u0131\u015Ft\u0131r\u0131lacak Birim
module_controller_title=Birim Denet\u00E7isi
module_controller_warning=Birim bulunamad\u0131\:
-monitor_equation_active=Aktif\: (me\u015Fgul/maksimum) > 25%
-monitor_equation_dead=\u00D6l\u00FC\: cevap yok
-monitor_equation_healthy=Sa\u011Fl\u0131kl\u0131\: (me\u015Fgul/maksimum) < 25%
-monitor_equation_load=Y\u00FCk\: ((me\u015Fgul / maksimum * 50) + ((kullan\u0131lan bellek / maksimum bellek)) > 25%
-monitor_equation_warning=Uyar\u0131\: (me\u015Fgul/maksimum) > 67%
-monitor_health_tab_title=Sa\u011Fl\u0131k
-monitor_health_title=\u0130zleme Sonu\u00E7lar\u0131
-monitor_is_title=\u0130zleyici olarak kullan
-monitor_label_right_active=Aktif
-monitor_label_right_dead=\u00D6l\u00FC
-monitor_label_right_healthy=Sa\u011Fl\u0131kl\u0131
-monitor_label_right_warning=Uyar\u0131
-monitor_legend_health=Sa\u011Fl\u0131k
-monitor_legend_load=Y\u00FCk
-monitor_legend_memory_per=Bellek % (kullan\u0131lan/toplam)
-monitor_legend_thread_per=\u0130\u015F par\u00E7ac\u0131\u011F\u0131 % (me\u015Fgul/maksimum)
-monitor_performance_servers=Sunucular
-monitor_performance_tab_title=Ba\u015Far\u0131m
-monitor_performance_title=Ba\u015Far\u0131m Grafi\u011Fi
name=\u0130sim\:
new=Yeni
newdn=Yeni ay\u0131rt edici isim
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_CN.properties Sun Nov 27 17:06:10 2016
@@ -254,19 +254,6 @@ modification_controller_title=\u4FEE\u6B
modification_manager_title=\u4FEE\u6B63\u7BA1\u7406\u5668
modify_test=\u4FEE\u6539\u6D4B\u8BD5
module_controller_title=\u6A21\u5757\u63A7\u5236\u5668
-monitor_equation_active=\u6D3B\u52A8\uFF1A(busy/max)>25%
-monitor_equation_dead=\u975E\u6D3B\u52A8\uFF1A\u6CA1\u6709\u54CD\u5E94
-monitor_equation_healthy=Healthy\:(busy/max)<25%
-monitor_health_title=\u76D1\u89C6\u5668\u7ED3\u679C
-monitor_is_title=\u7528\u4F5C\u76D1\u89C6\u5668
-monitor_label_right_active=\u6D3B\u52A8\u7684
-monitor_label_right_dead=\u975E\u6D3B\u52A8\u7684
-monitor_label_right_warning=\u8B66\u544A
-monitor_legend_load=\u8D1F\u8F7D
-monitor_legend_thread_per=\u7EBF\u7A0B%(busy/max)
-monitor_performance_servers=\u670D\u52A1\u5668
-monitor_performance_tab_title=\u6027\u80FD
-monitor_performance_title=\u6027\u80FD\u56FE
name=\u540D\u79F0\uFF1A
new=\u65B0\u5EFA
no=\u632A\u5A01\u8BED
Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties Sun Nov 27 17:06:10 2016
@@ -354,25 +354,6 @@ modification_manager_title=\u4FEE\u98FE\
modify_test=\u4FEE\u98FE\u6E2C\u8A66
modtest=\u4FEE\u98FE\u6E2C\u8A66
module_controller_title=\u6A21\u7D44\u63A7\u5236\u5668
-monitor_equation_active=\u6B63\u5E38\u904B\u4F5C (\u5FD9\u788C/\u6700\u5927) \u5927\u65BC 25 %
-monitor_equation_dead=\u505C\u6A5F \: \u6C92\u6709\u56DE\u61C9
-monitor_equation_healthy=\u5065\u5EB7 (\u5FD9\u788C/\u6700\u5927) < 25%
-monitor_equation_load=\u8CA0\u8F09 ( (busy / max) * 50) + ( (used memory / max memory) * 50)
-monitor_equation_warning=\u8B66\u544A (busy/max) > 67%
-monitor_health_tab_title=\u5065\u5EB7
-monitor_health_title=\u76E3\u8996\u7D50\u679C
-monitor_is_title=\u7576\u6210\u76E3\u8996\u5668
-monitor_label_right_active=\u6B63\u5E38\u904B\u4F5C
-monitor_label_right_dead=\u505C\u6A5F
-monitor_label_right_healthy=\u5065\u5EB7
-monitor_label_right_warning=\u8B66\u793A
-monitor_legend_health=\u5065\u5EB7
-monitor_legend_load=\u8CA0\u8F09
-monitor_legend_memory_per=\u8A18\u61B6\u9AD4\u4F7F\u7528\u7387 % (userd/total)
-monitor_legend_thread_per=\u57F7\u884C\u7DD2 % (busy/max)
-monitor_performance_servers=\u4F3A\u670D\u5668
-monitor_performance_tab_title=\u6548\u80FD
-monitor_performance_title=\u6548\u80FD\u5716\u5F62
name=\u540D\u7A31
new=\u65B0
newdn=\u65B0\u7684\u8B58\u5225\u540D\u7A31
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sun Nov 27 17:06:10 2016
@@ -205,9 +205,6 @@ public class SampleResult implements Ser
/** Should test terminate abruptly? */
private boolean stopTestNow = false;
- /** Is the sampler acting as a monitor? */
- private boolean isMonitor = false;
-
private int sampleCount = 1;
private long bytes = 0; // Allows override of sample size in case sampler does not want to store all the data
@@ -314,7 +311,6 @@ public class SampleResult implements Ser
// files is created automatically, and applies per instance
groupThreads = res.groupThreads;//OK
idleTime = res.idleTime;
- isMonitor = res.isMonitor;
label = res.label;//OK
latency = res.latency;
connectTime = res.connectTime;
@@ -1121,18 +1117,23 @@ public class SampleResult implements Ser
*
* @param monitor
* flag whether this sampler is working as a monitor
+ *
+ * @deprecated since 3.2 NOOP
*/
+ @Deprecated
public void setMonitor(boolean monitor) {
- isMonitor = monitor;
+ // NOOP
}
/**
* If the sampler is a monitor, method will return true.
*
* @return true if the sampler is a monitor
+ * @deprecated since 3.2 always return false
*/
+ @Deprecated
public boolean isMonitor() {
- return isMonitor;
+ return false;
}
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sun Nov 27 17:06:10 2016
@@ -148,13 +148,13 @@ public class SaveService {
// Must match _version property value in saveservice.properties
// used to ensure saveservice.properties and SaveService are updated simultaneously
- static final String PROPVERSION = "3.1";// Expected version $NON-NLS-1$
+ static final String PROPVERSION = "3.2";// Expected version $NON-NLS-1$
// Internal information only
private static String fileVersion = ""; // computed from saveservice.properties file// $NON-NLS-1$
// Must match the sha1 checksum of the file saveservice.properties (without newline character),
// used to ensure saveservice.properties and SaveService are updated simultaneously
- static final String FILEVERSION = "687b9fce95500ae04102444b9bf40ddd970c62aa"; // Expected value $NON-NLS-1$
+ static final String FILEVERSION = "69ec07ad15d0082f9aed0376963134f4ed583a81"; // Expected value $NON-NLS-1$
private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java Sun Nov 27 17:06:10 2016
@@ -58,8 +58,6 @@ public class HttpTestSampleGui extends A
private JTextField concurrentPool;
- private JCheckBox isMon;
-
private JCheckBox useMD5;
private JLabeledTextField embeddedRE; // regular expression used to match against embedded resource URLs
@@ -92,7 +90,6 @@ public class HttpTestSampleGui extends A
retrieveEmbeddedResources.setSelected(samplerBase.isImageParser());
concurrentDwn.setSelected(samplerBase.isConcurrentDwn());
concurrentPool.setText(samplerBase.getConcurrentPool());
- isMon.setSelected(samplerBase.isMonitor());
useMD5.setSelected(samplerBase.useMD5());
embeddedRE.setText(samplerBase.getEmbeddedUrlRE());
if (!isAJP) {
@@ -125,7 +122,6 @@ public class HttpTestSampleGui extends A
enableConcurrentDwn(retrieveEmbeddedResources.isSelected());
samplerBase.setConcurrentDwn(concurrentDwn.isSelected());
samplerBase.setConcurrentPool(concurrentPool.getText());
- samplerBase.setMonitor(isMon.isSelected());
samplerBase.setMD5(useMD5.isSelected());
samplerBase.setEmbeddedUrlRE(embeddedRE.getText());
if (!isAJP) {
@@ -216,11 +212,7 @@ public class HttpTestSampleGui extends A
// Use MD5
useMD5 = new JCheckBox(JMeterUtils.getResString("response_save_as_md5")); // $NON-NLS-1$
-
- // Is monitor
- isMon = new JCheckBox(JMeterUtils.getResString("monitor_is_title")); // $NON-NLS-1$
checkBoxPanel.add(useMD5);
- checkBoxPanel.add(isMon);
return checkBoxPanel;
}
@@ -259,7 +251,6 @@ public class HttpTestSampleGui extends A
concurrentDwn.setSelected(false);
concurrentPool.setText(String.valueOf(HTTPSamplerBase.CONCURRENT_POOL_SIZE));
enableConcurrentDwn(false);
- isMon.setSelected(false);
useMD5.setSelected(false);
urlConfigGui.clear();
embeddedRE.setText(""); // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Sun Nov 27 17:06:10 2016
@@ -107,7 +107,6 @@ public class AjpSampler extends HTTPSamp
boolean frd,
int fd) {
HTTPSampleResult res = new HTTPSampleResult();
- res.setMonitor(false);
res.setSampleLabel(url.toExternalForm());
res.sampleStart();
try {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java Sun Nov 27 17:06:10 2016
@@ -366,9 +366,11 @@ public abstract class HTTPAbstractImpl i
* Invokes {@link HTTPSamplerBase#isMonitor()}
*
* @return flag whether monitor is enabled
+ * @deprecated since 3.2 always return false
*/
+ @Deprecated
protected boolean isMonitor() {
- return testElement.isMonitor();
+ return false;
}
/**
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java Sun Nov 27 17:06:10 2016
@@ -203,7 +203,6 @@ public class HTTPHC3Impl extends HTTPHCA
HttpMethodBase httpMethod = null;
HTTPSampleResult res = new HTTPSampleResult();
- res.setMonitor(isMonitor());
res.setSampleLabel(urlStr); // May be replaced later
res.setHTTPMethod(method);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Sun Nov 27 17:06:10 2016
@@ -606,7 +606,6 @@ public class HTTPHC4Impl extends HTTPHCA
*/
protected HTTPSampleResult createSampleResult(URL url, String method) {
HTTPSampleResult res = new HTTPSampleResult();
- res.setMonitor(isMonitor());
res.setSampleLabel(url.toString()); // May be replaced later
res.setHTTPMethod(method);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java Sun Nov 27 17:06:10 2016
@@ -453,7 +453,6 @@ public class HTTPJavaImpl extends HTTPAb
}
HTTPSampleResult res = new HTTPSampleResult();
- res.setMonitor(isMonitor());
res.setSampleLabel(urlStr);
res.setURL(url);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Sun Nov 27 17:06:10 2016
@@ -538,14 +538,22 @@ public abstract class HTTPSamplerBase ex
this.setProperty(MONITOR, truth);
}
+ /**
+ * @deprecated since 3.2 always returns false
+ */
+ @Deprecated
public String getMonitor() {
- return this.getPropertyAsString(MONITOR);
+ return "false";
}
+ /**
+ * @deprecated since 3.2 always returns false
+ */
+ @Deprecated
public boolean isMonitor() {
- return this.getPropertyAsBoolean(MONITOR);
+ return false;
}
-
+
public void setImplementation(String value) {
this.setProperty(IMPLEMENTATION, value);
}
@@ -921,7 +929,6 @@ public abstract class HTTPSamplerBase ex
res.setResponseCode(NON_HTTP_RESPONSE_CODE+": " + e.getClass().getName());
res.setResponseMessage(NON_HTTP_RESPONSE_MESSAGE+": " + e.getMessage());
res.setSuccessful(false);
- res.setMonitor(this.isMonitor());
return res;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java Sun Nov 27 17:06:10 2016
@@ -257,7 +257,6 @@ public class SoapSampler extends HTTPSam
httpMethod = new PostMethod(urlStr);
HTTPSampleResult res = new HTTPSampleResult();
- res.setMonitor(false);
res.setSampleLabel(urlStr); // May be replaced later
res.setHTTPMethod(HTTPConstants.POST);
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Nov 27 17:06:10 2016
@@ -82,13 +82,13 @@ Fill in some detail.
<ch_section>Incompatible changes</ch_section>
<ul>
- <li>...</li>
+ <li>JMeter requires now at least a JAVA 8 version to run.</li>
</ul>
<h3>Deprecated and removed elements or functions</h3>
<p><note>These elements do not appear anymore in the menu, if you need them modify <code>not_in_menu</code> property. The JMeter team advises not to use them anymore and migrate to their replacement.</note></p>
<ul>
- <li>...</li>
+ <li><bug>60423</bug>Drop Monitor Results listener </li>
</ul>
<!-- =================== Improvements =================== -->
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1771608&r1=1771607&r2=1771608&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Nov 27 17:06:10 2016
@@ -323,7 +323,6 @@ so unsafe characters may need to be enco
and send HTTP/HTTPS requests for all images, Java applets, JavaScript files, CSSs, etc. referenced in the file.
See below for more details.
</property>
- <property name="Use as monitor" required="No">For use with the <complink name="Monitor Results"/> listener. DEPRECATED</property>
<property name="Save response as MD5 hash?" required="No">
If this is selected, then the response is not stored in the sample result.
Instead, the 32 character MD5 hash of the data is calculated and stored instead.
@@ -2697,7 +2696,6 @@ Most of the listeners currently keep a c
<li>Simple Data Writer</li>
<li>BeanShell/JSR223 Listener</li>
<li>Mailer Visualizer</li>
-<li>Monitor Results</li>
<li>Summary Report</li>
</ul>
<p>
@@ -3050,37 +3048,6 @@ See the <code>jmeter.properties</code> f
</description>
</component>
-<component name="Monitor Results (DEPRECATED)" index="§-num;.3.10" width="762" height="757" screenshot="monitor_screencap.png">
-<description>
-<p>Monitor Results is a new Visualizer for displaying server
-status. It is designed for Tomcat 5, but any servlet container
-can port the status servlet and use this monitor. There are two primary
-tabs for the monitor. The first is the "<code>Health</code>" tab, which will show the
-status of one or more servers. The second tab labled "<code>Performance</code>" shows
-the performance for one server for the last 1000 samples. The equations
-used for the load calculation is included in the Visualizer.</p>
-<p>Currently, the primary limitation of the monitor is system memory. A
-quick benchmark of memory usage indicates a buffer of 1000 data points for
-100 servers would take roughly 10Mb of RAM. On a 1.4Ghz centrino
-laptop with 1Gb of ram, the monitor should be able to handle several
-hundred servers.</p>
-<p>As a general rule, monitoring production systems should take care to
-set an appropriate interval. Intervals shorter than 5 seconds are too
-aggressive and have a potential of impacting the server. With a buffer of
-1000 data points at 5 second intervals, the monitor would check the server
-status 12 times a minute or 720 times a hour. This means the buffer shows
-the performance history of each machine for the last hour.</p>
-<note>
-The monitor requires Tomcat 5 or above.
-Use a browser to check that you can access the Tomcat status servlet OK.
-</note>
-<p>
-For a detailed description of how to use the monitor, please refer to
-<a href="build-monitor-test-plan.html">Building a Monitor Test Plan</a>
-</p>
-</description>
-</component>
-
<component name="Aggregate Graph" index="§-num;.3.12" width="1132" height="872" screenshot="aggregate_graph.png">
<description>The aggregate graph is similar to the aggregate report. The primary
difference is the aggregate graph provides an easy way to generate bar graphs and save