Author: foconer
Date: Sun Jun 4 19:36:25 2006
New Revision: 411641
URL: http://svn.apache.org/viewvc?rev=411641&view=rev
Log:
Fix runtime and compiletime error.
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/pom.xml
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
Modified: incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/pom.xml?rev=411641&r1=411640&r2=411641&view=diff
==============================================================================
--- incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/pom.xml
(original)
+++ incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/pom.xml Sun Jun
4 19:36:25 2006
@@ -23,12 +23,6 @@
<version>2.0</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>4.0-SNAPSHOT</version>
@@ -39,6 +33,11 @@
<version>4.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.1.1.0</version>
@@ -47,6 +46,16 @@
<groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
<version>10.1.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java?rev=411641&r1=411640&r2=411641&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ConsumerMojo.java
Sun Jun 4 19:36:25 2006
@@ -16,16 +16,18 @@
* limitations under the License.
*/
-import org.apache.activemq.tool.ConsumerTool;
+import org.apache.activemq.tool.JmsConsumerClient;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import javax.jms.JMSException;
+
/**
* Goal which touches a timestamp file.
*
* @goal consumer
- * @phase process
+ * @phase process-sources
*/
public class ConsumerMojo
extends AbstractMojo {
@@ -64,6 +66,10 @@
throws MojoExecutionException {
String[] args = {url, topic, subject, durable, maximumMessage};
- ConsumerTool.main(args);
+ try {
+ JmsConsumerClient.main(args);
+ } catch (JMSException e) {
+ throw new MojoExecutionException("Error Executing Consumer: " +
e.getMessage());
+ }
}
}
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java?rev=411641&r1=411640&r2=411641&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/maven/ProducerMojo.java
Sun Jun 4 19:36:25 2006
@@ -1,10 +1,11 @@
package org.apache.activemq.maven;
-import org.apache.activemq.tool.ConsumerTool;
-import org.apache.activemq.tool.ProducerTool;
+import org.apache.activemq.tool.JmsProducerClient;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import javax.jms.JMSException;
+
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
@@ -65,7 +66,11 @@
public void execute()
throws MojoExecutionException {
- String[] args = {url,topic,subject,durable,messageCount,messageSize};
- ProducerTool.main(args);
+ String[] args = {url, topic, subject, durable, messageCount,
messageSize};
+ try {
+ JmsProducerClient.main(args);
+ } catch (JMSException e) {
+ throw new MojoExecutionException("Error executing Producer: " +
e.getMessage());
+ }
}
}