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/11/17 23:06:35 UTC
svn commit: r1036249 - in
/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms:
client/Publisher.java control/gui/JMSPublisherGui.java
sampler/BaseJMSSampler.java sampler/PublisherSampler.java
Author: sebb
Date: Wed Nov 17 22:06:34 2010
New Revision: 1036249
URL: http://svn.apache.org/viewvc?rev=1036249&view=rev
Log:
Simplify - save DestinationSetup as a boolean
Modified:
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/control/gui/JMSPublisherGui.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
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=1036249&r1=1036248&r2=1036249&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 Wed Nov 17 22:06:34 2010
@@ -35,7 +35,6 @@ import javax.naming.Context;
import javax.naming.NamingException;
import org.apache.jmeter.protocol.jms.Utils;
-import org.apache.jmeter.protocol.jms.control.gui.JMSPublisherGui;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -54,7 +53,9 @@ public class Publisher implements Closea
private final boolean staticDest;
/**
- * Create a publisher using either the jndi.properties file or the provided parameters
+ * Create a publisher using either the jndi.properties file or the provided parameters.
+ * Uses a static destination (for backward compatibility)
+ *
* @param useProps true if a jndi.properties file is to be used
* @param initialContextFactory the (ignored if useProps is true)
* @param providerUrl (ignored if useProps is true)
@@ -71,7 +72,7 @@ public class Publisher implements Closea
String securityPrincipal, String securityCredentials) throws JMSException, NamingException {
this(useProps, initialContextFactory, providerUrl, connfactory,
destinationName, useAuth, securityPrincipal,
- securityCredentials, JMSPublisherGui.DEST_SETUP_STATIC);
+ securityCredentials, true);
}
/**
@@ -84,20 +85,20 @@ public class Publisher implements Closea
* @param useAuth (ignored if useProps is true)
* @param securityPrincipal (ignored if useProps is true)
* @param securityCredentials (ignored if useProps is true)
- * @param destinationSetup true is the destination is not to change between loops
+ * @param staticDestination true is the destination is not to change between loops
* @throws JMSException if the context could not be initialised, or there was some other error
* @throws NamingException
*/
public Publisher(boolean useProps, String initialContextFactory, String providerUrl,
String connfactory, String destinationName, boolean useAuth,
String securityPrincipal, String securityCredentials,
- String destinationSetup) throws JMSException, NamingException {
+ boolean staticDestination) throws JMSException, NamingException {
super();
ctx = InitialContextFactory.getContext(useProps, initialContextFactory,
providerUrl, useAuth, securityPrincipal, securityCredentials);
connection = Utils.getConnection(ctx, connfactory);
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
- staticDest = destinationSetup.equals(JMSPublisherGui.DEST_SETUP_STATIC) ? true : false;
+ staticDest = staticDestination;
if (staticDest) {
Destination dest = Utils.lookupDestination(ctx, destinationName);
producer = session.createProducer(dest);
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=1036249&r1=1036248&r2=1036249&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 Nov 17 22:06:34 2010
@@ -63,10 +63,6 @@ public class JMSPublisherGui extends Abs
public static final String MAP_MSG_RSC = "jms_map_message"; //$NON-NLS-1$
/** Create an ObjectMessage */
public static final String OBJECT_MSG_RSC = "jms_object_message"; //$NON-NLS-1$
-
- public final static String DEST_SETUP_STATIC = "jms_dest_setup_static"; // $NON-NLS-1$
-
- public final static String DEST_SETUP_DYNAMIC = "jms_dest_setup_dynamic"; // $NON-NLS-1$
//-- End of names used in JMX files
// Button group resources
@@ -102,6 +98,11 @@ public class JMSPublisherGui extends Abs
private final JLabeledRadioI18N msgChoice = new JLabeledRadioI18N("jms_message_type", MSGTYPES_ITEMS, TEXT_MSG_RSC); //$NON-NLS-1$
+
+ // These are the names of properties used to define the labels
+ private final static String DEST_SETUP_STATIC = "jms_dest_setup_static"; // $NON-NLS-1$
+
+ private final static String DEST_SETUP_DYNAMIC = "jms_dest_setup_dynamic"; // $NON-NLS-1$
// Button group resources
private final static String[] DEST_SETUP_ITEMS = { DEST_SETUP_STATIC, DEST_SETUP_DYNAMIC };
@@ -164,7 +165,7 @@ public class JMSPublisherGui extends Abs
sampler.setMessageChoice(msgChoice.getText());
sampler.setIterations(iterations.getText());
sampler.setUseAuth(useAuth.isSelected());
- sampler.setDestinationSetup(destSetup.getText());
+ sampler.setDestinationStatic(destSetup.getText().equals(DEST_SETUP_STATIC));
}
/**
@@ -248,7 +249,7 @@ public class JMSPublisherGui extends Abs
updateConfig(sampler.getConfigChoice());
iterations.setText(sampler.getIterations());
useAuth.setSelected(sampler.isUseAuth());
- destSetup.setText(sampler.getDestinationSetup());
+ destSetup.setText(sampler.isDestinationStatic() ? DEST_SETUP_STATIC : DEST_SETUP_DYNAMIC);
}
/**
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=1036249&r1=1036248&r2=1036249&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 Nov 17 22:06:34 2010
@@ -60,8 +60,9 @@ public abstract class BaseJMSSampler ext
private static final String READ_RESPONSE = "jms.read_response"; // $NON-NLS-1$
- // Destination setup (static or dynamic)
- private static final String DESTINATION_SETUP = "jms.destination_setup"; // $NON-NLS-1$
+ // Is Destination setup static? else dynamic
+ private static final String DESTINATION_STATIC = "jms.destination_static"; // $NON-NLS-1$
+ private static final boolean DESTINATION_STATIC_DEFAULT = true; // default to maintain compatibility
//-- End of JMX file attribute names
@@ -295,10 +296,10 @@ public abstract class BaseJMSSampler ext
/**
* if the sampler should use a static destination, call the method with true
*
- * @param properties
+ * @param isStatic
*/
- public void setDestinationSetup(String properties) {
- setProperty(DESTINATION_SETUP, properties);
+ public void setDestinationStatic(boolean isStatic) {
+ setProperty(DESTINATION_STATIC, isStatic, DESTINATION_STATIC_DEFAULT);
}
/**
@@ -306,8 +307,8 @@ public abstract class BaseJMSSampler ext
*
* @return whether the sampler should use a static destination.
*/
- public String getDestinationSetup() {
- return getPropertyAsString(DESTINATION_SETUP);
+ public boolean isDestinationStatic(){
+ return getPropertyAsBoolean(DESTINATION_STATIC, DESTINATION_STATIC_DEFAULT);
}
/**
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=1036249&r1=1036248&r2=1036249&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 Nov 17 22:06:34 2010
@@ -116,7 +116,7 @@ public class PublisherSampler extends Ba
private void initClient() throws JMSException, NamingException {
publisher = new Publisher(getUseJNDIPropertiesAsBoolean(), getJNDIInitialContextFactory(),
getProviderUrl(), getConnectionFactory(), getDestination(), isUseAuth(), getUsername(),
- getPassword(), getDestinationSetup());
+ getPassword(), isDestinationStatic());
ClientPool.addClient(publisher);
log.debug("PublisherSampler.initClient called");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org