Author: sebb
Date: Sat Sep 1 11:36:13 2007
New Revision: 571853
URL: http://svn.apache.org/viewvc?rev=571853&view=rev
Log:
Bug 403873 - add JMS point-to-point non-persistent delivery option
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
Modified:
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties?rev=571853&r1=571852&r2=571853&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/resources/messages.properties
Sat Sep 1 11:36:13 2007
@@ -330,6 +330,7 @@
jms_timeout=Timeout (milliseconds)
jms_topic=Topic
jms_use_file=From file
+jms_use_non_persistent_delivery=Use non-persistent delivery mode?
jms_use_properties_file=Use jndi.properties file
jms_use_random_file=Random File
jms_use_text=Textarea
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java?rev=571853&r1=571852&r2=571853&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
Sat Sep 1 11:36:13 2007
@@ -22,11 +22,13 @@
import javax.swing.BorderFactory;
import javax.swing.Box;
+import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JPanel;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
+import org.apache.jmeter.gui.util.HorizontalPanel;
import org.apache.jmeter.protocol.jms.sampler.JMSSampler;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -66,6 +68,8 @@
private ArgumentsPanel jmsPropertiesPanel;
private ArgumentsPanel jndiPropertiesPanel;
+
+ private JCheckBox useNonPersistentDelivery;
public JMSConfigGui() {
init();
@@ -105,6 +109,7 @@
boolean isOneway =
oneWay.getText().equals(JMeterUtils.getResString("jms_request")); //$NON-NLS-1$
element.setIsOneway(isOneway);
+ element.setNonPersistent(useNonPersistentDelivery.isSelected());
element.setTimeout(timeout.getText());
element.setContent(soapXml.getText());
@@ -173,6 +178,8 @@
}
box.setSelectedItem(selected);
+ useNonPersistentDelivery.setSelected(sampler.isNonPersistent());
+
timeout.setText(String.valueOf(sampler.getTimeout()));
soapXml.setText(sampler.getContent());
initialContextFactory.setText(sampler.getInitialContextFactory());
@@ -225,8 +232,11 @@
onewayPanel.add(oneWay);
messageNorthPanel.add(onewayPanel, BorderLayout.NORTH);
- JPanel timeoutPanel = new JPanel(new BorderLayout());
+ useNonPersistentDelivery = new
JCheckBox(JMeterUtils.getResString("jms_use_non_persistent_delivery"),false);
//$NON-NLS-1$
+
+ JPanel timeoutPanel = new HorizontalPanel();
timeoutPanel.add(timeout);
+ timeoutPanel.add(useNonPersistentDelivery);
messageNorthPanel.add(timeoutPanel, BorderLayout.SOUTH);
messagePanel.add(messageNorthPanel, BorderLayout.NORTH);
Modified:
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=571853&r1=571852&r2=571853&view=diff
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
Sat Sep 1 11:36:13 2007
@@ -24,6 +24,7 @@
import java.util.Iterator;
import java.util.Map;
+import javax.jms.DeliveryMode;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Queue;
@@ -80,6 +81,8 @@
private final static String QUEUE_CONNECTION_FACTORY_JNDI =
"JMSSampler.queueconnectionfactory"; // $NON-NLS-1$
+ private static final String IS_NON_PERSISTENT =
"JMSSampler.isNonPersistent"; // $NON-NLS-1$
+
//--
//
@@ -233,6 +236,10 @@
return getPropertyAsBoolean(IS_ONE_WAY);
}
+ public boolean isNonPersistent() {
+ return getPropertyAsBoolean(IS_NON_PERSISTENT);
+ }
+
public String getInitialContextFactory() {
return
getPropertyAsString(JMSSampler.JNDI_INITIAL_CONTEXT_FACTORY);
}
@@ -245,6 +252,10 @@
setProperty(new BooleanProperty(IS_ONE_WAY, isOneway));
}
+ public void setNonPersistent(boolean value) {
+ setProperty(new BooleanProperty(IS_NON_PERSISTENT, value));
+ }
+
public String toString() {
return getQueueConnectionFactory() + ", queue: " +
getSendQueue();
}
@@ -293,12 +304,18 @@
if (getPropertyAsBoolean(IS_ONE_WAY)) {
producer = session.createSender(sendQueue);
+ if (isNonPersistent()) {
+
producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ }
} else {
if (useTemporyQueue()) {
executor = new
TemporaryQueueExecutor(session, sendQueue);
} else {
producer =
session.createSender(sendQueue);
+ if (isNonPersistent()) {
+
producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
+ }
executor = new
FixedQueueExecutor(producer, getTimeout());
}
}
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=571853&r1=571852&r2=571853&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sat Sep 1 11:36:13 2007
@@ -48,13 +48,14 @@
<li>Bug 42947 - TestBeanGUI changes not picked up when short-cut keys used</li>
<li>Added serializer.jar (needed for update to xalan 2.7.0)</li>
<li>Bug 38687 - Module controller does not work in non-GUI mode</li>
-<li>Bug 28715 - allow variable cookie values (set
CookieManager.allow_variable_cookies=false to disable)</li>
</ul>
<h4>Improvements since 2.3RC3</h4>
<ul>
<li>Add stop thread option to CSV Dataset</li>
<li>Updated commons-httpclient to 3.1</li>
+<li>Bug 28715 - allow variable cookie values (set
CookieManager.allow_variable_cookies=false to disable)</li>
+<li>Bug 403873 - add JMS point-to-point non-persistent delivery option</li>
</ul>
<h3>Version 2.3RC3</h3>
Modified:
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml?rev=571853&r1=571852&r2=571853&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
(original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/component_reference.xml
Sat Sep 1 11:36:13 2007
@@ -979,6 +979,9 @@
The timeout in milliseconds for the reply-messages. If a reply has not
been received within the specified
time, the specific testcase failes and the specific reply message
received after the timeout is discarded.
</property>
+ <property name="Use non-persistent delivery mode?" required="Yes">
+ Whether to set DeliveryMode.NON_PERSISTENT.
+ </property>
<property name="Content" required="No">
The content of the message.
</property>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
