You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@jakarta.apache.org by se...@apache.org on 2010/06/23 15:14:06 UTC
svn commit: r957185 - in
/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms:
control/gui/JMSPublisherGui.java control/gui/JMSSubscriberGui.java
sampler/BaseJMSSampler.java sampler/PublisherSampler.java
sampler/SubscriberSampler.java
Author: sebb
Date: Wed Jun 23 13:14:05 2010
New Revision: 957185
URL: http://svn.apache.org/viewvc?rev=957185&view=rev
Log:
Replace Topic by Destination as far as possible
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
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/BaseJMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java?rev=957185&r1=957184&r2=957185&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java Wed Jun 23 13:14:05 2010
@@ -84,7 +84,7 @@ public class JMSPublisherGui extends Abs
private final JLabeledTextField jndiConnFac = new JLabeledTextField(JMeterUtils.getResString("jms_connection_factory")); //$NON-NLS-1$
- private final JLabeledTextField jmsTopic = new JLabeledTextField(JMeterUtils.getResString("jms_topic")); //$NON-NLS-1$
+ private final JLabeledTextField jmsDestination = new JLabeledTextField(JMeterUtils.getResString("jms_topic")); //$NON-NLS-1$
private final JCheckBox useAuth = new JCheckBox(JMeterUtils.getResString("jms_use_auth"), false); //$NON-NLS-1$
@@ -127,7 +127,7 @@ public class JMSPublisherGui extends Abs
sampler.setJNDIIntialContextFactory(jndiICF.getText());
sampler.setProviderUrl(urlField.getText());
sampler.setConnectionFactory(jndiConnFac.getText());
- sampler.setTopic(jmsTopic.getText());
+ sampler.setDestination(jmsDestination.getText());
sampler.setUsername(jmsUser.getText());
sampler.setPassword(jmsPwd.getText());
sampler.setTextMessage(textMessage.getText());
@@ -152,7 +152,7 @@ public class JMSPublisherGui extends Abs
sampler.setJNDIIntialContextFactory(jndiICF.getText());
sampler.setProviderUrl(urlField.getText());
sampler.setConnectionFactory(jndiConnFac.getText());
- sampler.setTopic(jmsTopic.getText());
+ sampler.setDestination(jmsDestination.getText());
sampler.setUsername(jmsUser.getText());
sampler.setPassword(jmsPwd.getText());
sampler.setTextMessage(textMessage.getText());
@@ -203,7 +203,7 @@ public class JMSPublisherGui extends Abs
JPanel commonParams = new JPanel();
commonParams.setLayout(new VerticalLayout(6, VerticalLayout.LEFT));
mainPanel.add(commonParams);
- commonParams.add(jmsTopic);
+ commonParams.add(jmsDestination);
commonParams.add(useAuth);
commonParams.add(jmsUser);
commonParams.add(jmsPwd);
@@ -231,7 +231,7 @@ public class JMSPublisherGui extends Abs
jndiICF.setText(""); // $NON-NLS-1$
urlField.setText(""); // $NON-NLS-1$
jndiConnFac.setText(""); // $NON-NLS-1$
- jmsTopic.setText(""); // $NON-NLS-1$
+ jmsDestination.setText(""); // $NON-NLS-1$
jmsUser.setText(""); // $NON-NLS-1$
jmsPwd.setText(""); // $NON-NLS-1$
textMessage.setText(""); // $NON-NLS-1$
@@ -255,7 +255,7 @@ public class JMSPublisherGui extends Abs
jndiICF.setText(sampler.getJNDIInitialContextFactory());
urlField.setText(sampler.getProviderUrl());
jndiConnFac.setText(sampler.getConnectionFactory());
- jmsTopic.setText(sampler.getTopic());
+ jmsDestination.setText(sampler.getDestination());
jmsUser.setText(sampler.getUsername());
jmsPwd.setText(sampler.getPassword());
textMessage.setText(sampler.getTextMessage());
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=957185&r1=957184&r2=957185&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 Wed Jun 23 13:14:05 2010
@@ -58,7 +58,7 @@ public class JMSSubscriberGui extends Ab
private final JLabeledTextField jndiConnFac =
new JLabeledTextField(JMeterUtils.getResString("jms_connection_factory")); // $NON-NLS-1$
- private final JLabeledTextField jmsTopic =
+ private final JLabeledTextField jmsDestination =
new JLabeledTextField(JMeterUtils.getResString("jms_topic")); // $NON-NLS-1$
private final JLabeledTextField jmsUser =
@@ -108,7 +108,7 @@ public class JMSSubscriberGui extends Ab
sampler.setJNDIIntialContextFactory(jndiICF.getText());
sampler.setProviderUrl(urlField.getText());
sampler.setConnectionFactory(jndiConnFac.getText());
- sampler.setTopic(jmsTopic.getText());
+ sampler.setDestination(jmsDestination.getText());
sampler.setUsername(jmsUser.getText());
sampler.setPassword(jmsPwd.getText());
sampler.setUseAuth(useAuth.isSelected());
@@ -130,7 +130,7 @@ public class JMSSubscriberGui extends Ab
sampler.setJNDIIntialContextFactory(jndiICF.getText());
sampler.setProviderUrl(urlField.getText());
sampler.setConnectionFactory(jndiConnFac.getText());
- sampler.setTopic(jmsTopic.getText());
+ sampler.setDestination(jmsDestination.getText());
sampler.setUsername(jmsUser.getText());
sampler.setPassword(jmsPwd.getText());
sampler.setUseAuth(useAuth.isSelected());
@@ -175,7 +175,7 @@ public class JMSSubscriberGui extends Ab
JPanel commonParams = new JPanel();
commonParams.setLayout(new VerticalLayout(6, VerticalLayout.LEFT));
mainPanel.add(commonParams);
- commonParams.add(jmsTopic);
+ commonParams.add(jmsDestination);
commonParams.add(useAuth);
commonParams.add(jmsUser);
commonParams.add(jmsPwd);
@@ -198,7 +198,7 @@ public class JMSSubscriberGui extends Ab
jndiICF.setText(sampler.getJNDIInitialContextFactory());
urlField.setText(sampler.getProviderUrl());
jndiConnFac.setText(sampler.getConnectionFactory());
- jmsTopic.setText(sampler.getTopic());
+ jmsDestination.setText(sampler.getDestination());
jmsUser.setText(sampler.getUsername());
jmsPwd.setText(sampler.getPassword());
iterations.setText(sampler.getIterations());
@@ -214,7 +214,7 @@ public class JMSSubscriberGui extends Ab
jndiICF.setText(""); // $NON-NLS-1$
urlField.setText(""); // $NON-NLS-1$
jndiConnFac.setText(""); // $NON-NLS-1$
- jmsTopic.setText(""); // $NON-NLS-1$
+ jmsDestination.setText(""); // $NON-NLS-1$
jmsUser.setText(""); // $NON-NLS-1$
jmsPwd.setText(""); // $NON-NLS-1$
iterations.setText(""); // $NON-NLS-1$
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=957185&r1=957184&r2=957185&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java Wed Jun 23 13:14:05 2010
@@ -45,7 +45,8 @@ public abstract class BaseJMSSampler ext
private static final String CONN_FACTORY = "jms.connection_factory"; // $NON-NLS-1$
- private static final String TOPIC = "jms.topic"; // $NON-NLS-1$
+ // N.B. Cannot change value, as that is used in JMX files
+ private static final String DEST = "jms.topic"; // $NON-NLS-1$
private static final String PRINCIPAL = "jms.security_principle"; // $NON-NLS-1$
@@ -133,21 +134,21 @@ public abstract class BaseJMSSampler ext
}
/**
- * set the topic
+ * set the destination (topic or queue name)
*
- * @param topic
+ * @param dest the destination
*/
- public void setTopic(String topic) {
- setProperty(TOPIC, topic);
+ public void setDestination(String dest) {
+ setProperty(DEST, dest);
}
/**
- * return the topic used for the benchmark
+ * return the destination (topic or queue name)
*
- * @return the topic
+ * @return the destination
*/
- public String getTopic() {
- return getPropertyAsString(TOPIC);
+ public String getDestination() {
+ return getPropertyAsString(DEST);
}
/**
Modified: jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java?rev=957185&r1=957184&r2=957185&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java (original)
+++ jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java Wed Jun 23 13:14:05 2010
@@ -115,8 +115,8 @@ public class PublisherSampler extends Ba
*
*/
private void initClient() throws JMSException, NamingException {
- publisher = new Publisher(getUseJNDIPropertiesAsBoolean(), getJNDIInitialContextFactory(), this
- .getProviderUrl(), getConnectionFactory(), getTopic(), isUseAuth(), getUsername(),
+ publisher = new Publisher(getUseJNDIPropertiesAsBoolean(), getJNDIInitialContextFactory(),
+ getProviderUrl(), getConnectionFactory(), getDestination(), isUseAuth(), getUsername(),
getPassword());
ClientPool.addClient(publisher);
log.debug("PublisherSampler.initClient called");
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=957185&r1=957184&r2=957185&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 Wed Jun 23 13:14:05 2010
@@ -105,16 +105,16 @@ public class SubscriberSampler extends B
interrupted = false;
OnMessageSubscriber sub = (OnMessageSubscriber) ClientPool.get(this);
if (sub == null) {
- sub = new OnMessageSubscriber(this.getUseJNDIPropertiesAsBoolean(), this.getJNDIInitialContextFactory(),
- this.getProviderUrl(), this.getConnectionFactory(), this.getTopic(), this.isUseAuth(), this
- .getUsername(), this.getPassword());
+ sub = new OnMessageSubscriber(getUseJNDIPropertiesAsBoolean(), getJNDIInitialContextFactory(),
+ getProviderUrl(), getConnectionFactory(), getDestination(),
+ isUseAuth(), getUsername(), getPassword());
queue.clear();
sub.setMessageListener(this);
sub.resume();
ClientPool.addClient(sub);
ClientPool.put(this, sub);
log.debug("SubscriberSampler.initListenerClient called");
- log.debug("loop count " + this.getIterations());
+ log.debug("loop count " + getIterations());
}
return sub;
}
@@ -126,11 +126,11 @@ public class SubscriberSampler extends B
*/
private void initReceiveClient() throws NamingException, JMSException {
interrupted = false;
- this.SUBSCRIBER = new ReceiveSubscriber(this.getUseJNDIPropertiesAsBoolean(), this
- .getJNDIInitialContextFactory(), this.getProviderUrl(), this.getConnectionFactory(), this.getTopic(),
- this.isUseAuth(), this.getUsername(), this.getPassword());
- this.SUBSCRIBER.resume();
- ClientPool.addClient(this.SUBSCRIBER);
+ SUBSCRIBER = new ReceiveSubscriber(getUseJNDIPropertiesAsBoolean(), this
+ .getJNDIInitialContextFactory(), getProviderUrl(), getConnectionFactory(), getDestination(),
+ isUseAuth(), getUsername(), getPassword());
+ SUBSCRIBER.resume();
+ ClientPool.addClient(SUBSCRIBER);
log.debug("SubscriberSampler.initReceiveClient called");
}
@@ -142,7 +142,7 @@ public class SubscriberSampler extends B
*/
@Override
public SampleResult sample() {
- if (this.getClientChoice().equals(JMSSubscriberGui.RECEIVE_RSC)) {
+ if (getClientChoice().equals(JMSSubscriberGui.RECEIVE_RSC)) {
return sampleWithReceive();
} else {
return sampleWithListener();
@@ -160,7 +160,7 @@ public class SubscriberSampler extends B
StringBuilder buffer = new StringBuilder();
StringBuilder propBuffer = new StringBuilder();
int cnt;
- int loop = this.getIterationCount();
+ int loop = getIterationCount();
result.setSampleLabel(getName());
@@ -197,7 +197,7 @@ public class SubscriberSampler extends B
extractContent(buffer, propBuffer, msg);
}
}
- if (this.getReadResponseAsBoolean()) {
+ if (getReadResponseAsBoolean()) {
result.setResponseData(buffer.toString().getBytes());
} else {
result.setBytes(buffer.toString().getBytes().length);
@@ -232,9 +232,9 @@ public class SubscriberSampler extends B
result.setSampleLabel(getName());
- if (this.SUBSCRIBER == null) { // TODO perhaps do this in test[Iteration]Start?
+ if (SUBSCRIBER == null) { // TODO perhaps do this in test[Iteration]Start?
try {
- this.initReceiveClient();
+ initReceiveClient();
} catch (NamingException ex) {
result.sampleStart();
result.sampleEnd();
@@ -248,12 +248,12 @@ public class SubscriberSampler extends B
result.setResponseMessage(ex.toString());
return result;
}
- this.SUBSCRIBER.start();
+ SUBSCRIBER.start();
}
- int loop = this.getIterationCount();
+ int loop = getIterationCount();
result.sampleStart();
- while (this.SUBSCRIBER.count(0) < loop && interrupted == false) {
+ while (SUBSCRIBER.count(0) < loop && interrupted == false) {
try {
Thread.sleep(0, 50);
} catch (InterruptedException e) {
@@ -264,10 +264,10 @@ public class SubscriberSampler extends B
int read = SUBSCRIBER.count(0);
result.setResponseMessage(read + " samples messages received");
for(cnt = 0; cnt < read ; cnt++) {
- Message msg = this.SUBSCRIBER.getMessage();
+ Message msg = SUBSCRIBER.getMessage();
extractContent(buffer, propBuffer, msg);
}
- if (this.getReadResponseAsBoolean()) {
+ if (getReadResponseAsBoolean()) {
result.setResponseData(buffer.toString().getBytes());
} else {
result.setBytes(buffer.toString().getBytes().length);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org