You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2015/01/16 13:08:03 UTC
[1/4] activemq-6 git commit: revert fix that was ported by accident
Repository: activemq-6
Updated Branches:
refs/heads/master 475f2322e -> f99a018a2
revert fix that was ported by accident
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/08185875
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/08185875
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/08185875
Branch: refs/heads/master
Commit: 0818587597d0d7c55a2a335d126e9dabfb1bd234
Parents: 475f232
Author: Andy Taylor <an...@apache.org>
Authored: Fri Jan 16 10:08:37 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Fri Jan 16 10:08:37 2015 +0000
----------------------------------------------------------------------
.../activemq/server/ActiveMQBootstrap.java | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/08185875/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 daf6a4b..ba0d63f 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
@@ -243,20 +243,12 @@ public class ActiveMQBootstrap
{
try
{
- if (!spawned)
- {
- manager.getActiveMQServer()
- .stop(true);
- manager.stop();
- manager = null;
- server = null;
- killFile.delete();
- }
- else
- {
- killFile.delete();
- Runtime.getRuntime().halt(777);
- }
+ manager.getActiveMQServer()
+ .stop(true);
+ manager.stop();
+ manager = null;
+ server = null;
+ killFile.delete();
}
catch (Exception e)
{
[3/4] activemq-6 git commit: fix the maven plugin to use the jms file
configuration
Posted by ma...@apache.org.
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 <an...@apache.org>
Authored: Fri Jan 16 11:16:38 2015 +0000
Committer: Andy Taylor <an...@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)
[4/4] activemq-6 git commit: Merge branch #65
Posted by ma...@apache.org.
Merge branch #65
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/f99a018a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/f99a018a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/f99a018a
Branch: refs/heads/master
Commit: f99a018a244296f49113b2ec510eaddf8d96e963
Parents: 475f232 e3656db
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Jan 16 12:06:45 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Fri Jan 16 12:06:45 2015 +0000
----------------------------------------------------------------------
.../jms/server/impl/JMSServerManagerImpl.java | 9 ++++---
.../activemq/server/ActiveMQBootstrap.java | 28 +++++++-------------
2 files changed, 16 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
[2/4] activemq-6 git commit: ACTIVEMQ6-14 - fix for removal of
bindings
Posted by ma...@apache.org.
ACTIVEMQ6-14 - fix for removal of bindings
https://issues.apache.org/jira/browse/ACTIVEMQ6-14
the jms server manager code was throwing a npe because of this, this commit addresses that.
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/0123d40c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/0123d40c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/0123d40c
Branch: refs/heads/master
Commit: 0123d40c43c398dcb8fb0d2e8a23627860f9135e
Parents: 0818587
Author: Andy Taylor <an...@apache.org>
Authored: Fri Jan 16 11:12:47 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Fri Jan 16 11:12:47 2015 +0000
----------------------------------------------------------------------
.../activemq/jms/server/impl/JMSServerManagerImpl.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/0123d40c/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
index 020dd36..8edcde4 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerManagerImpl.java
@@ -593,11 +593,14 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
ArrayList<String> bindingsToAdd = new ArrayList<String>();
- for (String bindingsItem : bindings)
+ if (bindings != null)
{
- if (bindToBindings(bindingsItem, destination))
+ for (String bindingsItem : bindings)
{
- bindingsToAdd.add(bindingsItem);
+ if (bindToBindings(bindingsItem, destination))
+ {
+ bindingsToAdd.add(bindingsItem);
+ }
}
}