Author: sebb
Date: Sat Sep 1 10:51:00 2007
New Revision: 571842
URL: http://svn.apache.org/viewvc?rev=571842&view=rev
Log:
Hide variables that should not be exposed (force access via get/set methods)
Modified:
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
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=571842&r1=571841&r2=571842&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 10:51:00 2007
@@ -29,8 +29,6 @@
import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.protocol.jms.sampler.JMSSampler;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
import org.apache.jorphan.gui.JLabeledChoice;
@@ -100,23 +98,23 @@
}
private void transfer(JMSSampler element) {
- element.setProperty(JMSSampler.QUEUE_CONNECTION_FACTORY_JNDI,
queueuConnectionFactory.getText());
- element.setProperty(JMSSampler.SEND_QUEUE, sendQueue.getText());
- element.setProperty(JMSSampler.RECEIVE_QUEUE,
receiveQueue.getText());
+
element.setQueueConnectionFactory(queueuConnectionFactory.getText());
+ element.setSendQueue(sendQueue.getText());
+ element.setReceiveQueue(receiveQueue.getText());
boolean isOneway =
oneWay.getText().equals(JMeterUtils.getResString("jms_request")); //$NON-NLS-1$
- element.setProperty(new BooleanProperty(JMSSampler.IS_ONE_WAY,
isOneway));
+ element.setIsOneway(isOneway);
- element.setProperty(JMSSampler.TIMEOUT, timeout.getText());
- element.setProperty(JMSSampler.XML_DATA, soapXml.getText());
+ element.setTimeout(timeout.getText());
+ element.setContent(soapXml.getText());
- element.setProperty(JMSSampler.JNDI_INITIAL_CONTEXT_FACTORY,
initialContextFactory.getText());
- element.setProperty(JMSSampler.JNDI_CONTEXT_PROVIDER_URL,
providerUrl.getText());
+
element.setInitialContextFactory(initialContextFactory.getText());
+ element.setContextProvider(providerUrl.getText());
Arguments jndiArgs = (Arguments)
jndiPropertiesPanel.createTestElement();
- element.setProperty(new
TestElementProperty(JMSSampler.JNDI_PROPERTIES, jndiArgs));
+ element.setJNDIProperties(jndiArgs);
Arguments args = (Arguments)
jmsPropertiesPanel.createTestElement();
- element.setProperty(new
TestElementProperty(JMSSampler.JMS_PROPERTIES, args));
+ element.setJMSProperties(args);
}
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=571842&r1=571841&r2=571842&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 10:51:00 2007
@@ -55,29 +55,32 @@
*/
public class JMSSampler extends AbstractSampler implements ThreadListener {
- public static final String JNDI_INITIAL_CONTEXT_FACTORY =
"JMSSampler.initialContextFactory"; // $NON-NLS-1$
+ private static final Logger LOGGER = LoggingManager.getLoggerForClass();
- public static final String JNDI_CONTEXT_PROVIDER_URL =
"JMSSampler.contextProviderUrl"; // $NON-NLS-1$
+ private static final int DEFAULT_TIMEOUT = 2000;
- public static final String JNDI_PROPERTIES =
"JMSSampler.jndiProperties"; // $NON-NLS-1$
+ //++ These are JMX names, and must not be changed
+ private static final String JNDI_INITIAL_CONTEXT_FACTORY =
"JMSSampler.initialContextFactory"; // $NON-NLS-1$
- private static final int DEFAULT_TIMEOUT = 2000;
+ private static final String JNDI_CONTEXT_PROVIDER_URL =
"JMSSampler.contextProviderUrl"; // $NON-NLS-1$
- public final static String TIMEOUT = "JMSSampler.timeout"; //
$NON-NLS-1$
+ private static final String JNDI_PROPERTIES =
"JMSSampler.jndiProperties"; // $NON-NLS-1$
- public static final String IS_ONE_WAY = "JMSSampler.isFireAndForget";
// $NON-NLS-1$
+ private static final String TIMEOUT = "JMSSampler.timeout"; //
$NON-NLS-1$
- public static final String JMS_PROPERTIES = "arguments"; // $NON-NLS-1$
+ private static final String IS_ONE_WAY = "JMSSampler.isFireAndForget";
// $NON-NLS-1$
- public static final String RECEIVE_QUEUE = "JMSSampler.ReceiveQueue";
// $NON-NLS-1$
+ private static final String JMS_PROPERTIES = "arguments"; // $NON-NLS-1$
- public static final String XML_DATA = "HTTPSamper.xml_data"; //
$NON-NLS-1$
+ private static final String RECEIVE_QUEUE = "JMSSampler.ReceiveQueue";
// $NON-NLS-1$
- public final static String SEND_QUEUE = "JMSSampler.SendQueue"; //
$NON-NLS-1$
+ private static final String XML_DATA = "HTTPSamper.xml_data"; //
$NON-NLS-1$
- public final static String QUEUE_CONNECTION_FACTORY_JNDI =
"JMSSampler.queueconnectionfactory"; // $NON-NLS-1$
+ private final static String SEND_QUEUE = "JMSSampler.SendQueue"; //
$NON-NLS-1$
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private final static String QUEUE_CONNECTION_FACTORY_JNDI =
"JMSSampler.queueconnectionfactory"; // $NON-NLS-1$
+
+ //--
//
// Member variables
@@ -182,10 +185,18 @@
return getArguments(JMSSampler.JMS_PROPERTIES);
}
+ public void setJMSProperties(Arguments args) {
+ setProperty(new TestElementProperty(JMSSampler.JMS_PROPERTIES,
args));
+ }
+
public Arguments getJNDIProperties() {
return getArguments(JMSSampler.JNDI_PROPERTIES);
}
+ public void setJNDIProperties(Arguments args) {
+ setProperty(new TestElementProperty(JMSSampler.JNDI_PROPERTIES,
args));
+ }
+
public String getQueueConnectionFactory() {
return getPropertyAsString(QUEUE_CONNECTION_FACTORY_JNDI);
}
@@ -418,12 +429,8 @@
return (Arguments) getProperty(name).getObjectValue();
}
- /**
- * @param i
- */
- public void setTimeout(int i) {
- setProperty(JMSSampler.TIMEOUT, String.valueOf(i));
-
+ public void setTimeout(String s) {
+ setProperty(JMSSampler.TIMEOUT, s);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
