You are viewing a plain text version of this content. The canonical link for it is here.
Posted to devnull@infra.apache.org by vl...@apache.org on 2019/06/08 18:41:42 UTC
[jmeter] 01/02: This commit was manufactured by cvs2svn to create
tag 'v1_9_1'.
This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to annotated tag v1_9_1
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 26e2dd2280795356e5a568bc55928909a2c2bdd5
Author: No Author <de...@apache.org>
AuthorDate: Sun Aug 17 15:44:29 2003 +0000
This commit was manufactured by cvs2svn to create tag 'v1_9_1'.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/tags/v1_9_1@323427 13f79535-47bb-0310-9956-ffa450edef68
Former-commit-id: 214d5e2358c66f53eeb7ea364b26e4efbc6e1ee8
---
build.xml | 30 ++++----
.../timers/gui/ConstantThroughputTimerGui.java | 9 +++
.../apache/jmeter/timers/gui/ConstantTimerGui.java | 9 +++
.../jmeter/timers/gui/GaussianRandomTimerGui.java | 10 +++
.../jmeter/timers/gui/UniformRandomTimerGui.java | 11 ++-
.../apache/jmeter/config/gui/ArgumentsPanel.java | 1 +
src/core/org/apache/jmeter/gui/GuiPackage.java | 85 +++++++++-------------
src/core/org/apache/jmeter/util/JMeterUtils.java | 2 +-
.../org/apache/jorphan/gui/ObjectTableModel.java | 32 ++++----
.../protocol/http/control/CookieManager.java | 5 +-
xdocs/stylesheets/project.xml | 2 +-
xdocs/usermanual/get-started.xml | 4 +-
12 files changed, 119 insertions(+), 81 deletions(-)
diff --git a/build.xml b/build.xml
index bf4b699..55953db 100644
--- a/build.xml
+++ b/build.xml
@@ -127,7 +127,7 @@
<target name="init" depends="check-libs,report-missing-libs">
<tstamp/>
<!-- JMeter version -->
- <property name="version" value="1.9"/>
+ <property name="version" value="1.9.1"/>
</target>
<!-- JMeter Javadoc version (keep in line with above) -->
@@ -231,6 +231,7 @@
<javac srcdir="${src.http}" destdir="${build.http}" optimize="${optimize}" debug="on" target="${target.java.version}" deprecation="${deprecation}" encoding="${encoding}">
<include name="**/*.java"/>
<exclude name="org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java" unless="javamail.complete"/>
+ <exclude name="org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java" unless="javamail.complete"/>
<classpath>
<path refid="classpath"/>
<pathelement location="${build.jorphan}"/>
@@ -384,9 +385,19 @@
</patternset>
<patternset id="dist.sources">
- <include name="${src.dir}/"/>
- <include name="${docs.src}/"/>
- <include name="*"/>
+ <exclude name="**/CVS/**"/>
+ <exclude name="**/docs/**"/>
+ <exclude name="**/printable_docs/**"/>
+ <exclude name="${build.dir}/**"/>
+ <exclude name="${dist.dir}/**"/>
+ <exclude name="${lib.dir}/ext/**"/>
+ <exclude name="**/eclipse/**"/>
+ <exclude name="**/mail.jar"/>
+ <exclude name="**/mailapi.jar"/>
+ <exclude name="**/activation.jar"/>
+ <exclude name="**/imap.jar"/>
+ <exclude name="**/pop3.jar"/>
+ <exclude name="**/smtp.jar"/>
</patternset>
<target name="dist" depends="assume-libs-present,clean,install,all-docs,test,src_dist" description="Create the distribution packages.">
@@ -416,13 +427,12 @@
</zip>
</target>
- <target name="src_dist" depends="assume-libs-present,clean,install,all-docs,test" description="Create the distribution packages.">
+ <target name="src_dist" depends="assume-libs-present,clean" description="Create the distribution packages.">
<property name="dist.name" value="jakarta-jmeter-${version}"/>
<mkdir dir="${dist.dir}"/>
<tar destfile="${dist.dir}/${dist.name}.src.tar" longfile="gnu">
<tarfileset dir="." prefix="${dist.name}" excludes="${dist.executables}" defaultexcludes="yes">
- <patternset refid="dist.binaries"/>
<patternset refid="dist.sources"/>
</tarfileset>
<tarfileset mode="755" includes="${dist.executables}" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
@@ -430,17 +440,9 @@
<gzip zipfile="${dist.dir}/${dist.name}.src.tgz" src="${dist.dir}/${dist.name}.src.tar" />
<zip zipfile="${dist.dir}/${dist.name}.src.zip">
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
- <patternset refid="dist.binaries"/>
<patternset refid="dist.sources"/>
</zipfileset>
</zip>
- <tar destfile="${dist.dir}/${dist.name}-javadoc.tar" longfile="gnu">
- <tarfileset includes="${docs.api.dest}/" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
- </tar>
- <gzip zipfile="${dist.dir}/${dist.name}-javadoc.tgz" src="${dist.dir}/${dist.name}-javadoc.tar" />
- <zip zipfile="${dist.dir}/${dist.name}-javadoc.zip">
- <zipfileset includes="${docs.api.dest}/" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
- </zip>
</target>
<target name="clean" description="Clean up to force a build from source.">
diff --git a/src/components/org/apache/jmeter/timers/gui/ConstantThroughputTimerGui.java b/src/components/org/apache/jmeter/timers/gui/ConstantThroughputTimerGui.java
index 6182335..3c92315 100644
--- a/src/components/org/apache/jmeter/timers/gui/ConstantThroughputTimerGui.java
+++ b/src/components/org/apache/jmeter/timers/gui/ConstantThroughputTimerGui.java
@@ -156,4 +156,13 @@ public class ConstantThroughputTimerGui
add(throughputPanel);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ throughputField.setText(DEFAULT_THROUGHPUT);
+ super.clear();
+ }
}
diff --git a/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java b/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
index 46d8bd7..55cb023 100644
--- a/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
+++ b/src/components/org/apache/jmeter/timers/gui/ConstantTimerGui.java
@@ -167,4 +167,13 @@ public class ConstantTimerGui extends AbstractTimerGui
add(delayPanel);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ delayField.setText(DEFAULT_DELAY);
+ super.clear();
+ }
}
diff --git a/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java b/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
index b07c2e7..6dc97fd 100644
--- a/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
+++ b/src/components/org/apache/jmeter/timers/gui/GaussianRandomTimerGui.java
@@ -198,5 +198,15 @@ public class GaussianRandomTimerGui extends AbstractTimerGui
// Set the initial focus to the delay field
new FocusRequester(rangeField);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ rangeField.setText(DEFAULT_RANGE);
+ delayField.setText(DEFAULT_DELAY);
+ super.clear();
+ }
}
diff --git a/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java b/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
index ff40c10..a12a5e8 100644
--- a/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
+++ b/src/components/org/apache/jmeter/timers/gui/UniformRandomTimerGui.java
@@ -198,5 +198,14 @@ public class UniformRandomTimerGui extends AbstractTimerGui
// Set the initial focus to the range field
new FocusRequester(rangeField);
}
-
+
+ /* (non-Javadoc)
+ * @see org.apache.jmeter.gui.JMeterGUIComponent#clear()
+ */
+ public void clear()
+ {
+ rangeField.setText(DEFAULT_RANGE);
+ delayField.setText(DEFAULT_DELAY);
+ super.clear();
+ }
}
diff --git a/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java b/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
index c998ba9..c377e07 100644
--- a/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -280,6 +280,7 @@ public class ArgumentsPanel
*/
public void clear()
{
+ stopTableEditing();
tableModel.clearData();
}
diff --git a/src/core/org/apache/jmeter/gui/GuiPackage.java b/src/core/org/apache/jmeter/gui/GuiPackage.java
index 942a24b..ffc9ac1 100644
--- a/src/core/org/apache/jmeter/gui/GuiPackage.java
+++ b/src/core/org/apache/jmeter/gui/GuiPackage.java
@@ -68,6 +68,7 @@ import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.TestPlan;
+import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -86,51 +87,48 @@ import org.apache.log.Logger;
public class GuiPackage
{
/** Logging. */
- private static transient Logger log =
- LoggingManager.getLoggerForClass();
+ private static transient Logger log = LoggingManager.getLoggerForClass();
/** Singleton instance. */
private static GuiPackage guiPack;
-
+
/**
* Flag indicating whether or not parts of the tree have changed since
* they were last saved.
*/
private boolean dirty = false;
-
+
/**
* Map from TestElement to JMeterGUIComponent, mapping the nodes in the
* tree to their corresponding GUI components.
*/
private Map nodesToGui = new HashMap();
-
+
/**
* Map from String to JMeterGUIComponent, mapping the fully qualified class
* name of a GUI component to an instance of that component.
*/
private Map guis = new HashMap();
-
+
/** The currently selected node in the tree. */
private JMeterTreeNode currentNode = null;
-
+
/** The model for JMeter's test tree. */
private JMeterTreeModel treeModel;
-
+
/** The listener for JMeter's test tree. */
private JMeterTreeListener treeListener;
/** The main JMeter frame. */
private MainFrame mainFrame;
-
/**
* Private constructor to permit instantiation only from within this class.
* Use {@link #getInstance()} to retrieve a singleton instance.
*/
private GuiPackage()
- {
- }
-
+ {}
+
/**
* Retrieve the singleton GuiPackage instance.
*
@@ -140,7 +138,7 @@ public class GuiPackage
{
return guiPack;
}
-
+
/**
* When GuiPackage is requested for the first time, it should be given
* handles to JMeter's Tree Listener and TreeModel.
@@ -150,9 +148,7 @@ public class GuiPackage
*
* @return GuiPackage
*/
- public static GuiPackage getInstance(
- JMeterTreeListener listener,
- JMeterTreeModel treeModel)
+ public static GuiPackage getInstance(JMeterTreeListener listener, JMeterTreeModel treeModel)
{
if (guiPack == null)
{
@@ -227,7 +223,7 @@ public class GuiPackage
{
nodesToGui.remove(node);
}
-
+
/**
* Convenience method for grabbing the gui for the current node.
*
@@ -237,9 +233,12 @@ public class GuiPackage
{
try
{
- TestElement currentNode =
- treeListener.getCurrentNode().createTestElement();
+ TestElement currentNode = treeListener.getCurrentNode().createTestElement();
JMeterGUIComponent comp = getGui(currentNode);
+ if (!(comp instanceof AbstractVisualizer)) // a hack that needs to be fixed for 2.0
+ {
+ comp.clear();
+ }
comp.configure(currentNode);
return comp;
}
@@ -249,7 +248,7 @@ public class GuiPackage
return null;
}
}
-
+
/**
* Find the JMeterTreeNode for a certain TestElement object.
* @param userObject the test element to search for
@@ -259,7 +258,7 @@ public class GuiPackage
{
return treeModel.getNodeOf(userObject);
}
-
+
/**
* Create a TestElement corresponding to the specified GUI class.
*
@@ -303,10 +302,7 @@ public class GuiPackage
* @throws ClassNotFoundException if the specified GUI class cannot be
* found
*/
- private JMeterGUIComponent getGuiFromCache(String guiClass)
- throws InstantiationException,
- IllegalAccessException,
- ClassNotFoundException
+ private JMeterGUIComponent getGuiFromCache(String guiClass) throws InstantiationException, IllegalAccessException, ClassNotFoundException
{
JMeterGUIComponent comp = (JMeterGUIComponent) guis.get(guiClass);
if (comp == null)
@@ -348,10 +344,8 @@ public class GuiPackage
{
if (currentNode != null)
{
- log.debug(
- "Updating current node " + currentNode.createTestElement());
- JMeterGUIComponent comp =
- getGui(currentNode.createTestElement());
+ log.debug("Updating current node " + currentNode.createTestElement());
+ JMeterGUIComponent comp = getGui(currentNode.createTestElement());
TestElement el = currentNode.createTestElement();
comp.modifyTestElement(el);
}
@@ -375,7 +369,7 @@ public class GuiPackage
{
this.dirty = dirty;
}
-
+
/**
* Retrieves the state of the 'dirty' property, a flag that indicates if
* there are test tree components that have been modified since they were
@@ -388,7 +382,7 @@ public class GuiPackage
{
return dirty;
}
-
+
/**
* Add a subtree to the currently selected node.
*
@@ -399,12 +393,11 @@ public class GuiPackage
* @throws IllegalUserActionException if a subtree cannot be added to the
* currently selected node
*/
- public HashTree addSubTree(HashTree subTree)
- throws IllegalUserActionException
+ public HashTree addSubTree(HashTree subTree) throws IllegalUserActionException
{
return treeModel.addSubTree(subTree, treeListener.getCurrentNode());
}
-
+
/**
* Get the currently selected subtree.
*
@@ -414,7 +407,7 @@ public class GuiPackage
{
return treeModel.getCurrentSubTree(treeListener.getCurrentNode());
}
-
+
/**
* Get the model for JMeter's test tree.
*
@@ -434,7 +427,7 @@ public class GuiPackage
{
treeModel = newTreeModel;
}
-
+
/**
* Get a ValueReplacer for the test tree.
*
@@ -442,11 +435,7 @@ public class GuiPackage
*/
public ValueReplacer getReplacer()
{
- return new ValueReplacer(
- (TestPlan) ((JMeterGUIComponent) getTreeModel()
- .getTestPlan()
- .getArray()[0])
- .createTestElement());
+ return new ValueReplacer((TestPlan) ((JMeterGUIComponent) getTreeModel().getTestPlan().getArray()[0]).createTestElement());
}
/**
@@ -458,7 +447,7 @@ public class GuiPackage
{
mainFrame = newMainFrame;
}
-
+
/**
* Get the main JMeter frame.
*
@@ -468,7 +457,7 @@ public class GuiPackage
{
return mainFrame;
}
-
+
/**
* Set the listener for JMeter's test tree.
*
@@ -478,7 +467,7 @@ public class GuiPackage
{
treeListener = newTreeListener;
}
-
+
/**
* Get the listener for JMeter's test tree.
*
@@ -488,7 +477,7 @@ public class GuiPackage
{
return treeListener;
}
-
+
/**
* Display the specified popup menu with the source component and location
* from the specified mouse event.
@@ -513,10 +502,8 @@ public class GuiPackage
{
if (popup != null)
{
- log.debug(
- "Showing pop up for " + invoker
- + " at x,y = " + e.getX() + "," + e.getY());
-
+ log.debug("Showing pop up for " + invoker + " at x,y = " + e.getX() + "," + e.getY());
+
popup.pack();
popup.show(invoker, e.getX(), e.getY());
popup.setVisible(true);
diff --git a/src/core/org/apache/jmeter/util/JMeterUtils.java b/src/core/org/apache/jmeter/util/JMeterUtils.java
index abc5a26..d55fa7b 100644
--- a/src/core/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/org/apache/jmeter/util/JMeterUtils.java
@@ -98,7 +98,7 @@ import org.xml.sax.XMLReader;
*/
public class JMeterUtils implements UnitTestManager
{
- private static final String VERSION = "1.9";
+ private static final String VERSION = "1.9.1";
private static PatternCacheLRU patternCache =
new PatternCacheLRU(1000, new Perl5Compiler());
diff --git a/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java b/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
index f5f49aa..52c4808 100644
--- a/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
+++ b/src/jorphan/org/apache/jorphan/gui/ObjectTableModel.java
@@ -163,21 +163,27 @@ public class ObjectTableModel extends DefaultTableModel
*/
public void setValueAt(Object cellValue, int row, int col)
{
- Object value = objects.get(row);
- Method setMethod = (Method)setMethods.get(col);
- try
- {
- setMethod.invoke(value,new Object[]{cellValue});
- }
- catch (IllegalAccessException e)
- {
- log.error("Illegal method access",e);
- }
- catch (InvocationTargetException e)
+ if (row < objects.size())
{
- log.error("incorrect method access",e);
+ Object value = objects.get(row);
+ if (col < setMethods.size())
+ {
+ Method setMethod = (Method) setMethods.get(col);
+ try
+ {
+ setMethod.invoke(value, new Object[] { cellValue });
+ }
+ catch (IllegalAccessException e)
+ {
+ log.error("Illegal method access", e);
+ }
+ catch (InvocationTargetException e)
+ {
+ log.error("incorrect method access", e);
+ }
+ super.fireTableDataChanged();
+ }
}
- super.fireTableDataChanged();
}
/**
diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
index a7a8e67..ef94177 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
@@ -231,7 +231,10 @@ public class CookieManager extends ConfigTestElement
public void add(Cookie c)
{
getCookies().addItem(c);
- JMeterContextService.getContext().getVariables().put(c.getName(),c.getValue());
+ if(JMeterContextService.getContext().isSamplingStarted())
+ {
+ JMeterContextService.getContext().getVariables().put(c.getName(),c.getValue());
+ }
}
/** add an empty cookie */
diff --git a/xdocs/stylesheets/project.xml b/xdocs/stylesheets/project.xml
index af16056..9a9402a 100644
--- a/xdocs/stylesheets/project.xml
+++ b/xdocs/stylesheets/project.xml
@@ -18,7 +18,7 @@
<menu name="download">
<item name="Download Releases" href="http://jakarta.apache.org/builds/jakarta-jmeter/release"/>
<item name="Download Nightly Tarball" href="http://cvs.apache.org/builds/jakarta-jmeter/nightly"/>
- <item name="Download Latest Stable Release" href="http://jakarta.apache.org/builds/jakarta-jmeter/release/v1.9/jakarta-jmeter-1.9.zip"/>
+ <item name="Download Latest Stable Release" href="http://jakarta.apache.org/builds/jakarta-jmeter/release/v1.9/jakarta-jmeter-1.9.1.zip"/>
<!-- <item name="Download Latest Release Candidate" href="http://jakarta.apache.org/builds/jakarta-jmeter/unstable/v1.9/jakarta-jmeter-1.9.RC3.zip"/> -->
</menu>
<menu name="Documentation">
diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml
index 50b6cc2..1420b3d 100644
--- a/xdocs/usermanual/get-started.xml
+++ b/xdocs/usermanual/get-started.xml
@@ -34,7 +34,9 @@ over your Test Plans.</p>
currently to be compatible with the 1.3 JDK's, though it is expected JMeter performs best with 1.4 or better. Because JMeter uses only
standard Java APIs (java.*), please do not file bug reports if your JRE fails to run
JMeter because of JRE implementation issues.</p>
-<note>JDK1.4.1Beta appears to be buggy, and there are some GUI elements that won't work correctly in this JVM.</note>
+<note>JDK1.4.1Beta appears to be buggy, and there are some GUI elements that won't work correctly in this JVM.<p>
+JDK1.3 + JMeter appears to have problems handling HTTP redirects correctly. If you are getting very high time results
+with redirected pages, you should try upgrading to jdk1.4</note>
</subsection>
<subsection name="2.1.2 Operating Systems" anchor="os">