Author: sebb
Date: Thu Nov 6 17:30:43 2008
New Revision: 712032
URL: http://svn.apache.org/viewvc?rev=712032&view=rev
Log:
Bug 45460 - JMS TestPlan elements depend on resource property
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/jmspublisher.png
jakarta/jmeter/trunk/docs/images/screenshots/jmssubscriber.png
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
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
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/jmspublisher.png
jakarta/jmeter/trunk/xdocs/images/screenshots/jmssubscriber.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/jmspublisher.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/jmspublisher.png?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/jmeter/trunk/docs/images/screenshots/jmssubscriber.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/jmssubscriber.png?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
Binary files - no diff available.
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=712032&r1=712031&r2=712032&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
Thu Nov 6 17:30:43 2008
@@ -323,9 +323,7 @@
java_request_defaults=Java Request Defaults
javascript_expression=JavaScript expression to evaluate
jexl_expression=JEXL expression to evaluate
-jms_auth_not_required=Not Required
jms_auth_required=Required
-jms_authentication=Authentication
jms_client_caption=Receive client uses TopicSubscriber.receive() to listen for
message.
jms_client_caption2=MessageListener uses onMessage(Message) interface to
listen for new messages.
jms_client_type=Client
@@ -366,6 +364,7 @@
jms_text_message=Text Message
jms_timeout=Timeout (milliseconds)
jms_topic=Topic
+jms_use_auth=Use Authorization?
jms_use_file=From file
jms_use_non_persistent_delivery=Use non-persistent delivery mode?
jms_use_properties_file=Use jndi.properties file
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
Thu Nov 6 17:30:43 2008
@@ -290,9 +290,7 @@
java_request=Java Anfrage (Request)
javascript_expression=Zu evaluierender JavaScript Ausdruck
jexl_expression=Auszuwertender JEXL Ausdruck
-jms_auth_not_required=Nicht ben\u00F6tigt
jms_auth_required=Ben\u00F6tigt
-jms_authentication=Authentifikation
jndi_config_title=JNDI Konfiguration
jndi_url_jndi_props=JNDI Eigenschaften
load_wsdl=Lade WSDL
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
Thu Nov 6 17:30:43 2008
@@ -249,9 +249,7 @@
iterator_num=Contador del bucle\:
java_request=Petici\u00F3n Java
java_request_defaults=Valores por defecto para Petici\u00F3n Java
-jms_auth_not_required=No Requerido
jms_auth_required=Requerido
-jms_authentication=Autenticaci\u00F3n
jms_client_caption=El cliente Receive utiliza TopicSubscriber.receive() para
escuchar un mensaje.
jms_client_caption2=MessageListener utiliza la interfaz onMessage(Message)
para escuchar nuevos mensajes
jms_client_type=Cliente
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Thu Nov 6 17:30:43 2008
@@ -280,9 +280,7 @@
java_request_defaults=Requ\u00EAte Java par d\u00E9faut
javascript_expression=Expression JavaScript \u00E0 \u00E9valuer
jexl_expression=Expression JEXL \u00E0 \u00E9valuer
-jms_auth_not_required=Optionnel
jms_auth_required=Obligatoire
-jms_authentication=Authentification
jms_timeout=D\u00E9lai (millisecondes)
jms_use_file=Depuis un fichier
jms_user=Utilisateur
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
Thu Nov 6 17:30:43 2008
@@ -306,9 +306,7 @@
java_request_defaults=Java \u0130ste\u011Fi \u00D6ntan\u0131ml\u0131
De\u011Ferleri
javascript_expression=De\u011Ferlendirilecek javascript ifadesi
jexl_expression=De\u011Ferlendirilecek JEXL ifadesi
-jms_auth_not_required=Gerekli De\u011Fil
jms_auth_required=Gerekli
-jms_authentication=Kimlik Do\u011Frulamas\u0131
jms_client_caption=Mesaj dinlemek i\u00E7in TopicSubscriber.receive() kullanan
istemciyi al.
jms_client_caption2=MessageListener yeni mesajlar\u0131 dinlemek i\u00E7in
onMessage(Message)'\u0131 kullan\u0131r.
jms_client_type=\u0130stemci
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_zh_TW.properties
Thu Nov 6 17:30:43 2008
@@ -249,9 +249,7 @@
iterator_num=\u8FF4\u5708\u6B21\u6578\uFF1A
java_request=Java \u8981\u6C42
java_request_defaults=Java \u8981\u6C42\u9810\u8A2D\u503C
-jms_auth_not_required=\u975E\u5FC5\u8981
jms_auth_required=\u5FC5\u8981
-jms_authentication=\u8A8D\u8B49
jms_client_caption=\u63A5\u6536\u7AEF\u900F\u904ETopicSubscriber.receive()\u63A5\u807D\u8A0A\u606F
jms_client_caption2=MessageListener\u900F\u904EonMessage(Message\u4ECB\u9762\u63A5\u807D\u8A0A\u606F
jms_client_type=\u7528\u6236\u7AEF
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
Thu Nov 6 17:30:43 2008
@@ -29,7 +29,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import org.apache.jmeter.protocol.jms.sampler.BaseJMSSampler;
/**
* InitialContextFactory is responsible for getting and instance of the initial
@@ -41,13 +40,13 @@
private static final Logger log = LoggingManager.getLoggerForClass();
- public static synchronized Context lookupContext(String jndi, String url,
String useAuth, String user, String pwd) {
+ public static synchronized Context lookupContext(String jndi, String url,
boolean useAuth, String user, String pwd) {
Context ctx = (Context) MAP.get(jndi + url);
if (ctx == null) {
Properties props = new Properties();
props.setProperty(Context.INITIAL_CONTEXT_FACTORY, jndi);
props.setProperty(Context.PROVIDER_URL, url);
- if (useAuth != null && useAuth.equals(BaseJMSSampler.required) &&
user != null && pwd != null
+ if (useAuth && user != null && pwd != null
&& user.length() > 0 && pwd.length() > 0) {
props.setProperty(Context.SECURITY_PRINCIPAL, user);
props.setProperty(Context.SECURITY_CREDENTIALS, pwd);
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
Thu Nov 6 17:30:43 2008
@@ -73,7 +73,7 @@
* @param pwd
*/
public OnMessageSubscriber(boolean useProps, String jndi, String url,
String connfactory, String topic,
- String useAuth, String user, String pwd) {
+ boolean useAuth, String user, String pwd) {
Context ctx = initJNDI(useProps, jndi, url, useAuth, user, pwd);
if (ctx != null) {
initConnection(ctx, connfactory, topic);
@@ -93,7 +93,7 @@
* @param pwd
* @return the context or null
*/
- public Context initJNDI(boolean useProps, String jndi, String url, String
useAuth, String user, String pwd) {
+ public Context initJNDI(boolean useProps, String jndi, String url, boolean
useAuth, String user, String pwd) {
if (useProps) {
try {
return new InitialContext();
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
Thu Nov 6 17:30:43 2008
@@ -52,7 +52,7 @@
/**
*
*/
- public Publisher(boolean useProps, String jndi, String url, String
connfactory, String topic, String useAuth,
+ public Publisher(boolean useProps, String jndi, String url, String
connfactory, String topic, boolean useAuth,
String user, String pwd) {
super();
Context ctx = initJNDI(useProps, jndi, url, useAuth, user, pwd);
@@ -63,7 +63,7 @@
}
}
- public Context initJNDI(boolean useProps, String jndi, String url, String
useAuth, String user, String pwd) {
+ public Context initJNDI(boolean useProps, String jndi, String url, boolean
useAuth, String user, String pwd) {
if (useProps) {
try {
return new InitialContext();
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
Thu Nov 6 17:30:43 2008
@@ -65,7 +65,7 @@
}
public ReceiveSubscriber(boolean useProps, String jndi, String url, String
connfactory, String topic,
- String useAuth, String user, String pwd) {
+ boolean useAuth, String user, String pwd) {
Context ctx = initJNDI(useProps, jndi, url, useAuth, user, pwd);
if (ctx != null) {
initConnection(ctx, connfactory, topic);
@@ -85,7 +85,7 @@
* @param pwd
* @return the JNDI initial context or null
*/
- public Context initJNDI(boolean useProps, String jndi, String url, String
useAuth, String user, String pwd) {
+ public Context initJNDI(boolean useProps, String jndi, String url, boolean
useAuth, String user, String pwd) {
if (useProps) {
try {
return new InitialContext();
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=712032&r1=712031&r2=712032&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
Thu Nov 6 17:30:43 2008
@@ -65,12 +65,6 @@
private String[] msgTypes = { text_msg, object_msg };
- private String required = JMeterUtils.getResString("jms_auth_required");
//$NON-NLS-1$
-
- private String not_req =
JMeterUtils.getResString("jms_auth_not_required"); //$NON-NLS-1$
-
- private String[] auth_items = { required, not_req };
-
JCheckBox useProperties = new
JCheckBox(JMeterUtils.getResString("jms_use_properties_file"), false);
//$NON-NLS-1$
JLabeledRadio configChoice = new
JLabeledRadio(JMeterUtils.getResString("jms_config"), items, use_text);
//$NON-NLS-1$
@@ -83,7 +77,8 @@
JLabeledTextField jmsTopic = new
JLabeledTextField(JMeterUtils.getResString("jms_topic")); //$NON-NLS-1$
- JLabeledRadio reqAuth = new
JLabeledRadio(JMeterUtils.getResString("jms_authentication"), auth_items,
not_req); //$NON-NLS-1$
+ private JCheckBox useAuth =
+ new JCheckBox(JMeterUtils.getResString("jms_use_auth"), false);
//$NON-NLS-1$
JLabeledTextField jmsUser = new
JLabeledTextField(JMeterUtils.getResString("jms_user")); //$NON-NLS-1$
@@ -138,7 +133,7 @@
sampler.setConfigChoice(configChoice.getText());
sampler.setMessageChoice(msgChoice.getText());
sampler.setIterations(iterations.getText());
- sampler.setUseAuth(reqAuth.getText());
+ sampler.setUseAuth(useAuth.isSelected());
return sampler;
}
@@ -163,7 +158,7 @@
sampler.setConfigChoice(configChoice.getText());
sampler.setMessageChoice(msgChoice.getText());
sampler.setIterations(iterations.getText());
- sampler.setUseAuth(reqAuth.getText());
+ sampler.setUseAuth(useAuth.isSelected());
}
/**
@@ -201,13 +196,12 @@
configChoice.addChangeListener(this);
msgChoice.addChangeListener(this);
- reqAuth.addChangeListener(this);
JPanel commonParams = new JPanel();
commonParams.setLayout(new VerticalLayout(6, VerticalLayout.LEFT));
mainPanel.add(commonParams);
commonParams.add(jmsTopic);
- commonParams.add(reqAuth);
+ commonParams.add(useAuth);
commonParams.add(jmsUser);
commonParams.add(jmsPwd);
commonParams.add(iterations);
@@ -244,7 +238,7 @@
configChoice.setText(use_text);
updateConfig(use_text);
iterations.setText(""); // $NON-NLS-1$
- reqAuth.setText(""); // $NON-NLS-1$
+ useAuth.setSelected(false);
}
/**
@@ -267,7 +261,7 @@
msgChoice.setText(sampler.getMessageChoice());
updateConfig(sampler.getConfigChoice());
iterations.setText(sampler.getIterations());
- reqAuth.setText(sampler.getUseAuth());
+ useAuth.setSelected(sampler.isUseAuth());
}
/**
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=712032&r1=712031&r2=712032&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
Thu Nov 6 17:30:43 2008
@@ -68,14 +68,8 @@
private JLabeledTextField iterations =
new JLabeledTextField(JMeterUtils.getResString("jms_itertions")); //
$NON-NLS-1$
- private static final String required =
JMeterUtils.getResString("jms_auth_required"); // $NON-NLS-1$
-
- private static final String not_req =
JMeterUtils.getResString("jms_auth_not_required"); // $NON-NLS-1$
-
- private static final String[] auth_items = { required, not_req };
-
- private JLabeledRadio reqAuth =
- new JLabeledRadio(JMeterUtils.getResString("jms_authentication"),
auth_items, not_req); // $NON-NLS-1$
+ private JCheckBox useAuth =
+ new JCheckBox(JMeterUtils.getResString("jms_use_auth"), false);
//$NON-NLS-1$
private JCheckBox readResponse =
new JCheckBox(JMeterUtils.getResString("jms_read_response"), true); //
$NON-NLS-1$
@@ -118,7 +112,7 @@
sampler.setTopic(jmsTopic.getText());
sampler.setUsername(jmsUser.getText());
sampler.setPassword(jmsPwd.getText());
- sampler.setUseAuth(reqAuth.getText());
+ sampler.setUseAuth(useAuth.isSelected());
sampler.setIterations(iterations.getText());
sampler.setReadResponse(String.valueOf(readResponse.isSelected()));
sampler.setClientChoice(clientChoice.getText());
@@ -140,7 +134,7 @@
sampler.setTopic(jmsTopic.getText());
sampler.setUsername(jmsUser.getText());
sampler.setPassword(jmsPwd.getText());
- sampler.setUseAuth(reqAuth.getText());
+ sampler.setUseAuth(useAuth.isSelected());
sampler.setIterations(iterations.getText());
sampler.setReadResponse(String.valueOf(readResponse.isSelected()));
sampler.setClientChoice(clientChoice.getText());
@@ -179,13 +173,11 @@
lookup.add(urlField);
lookup.add(jndiConnFac);
- reqAuth.addChangeListener(this);
-
JPanel commonParams = new JPanel();
commonParams.setLayout(new VerticalLayout(6, VerticalLayout.LEFT));
mainPanel.add(commonParams);
commonParams.add(jmsTopic);
- commonParams.add(reqAuth);
+ commonParams.add(useAuth);
commonParams.add(jmsUser);
commonParams.add(jmsPwd);
commonParams.add(iterations);
@@ -210,7 +202,7 @@
jmsUser.setText(sampler.getUsername());
jmsPwd.setText(sampler.getPassword());
iterations.setText(sampler.getIterations());
- reqAuth.setText(sampler.getUseAuth());
+ useAuth.setSelected(sampler.isUseAuth());
readResponse.setSelected(sampler.getReadResponseAsBoolean());
clientChoice.setText(sampler.getClientChoice());
}
@@ -225,7 +217,7 @@
jmsUser.setText(""); // $NON-NLS-1$
jmsPwd.setText(""); // $NON-NLS-1$
iterations.setText(""); // $NON-NLS-1$
- reqAuth.setText(""); // $NON-NLS-1$
+ useAuth.setSelected(false);
readResponse.setSelected(true);
clientChoice.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=712032&r1=712031&r2=712032&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
Thu Nov 6 17:30:43 2008
@@ -52,9 +52,8 @@
private static final String READ_RESPONSE = "jms.read_response"; //
$NON-NLS-1$
//--
- public static final String required =
JMeterUtils.getResString("jms_auth_required"); // $NON-NLS-1$
-
- public static final String not_req =
JMeterUtils.getResString("jms_auth_not_required"); // $NON-NLS-1$
+ // See BUG 45460. We need to keep the resource in order to interpret
existing files
+ private static final String REQUIRED =
JMeterUtils.getResString("jms_auth_required"); // $NON-NLS-1$
public BaseJMSSampler() {
}
@@ -211,10 +210,10 @@
/**
* Set whether authentication is required for JNDI
*
- * @param auth
+ * @param useAuth
*/
- public void setUseAuth(String auth) {
- setProperty(USE_AUTH, auth);
+ public void setUseAuth(boolean useAuth) {
+ setProperty(USE_AUTH, useAuth);
}
/**
@@ -222,8 +221,9 @@
*
* @return whether jndi requires authentication
*/
- public String getUseAuth() {
- return getPropertyAsString(USE_AUTH);
+ public boolean isUseAuth() {
+ final String useAuth = getPropertyAsString(USE_AUTH);
+ return useAuth.equalsIgnoreCase("true") || useAuth.equals(REQUIRED);
// $NON-NLS-1$
}
/**
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=712032&r1=712031&r2=712032&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
Thu Nov 6 17:30:43 2008
@@ -110,7 +110,7 @@
*/
public synchronized void initClient() {
this.PUB = new Publisher(this.getUseJNDIPropertiesAsBoolean(),
this.getJNDIInitialContextFactory(), this
- .getProviderUrl(), this.getConnectionFactory(),
this.getTopic(), this.getUseAuth(), this.getUsername(),
+ .getProviderUrl(), this.getConnectionFactory(),
this.getTopic(), this.isUseAuth(), this.getUsername(),
this.getPassword());
ClientPool.addClient(this.PUB);
log.info("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=712032&r1=712031&r2=712032&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
Thu Nov 6 17:30:43 2008
@@ -103,7 +103,7 @@
OnMessageSubscriber sub = (OnMessageSubscriber) ClientPool.get(this);
if (sub == null) {
sub = new
OnMessageSubscriber(this.getUseJNDIPropertiesAsBoolean(),
this.getJNDIInitialContextFactory(),
- this.getProviderUrl(), this.getConnectionFactory(),
this.getTopic(), this.getUseAuth(), this
+ this.getProviderUrl(), this.getConnectionFactory(),
this.getTopic(), this.isUseAuth(), this
.getUsername(), this.getPassword());
sub.setMessageListener(this);
sub.resume();
@@ -122,7 +122,7 @@
public void initReceiveClient() {
this.SUBSCRIBER = new
ReceiveSubscriber(this.getUseJNDIPropertiesAsBoolean(), this
.getJNDIInitialContextFactory(), this.getProviderUrl(),
this.getConnectionFactory(), this.getTopic(),
- this.getUseAuth(), this.getUsername(), this.getPassword());
+ this.isUseAuth(), this.getUsername(), this.getPassword());
this.SUBSCRIBER.resume();
ClientPool.addClient(this.SUBSCRIBER);
log.info("SubscriberSampler.initReceiveClient called");
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Thu Nov 6 17:30:43 2008
@@ -147,6 +147,7 @@
<li>Bug 46148 - HTTP sampler fails on SSL requests when logging for
jmeter.util is set to DEBUG</li>
<li>TCP sampler now calls setupTest() and teardownTest() methods</li>
<li>Bug 45458 - Point to Point JMS in combination with authentication</li>
+<li>Bug 45460 - JMS TestPlan elements depend on resource property</li>
</ul>
<h3>Improvements</h3>
Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/jmspublisher.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/jmspublisher.png?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/jmssubscriber.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/jmssubscriber.png?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=712032&r1=712031&r2=712032&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Thu Nov 6
17:30:43 2008
@@ -1091,7 +1091,7 @@
</properties>
</component>
-<component name="JMS Publisher" index="§-num;.1.13" width="438"
height="750" screenshot="jmspublisher.png">
+<component name="JMS Publisher" index="§-num;.1.13" width="435"
height="745" screenshot="jmspublisher.png">
<note>ALPHA CODE</note>
<description>
<p>
@@ -1117,7 +1117,7 @@
</properties>
</component>
-<component name="JMS Subscriber" index="§-num;.1.14" width="497"
height="434" screenshot="jmssubscriber.png">
+<component name="JMS Subscriber" index="§-num;.1.14" width="502"
height="417" screenshot="jmssubscriber.png">
<note>ALPHA CODE</note>
<description>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
