activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [3/4] activemq-6 git commit: fix the maven plugin to use the jms file configuration
Date Fri, 16 Jan 2015 12:08:05 GMT
fix the maven plugin to use the jms file configuration


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

Branch: refs/heads/master
Commit: e3656db93d0642b4ab05bc401154429d1f8465ea
Parents: 0123d40
Author: Andy Taylor <andytaylor@apache.org>
Authored: Fri Jan 16 11:16:38 2015 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Fri Jan 16 11:16:38 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/activemq/server/ActiveMQBootstrap.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e3656db9/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
----------------------------------------------------------------------
diff --git a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
index ba0d63f..43dd087 100644
--- a/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
+++ b/activemq-maven-plugin/src/main/java/org/apache/activemq/server/ActiveMQBootstrap.java
@@ -120,7 +120,7 @@ public class ActiveMQBootstrap
             securityConfiguration = new SecurityConfiguration();
          }
 
-         createServer(configuration);
+         createServer(configuration, jmsFileConfiguration);
 
          if (waitOnStart)
          {
@@ -168,7 +168,7 @@ public class ActiveMQBootstrap
       }
    }
 
-   private void createServer(Configuration configuration) throws Exception
+   private void createServer(Configuration configuration, JMSConfiguration jmsFileConfiguration)
throws Exception
    {
       if (nodeId != null && !nodeId.equals("") && !nodeId.equals("null"))
       {
@@ -188,7 +188,7 @@ public class ActiveMQBootstrap
                                          securityManager != null ? securityManager : new
ActiveMQSecurityManagerImpl(securityConfiguration));
       }
 
-      manager = new JMSServerManagerImpl(server);
+      manager = new JMSServerManagerImpl(server, jmsFileConfiguration);
       manager.start();
    }
 
@@ -259,7 +259,7 @@ public class ActiveMQBootstrap
          {
             try
             {
-               createServer(configuration);
+               createServer(configuration, jmsFileConfiguration);
                restartFile.delete();
             }
             catch (Exception e)


Mime
View raw message