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/14 13:08:49 UTC
[1/4] activemq-6 git commit: fix maven plugin to wait until stop
thread has been called by making thread non deamon
Repository: activemq-6
Updated Branches:
refs/heads/master c98937c08 -> 260f579c1
fix maven plugin to wait until stop thread has been called by making thread non deamon
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/5595e0a9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/5595e0a9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/5595e0a9
Branch: refs/heads/master
Commit: 5595e0a9fc2ef613beede95676b85417bbdf379d
Parents: 41fed21
Author: Andy Taylor <an...@apache.org>
Authored: Tue Jan 13 15:07:41 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Jan 14 09:09:58 2015 +0000
----------------------------------------------------------------------
.../main/java/org/apache/activemq/server/ActiveMQBootstrap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/5595e0a9/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 49b16c8..ae7ecfb 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
@@ -135,7 +135,7 @@ public class ActiveMQBootstrap
{
restartFile.delete();
}
- final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true);
+ final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", false);
timer.scheduleAtFixedRate(new ServerStopTimerTask(stopFile, killFile, restartFile, timer), 500, 500);
}
}
[2/4] activemq-6 git commit: added data dir exclude for Rat plugin
Posted by ma...@apache.org.
added data dir exclude for Rat plugin
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/41fed219
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/41fed219
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/41fed219
Branch: refs/heads/master
Commit: 41fed219c015080558703601e67098edbecc84fe
Parents: c98937c
Author: Andy Taylor <an...@apache.org>
Authored: Tue Jan 13 10:37:47 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Jan 14 09:09:58 2015 +0000
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/41fed219/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0f861f7..cee5074 100644
--- a/pom.xml
+++ b/pom.xml
@@ -916,6 +916,7 @@
<exclude>etc/org.eclipse.*</exclude>
<exclude>docs/user-manual/en/*.json</exclude>
<exclude>**/target/</exclude>
+ <exclude>**/data/</exclude>
<exclude>**/*.bindings</exclude>
<exclude>**/*.lock</exclude>
<exclude>**/META-INF/services/*</exclude>
[4/4] activemq-6 git commit: Merge branch #62
Posted by ma...@apache.org.
Merge branch #62
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/260f579c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/260f579c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/260f579c
Branch: refs/heads/master
Commit: 260f579c18a2c997c72121aa5f4adc589df5990c
Parents: 0028efb 2c61399
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Jan 14 12:08:22 2015 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Wed Jan 14 12:08:22 2015 +0000
----------------------------------------------------------------------
.../activemq/api/core/client/ClientSession.java | 12 +
.../core/management/ActiveMQServerControl.java | 4 +-
.../core/management/AddressSettingsInfo.java | 24 +-
.../core/client/impl/AddressQueryImpl.java | 11 +-
.../core/client/impl/QueueQueryImpl.java | 20 +
.../core/impl/ActiveMQSessionContext.java | 16 +-
.../core/protocol/core/impl/ChannelImpl.java | 4 +
.../core/protocol/core/impl/PacketDecoder.java | 14 +
.../core/protocol/core/impl/PacketImpl.java | 4 +
.../SessionBindingQueryResponseMessage.java | 9 +-
.../SessionBindingQueryResponseMessage_V2.java | 90 +++
.../SessionQueueQueryResponseMessage.java | 21 +-
.../SessionQueueQueryResponseMessage_V2.java | 130 ++++
.../activemq/core/server/QueueQueryResult.java | 22 +-
.../activemq/utils/LinkedListIterator.java | 2 +-
.../main/resources/activemq-version.properties | 2 +-
.../jms/client/ActiveMQMessageProducer.java | 9 +-
.../activemq/jms/client/ActiveMQSession.java | 37 +-
.../activemq/server/ActiveMQBootstrap.java | 2 +-
.../deployers/impl/FileConfigurationParser.java | 12 +
.../impl/ActiveMQServerControlImpl.java | 8 +-
.../cursor/impl/PageSubscriptionImpl.java | 18 +-
.../core/persistence/QueueBindingInfo.java | 2 +
.../impl/journal/JournalStorageManager.java | 20 +-
.../core/postoffice/AddressManager.java | 3 +
.../activemq/core/postoffice/PostOffice.java | 3 +
.../core/postoffice/impl/PostOfficeImpl.java | 5 +
.../postoffice/impl/SimpleAddressManager.java | 11 +
.../core/ServerSessionPacketHandler.java | 30 +-
.../activemq/core/server/ActiveMQServer.java | 7 +
.../core/server/ActiveMQServerLogger.java | 4 +
.../core/server/AutoCreatedQueueManager.java | 29 +
.../core/server/BindingQueryResult.java | 11 +-
.../org/apache/activemq/core/server/Queue.java | 13 +-
.../activemq/core/server/QueueFactory.java | 3 +-
.../core/server/impl/ActiveMQServerImpl.java | 27 +-
.../impl/AutoCreatedQueueManagerImpl.java | 93 +++
.../impl/BackupRecoveryJournalLoader.java | 2 +-
.../core/server/impl/LastValueQueue.java | 2 +
.../core/server/impl/LiveOnlyActivation.java | 3 +-
.../server/impl/PostOfficeJournalLoader.java | 9 +-
.../core/server/impl/QueueFactoryImpl.java | 5 +-
.../activemq/core/server/impl/QueueImpl.java | 58 +-
.../core/server/impl/ScaleDownHandler.java | 619 +++++++++++--------
.../core/server/impl/ServerSessionImpl.java | 30 +-
.../core/settings/impl/AddressSettings.java | 70 ++-
.../resources/schema/activemq-configuration.xsd | 17 +
.../core/config/impl/FileConfigurationTest.java | 4 +
.../impl/ScheduledDeliveryHandlerTest.java | 13 +-
.../core/settings/AddressSettingsTest.java | 3 +-
.../activemq/tests/util/ServiceTestBase.java | 2 +-
.../resources/ConfigurationTest-full-config.xml | 4 +
docs/user-manual/en/client-classpath.md | 4 +-
docs/user-manual/en/queue-attributes.md | 12 +
examples/core/embedded-remote/pom.xml | 5 -
examples/core/embedded/pom.xml | 5 -
examples/core/perf/pom.xml | 10 -
examples/core/vertx-connector/pom.xml | 10 +-
examples/jms/activemq-ra-rar/pom.xml | 8 +-
examples/jms/aerogear/pom.xml | 1 -
examples/jms/applet/applet.html | 2 +-
examples/jms/bridge/pom.xml | 2 -
.../activemq/jms/example/EmbeddedExample.java | 1 -
examples/jms/ha-policy-autobackup/pom.xml | 2 -
examples/jms/jms-bridge/readme.html | 10 +-
.../activemq/jms/example/JMSBridgeExample.java | 4 +-
examples/jms/perf/pom.xml | 10 +-
examples/jms/pom.xml | 1 -
examples/jms/proton-cpp/pom.xml | 10 +-
examples/jms/stop-server-failover/pom.xml | 2 -
.../jms/example/SymmetricClusterExample.java | 6 +-
examples/jms/xa-heuristic/pom.xml | 5 -
examples/jms/xa-with-jta/pom.xml | 142 -----
examples/jms/xa-with-jta/readme.html | 220 -------
.../activemq/jms/example/XAwithJTAExample.java | 222 -------
.../activemq/server0/activemq-configuration.xml | 54 --
.../resources/activemq/server0/activemq-jms.xml | 28 -
.../activemq/server0/activemq-users.xml | 27 -
.../src/main/resources/jbossts-properties.xml | 175 ------
.../src/main/resources/jndi.properties | 20 -
pom.xml | 5 +-
.../tests/concurrent/server/impl/QueueTest.java | 1 +
.../client/AutoCreateJmsQueueTest.java | 187 ++++++
.../client/AutoDeleteJmsQueueTest.java | 84 +++
.../integration/client/HangConsumerTest.java | 13 +-
.../client/InterruptedLargeMessageTest.java | 10 +-
.../integration/client/PagingOrderTest.java | 8 +-
.../cluster/distribution/ClusterTestBase.java | 6 +-
.../jms/client/TopicCleanupTest.java | 2 +-
.../jms/jms2client/NonExistentQueueTest.java | 2 +-
.../management/ActiveMQServerControlTest.java | 22 +-
.../ActiveMQServerControlUsingCoreTest.java | 8 +-
.../persistence/ExportFormatTest.java | 62 +-
.../integration/server/ScaleDownDirectTest.java | 319 ++++++++++
.../tests/integration/server/ScaleDownTest.java | 62 +-
.../apache/activemq/jms/tests/SessionTest.java | 9 +
.../timing/core/server/impl/QueueImplTest.java | 3 +
.../unit/core/postoffice/impl/FakeQueue.java | 13 +-
.../unit/core/server/impl/QueueImplTest.java | 389 +++---------
.../core/server/impl/fakes/FakePostOffice.java | 7 +
.../server/impl/fakes/FakeQueueFactory.java | 4 +-
101 files changed, 2068 insertions(+), 1719 deletions(-)
----------------------------------------------------------------------
[3/4] activemq-6 git commit: example fixes
Posted by ma...@apache.org.
example fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/2c61399b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/2c61399b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/2c61399b
Branch: refs/heads/master
Commit: 2c61399b1138e7b18fc1e8868dc684a0369c3cd7
Parents: 5595e0a
Author: Andy Taylor <an...@apache.org>
Authored: Tue Jan 13 15:51:16 2015 +0000
Committer: Andy Taylor <an...@apache.org>
Committed: Wed Jan 14 09:11:22 2015 +0000
----------------------------------------------------------------------
.../java/org/apache/activemq/jms/example/EmbeddedExample.java | 1 -
.../apache/activemq/jms/example/SymmetricClusterExample.java | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2c61399b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
index 05f227c..8ef78fa 100644
--- a/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
+++ b/examples/jms/embedded-simple/src/main/java/org/apache/activemq/jms/example/EmbeddedExample.java
@@ -57,7 +57,6 @@ public class EmbeddedExample extends ActiveMQExample
System.out.println("Started Embedded JMS Server");
JMSServerManager jmsServerManager = jmsServer.getJMSServerManager();
- jmsServerManager.addQueueToJndi("exampleQueue", "queue/exampleQueue");
List<String> connectors = new ArrayList<String>();
connectors.add("in-vm");
jmsServerManager.createConnectionFactory("ConnectionFactory", false, JMSFactoryType.CF, connectors, "ConnectionFactory");
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/2c61399b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java
----------------------------------------------------------------------
diff --git a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java
index de4eb5e..235226a 100644
--- a/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java
+++ b/examples/jms/symmetric-cluster/src/main/java/org/apache/activemq/jms/example/SymmetricClusterExample.java
@@ -82,8 +82,10 @@ public class SymmetricClusterExample extends ActiveMQExample
// connection factory directly we avoid having to worry about a JNDI look-up.
// In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without
// having to know about a specific one.
- UDPBroadcastGroupConfiguration udpCfg = new UDPBroadcastGroupConfiguration("231.7.7.7", 9876, null, -1);
- DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(ActiveMQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, ActiveMQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, udpCfg);
+ UDPBroadcastGroupConfiguration udpCfg = new UDPBroadcastGroupConfiguration();
+ udpCfg.setGroupAddress("231.7.7.7").setGroupPort(9876);
+ DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration();
+ groupConfiguration.setBroadcastEndpointFactoryConfiguration(udpCfg);
ConnectionFactory cf = ActiveMQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.CF);