Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Added default values 

- Added checking for NPE

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@412670 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Adrian T. Co 2006-06-08 06:05:12 +00:00
parent 663b8a24f9
commit c56ae926a5
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsClientSupport.java
View File

@ -29,6 +29,8 @@ import java.util.Properties;
public class JmsClientSupport extends JmsFactorySupport { public class JmsClientSupport extends JmsFactorySupport {
private static final Log log = LogFactory.getLog(JmsClientSupport.class); private static final Log log = LogFactory.getLog(JmsClientSupport.class);
public static final String DEFAULT_SPI_CLASS = "org.apache.activemq.tool.spi.ActiveMQPojoSPI";
private static final String PREFIX_CONFIG_CLIENT = "client."; private static final String PREFIX_CONFIG_CLIENT = "client.";
public static final String SESSION_AUTO_ACKNOWLEDGE = "autoAck"; public static final String SESSION_AUTO_ACKNOWLEDGE = "autoAck";
public static final String SESSION_CLIENT_ACKNOWLEDGE = "clientAck"; public static final String SESSION_CLIENT_ACKNOWLEDGE = "clientAck";
@ -40,7 +42,7 @@ public class JmsClientSupport extends JmsFactorySupport {
protected Session jmsSession; protected Session jmsSession;
// Client settings // Client settings
protected String spiClass; protected String spiClass = DEFAULT_SPI_CLASS;
protected boolean sessTransacted = false; protected boolean sessTransacted = false;
protected String sessAckMode = SESSION_AUTO_ACKNOWLEDGE; protected String sessAckMode = SESSION_AUTO_ACKNOWLEDGE;
protected String destName = "TEST.FOO"; protected String destName = "TEST.FOO";

2
tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsClientSystemSupport.java
View File

@ -38,7 +38,7 @@ public abstract class JmsClientSystemSupport {
protected Properties jmsClientSettings = new Properties(); protected Properties jmsClientSettings = new Properties();
protected ThreadGroup clientThreadGroup; protected ThreadGroup clientThreadGroup;
protected PerfMeasurementTool performanceSampler; protected PerfMeasurementTool performanceSampler;
protected String reportDirectory; protected String reportDirectory = "";
protected int numClients = 1; protected int numClients = 1;
protected int totalDests = 1; protected int totalDests = 1;

22
tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsFactorySupport.java
View File

@ -62,10 +62,12 @@ public class JmsFactorySupport {
public void setJmsFactorySettings(Properties jmsFactorySettings) { public void setJmsFactorySettings(Properties jmsFactorySettings) {
this.jmsFactorySettings = jmsFactorySettings; this.jmsFactorySettings = jmsFactorySettings;
try { if (spiFactory != null) {
spiFactory.configureConnectionFactory(jmsFactory, jmsFactorySettings); try {
} catch (Exception e) { spiFactory.configureConnectionFactory(jmsFactory, jmsFactorySettings);
log.warn(e); } catch (Exception e) {
log.warn(e);
}
} }
} }
@ -79,10 +81,14 @@ public class JmsFactorySupport {
String val = settings.getProperty(key); String val = settings.getProperty(key);
setProperty(key, val); setProperty(key, val);
} }
try {
spiFactory.configureConnectionFactory(jmsFactory, jmsFactorySettings); if (spiFactory != null) {
} catch (Exception e) { try {
log.warn(e); spiFactory.configureConnectionFactory(jmsFactory, jmsFactorySettings);
} catch (Exception e) {
e.printStackTrace();
log.warn(e);
}
} }
} }

3
tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/PerfReportGenerator.java
View File

@ -42,7 +42,8 @@ public class PerfReportGenerator {
public void startGenerateReport() { public void startGenerateReport() {
setReportDirectory(this.getTestSettings().getProperty("sysTest.reportDirectory")); setReportDirectory(this.getTestSettings().getProperty("sysTest.reportDirectory", ""));
File reportDir = new File(getReportDirectory()); File reportDir = new File(getReportDirectory());