activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] activemq git commit: Use the Camel apt compiler for the activemq-camel plugin to generte component details.
Date Tue, 11 Nov 2014 08:52:47 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk 2842cbd5b -> 0e98ed6f5


Use the Camel apt compiler for the activemq-camel plugin to generte component details.


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/dfd168b0
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/dfd168b0
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/dfd168b0

Branch: refs/heads/trunk
Commit: dfd168b0b6f1b8168faccc0fb4d82c8d7e7fc5cb
Parents: 2842cbd
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Tue Nov 11 08:20:01 2014 +0100
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Tue Nov 11 08:24:39 2014 +0100

----------------------------------------------------------------------
 activemq-camel/pom.xml                          | 22 ++++++++++++++++++++
 .../camel/component/ActiveMQComponent.java      |  7 ++-----
 2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/dfd168b0/activemq-camel/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index d06befc..3a07a93 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -55,6 +55,13 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-jms</artifactId>
     </dependency>
+    <!-- use the Camel apt compiler plugin -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>apt</artifactId>
+      <version>${camel-version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-spring</artifactId>
@@ -208,6 +215,21 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+
+      <!-- use Camel plugins to generate component details -->
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-package-maven-plugin</artifactId>
+        <version>${camel-version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate-components-list</goal>
+            </goals>
+            <phase>generate-resources</phase>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/dfd168b0/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
index 47dee42..3826857 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQComponent.java
@@ -20,7 +20,6 @@ import java.net.URISyntaxException;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.EnhancedConnection;
 import org.apache.activemq.Service;
 import org.apache.activemq.advisory.DestinationSource;
@@ -41,8 +40,6 @@ import javax.jms.Connection;
 
 /**
  * The <a href="http://activemq.apache.org/camel/activemq.html">ActiveMQ Component</a>
- *
- * 
  */
 public class ActiveMQComponent extends JmsComponent implements EndpointCompleter {
     private final CopyOnWriteArrayList<SingleConnectionFactory> singleConnectionFactoryList
=
@@ -91,10 +88,10 @@ public class ActiveMQComponent extends JmsComponent implements EndpointCompleter
     }
 
     public ActiveMQComponent(ActiveMQConfiguration configuration) {
-        super(configuration);
+        super();
+        setConfiguration(configuration);
     }
 
-
     public void setBrokerURL(String brokerURL) {
         if (getConfiguration() instanceof ActiveMQConfiguration) {
             ((ActiveMQConfiguration)getConfiguration()).setBrokerURL(brokerURL);


Mime
View raw message