activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1417041 - in /activemq/trunk: activemq-tooling/ activemq-tooling/activemq-maven-plugin/ activemq-tooling/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/ activemq-tooling/activemq-maven-plugin/src/test/java/org/apache/activem...
Date Tue, 04 Dec 2012 17:19:38 GMT
Author: tabish
Date: Tue Dec  4 17:19:35 2012
New Revision: 1417041

URL: http://svn.apache.org/viewvc?rev=1417041&view=rev
Log:
fix for: https://issues.apache.org/jira/browse/AMQ-4169

Rename the activemq maven plugin so that they follow the maven plugin naming guidelines. 
Also update the code to use non-deprecated annotations for properties. 

Added:
    activemq/trunk/activemq-tooling/activemq-maven-plugin/
      - copied from r1416943, activemq/trunk/activemq-tooling/maven-activemq-plugin/
    activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/
      - copied from r1416943, activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/
    activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/
      - copied from r1416943, activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/
Removed:
    activemq/trunk/activemq-tooling/maven-activemq-memtest-plugin/
    activemq/trunk/activemq-tooling/maven-activemq-perf-plugin/
    activemq/trunk/activemq-tooling/maven-activemq-plugin/
Modified:
    activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml
    activemq/trunk/activemq-tooling/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java
    activemq/trunk/activemq-tooling/activemq-maven-plugin/src/test/java/org/apache/activemq/maven/XBeanFileResolverTest.java
    activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
    activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java
    activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml
    activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
    activemq/trunk/activemq-tooling/pom.xml
    activemq/trunk/assembly/pom.xml

Modified: activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/activemq-maven-plugin/pom.xml Tue Dec  4 17:19:35 2012
@@ -5,9 +5,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-   
+
     http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@
     <version>5.8-SNAPSHOT</version>
   </parent>
 
-  <artifactId>maven-activemq-plugin</artifactId>
+  <artifactId>activemq-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>ActiveMQ :: StartUp Plugin</name>
 
@@ -82,5 +82,5 @@
       </plugin>
     </plugins>
   </build>
-  
+
 </project>

Modified: activemq/trunk/activemq-tooling/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java
(original)
+++ activemq/trunk/activemq-tooling/activemq-maven-plugin/src/main/java/org/apache/activemq/maven/BrokerMojo.java
Tue Dec  4 17:19:35 2012
@@ -43,15 +43,15 @@ import org.apache.maven.project.MavenPro
 
 /**
  * Goal which starts an activemq broker.
- * 
+ *
  * @goal run
  * @phase process-sources
  */
 public class BrokerMojo extends AbstractMojo {
     /**
      * The maven project.
-     * 
-     * @parameter expression="${project}"
+     *
+     * @parameter property="${project}"
      * @required
      * @readonly
      */
@@ -61,8 +61,8 @@ public class BrokerMojo extends Abstract
      * The broker configuration uri The list of currently supported URI syntaxes
      * is described <a
      * href="http://activemq.apache.org/how-do-i-embed-a-broker-inside-a-connection.html">here</a>
-     * 
-     * @parameter expression="${configUri}"
+     *
+     * @parameter property="${configUri}"
      *            default-value="broker:(tcp://localhost:61616)?useJmx=false&persistent=false"
      * @required
      */
@@ -70,25 +70,26 @@ public class BrokerMojo extends Abstract
 
     /**
      * Indicates whether to fork the broker, useful for integration tests.
-     * 
-     * @parameter expression="${fork}" default-value="false"
+     *
+     * @parameter property="${fork}" default-value="false"
      */
     private boolean fork;
 
     /**
      * System properties to add
-     * 
-     * @parameter expression="${systemProperties}"
+     *
+     * @parameter property="${systemProperties}"
      */
     private Properties systemProperties;
 
     /**
      * Skip execution of the ActiveMQ Broker plugin if set to true
-     * 
-     * @parameter expression="${skip}"
+     *
+     * @parameter property="${skip}"
      */
     private boolean skip;
 
+    @Override
     public void execute() throws MojoExecutionException {
         try {
             if (skip) {
@@ -108,6 +109,7 @@ public class BrokerMojo extends Abstract
             final BrokerService broker = BrokerFactory.createBroker(configUri);
             if (fork) {
                 new Thread(new Runnable() {
+                    @Override
                     public void run() {
                         try {
                             broker.start();
@@ -128,7 +130,7 @@ public class BrokerMojo extends Abstract
 
     /**
      * Wait for a shutdown invocation elsewhere
-     * 
+     *
      * @throws Exception
      */
     protected void waitForShutdown(BrokerService broker) throws Exception {
@@ -136,6 +138,7 @@ public class BrokerMojo extends Abstract
             false
         };
         Runtime.getRuntime().addShutdownHook(new Thread() {
+            @Override
             public void run() {
                 synchronized (shutdown) {
                     shutdown[0] = true;

Modified: activemq/trunk/activemq-tooling/activemq-maven-plugin/src/test/java/org/apache/activemq/maven/XBeanFileResolverTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-maven-plugin/src/test/java/org/apache/activemq/maven/XBeanFileResolverTest.java?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-maven-plugin/src/test/java/org/apache/activemq/maven/XBeanFileResolverTest.java
(original)
+++ activemq/trunk/activemq-tooling/activemq-maven-plugin/src/test/java/org/apache/activemq/maven/XBeanFileResolverTest.java
Tue Dec  4 17:19:35 2012
@@ -21,13 +21,10 @@ import static org.junit.Assert.assertEqu
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.activemq.maven.XBeanFileResolver;
 import org.junit.Test;
 
 /**
  * Test for: Helper to convert relative paths to XBean description files to URL-compliant
absolute paths.
- * 
- * @author Marc CARRE <carre.marc@gmail.com>
  */
 public class XBeanFileResolverTest {
     private static final String XBEAN_FILE = "xbean:file:";
@@ -37,7 +34,7 @@ public class XBeanFileResolverTest {
         String currentDirectory = getCurrentDirectoryLinuxStyle();
         String relativeXBeanFilePath = "src/main/resources/activemq.xml";
 
-        // e.g. xbean:file:C:/dev/src/active-mq/activemq-tooling/maven-activemq-plugin/src/main/resources/activemq.xml
+        // e.g. xbean:file:C:/dev/src/active-mq/activemq-tooling/activemq-maven-plugin/src/main/resources/activemq.xml
         String expectedUrl = XBEAN_FILE + currentDirectory + "/" + relativeXBeanFilePath;
 
         String actualUrl = XBeanFileResolver.toUrlCompliantAbsolutePath(XBEAN_FILE + relativeXBeanFilePath);

Modified: activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/pom.xml Tue Dec  4 17:19:35
2012
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-   
+
     http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,7 +25,7 @@
     <version>5.8-SNAPSHOT</version>
   </parent>
 
-  <artifactId>maven-activemq-memtest-plugin</artifactId>
+  <artifactId>activemq-memtest-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <name>ActiveMQ :: Memory Usage Test Plugin</name>
 

Modified: activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java
(original)
+++ activemq/trunk/activemq-tooling/activemq-memtest-maven-plugin/src/main/java/org/apache/activemq/maven/MemtestMojo.java
Tue Dec  4 17:19:35 2012
@@ -22,91 +22,92 @@ import org.apache.maven.plugin.MojoExecu
 
 /**
  * Goal which does a memory usage test to check for any memory leak
- * 
+ *
  * @goal memtest
  * @phase process-sources
  */
 public class MemtestMojo extends AbstractMojo {
 
     /**
-     * @parameter expression="${url}
+     * @parameter property="${url}
      */
     private String url;
 
     /**
-     * @parameter expression="${topic}" default-value="true"
+     * @parameter property="${topic}" default-value="true"
      * @required
      */
     private String topic;
 
     /**
-     * @parameter expression="${connectionCheckpointSize}" default-value="-1"
+     * @parameter property="${connectionCheckpointSize}" default-value="-1"
      * @required
      */
     private String connectionCheckpointSize;
 
     /**
-     * @parameter expression="${durable}" default-value="false"
+     * @parameter property="${durable}" default-value="false"
      * @required
      */
     private String durable;
 
     /**
-     * @parameter expression="${producerCount}" default-value="1"
+     * @parameter property="${producerCount}" default-value="1"
      * @required
      */
     private String producerCount;
 
     /**
-     * @parameter expression="${prefetchSize}" default-value="-1"
+     * @parameter property="${prefetchSize}" default-value="-1"
      * @required
      */
     private String prefetchSize;
 
     /**
-     * @parameter expression="${consumerCount}" default-value="1"
+     * @parameter property="${consumerCount}" default-value="1"
      * @required
      */
     private String consumerCount;
 
     /**
-     * @parameter expression="${messageCount}" default-value="100000"
+     * @parameter property="${messageCount}" default-value="100000"
      * @required
      */
     private String messageCount;
 
     /**
-     * @parameter expression="${messageSize}" default-value="10240"
+     * @parameter property="${messageSize}" default-value="10240"
      * @required
      */
     private String messageSize;
 
     /**
-     * @parameter expression="${checkpointInterval}" default-value="2"
+     * @parameter property="${checkpointInterval}" default-value="2"
      * @required
      */
     private String checkpointInterval;
 
     /**
-     * @parameter expression="${destinationName}" default-value="FOO.BAR"
+     * @parameter property="${destinationName}" default-value="FOO.BAR"
      * @required
      */
     private String destinationName;
 
     /**
-     * @parameter expression="${reportName}"
+     * @parameter property="${reportName}"
      *            default-value="activemq-memory-usage-report"
      * @required
      */
     private String reportName;
 
     /**
-     * @parameter expression="${reportDirectory}"
+     * @parameter property="${reportDirectory}"
      *            default-value="${project.build.directory}/test-memtest"
      * @required
      */
     private String reportDirectory;
 
+    @Override
     public void execute() throws MojoExecutionException {
 
         JMSMemtest.main(createArgument());

Modified: activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml (original)
+++ activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/pom.xml Tue Dec  4 17:19:35
2012
@@ -5,9 +5,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-   
+
     http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,9 +22,9 @@
         <groupId>org.apache.activemq.tooling</groupId>
         <artifactId>activemq-tooling</artifactId>
         <version>5.8-SNAPSHOT</version>
-	</parent>
+    </parent>
 
-    <artifactId>maven-activemq-perf-plugin</artifactId>
+    <artifactId>activemq-perf-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
     <name>ActiveMQ :: Performance Test Plugin</name>
 

Modified: activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java?rev=1417041&r1=1416943&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
(original)
+++ activemq/trunk/activemq-tooling/activemq-perf-maven-plugin/src/main/java/org/apache/activemq/maven/ServerMojo.java
Tue Dec  4 17:19:35 2012
@@ -29,23 +29,23 @@ import org.apache.maven.plugin.MojoExecu
 
 /**
  * Goal which starts activemq broker.
- * 
+ *
  * @goal broker
  * @phase process-sources
  */
 public class ServerMojo extends AbstractMojo {
     /**
      * Location of the output directory. Defaults to target.
-     * 
-     * @parameter expression="${project.build.directory}"
+     *
+     * @parameter property="${project.build.directory}"
      * @required
      */
     private File outputDirectory;
 
     /**
      * Location of the predefined config files.
-     * 
-     * @parameter expression="${configDirectory}"
+     *
+     * @parameter property="${configDirectory}"
      *            default-value="${basedir}/src/main/resources/broker-conf"
      * @required
      */
@@ -53,26 +53,27 @@ public class ServerMojo extends Abstract
 
     /**
      * Type of activemq configuration to use. This is also the filename used.
-     * 
-     * @parameter expression="${configType}" default-value="activemq"
+     *
+     * @parameter property="${configType}" default-value="activemq"
      * @required
      */
     private String configType;
 
     /**
      * Location of activemq config file other those found in resources/config.
-     * 
-     * @parameter expression="${configFile}"
+     *
+     * @parameter property="${configFile}"
      */
     private File configFile;
 
     /**
      * Broker URL.
-     * 
-     * @parameter expression="${url}"
+     *
+     * @parameter property="${url}"
      */
     private String url;
 
+    @Override
     public void execute() throws MojoExecutionException {
 
         File out = outputDirectory;
@@ -109,7 +110,7 @@ public class ServerMojo extends Abstract
 
     /**
      * Copy activemq configuration file to output directory.
-     * 
+     *
      * @param source
      * @return
      * @throws IOException

Modified: activemq/trunk/activemq-tooling/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-tooling/pom.xml?rev=1417041&r1=1417040&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/activemq-tooling/pom.xml (original)
+++ activemq/trunk/activemq-tooling/pom.xml Tue Dec  4 17:19:35 2012
@@ -6,9 +6,9 @@
     The ASF licenses this file to You under the Apache License, Version 2.0
     (the "License"); you may not use this file except in compliance with
     the License.  You may obtain a copy of the License at
-   
+
     http://www.apache.org/licenses/LICENSE-2.0
-   
+
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,9 +31,9 @@
   <name>ActiveMQ :: Tooling</name>
 
   <modules>
-    <module>maven-activemq-memtest-plugin</module>
-    <module>maven-activemq-perf-plugin</module>
-    <module>maven-activemq-plugin</module>
-  </modules> 
+    <module>activemq-memtest-maven-plugin</module>
+    <module>activemq-perf-maven-plugin</module>
+    <module>activemq-maven-plugin</module>
+  </modules>
 
 </project>

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1417041&r1=1417040&r2=1417041&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Tue Dec  4 17:19:35 2012
@@ -45,7 +45,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-client</artifactId>
@@ -84,7 +84,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jdbc-store</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-mqtt</artifactId>
@@ -454,7 +454,7 @@
       </plugin>
       <!-- plugin>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>maven-activemq-plugin</artifactId>
+        <artifactId>activemq-maven-plugin</artifactId>
         <version>${project.version}</version>
         <configuration>
           <configFile>${basedir}/src/release/conf/activemq.xml</configFile>



Mime
View raw message