Author: pmouawad
Date: Tue Oct 25 21:10:15 2011
New Revision: 1188913
URL: http://svn.apache.org/viewvc?rev=1188913&view=rev
Log:
Bug 52052 - Using a delimiter to separate result-messages for JMS Subscriber
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1188913&r1=1188912&r2=1188913&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Tue Oct 25 21:10:15 2011
@@ -377,6 +377,7 @@ jms_requestreply=Request Response
jms_sample_title=JMS Default Request
jms_selector=JMS Selector
jms_send_queue=JNDI name Request queue
+jms_separator=Separator
jms_stop_between_samples=Stop between samples?
jms_subscriber_on_message=Use MessageListener.onMessage()
jms_subscriber_receive=Use MessageConsumer.receive()
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java?rev=1188913&r1=1188912&r2=1188913&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSubscriberGui.java
Tue Oct 25 21:10:15 2011
@@ -86,6 +86,9 @@ public class JMSSubscriberGui extends Ab
private final JLabeledTextField timeout =
new JLabeledTextField(JMeterUtils.getResString("jms_timeout"));
//$NON-NLS-1$
+ private final JLabeledTextField separator =
+ new JLabeledTextField(JMeterUtils.getResString("jms_separator"));
//$NON-NLS-1$
+
//++ Do not change these strings; they are used in JMX files to record the
button settings
public final static String RECEIVE_RSC = "jms_subscriber_receive"; //
$NON-NLS-1$
@@ -153,6 +156,7 @@ public class JMSSubscriberGui extends Ab
sampler.setStopBetweenSamples(stopBetweenSamples.isSelected());
sampler.setTimeout(timeout.getText());
sampler.setDestinationStatic(destSetup.getText().equals(DEST_SETUP_STATIC));
+ sampler.setSeparator(separator.getText());
}
/**
@@ -191,7 +195,8 @@ public class JMSSubscriberGui extends Ab
choice.add(clientChoice);
choice.add(stopBetweenSamples);
mainPanel.add(choice);
-
+ mainPanel.add(separator);
+
useProperties.addChangeListener(this);
useAuth.addChangeListener(this);
}
@@ -221,6 +226,7 @@ public class JMSSubscriberGui extends Ab
clientChoice.setText(sampler.getClientChoice());
stopBetweenSamples.setSelected(sampler.isStopBetweenSamples());
timeout.setText(sampler.getTimeout());
+ separator.setText(sampler.getSeparator());
destSetup.setText(sampler.isDestinationStatic() ? DEST_SETUP_STATIC :
DEST_SETUP_DYNAMIC);
}
@@ -238,7 +244,8 @@ public class JMSSubscriberGui extends Ab
jmsUser.setText(""); // $NON-NLS-1$
jmsPwd.setText(""); // $NON-NLS-1$
iterations.setText("1"); // $NON-NLS-1$
- timeout.setText("");
+ timeout.setText(""); // $NON-NLS-1$
+ separator.setText(""); // $NON-NLS-1$
useAuth.setSelected(false);
jmsUser.setEnabled(false);
jmsPwd.setEnabled(false);
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1188913&r1=1188912&r2=1188913&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
Tue Oct 25 21:10:15 2011
@@ -87,6 +87,9 @@ public class SubscriberSampler extends B
private static final String CLIENT_ID_DEFAULT = ""; // $NON-NLS-1$
private static final String JMS_SELECTOR_DEFAULT = ""; // $NON-NLS-1$
private static final String STOP_BETWEEN = "jms.stop_between_samples"; //
$NON-NLS-1$
+ private static final String SEPARATOR = "jms.separator"; // $NON-NLS-1$
+ private static final String SEPARATOR_DEFAULT = ""; // $NON-NLS-1$
+
private transient boolean START_ON_SAMPLE = false;
@@ -245,6 +248,7 @@ public class SubscriberSampler extends B
}
}
Utils.messageProperties(propBuffer, msg);
+ propBuffer.append(getSeparator());
} catch (JMSException e) {
log.error(e.getMessage());
}
@@ -399,6 +403,21 @@ public class SubscriberSampler extends B
public void setJmsSelector(String jmsSelector) {
setProperty(JMS_SELECTOR, jmsSelector, JMS_SELECTOR_DEFAULT);
}
+
+ /**
+ * @return Separator for sampler results
+ */
+ public String getSeparator() {
+ return getPropertyAsString(SEPARATOR, SEPARATOR_DEFAULT);
+ }
+
+ /**
+ * Separator for sampler results
+ * @param text
+ */
+ public void setSeparator(String text) {
+ setProperty(SEPARATOR, text, SEPARATOR_DEFAULT);
+ }
// This was the old value that was checked for
private final static String RECEIVE_STR =
JMeterUtils.getResString(JMSSubscriberGui.RECEIVE_RSC); // $NON-NLS-1$
@@ -445,4 +464,5 @@ public class SubscriberSampler extends B
public void testStarted(String host) {
// NOOP
}
+
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1188913&r1=1188912&r2=1188913&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Oct 25 21:10:15 2011
@@ -184,6 +184,7 @@ Mirror server now uses default port 8081
<li>Bug 51861 - Improve HTTP Request GUI to better show parameters without
name (GWT RPC requests for example) (UNDER DEVELOPMENT)</li>
<li>Bug 52040 - Add a toolbar in JMeter main window</li>
<li>Bug 51816 - Comment Field in User Defined Variables control.</li>
+<li>Bug 52052 - Using a delimiter to separate result-messages for JMS
Subscriber</li>
</ul>
<h2>Non-functional changes</h2>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
