diff --git a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java index 430f41ab6d..95bfa100e2 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java +++ b/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java @@ -29,79 +29,79 @@ import org.apache.maven.plugin.MojoExecutionException; public class MemtestMojo extends AbstractMojo { /** - * @parameter property="${url} + * @parameter property="url" */ private String url; /** - * @parameter property="${topic}" default-value="true" + * @parameter property="topic" default-value="true" * @required */ private String topic; /** - * @parameter property="${connectionCheckpointSize}" default-value="-1" + * @parameter property="connectionCheckpointSize" default-value="-1" * @required */ private String connectionCheckpointSize; /** - * @parameter property="${durable}" default-value="false" + * @parameter property="durable" default-value="false" * @required */ private String durable; /** - * @parameter property="${producerCount}" default-value="1" + * @parameter property="producerCount" default-value="1" * @required */ private String producerCount; /** - * @parameter property="${prefetchSize}" default-value="-1" + * @parameter property="prefetchSize" default-value="-1" * @required */ private String prefetchSize; /** - * @parameter property="${consumerCount}" default-value="1" + * @parameter property="consumerCount" default-value="1" * @required */ private String consumerCount; /** - * @parameter property="${messageCount}" default-value="100000" + * @parameter property="messageCount" default-value="100000" * @required */ private String messageCount; /** - * @parameter property="${messageSize}" default-value="10240" + * @parameter property="messageSize" default-value="10240" * @required */ private String messageSize; /** - * @parameter property="${checkpointInterval}" default-value="2" + * @parameter property="checkpointInterval" default-value="2" * @required */ private String checkpointInterval; /** - * @parameter property="${destinationName}" default-value="FOO.BAR" + * @parameter property="destinationName" default-value="FOO.BAR" * @required */ private String destinationName; /** - * @parameter property="${reportName}" + * @parameter property="$reportName" * default-value="activemq-memory-usage-report" * @required */ private String reportName; /** - * @parameter property="${reportDirectory}" + * @parameter property="reportDirectory" * default-value="${project.build.directory}/test-memtest" * @required */ diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml index 20976e1e87..ede5936466 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml @@ -38,6 +38,10 @@ org.apache.activemq activemq-broker + + org.apache.activemq + activemq-spring + org.apache.activemq activemq-console diff --git a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java index b7fb08d08d..da6b695d9c 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java +++ b/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java @@ -37,7 +37,7 @@ public class ServerMojo extends AbstractMojo { /** * Location of the output directory. Defaults to target. * - * @parameter property="${project.build.directory}" + * @parameter property="project.build.directory" * @required */ private File outputDirectory; @@ -45,7 +45,7 @@ public class ServerMojo extends AbstractMojo { /** * Location of the predefined config files. * - * @parameter property="${configDirectory}" + * @parameter property="configDirectory" * default-value="${basedir}/src/main/resources/broker-conf" * @required */ @@ -54,7 +54,7 @@ public class ServerMojo extends AbstractMojo { /** * Type of activemq configuration to use. This is also the filename used. * - * @parameter property="${configType}" default-value="activemq" + * @parameter property="configType" default-value="activemq" * @required */ private String configType; @@ -62,14 +62,14 @@ public class ServerMojo extends AbstractMojo { /** * Location of activemq config file other those found in resources/config. * - * @parameter property="${configFile}" + * @parameter property="configFile" */ private File configFile; /** * Broker URL. * - * @parameter property="${url}" + * @parameter property="url" */ private String url; @@ -105,6 +105,7 @@ public class ServerMojo extends AbstractMojo { args[1] = "xbean:" + (config.toURI()).toString(); } + getLog().info("Starting broker with configuration in: " + args[1]); Main.main(args); }