jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1763847 - in /jmeter/trunk: bin/ src/core/org/apache/jmeter/resources/ src/monitor/components/org/apache/jmeter/monitor/util/ src/monitor/components/org/apache/jmeter/visualizers/ src/monitor/model/org/apache/jmeter/monitor/model/ src/moni...
Date Fri, 07 Oct 2016 22:33:47 GMT
Author: pmouawad
Date: Fri Oct  7 22:33:46 2016
New Revision: 1763847

URL: http://svn.apache.org/viewvc?rev=1763847&view=rev
Log:
Bug 60224 - Deprecate Monitor Results listener 
Bugzilla Id: 60224

Modified:
    jmeter/trunk/bin/jmeter.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
    jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGuiListener.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorListener.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorTabPane.java
    jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Connector.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Jvm.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Memory.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfo.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfo.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Worker.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Constants.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Parser.java
    jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Fri Oct  7 22:33:46 2016
@@ -169,8 +169,8 @@ jmeter.laf.mac=System
 #jmeter.tree.icons.size=32x32
 
 #Components to not display in JMeter GUI (GUI class name or static label)
-# These elements are deprecated and will be removed in next version: MongoDB Script, MongoDB
Source Config
-not_in_menu=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler, org.apache.jmeter.protocol.mongodb.config.MongoSourceElement
+# These elements are deprecated and will be removed in next version: MongoDB Script, MongoDB
Source Config, Monitor Results
+not_in_menu=org.apache.jmeter.protocol.mongodb.sampler.MongoScriptSampler, org.apache.jmeter.protocol.mongodb.config.MongoSourceElement,org.apache.jmeter.visualizers.MonitorHealthVisualizer
 
 # Number of items in undo history
 # Feature is disabled by default (0) due to known and not fixed bugs:

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=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri Oct  7 22:33:46
2016
@@ -681,8 +681,8 @@ monitor_equation_healthy=Healthy:  (busy
 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
-monitor_is_title=Use as Monitor
+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 %

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=1763847&r1=1763846&r2=1763847&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 Fri Oct  7 22:33:46
2016
@@ -671,8 +671,8 @@ monitor_equation_healthy=Sant\u00E9 \:
 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
-monitor_is_title=Utiliser comme moniteur
+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

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/MemoryBenchmark.java
Fri Oct  7 22:33:46 2016
@@ -16,8 +16,8 @@
  */
 package org.apache.jmeter.monitor.util;
 
-import java.util.List;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.apache.jmeter.monitor.model.Connector;
 import org.apache.jmeter.monitor.model.Jvm;
@@ -34,7 +34,10 @@ import org.apache.jmeter.visualizers.Mon
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class MemoryBenchmark {
 
     @SuppressWarnings({ "unchecked", "rawtypes" })

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java Fri Oct
 7 22:33:46 2016
@@ -35,7 +35,10 @@ import org.apache.jmeter.monitor.model.S
  * The load factors are stored in the properties files. Simply change the values
  * in the properties to change how load is calculated. The defaults values are
  * memory (50) and threads (50). The sum of the factors must equal 100.
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class Stats {
 
     public static final int DEAD = 0;

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
Fri Oct  7 22:33:46 2016
@@ -31,6 +31,11 @@ import org.apache.jmeter.protocol.http.s
 import org.apache.jmeter.samplers.Clearable;
 import org.apache.jmeter.samplers.SampleResult;
 
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public class MonitorAccumModel implements Clearable, Serializable {
 
     private static final long serialVersionUID = 240L;
@@ -160,26 +165,22 @@ public class MonitorAccumModel implement
         if (sample instanceof HTTPSampleResult) {
             surl = ((HTTPSampleResult) sample).getURL();
             // String rescontent = new String(sample.getResponseData());
-            if (sample.isResponseCodeOK() && ((HTTPSampleResult) sample).isMonitor())
{
-                ObjectFactory of = ObjectFactory.getInstance();
-                Status st = of.parseBytes(sample.getResponseData());
-                st.setConnectorPrefix(connectorPrefix);
-                if (surl != null) {// surl can be null if read from a file
-                    MonitorStats stat = new MonitorStats(Stats.calculateStatus(st), Stats.calculateLoad(st),
0, Stats
-                            .calculateMemoryLoad(st), Stats.calculateThreadLoad(st), surl.getHost(),
String.valueOf(surl
-                            .getPort()), surl.getProtocol(), System.currentTimeMillis());
-                    MonitorModel mo = new MonitorModel(stat);
-                    this.addSample(mo);
-                    notifyListeners(mo);
-                } 
-                // This part of code throws NullPointerException
-                // Don't think Monitor results can be loaded from files
-                // see https://bz.apache.org/bugzilla/show_bug.cgi?id=51810
-//                else {
-//                    noResponse(surl);
-//                }
-            } else if (((HTTPSampleResult) sample).isMonitor()) {
-                noResponse(surl);
+            if (((HTTPSampleResult) sample).isMonitor()) {
+                if (sample.isResponseCodeOK()) {
+                    ObjectFactory of = ObjectFactory.getInstance();
+                    Status st = of.parseBytes(sample.getResponseData());
+                    st.setConnectorPrefix(connectorPrefix);
+                    if (surl != null) {// surl can be null if read from a file
+                        MonitorStats stat = new MonitorStats(Stats.calculateStatus(st), Stats.calculateLoad(st),
0, Stats
+                                .calculateMemoryLoad(st), Stats.calculateThreadLoad(st),
surl.getHost(), String.valueOf(surl
+                                .getPort()), surl.getProtocol(), System.currentTimeMillis());
+                        MonitorModel mo = new MonitorModel(stat);
+                        this.addSample(mo);
+                        notifyListeners(mo);
+                    }
+                } else if (((HTTPSampleResult) sample).isMonitor()) {
+                    noResponse(surl);
+                }
             }
         }
     }

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java Fri
Oct  7 22:33:46 2016
@@ -28,7 +28,10 @@ import org.apache.jmeter.samplers.Cleara
 /**
  * MonitorGraph will draw the performance history of a given server. It displays
  * 4 lines:
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class MonitorGraph extends JComponent implements MonitorGuiListener, Clearable {
 
     private static final long serialVersionUID = 240L;

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGuiListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGuiListener.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGuiListener.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGuiListener.java
Fri Oct  7 22:33:46 2016
@@ -16,6 +16,11 @@
  */
 package org.apache.jmeter.visualizers;
 
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public interface MonitorGuiListener {
     void updateGui(MonitorModel event);
 

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
Fri Oct  7 22:33:46 2016
@@ -34,7 +34,10 @@ import org.apache.jmeter.util.JMeterUtil
 /**
  * The health panel is responsible for showing the health of the servers. It
  * only uses the most current information to show the status.
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class MonitorHealthPanel extends JPanel implements MonitorListener, Clearable {
     private static final long serialVersionUID = 240L;
 

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthVisualizer.java
Fri Oct  7 22:33:46 2016
@@ -41,7 +41,10 @@ import org.apache.log.Logger;
  * collectors rather the same information. Instead, I would rather have the
  * visualizer be the container for the data and simply pass the data to child
  * JComponents. In the future, we may want to add email alerts as a third tab.
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class MonitorHealthVisualizer extends AbstractVisualizer implements ImageVisualizer,
ItemListener,
         GraphListener, Clearable {
 

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorListener.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorListener.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorListener.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorListener.java
Fri Oct  7 22:33:46 2016
@@ -16,6 +16,11 @@
  */
 package org.apache.jmeter.visualizers;
 
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public interface MonitorListener {
     void addSample(MonitorModel model);
 }

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorModel.java Fri
Oct  7 22:33:46 2016
@@ -22,6 +22,11 @@ import java.util.Date;
 
 import org.apache.jmeter.samplers.Clearable;
 
+/**
+ * 
+ * @deprecated since 3.1
+ */
+@Deprecated
 public class MonitorModel implements Clearable, Serializable, Cloneable {
 
     private static final long serialVersionUID = 240L;

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
Fri Oct  7 22:33:46 2016
@@ -41,6 +41,11 @@ import org.apache.jmeter.samplers.Cleara
 import org.apache.jmeter.samplers.SampleResult;
 import org.apache.jmeter.util.JMeterUtils;
 
+/**
+ * 
+ * @deprecated since 3.1
+ */
+@Deprecated
 public class MonitorPerformancePanel extends JSplitPane implements TreeSelectionListener,
MonitorListener, Clearable {
 
     private static final long serialVersionUID = 240L;

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java Fri
Oct  7 22:33:46 2016
@@ -21,14 +21,17 @@ import java.io.Serializable;
 import org.apache.jmeter.monitor.util.Stats;
 import org.apache.jmeter.testelement.AbstractTestElement;
 
-/*
+/**
  *  TODO - convert this into an immutable class using plain variables
  *  The current implementation is quite inefficient, as it stores everything
  *  in properties.
  *
  *  This will require changes to ResultCollector.recordStats()
  *  and SaveService.saveTestElement() which are both currently only used by Monitor classes
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class MonitorStats extends AbstractTestElement implements Serializable {
 
     private static final long serialVersionUID = 240L;

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorTabPane.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorTabPane.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorTabPane.java
(original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorTabPane.java
Fri Oct  7 22:33:46 2016
@@ -18,6 +18,11 @@ package org.apache.jmeter.visualizers;
 
 import javax.swing.JTabbedPane;
 
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public class MonitorTabPane extends JTabbedPane {
 
     private static final long serialVersionUID = 240L;

Modified: jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java (original)
+++ jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java Fri
Oct  7 22:33:46 2016
@@ -22,6 +22,7 @@ import java.awt.FlowLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JPanel;
 import javax.swing.JLabel;
+
 import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jmeter.monitor.util.Stats;
 
@@ -30,7 +31,10 @@ import org.apache.jmeter.monitor.util.St
  * status. The server label consist of the protocol, host and port. For example,
  * a system with multiple Tomcat's running on different ports would be different
  * ServerPanel.
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class ServerPanel extends JPanel implements MonitorGuiListener {
 
     private static final long serialVersionUID = 240L;

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Connector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Connector.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Connector.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Connector.java Fri Oct
 7 22:33:46 2016
@@ -15,7 +15,11 @@
  * limitations under the License.
  */
 package org.apache.jmeter.monitor.model;
-
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public interface Connector {
     ThreadInfo getThreadInfo();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ConnectorImpl.java Fri
Oct  7 22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class ConnectorImpl implements Connector {
     private ThreadInfo threadinfo = null;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Jvm.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Jvm.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Jvm.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Jvm.java Fri Oct  7 22:33:46
2016
@@ -16,7 +16,11 @@
  */
 
 package org.apache.jmeter.monitor.model;
-
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public interface Jvm {
     Memory getMemory();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/JvmImpl.java Fri Oct  7
22:33:46 2016
@@ -18,8 +18,10 @@ package org.apache.jmeter.monitor.model;
 
 /**
  *
- * @version $Revision$
+ * @version $Revision$ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class JvmImpl implements Jvm {
     private Memory memory = null;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Memory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Memory.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Memory.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Memory.java Fri Oct  7
22:33:46 2016
@@ -21,7 +21,10 @@ package org.apache.jmeter.monitor.model;
 
 /**
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public interface Memory {
     long getMax();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/MemoryImpl.java Fri Oct
 7 22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class MemoryImpl implements Memory {
     private long max = 0;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ObjectFactory.java Fri
Oct  7 22:33:46 2016
@@ -25,7 +25,10 @@ import org.apache.jmeter.samplers.Sample
 /**
  * ObjectFactory is a simple factory class which creates new instances of
  * objects. It also provides convienant method to parse XML status results.
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class ObjectFactory {
 
     private static class ObjectFactoryHolder {

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfo.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfo.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfo.java Fri Oct
 7 22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 
 /**
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public interface RequestInfo {
     long getBytesReceived();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/RequestInfoImpl.java Fri
Oct  7 22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class RequestInfoImpl implements RequestInfo {
     private long bytesReceived = 0;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Status.java Fri Oct  7
22:33:46 2016
@@ -17,7 +17,11 @@
 package org.apache.jmeter.monitor.model;
 
 import java.util.List;
-
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public interface Status {
     Jvm getJvm();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/StatusImpl.java Fri Oct
 7 22:33:46 2016
@@ -22,7 +22,10 @@ import java.util.List;
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class StatusImpl implements Status {
     private Jvm jvm = null;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfo.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfo.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfo.java Fri Oct
 7 22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 
 /**
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public interface ThreadInfo {
     int getMaxSpareThreads();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/ThreadInfoImpl.java Fri
Oct  7 22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class ThreadInfoImpl implements ThreadInfo {
     private int maxSpareThreads = 0;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Worker.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Worker.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Worker.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Worker.java Fri Oct  7
22:33:46 2016
@@ -19,7 +19,10 @@ package org.apache.jmeter.monitor.model;
 
 /**
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public interface Worker {
     int getRequestProcessingTime();
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkerImpl.java Fri Oct
 7 22:33:46 2016
@@ -18,7 +18,9 @@ package org.apache.jmeter.monitor.model;
 
 /**
  *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class WorkerImpl implements Worker {
     private int requestProcessingTime = 0;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/Workers.java Fri Oct  7
22:33:46 2016
@@ -21,7 +21,10 @@ import java.util.List;
 
 /**
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public interface Workers {
 
     List<Worker> getWorker();

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/model/WorkersImpl.java Fri Oct
 7 22:33:46 2016
@@ -22,7 +22,10 @@ import java.util.List;
 /**
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class WorkersImpl implements Workers {
     private final List<Worker> worker;
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Constants.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Constants.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Constants.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Constants.java Fri Oct
 7 22:33:46 2016
@@ -20,7 +20,10 @@ package org.apache.jmeter.monitor.parser
  * Constants for the custom DocumentHandler.
  *
  * @version $Revision$
+ *
+ * @deprecated since 3.1
  */
+@Deprecated
 public class Constants {
     public static final String STATUS = "status";
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java Fri
Oct  7 22:33:46 2016
@@ -22,7 +22,6 @@ import java.util.Stack;
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
-
 import org.apache.jmeter.monitor.model.ObjectFactory;
 import org.apache.jmeter.monitor.model.Connector;
 import org.apache.jmeter.monitor.model.Jvm;
@@ -33,7 +32,11 @@ import org.apache.jmeter.monitor.model.T
 import org.apache.jmeter.monitor.model.Worker;
 import org.apache.jmeter.monitor.model.Workers;
 import org.apache.jmeter.monitor.model.WorkersImpl;
-
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public class MonitorHandler extends DefaultHandler {
   
     private final ObjectFactory factory;

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Parser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Parser.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Parser.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/Parser.java Fri Oct  7
22:33:46 2016
@@ -18,7 +18,11 @@ package org.apache.jmeter.monitor.parser
 
 import org.apache.jmeter.monitor.model.Status;
 import org.apache.jmeter.samplers.SampleResult;
-
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public interface Parser {
     Status parseBytes(byte[] bytes);
 

Modified: jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java (original)
+++ jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java Fri Oct
 7 22:33:46 2016
@@ -33,6 +33,11 @@ import org.apache.jmeter.samplers.Sample
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 
+/**
+ *
+ * @deprecated since 3.1
+ */
+@Deprecated
 public abstract class ParserImpl implements Parser {
 
     private static final Logger log = LoggingManager.getLoggerForClass();

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Oct  7 22:33:46 2016
@@ -79,7 +79,8 @@ Summary
 
 <h3>Deprecated and removed elements</h3>
 <ul>
-    <li>Since 3.1 version, deprecated elements Distribution Graph and Spline Visualizer
were removed, see <bugzilla>60222</bugzilla></li>
+    <li><bug>60222</bug>Remove deprecated elements Distribution Graph,
Spline Visualizer</li>
+    <li><bug>60224</bug>Deprecate <code><a href="./usermanual/component_reference.html#Monitor_Results_(DEPRECATED)">Monitor
Results</a></code> listener</li>
 </ul>
 
 <!-- =================== Improvements =================== -->
@@ -116,7 +117,6 @@ Summary
     <li><bug>59975</bug>View Results Tree : Text renderer annoyingly scrolls
down when content is bulky. Contributed by Ubik Load Pack (support at ubikloadpack.com)</li>
     <li><bug>60109</bug>Summariser : Make it ignore TC generated SampleResult
in its summary computations</li>
     <li><bug>59948</bug>Add a formatted and sane HTML source code render
to View Results Tree</li>
-    <li><bug>60222</bug>Remove deprecated elements Distribution Graph,
Spline Visualizer</li>
 </ul>
 
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1763847&r1=1763846&r2=1763847&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Oct  7 22:33:46 2016
@@ -1085,7 +1085,7 @@ BeanShell does not currently support Jav
         <li><code>FileName</code> - the file name, if any</li>
         <li><code>Parameters</code> - text from the Parameters field</li>
         <li><code>bsh.args</code> - the parameters, split as described
above</li>
-        <li><code>SampleResult</code> - pointer to the current SampleResult</li>
+        <li><code>SampleResult</code> - pointer to the current <a href="../api/org/apache/jmeter/samplers/SampleResult.html"><code>SampleResult</code></a></li>
             <li><code>ResponseCode</code> defaults to <code>200</code></li>
             <li><code>ResponseMessage</code> defaults to "<code>OK</code>"</li>
             <li><code>IsSuccess</code> defaults to <code>true</code></li>
@@ -3052,7 +3052,7 @@ See the <code>jmeter.properties</code> f
 </description>
 </component>
 
-<component name="Monitor Results" index="&sect-num;.3.10"  width="762" height="757"
screenshot="monitor_screencap.png">
+<component name="Monitor Results (DEPRECATED)" index="&sect-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




Mime
View raw message