[2/3] activemq-artemis git commit: remove now invalid tests

[clebertsuconic]

remove now invalid tests

Since we are removing the finalize cleanup these tests are now invalid


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

Branch: refs/heads/master
Commit: d9ac06a9074b218387f6c4de7fab4e1d0b81f600
Parents: 945963e
Author: Clebert Suconic 
Authored: Mon Jan 11 19:41:21 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 19:43:31 2016 -0500

--
 .../client/SessionCloseOnGCTest.java| 48 
 1 file changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d9ac06a9/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
index 3f25a47..2f97e32 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
@@ -176,52 +176,4 @@ public class SessionCloseOnGCTest extends ActiveMQTestBase 
{
   locator = null;
   ActiveMQTestBase.checkWeakReferences(fref);
}
-
-   @Test
-   public void testCloseOneSessionOnGC() throws Exception {
-  ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) 
locator.createSessionFactory();
-
-  {
- ClientSession session = sf.createSession(false, true, true);
-
- Assert.assertEquals(1, 
server.getRemotingService().getConnections().size());
-  }
-
-  for (int i = 0; i < 1000 && sf.numSessions() != 0; i++) {
- forceGC();
-  }
-
-  Assert.assertEquals(0, sf.numSessions());
-  Assert.assertEquals(1, sf.numConnections());
-  Assert.assertEquals(1, 
server.getRemotingService().getConnections().size());
-   }
-
-   @Test
-   public void testCloseSeveralSessionOnGC() throws Exception {
-  ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) 
locator.createSessionFactory();
-
-  ClientSession session1 = sf.createSession(false, true, true);
-  ClientSession session2 = sf.createSession(false, true, true);
-  ClientSession session3 = sf.createSession(false, true, true);
-
-  Assert.assertEquals(1, 
server.getRemotingService().getConnections().size());
-
-  WeakReference ref1 = new WeakReference<>(session1);
-  WeakReference ref2 = new WeakReference<>(session2);
-  WeakReference ref3 = new WeakReference<>(session3);
-
-  session1 = null;
-  session2 = null;
-  session3 = null;
-
-  ActiveMQTestBase.checkWeakReferences(ref1, ref2, ref3);
-
-  for (int i = 0; i < 1000 && sf.numSessions() != 0; i++) {
- forceGC();
-  }
-  Assert.assertEquals("# sessions", 0, sf.numSessions());
-  Assert.assertEquals("# connections", 1, sf.numConnections());
-  Assert.assertEquals("# connections in remoting service", 1, 
server.getRemotingService().getConnections().size());
-   }
-
 }

[1/3] activemq-artemis git commit: Remove DelegatingSession class

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master c4837c2c3 -> 663f7f78f


Remove DelegatingSession class

DelegatingSession class wraps ClientSessionImpl and attempts to close
session should it not be closed by the user.  It does this by
implementing finalize.  However, the order in which finalize runs can be
difficult to predict as compilers, and JIT compilers are able to
optimize early.

The current DelegatingSession was causing problems of finalize getting
called early (before consumers, producers were finished with the
session).  This was causing tests to fail on the IBM JDK (which
optimizes early).  The same happens on OpenJDK if the GC is forced.


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

Branch: refs/heads/master
Commit: 945963ed07094723aa38e5f8f423572e0d82e9a3
Parents: c4837c2
Author: Martyn Taylor 
Authored: Mon Jan 11 11:15:39 2016 +
Committer: Clebert Suconic 
Committed: Mon Jan 11 19:43:10 2016 -0500

--
 .../client/impl/ClientSessionFactoryImpl.java   |   6 +-
 .../core/client/impl/DelegatingSession.java | 668 ---
 .../failover/AsynchronousFailoverTest.java  |  10 +-
 .../tests/integration/jms/JmsProducerTest.java  |   3 +-
 4 files changed, 5 insertions(+), 682 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/945963ed/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
index 9df7ed4..135f172 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionFactoryImpl.java
@@ -38,10 +38,10 @@ import 
org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException;
 import org.apache.activemq.artemis.api.core.Interceptor;
 import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.FailoverEventListener;
 import org.apache.activemq.artemis.api.core.client.FailoverEventType;
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.core.client.SessionFailureListener;
 import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
@@ -57,8 +57,8 @@ import 
org.apache.activemq.artemis.spi.core.remoting.Connection;
 import 
org.apache.activemq.artemis.spi.core.remoting.ConnectionLifeCycleListener;
 import org.apache.activemq.artemis.spi.core.remoting.Connector;
 import org.apache.activemq.artemis.spi.core.remoting.ConnectorFactory;
-import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
 import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
+import org.apache.activemq.artemis.spi.core.remoting.TopologyResponseHandler;
 import org.apache.activemq.artemis.utils.ClassloadingUtil;
 import org.apache.activemq.artemis.utils.ConcurrentHashSet;
 import org.apache.activemq.artemis.utils.ConfirmationWindowWarning;
@@ -663,7 +663,7 @@ public class ClientSessionFactoryImpl implements 
ClientSessionFactoryInternal, C
  sessions.add(session);
   }
 
-  return new DelegatingSession(session);
+  return session;
 
}
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/945963ed/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
deleted file mode 100644
index 087a150..000
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/DelegatingSession.java
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license 

[3/3] activemq-artemis git commit: This closes #308

[clebertsuconic]

This closes #308


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

Branch: refs/heads/master
Commit: 663f7f78f2e8f1b0f54c5f49c9812e0bb32ed72c
Parents: c4837c2 d9ac06a
Author: Clebert Suconic 
Authored: Mon Jan 11 19:45:37 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 19:45:37 2016 -0500

--
 .../client/impl/ClientSessionFactoryImpl.java   |   6 +-
 .../core/client/impl/DelegatingSession.java | 668 ---
 .../client/SessionCloseOnGCTest.java|  48 --
 .../failover/AsynchronousFailoverTest.java  |  10 +-
 .../tests/integration/jms/JmsProducerTest.java  |   3 +-
 5 files changed, 5 insertions(+), 730 deletions(-)
--

svn commit: r977516 - in /websites/production/activemq/content: cache/main.pageCache cross-language-clients.html

[buildbot]

Author: buildbot
Date: Tue Jan 12 00:21:32 2016
New Revision: 977516

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/cross-language-clients.html

Modified: websites/production/activemq/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/activemq/content/cross-language-clients.html
==
--- websites/production/activemq/content/cross-language-clients.html (original)
+++ websites/production/activemq/content/cross-language-clients.html Tue Jan 12 
00:21:32 2016
@@ -72,7 +72,7 @@
   
 
 
-Apache ActiveMQ is a message broker 
written in Java together with a full JMS client, however it supports protocols 
likeOpenWireandSTOMPthat can be used by applications 
in other languages.Client 
Librarieshttp://activemq.apache.org/nms/;>.NEThttp://docs.codehaus.org/display/STOMP/C; 
style="line-height: 1.42857;" rel="nofollow">C(defunct)http://activemq.apache.org/cms/;>C++https://github.com/igb/Erlang-STOMP-Client; 
style="line-height: 1.42857;" rel="nofollow">ErlangGohttps://github.com/toschoo/mom/; rel="nofollow">Haskellhttps://code.google.com/p/hxstomp/; 
rel="nofollow">Haxe (defunct)https://github.com/fribeiro1/jekpro-activemq-library; style="line-height: 
1.42857;" rel="nofollow">Jekejeke Prologhttps://github.com/fribeiro1/ActiveMQ-Extension; 
style="line-height: 1.42857;" rel="nofollow">NetLogohttp://search.cpan.org/~lcons/Net-STOMP-Client/; style="line-height: 
1.42857;" rel="nofollow">Perl 5https://github.com/hww3/pike_modules-public_protocols_stomp; 
style="line-height: 1.42857;" rel="nofollow">Pikehttps://github.com/jasonrbriggs/stomp.py/; 
rel="nofollow">Pythonhttps://github.com/tonyg/racket-stomp; style="line-height: 1.42857;" 
rel="nofollow">Rackethttps://github.com/kookster/activemessaging; rel="nofollow">Ruby on 
Railshttps://github.com/siemens/tstomp; style="line-height: 1.42857;" 
rel="nofollow">Tcl/TkProtocolsThe following protocols 
may be used for interoperability:AMQPMQTTOpenWireRESTSTOMPWebSocketSamplesLanguageVariantVMInterfaceProtocolCodeAwkGawkNoneSocketsSTOMPhttps://simplesassim.wordpress.com/2014/03/06/how-to-send-a-message-to-an-apache-activemq-queue-with-gawk/;
 rel="nofollow">Send to Queuehref="https://simplesassim.wordpress.com/2014/03/06/how-to-send-a-message-to-an-apache-activemq-topic-with-gawk/;
 > rel="nofollow">Send to Topicclass="external-link" 
 >href="https://simplesassim.wordpress.com/2014/03/06/how-to-receive-a-message-from-an-apache-activemq-queue-with-gawk/;
 > rel="nofollow">Receive from Queueclass="external-link" 
 >href="https://simplesassim.wordpress.com/2014/03/06/how-to-receive-a-message-from-an-apache-activemq-topic-with-gawk/;
 > rel="nofollow">Receive from Topicrowspan="1" class="confluenceTd">Cclass="confluenceTd">Noneclass="confluenceTd">Noneclass="confluenceTd">Client Libraryrowspan="1" class="confluenceTd">STOMPclass="confluenceTd">https://simplesassim.wordpress.com/2014/02/23/how-to-send-a-message-to-an-apache-activemq-queue-with-c/;
 rel="nofollow">Send to Queuehttps://simplesassim.wordpress.com/2014/02/23/how-to-send-a-message-to-an-apache-activemq-topic-with-c/;
 rel="nofollow">Send to Topichttps://simplesassim.wordpress.com/2014/02/23/how-to-receive-a-message-from-an-apache-activemq-queue-with-c/;
 rel="nofollow">Receive from Queuehttps://simplesassim.wordpress.com/2014/02/23/how-to-receive-a-message-from-an-apache-activemq-topic-with-c/;
 rel="nofollow">Receive from TopicCOBOLGNU COBOLNoneSocketsSTOMPhttps://simplesassim.wordpress.com/2014/04/15/how-to-send-a-message-to-an-apache-activemq-queue-with-gnu-cobol/;
 rel="nofollow">Send to Queuehttps://simplesassim.wordpress.com/2014/04/15/how-to-send-a-message-to-an-apache-activemq-topic-with-gnu-cobol/;
 rel="nofollow">Send to Topichttps://simplesassim.wordpress.com/2014/04/17/how-to-receive-a-message-from-an-apache-activemq-queue-with-gnu-cobol/;
 rel="nofollow">Receive from Queuehttps://simplesassim.wordpress.com/2014/04/17/how-to-receive-a-message-from-an-apache-activemq-topic-with-gnu-cobol/;
 rel="nofollow">Receive from TopicCOBOLVisual COBOLJVMClient LibraryOpenWirehttps://simplesassim.wordpress.com/2013/11/12/how-to-send-a-message-to-an-apache-activemq-queue-with-visual-cobol/;
 rel="nofollow">Send to Queuehttps://simplesassim.wordpress.com/2013/11/12/how-to-send-a-message-to-an-apache-activemq-topic-with-visual-cobol/;
 rel="nofollow">Send to Topichttps://simplesassim.wordpress.com/2013/11/13/how-to-receive-a-message-from-an-apache-activemq-queue-with-visual-cobol/;
 rel="nofollow">Receive from Queuehttps://simplesassim.wordpress.com/2013/11/13/how-to-receive-a-message-from-an-apache-activemq-topic-with-visual-cobol/;
 rel="nofollow">Receive from TopicCeylonNoneJVMClient 

Build failed in Jenkins: ActiveMQ-Artemis-Master #292

[Apache Jenkins Server]

See 

Changes:

[clebertsuconic] Remove DelegatingSession class

[clebertsuconic] remove now invalid tests

--
[...truncated 18842 lines...]
01:12:49,893 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Finished test: 
testJMSTimestampOnSelector()...
01:12:49,893 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Starting test: 
testSelectiveClosingConsumer()...
01:12:49,905 INFO  [org.apache.activemq.artemis.jms.tests] sent message
01:12:52,908 INFO  [org.apache.activemq.artemis.jms.tests] closed first consumer
01:12:52,912 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Finished test: 
testSelectiveClosingConsumer()...
01:12:52,913 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Starting test: 
testJMSPriorityOnSelector()...
01:12:52,923 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Finished test: 
testJMSPriorityOnSelector()...
01:12:52,924 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Starting test: 
testWithSelector()...
01:12:55,452 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Finished test: 
testWithSelector()...
01:12:55,453 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Starting test: 
testJMSTypeOnSelector()...
01:12:55,492 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Finished test: 
testJMSTypeOnSelector()...
01:12:55,493 INFO  [org.apache.activemq.artemis.jms.tests] #*#*# Starting test: 
testManyQueue()...
01:12:57,175 INFO  [org.apache.activemq.artemis.jms.tests] Got message 0
01:12:57,175 INFO  [org.apache.activemq.artemis.jms.tests] Got message 1
01:12:57,176 INFO  [org.apache.activemq.artemis.jms.tests] Got message 2
01:12:57,176 INFO  [org.apache.activemq.artemis.jms.tests] Got message 3
01:12:57,177 INFO  [org.apache.activemq.artemis.jms.tests] Got message 4
01:12:57,177 INFO  [org.apache.activemq.artemis.jms.tests] Got message 5
01:12:57,177 INFO  [org.apache.activemq.artemis.jms.tests] Got message 6
01:12:57,178 INFO  [org.apache.activemq.artemis.jms.tests] Got message 7
01:12:57,178 INFO  [org.apache.activemq.artemis.jms.tests] Got message 8
01:12:57,178 INFO  [org.apache.activemq.artemis.jms.tests] Got message 9
01:12:57,179 INFO  [org.apache.activemq.artemis.jms.tests] Got message 10
01:12:57,179 INFO  [org.apache.activemq.artemis.jms.tests] Got message 11
01:12:57,179 INFO  [org.apache.activemq.artemis.jms.tests] Got message 12
01:12:57,180 INFO  [org.apache.activemq.artemis.jms.tests] Got message 13
01:12:57,180 INFO  [org.apache.activemq.artemis.jms.tests] Got message 14
01:12:57,180 INFO  [org.apache.activemq.artemis.jms.tests] Got message 15
01:12:57,181 INFO  [org.apache.activemq.artemis.jms.tests] Got message 16
01:12:57,181 INFO  [org.apache.activemq.artemis.jms.tests] Got message 17
01:12:57,181 INFO  [org.apache.activemq.artemis.jms.tests] Got message 18
01:12:57,182 INFO  [org.apache.activemq.artemis.jms.tests] Got message 19
01:12:57,182 INFO  [org.apache.activemq.artemis.jms.tests] Got message 20
01:12:57,182 INFO  [org.apache.activemq.artemis.jms.tests] Got message 21
01:12:57,183 INFO  [org.apache.activemq.artemis.jms.tests] Got message 22
01:12:57,183 INFO  [org.apache.activemq.artemis.jms.tests] Got message 23
01:12:57,183 INFO  [org.apache.activemq.artemis.jms.tests] Got message 24
01:12:57,183 INFO  [org.apache.activemq.artemis.jms.tests] Got message 25
01:12:57,184 INFO  [org.apache.activemq.artemis.jms.tests] Got message 26
01:12:57,184 INFO  [org.apache.activemq.artemis.jms.tests] Got message 27
01:12:57,184 INFO  [org.apache.activemq.artemis.jms.tests] Got message 28
01:12:57,184 INFO  [org.apache.activemq.artemis.jms.tests] Got message 29
01:12:57,185 INFO  [org.apache.activemq.artemis.jms.tests] Got message 30
01:12:57,185 INFO  [org.apache.activemq.artemis.jms.tests] Got message 31
01:12:57,185 INFO  [org.apache.activemq.artemis.jms.tests] Got message 32
01:12:57,185 INFO  [org.apache.activemq.artemis.jms.tests] Got message 33
01:12:57,186 INFO  [org.apache.activemq.artemis.jms.tests] Got message 34
01:12:57,186 INFO  [org.apache.activemq.artemis.jms.tests] Got message 35
01:12:57,186 INFO  [org.apache.activemq.artemis.jms.tests] Got message 36
01:12:57,186 INFO  [org.apache.activemq.artemis.jms.tests] Got message 37
01:12:57,186 INFO  [org.apache.activemq.artemis.jms.tests] Got message 38
01:12:57,187 INFO  [org.apache.activemq.artemis.jms.tests] Got message 39
01:12:57,187 INFO  [org.apache.activemq.artemis.jms.tests] Got message 40
01:12:57,187 INFO  [org.apache.activemq.artemis.jms.tests] Got message 41
01:12:57,187 INFO  [org.apache.activemq.artemis.jms.tests] Got message 42
01:12:57,188 INFO  [org.apache.activemq.artemis.jms.tests] Got message 43
01:12:57,188 INFO  [org.apache.activemq.artemis.jms.tests] Got message 44
01:12:57,188 INFO  [org.apache.activemq.artemis.jms.tests] Got message 45
01:12:57,188 INFO  [org.apache.activemq.artemis.jms.tests] Got message 46
01:12:57,189 INFO  

Jenkins build is still unstable: ActiveMQ-Java7 » ActiveMQ :: Unit Tests #912

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java7 #912

[Apache Jenkins Server]

See 

Jenkins build became unstable: ActiveMQ-Java7 » ActiveMQ :: Generic JMS Pool #912

[Apache Jenkins Server]

See 

[2/3] activemq-artemis git commit: Dealing with expected IBM JDK thread and refactoring the Thread check as a Rule

[clebertsuconic]

Dealing with expected IBM JDK thread and refactoring the Thread check as a Rule


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

Branch: refs/heads/master
Commit: e56ca95fdc9f813b339e6cb182a94f833161202f
Parents: 4e5ec13
Author: Clebert Suconic 
Authored: Mon Jan 11 16:11:19 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 20:02:46 2016 -0500

--
 .../artemis/tests/util/ActiveMQTestBase.java| 130 +
 .../artemis/tests/util/ThreadLeakCheckRule.java | 189 +++
 ...MDBMultipleHandlersServerDisconnectTest.java |   2 +-
 .../broadcast/JGroupsBroadcastTest.java |  12 +-
 4 files changed, 200 insertions(+), 133 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e56ca95f/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
--
diff --git 
a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
 
b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 4e0c35f..bd2a156 100644
--- 
a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ 
b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -143,6 +143,9 @@ import org.junit.runner.Description;
  */
 public abstract class ActiveMQTestBase extends Assert {
 
+   @Rule
+   public ThreadLeakCheckRule leakCheckRule = new ThreadLeakCheckRule();
+
public static final String TARGET_TMP = "./target/tmp";
public static final String INVM_ACCEPTOR_FACTORY = 
InVMAcceptorFactory.class.getCanonicalName();
public static final String INVM_CONNECTOR_FACTORY = 
InVMConnectorFactory.class.getCanonicalName();
@@ -173,10 +176,8 @@ public abstract class ActiveMQTestBase extends Assert {
private final Collection otherComponents = new 
HashSet<>();
private final Set executorSet = new HashSet<>();
 
-   private boolean checkThread = true;
private String testDir;
private int sendMsgCount = 0;
-   private Map previousThreads;
 
@Rule
public TestName name = new TestName();
@@ -306,46 +307,6 @@ public abstract class ActiveMQTestBase extends Assert {
 }
  }
 
- if (checkThread) {
-StringBuffer buffer = null;
-
-boolean failed = true;
-
-boolean failedOnce = false;
-
-long timeout = System.currentTimeMillis() + 6;
-while (failed && timeout > System.currentTimeMillis()) {
-   buffer = new StringBuffer();
-
-   failed = checkThread(buffer);
-
-   if (failed) {
-  failedOnce = true;
-  forceGC();
-  Thread.sleep(500);
-  log.info("There are still threads running, trying again");
-  System.out.println(buffer);
-   }
-}
-
-if (failed) {
-   logAndSystemOut("Thread leaked on test " + 
this.getClass().getName() + "::" + this.getName() + "\n" +
-  buffer);
-   logAndSystemOut("Thread leakage! Failure!!!");
-
-   fail("Thread leaked");
-}
-else if (failedOnce) {
-   System.out.println(" Threads cleared after 
retries ");
-   System.out.println();
-}
-
-
- }
- else {
-checkThread = true;
- }
-
  if (Thread.currentThread().getContextClassLoader() == null) {
 
Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
 fail("Thread Context ClassLoader was set to null at some point 
before this test. We will set to this.getClass().getClassLoader(), but you are 
supposed to fix your tests");
@@ -370,8 +331,6 @@ public abstract class ActiveMQTestBase extends Assert {
 
   // checkFreePort(TransportConstants.DEFAULT_PORT);
 
-  previousThreads = Thread.getAllStackTraces();
-
   logAndSystemOut("#test " + getName());
}
 
@@ -401,7 +360,7 @@ public abstract class ActiveMQTestBase extends Assert {
}
 
protected void disableCheckThread() {
-  checkThread = false;
+  leakCheckRule.disable();
}
 
protected String getName() {
@@ -1960,87 +1919,6 @@ public abstract class ActiveMQTestBase extends Assert {
   }
}
 
-   /**
-* @param buffer
-

[1/3] activemq-artemis git commit: fixing checkstyle

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 663f7f78f -> e847c14b9


fixing checkstyle


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

Branch: refs/heads/master
Commit: 4e5ec13558044e351e2eaca92a3f491a14e99e1b
Parents: 663f7f7
Author: Clebert Suconic 
Authored: Mon Jan 11 20:02:29 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 20:02:45 2016 -0500

--
 .../artemis/tests/integration/client/SessionCloseOnGCTest.java | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4e5ec135/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
index 2f97e32..a429a88 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseOnGCTest.java
@@ -21,10 +21,8 @@ import java.lang.ref.WeakReference;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
 import org.apache.activemq.artemis.api.core.client.ServerLocator;
-import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 

[3/3] activemq-artemis git commit: using double quotes otherwise Idea can't run the tests properly

[clebertsuconic]

using double quotes otherwise Idea can't run the tests properly


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

Branch: refs/heads/master
Commit: e847c14b942dd22169dac170b9298accbc8ab521
Parents: e56ca95
Author: Clebert Suconic 
Authored: Mon Jan 11 18:57:24 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 20:02:46 2016 -0500

--
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e847c14b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ce35540..fcbf91b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,8 +118,8 @@
   -->
 
   
-Djava.util.logging.manager=org.jboss.logmanager.LogManager
- 
-Dlogging.configuration='file:${activemq.basedir}/tests/config/logging.properties'
- -Djava.library.path='${activemq.basedir}/artemis-native/bin/' 
-Djgroups.bind_addr=localhost 
-Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost
+ 
-Dlogging.configuration="file:${activemq.basedir}/tests/config/logging.properties"
+ -Djava.library.path="${activemq.basedir}/artemis-native/bin" 
-Djgroups.bind_addr=localhost 
-Dorg.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory.localBindAddress=localhost
  -Djava.net.preferIPv4Stack=true
   
   ${project.basedir}

buildbot failure in ASF Buildbot on activemq-site-production

[buildbot]

The Buildbot has detected a new failure on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4687

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot

Jenkins build is still unstable: ActiveMQ-Java7-All-UnitTests #319

[Apache Jenkins Server]

See 

Jenkins build is back to normal : ActiveMQ-Artemis-Master #293

[Apache Jenkins Server]

See 

activemq-artemis git commit: fixing hanging test

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master e847c14b9 -> c945879de


fixing hanging test


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

Branch: refs/heads/master
Commit: c945879dec3c7291969683e9adc7e2a8fd0f4742
Parents: e847c14
Author: Clebert Suconic 
Authored: Mon Jan 11 21:00:48 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 21:00:48 2016 -0500

--
 .../tests/integration/client/IncompatibleVersionTest.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c945879d/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
index fb4b4e6..21905df 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
@@ -87,12 +87,12 @@ public class IncompatibleVersionTest extends 
ActiveMQTestBase {
 
@Override
@After
-   public void tearDown() {
+   public void tearDown() throws Exception {
   connection.destroy();
 
   closeServerLocator(locator);
   stopComponent(server);
-  // You CANNOT CALL super.tearDown();
+  super.tearDown();
}
 
@Test

[1/2] activemq-artemis git commit: This closes #309

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master ee962dc13 -> 5fe1fa653


This closes #309


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

Branch: refs/heads/master
Commit: 5fe1fa6531fa2ebf3fce875f54af8260b21a2eb0
Parents: ee962dc 1ad37ea
Author: Clebert Suconic 
Authored: Mon Jan 11 22:56:50 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 22:56:50 2016 -0500

--
 .../java/org/apache/activemq/artemis/cli/commands/Create.java  | 6 --
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-336 don't hard-code instance path

[clebertsuconic]

ARTEMIS-336 don't hard-code instance path


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

Branch: refs/heads/master
Commit: 1ad37ea2b17daa2bdb90cd865761ad6b0b7e40e6
Parents: ee962dc
Author: jbertram 
Authored: Mon Jan 11 20:16:33 2016 -0600
Committer: Clebert Suconic 
Committed: Mon Jan 11 22:56:50 2016 -0500

--
 .../java/org/apache/activemq/artemis/cli/commands/Create.java  | 6 --
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile   | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ad37ea2/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 23e0fd1..0a95041 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -575,7 +575,6 @@ public class Create extends InputAbstract {
  new File(directory, ETC_LOGIN_CONFIG_WITHOUT_GUEST).renameTo(new 
File(directory, ETC_LOGIN_CONFIG));
   }
 
-  filters.put("${login-config}", "-Djava.security.auth.login.config=" + 
path(directory, false) + "/etc/login.config");
   write(ETC_ARTEMIS_ROLES_PROPERTIES, filters, false);
 
   if (IS_WINDOWS) {
@@ -604,10 +603,13 @@ public class Create extends InputAbstract {
 
   performAutoTune(filters, aio, dataFolder);
 
-  write(ETC_BOOTSTRAP_XML, filters, false);
   write(ETC_BROKER_XML, filters, false);
   write(ETC_ARTEMIS_USERS_PROPERTIES, filters, false);
 
+  // we want this variable to remain unchanged so that it will use the 
value set in the profile
+  filters.remove("${artemis.instance}");
+  write(ETC_BOOTSTRAP_XML, filters, false);
+
   context.out.println("");
   context.out.println("You can now start the broker by executing:  ");
   context.out.println("");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ad37ea2/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index c6ceeef..f734691 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -16,6 +16,7 @@
 # under the License.
 
 ARTEMIS_HOME='${artemis.home}'
+ARTEMIS_INSTANCE='${artemis.instance}'
 
 # Cluster Properties: Used to pass arguments to ActiveMQ Artemis which can be 
referenced in broker.xml
 #ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 
-Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 
-Dactivemq.remoting.hornetq.port=5446"
@@ -23,7 +24,7 @@ ARTEMIS_HOME='${artemis.home}'
 
 
 # Java Opts
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods 
-Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} 
${login-config} ${java-opts}"
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods 
-Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} 
-Djava.security.auth.login.config=$ARTEMIS_INSTANCE/etc/login.config 
${java-opts} -Dartemis.instance=$ARTEMIS_INSTANCE"
 
 
 # Debug args: Uncomment to enable debug

activemq-artemis git commit: fixing missing tearDown call

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master c945879de -> ee962dc13


fixing missing tearDown call


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

Branch: refs/heads/master
Commit: ee962dc13715905a38aa628b2d12fd10658a543a
Parents: c945879
Author: Clebert Suconic 
Authored: Mon Jan 11 22:51:31 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 22:51:31 2016 -0500

--
 .../artemis/tests/integration/mqtt/imported/MQTTTestSupport.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ee962dc1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index 2e37110..61fcec0 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -114,6 +114,7 @@ public class MQTTTestSupport extends ActiveMQTestBase {
   System.clearProperty("javax.net.ssl.keyStorePassword");
   System.clearProperty("javax.net.ssl.keyStoreType");
   stopBroker();
+  super.tearDown();
}
 
public void startBroker() throws Exception {

buildbot success in ASF Buildbot on activemq-site-production

[buildbot]

The Buildbot has detected a restored build on builder activemq-site-production 
while building ASF Buildbot. Full details are available at:
http://ci.apache.org/builders/activemq-site-production/builds/4688

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-cms-slave

Build Reason: The Nightly scheduler named 'activemq-site-production' triggered 
this build
Build Source Stamp: [branch activemq/activemq-website] HEAD
Blamelist: 

Build succeeded!

Sincerely,
 -The Buildbot

[2/2] activemq git commit: Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations

[gtully]

Network of brokers on duplex mode reports InstanceAlreadyExistsException on 
already existing destinations


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

Branch: refs/heads/master
Commit: 6b1e87410da4a2033c286fcaa758371e48da62ec
Parents: 8f6baf8
Author: Altaflux 
Authored: Mon Jan 4 15:00:00 2016 -0600
Committer: gtully 
Committed: Mon Jan 11 12:59:33 2016 +

--
 .../network/MBeanBridgeDestination.java | 144 ++-
 .../network/DuplexNetworkMBeanTest.java | 100 +++--
 2 files changed, 162 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/6b1e8741/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
index bab5574..888d295 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
@@ -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
- *
+ * 
+ * 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.
@@ -16,12 +16,6 @@
  */
 package org.apache.activemq.network;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.management.ObjectName;
-
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.jmx.AnnotatedMBean;
 import org.apache.activemq.broker.jmx.BrokerMBeanSupport;
@@ -33,6 +27,11 @@ import org.apache.activemq.thread.Scheduler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.management.ObjectName;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
 public class MBeanBridgeDestination {
 private static final Logger LOG = 
LoggerFactory.getLogger(MBeanBridgeDestination.class);
 private final BrokerService brokerService;
@@ -41,9 +40,8 @@ public class MBeanBridgeDestination {
 private final NetworkBridgeConfiguration networkBridgeConfiguration;
 private final Scheduler scheduler;
 private final Runnable purgeInactiveDestinationViewTask;
-private Map destinationObjectNameMap = 
new ConcurrentHashMap();
-private Map 
outboundDestinationViewMap = new ConcurrentHashMap();
-private Map 
inboundDestinationViewMap = new ConcurrentHashMap();
+private final Map 
outboundDestinationViewMap = new ConcurrentHashMap<>();
+private final Map 
inboundDestinationViewMap = new ConcurrentHashMap<>();
 
 public MBeanBridgeDestination(BrokerService brokerService, 
NetworkBridgeConfiguration networkBridgeConfiguration, NetworkBridge bridge, 
NetworkBridgeView networkBridgeView) {
 this.brokerService = brokerService;
@@ -61,49 +59,48 @@ public class MBeanBridgeDestination {
 
 public void onOutboundMessage(Message message) {
 ActiveMQDestination destination = message.getDestination();
-NetworkDestinationView networkDestinationView = 
outboundDestinationViewMap.get(destination);
-if (networkDestinationView == null) {
-synchronized (destinationObjectNameMap) {
-if ((networkDestinationView = 
outboundDestinationViewMap.get(destination)) == null) {
-ObjectName bridgeObjectName = bridge.getMbeanObjectName();
-try {
-ObjectName objectName = 
BrokerMBeanSupport.createNetworkOutBoundDestinationObjectName(bridgeObjectName, 
destination);
-networkDestinationView = new 
NetworkDestinationView(networkBridgeView, 

[1/2] activemq git commit: Network of brokers on duplex mode reports InstanceAlreadyExistsException on already existing destinations https://issues.apache.org/jira/browse/AMQ-6052 closes #164

[gtully]

Repository: activemq
Updated Branches:
  refs/heads/master 8f6baf818 -> 3bb7e4a5c


Network of brokers on duplex mode reports InstanceAlreadyExistsException on 
already existing destinations
https://issues.apache.org/jira/browse/AMQ-6052
closes #164


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

Branch: refs/heads/master
Commit: 3bb7e4a5c8497c8259a267e2eb11dddb8615a1ea
Parents: 6b1e874
Author: Altaflux 
Authored: Mon Jan 4 15:03:26 2016 -0600
Committer: gtully 
Committed: Mon Jan 11 12:59:33 2016 +

--
 .../org/apache/activemq/network/MBeanBridgeDestination.java| 6 +++---
 .../org/apache/activemq/network/DuplexNetworkMBeanTest.java| 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/3bb7e4a5/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
 
b/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
index 888d295..479e382 100644
--- 
a/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/network/MBeanBridgeDestination.java
@@ -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
- * 
+ *
+ *  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.

http://git-wip-us.apache.org/repos/asf/activemq/blob/3bb7e4a5/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
index 1efb393..3736f7d 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
@@ -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
- * 
+ *
+ *  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.

activemq git commit: Polished

[davsclaus]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.12.x 5f0064622 -> b21ad1a0f


Polished


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

Branch: refs/heads/activemq-5.12.x
Commit: b21ad1a0f912e9147d5bdb21d11583bfb1386b30
Parents: 5f00646
Author: Claus Ibsen 
Authored: Mon Jan 11 13:34:48 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Jan 11 13:36:04 2016 +0100

--
 .../org/apache/activemq/camel/component/ActiveMQEndpoint.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/b21ad1a0/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
--
diff --git 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
index 1268f61..b5ab883 100644
--- 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
+++ 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
@@ -21,7 +21,9 @@ import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
 /**
- * ActiveMQ endpoint.
+ * The activemq component allows messages to be sent to (or consumed from) 
Apache ActiveMQ.
+ *
+ * This component extends the Camel JMS component.
  */
 @UriEndpoint(scheme = "activemq", title = "ActiveMQ", syntax = 
"activemq:destinationType:destinationName", consumerClass = JmsConsumer.class, 
label = "messaging")
 public class ActiveMQEndpoint extends JmsEndpoint {

[2/2] activemq git commit: Polished

[davsclaus]

Polished


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

Branch: refs/heads/activemq-5.13.x
Commit: a558f8d4f197f0f83a91f8f7e5dc9653d5c24707
Parents: 2f06248
Author: Claus Ibsen 
Authored: Mon Jan 11 13:34:48 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Jan 11 13:35:32 2016 +0100

--
 .../org/apache/activemq/camel/component/ActiveMQEndpoint.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/a558f8d4/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
--
diff --git 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
index 1268f61..b5ab883 100644
--- 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
+++ 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
@@ -21,7 +21,9 @@ import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
 /**
- * ActiveMQ endpoint.
+ * The activemq component allows messages to be sent to (or consumed from) 
Apache ActiveMQ.
+ *
+ * This component extends the Camel JMS component.
  */
 @UriEndpoint(scheme = "activemq", title = "ActiveMQ", syntax = 
"activemq:destinationType:destinationName", consumerClass = JmsConsumer.class, 
label = "messaging")
 public class ActiveMQEndpoint extends JmsEndpoint {

[1/2] activemq git commit: Polished

[davsclaus]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.13.x 2f062488c -> a558f8d4f
  refs/heads/master 5f8a3df5a -> 8f6baf818


Polished


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

Branch: refs/heads/master
Commit: 8f6baf81885793a8615fde946674a61340ec4e91
Parents: 5f8a3df
Author: Claus Ibsen 
Authored: Mon Jan 11 13:34:48 2016 +0100
Committer: Claus Ibsen 
Committed: Mon Jan 11 13:34:48 2016 +0100

--
 .../org/apache/activemq/camel/component/ActiveMQEndpoint.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/8f6baf81/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
--
diff --git 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
index 1268f61..b5ab883 100644
--- 
a/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
+++ 
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/ActiveMQEndpoint.java
@@ -21,7 +21,9 @@ import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
 /**
- * ActiveMQ endpoint.
+ * The activemq component allows messages to be sent to (or consumed from) 
Apache ActiveMQ.
+ *
+ * This component extends the Camel JMS component.
  */
 @UriEndpoint(scheme = "activemq", title = "ActiveMQ", syntax = 
"activemq:destinationType:destinationName", consumerClass = JmsConsumer.class, 
label = "messaging")
 public class ActiveMQEndpoint extends JmsEndpoint {

svn commit: r11871 - /release/activemq/5.12.2/

[tabish]

Author: tabish
Date: Mon Jan 11 14:56:44 2016
New Revision: 11871

Log:
Adding the 5.12.2 release

Added:
release/activemq/5.12.2/
release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip   (with 
props)
release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.asc
release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.md5
release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.sha1
release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz   (with props)
release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.asc
release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.md5
release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.sha1
release/activemq/5.12.2/apache-activemq-5.12.2-bin.zip   (with props)
release/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.asc
release/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.md5
release/activemq/5.12.2/apache-activemq-5.12.2-bin.zip.sha1

Added: release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip
==
Binary file - no diff available.

Propchange: release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip
--
svn:mime-type = application/octet-stream

Added: release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.asc
==
--- release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.asc 
(added)
+++ release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.asc Mon 
Jan 11 14:56:44 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCgAGBQJWi+WKAAoJEIen91pqi6X8t2YP/3lG0ZF6sYLncJ4YMa4yyCCr
+4syL2T9IN5eqNCeJTWVjy0yDi2eiZef/zrS6TVwaOeTmJHTdrBi8IfbOfjxS8jfo
+D/JugJPh/OM+8LDymLd1mn1DZx+Ru36LWAY05xFUNXvc7r1qvS+jaG+lu7zlC+iT
+5GqiU7EdW28kFEkqdn1XDNOzg1BzGguVT3yecFstBvypavugASq/jkeXvd/Aa/px
+DJ8y+5PxcLHKDfoTw7BHTr0VL549L99aaVsS3hDhtjw8IJslQCFoyNhTAEhNCA+1
+kkB4iVmpX66ZGmZsUt2Jb+hKu58DtiVuJVWE9GnCTBPpH2z+a4kRpD1dRdCyE5FW
+Udl/3DqL7Brsv0SzgyUx6Ukvc7ujzEA2KA9FnjQ7Y+rXJ5/WHyPqrNMzIu7nRu7E
++84QKS4LfPO/b0fIPlyZKwG0P46w8ac2b9jKqYkFWjmpvvtL4H6R4MxA7+NgegAH
+j/8+65/e1c+kCcQV5IOJ1fMFy8AxEXbCdYIkFSbGm7Xz6ehuZYRuSN+vARv6YgOU
+Kwte9suLXs/q5inLpyL5lbR+q/KSxeXOOpTai7n66toVudrgOEh+MFX4QomrFCG6
+xPlxwYUY3MJoYJPRMMuuOmFZh6ErxdlWohyZiyA+hcrEChzhZu6nLY29yXGGOAIk
++24hPm3rRIVMnoCRMUvU
+=LCTu
+-END PGP SIGNATURE-

Added: release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.md5
==
--- release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.md5 
(added)
+++ release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.md5 Mon 
Jan 11 14:56:44 2016
@@ -0,0 +1 @@
+35114f59402fba3659949201bff5f2b0
\ No newline at end of file

Added: release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.sha1
==
--- release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.sha1 
(added)
+++ release/activemq/5.12.2/activemq-parent-5.12.2-source-release.zip.sha1 Mon 
Jan 11 14:56:44 2016
@@ -0,0 +1 @@
+7eac2980572242c0331f2f656437a452e54741e0
\ No newline at end of file

Added: release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz
==
Binary file - no diff available.

Propchange: release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.asc
==
--- release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.asc (added)
+++ release/activemq/5.12.2/apache-activemq-5.12.2-bin.tar.gz.asc Mon Jan 11 
14:56:44 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABCgAGBQJWi+qaAAoJEIen91pqi6X8B4cP/1tCkTbQHaC8no77ESRM1d/q
+Dp5c2jt6gXJlF2o6BbLUts6vzt7CTzfVTLYBmlLP3VW0jo/Lx376jtfi98VB9WZ6
+At2CjhJUjAl8bXrM4JhlmI3jDRvFOC97NHf2SxBNkDK5QKl49u/iG4gCAUzEyzEd
+4mBvR9FLON1iFzD+NC9Rt/rRyKoT0DTu6AqSsfHKzNZsgLuK1IZrho2pEJdJS7nq
+LtIO/knxs5N8kHFLMaDQ6iVVd0bncMVm0Hnzl/gEiCyQ3Oux1UphUzGmVsQr5Inh
+c741oAUoWRizSe5DW/lbm7ZX5MA1RXSn+ADSbQO0SpeOcI0gIP8CgwIMwjBytJxh
+2Ysql6YbT/cei+Zj1p7lJTtE+mSVdtY1sQgoymtp2YkCbGMAHsLTnTb8D5bJjyJH
+xR9jeXhHU94yD1wOUgbNpef3RA771ayaUe22UJVMJjc5rB4wSWr9fXvj82kIoVOt
+YzlUtCLGRTWCoMThQROKSKp/xJYNPUFPnTMcn1hhN98wH4OVPB81anhkXmnf64vu
+jNiXHR+C8wb8s1aLUkfMW+vVHvuYQUYTR4HCtW4eF4CEMBwtZgwzgZrSiSeP1OAB
+ARUWKSxh3E2pBCfZKgDGg7D7+sFTFowCKj5wkWXI3giJFWQyBZndHwwjTeZ6WVBH
+bzuh2x6fK+dr3N/3bK0F
+=egLP
+-END PGP SIGNATURE-

Added: 

activemq git commit: AMQ-6121 AMQ-6122

[tabish]

Repository: activemq
Updated Branches:
  refs/heads/master 3bb7e4a5c -> 66cfc7bab


AMQ-6121
AMQ-6122

Prevent messages on DLQ for looping back onto the same DLQ.  Prevents
expired messages from bouncing back and duplicate messages from the
store from causing a deadlock.

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

Branch: refs/heads/master
Commit: 66cfc7bab3dfa2e079bbc5276312c97ab02cae4f
Parents: 3bb7e4a
Author: Timothy Bish 
Authored: Mon Jan 11 10:57:38 2016 -0500
Committer: Timothy Bish 
Committed: Mon Jan 11 10:57:38 2016 -0500

--
 .../activemq/broker/region/RegionBroker.java|   8 +-
 .../broker/policy/DeadLetterTestSupport.java|   8 +-
 .../org/apache/activemq/bugs/AMQ6121Test.java   | 149 +
 .../org/apache/activemq/bugs/AMQ6122Test.java   | 158 +++
 4 files changed, 319 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/66cfc7ba/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
index e975b4c..961618d 100755
--- 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
@@ -775,6 +775,13 @@ public class RegionBroker extends EmptyBroker {
 DeadLetterStrategy deadLetterStrategy = ((Destination) 
node.getRegionDestination()).getDeadLetterStrategy();
 if (deadLetterStrategy != null) {
 if 
(deadLetterStrategy.isSendToDeadLetterQueue(message)) {
+ActiveMQDestination deadLetterDestination = 
deadLetterStrategy.getDeadLetterQueueFor(message, subscription);
+// Prevent a DLQ loop where same message is sent 
from a DLQ back to itself
+if 
(deadLetterDestination.equals(message.getDestination())) {
+LOG.debug("Not re-adding to DLQ: {}, dest: 
{}", message.getMessageId(), message.getDestination());
+return false;
+}
+
 // message may be inflight to other subscriptions 
so do not modify
 message = message.copy();
 long dlqExpiration = 
deadLetterStrategy.getExpiration();
@@ -796,7 +803,6 @@ public class RegionBroker extends EmptyBroker {
 // not get filled when the message is first sent,
 // it is only populated if the message is routed to
 // another destination like the DLQ
-ActiveMQDestination deadLetterDestination = 
deadLetterStrategy.getDeadLetterQueueFor(message, subscription);
 ConnectionContext adminContext = context;
 if (context.getSecurityContext() == null || 
!context.getSecurityContext().isBrokerContext()) {
 adminContext = 
BrokerSupport.getConnectionContext(this);

http://git-wip-us.apache.org/repos/asf/activemq/blob/66cfc7ba/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
index a0a8cc6..8f9c3ba 100755
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/DeadLetterTestSupport.java
@@ -133,13 +133,15 @@ public abstract class DeadLetterTestSupport extends 
TestSupport {
 
 @Override
 public boolean isSatisified() throws Exception {
-QueueViewMBean dlqView = null;
+boolean satisfied = false;
+
 try {
-dlqView = getProxyToQueue(dlqQ.getQueueName());
+QueueViewMBean dlqView = 
getProxyToQueue(dlqQ.getQueueName());
+satisfied = dlqView != null ? dlqView.isDLQ() : false;
 } catch (Throwable error) {
 }
 
-

svn commit: r977480 - in /websites/production/activemq/content: cache/main.pageCache version-5-getting-started.html

[buildbot]

Author: buildbot
Date: Mon Jan 11 15:21:51 2016
New Revision: 977480

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/version-5-getting-started.html

Modified: websites/production/activemq/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/activemq/content/version-5-getting-started.html
==
--- websites/production/activemq/content/version-5-getting-started.html 
(original)
+++ websites/production/activemq/content/version-5-getting-started.html Mon Jan 
11 15:21:51 2016
@@ -81,7 +81,7 @@
   
 
 
-IntroductionThis document 
describes how to install and configure ActiveMQ for both Unix and Windows' 
platforms.Document 
OrganizationThe Getting Started Guide for ActiveMQ contains the 
following sections:#Introduction#Document Organization#Pre-Installation 
Requirements#Installation Procedure for 
Windows#Windows Binary 
Installation#Windows Source 
Installation#Windows Develo
 pers' Release#Installation Procedure for 
Unix#Unix 
Binary Installation#Unix Source Installation#Unix Developers' 
Release#Starting ActiveMQ#Testing the 
Installation#Monitoring ActiveMQ#Stopping 
ActiveMQ#Starting ActiveMQ with a different 
configuration file#Configuring ActiveMQPre-Installation 
RequirementsHardware:60 MB of free disk 
space for the ActiveMQ binary distribution.200 MB of free disk space 
for the ActiveMQ source or developer's 
distributions.Operating 
Systems:Windows: Windows XP SP2, Windows 
2000.Unix: Ubuntu Linux, Powerdog Linux, MacOS, AIX, HP-UX, Solaris, 
or any Unix platform that supports 
Java.Environment:Java Developer Kit 
(JDK) 1.6.x or greater for deployment and 1.6.x (Java 6) for 
compiling/building.The JAVA_HOME environment variable must be set to 
the directory where the JDK is installed, e.g., c:\Program 
Files\jdk.1.6.0_xx_xx.Maven 3.0 or greater (required when 
installing source or developer's releases).http://cvs.apache.org/repository/geronimo-spec/jars/;>JARs that wil
 l be used must be added to the classpath.Installation 
Procedure for WindowsThis section of the Getting Started Guide explains 
how to install binary and source distributions of ActiveMQ on a Windows 
system.Windows 
Binary InstallationThis procedure explains how to download and install 
the binary distribution on a Windows system.From a browser, 
navigate to http://activemq.apache.org/;>activemq.apache.org/.Click the 
Download link in the navigation pane 
(the left pane).Select the latest distribution (for older releases, 
click the link to the archives). For a binary distribution, 
the filename will be similar to: 
activemq-x.x.x.zip.Extract the files from the ZIP file 
into a directory o
 f your choice.Proceed to the #Starting ActiveMQ section of this 
document.Following start-up, go to the #Testing the Installation section of 
this document.Windows Source 
InstallationThis procedure explains how to download and install the 
source distribution on a Windows system.NOTE: ActiveMQ 
requires Java 6 to run and to buildFrom a browser, navigate to http://activemq.apache.org/;>activemq.apache.org/.Click the 
Download link in the navigation pane 
(the left pane).Select the latest distribution (for older releases, 
click the link to the archives). For a source distribution, 
the filename will be similar to: activemq
 -x.x-src.zip.Extract ActiveMQ from the ZIP file into a 
directory of your choice. Build ActiveMQ 
using Maven 2.1 or greater and Java 1.6.The recommended method of 
building ActiveMQ is the following:
+IntroductionThis document 
describes how to install and configure ActiveMQ for both Unix and Windows' 
platforms.Document 
OrganizationThe Getting Started Guide for ActiveMQ contains the 
following sections:#Introduction#Document Organization#Pre-Installation 
Requirements#Installation Procedure for 
Windows#Windows Binary 
Installation#Windows Source 
Installation#Windows Develo
 pers' Release#Installation Procedure for 
Unix#Unix 
Binary Installation#Unix Source Installation#Unix Developers' 
Release#Starting ActiveMQ#Testing the 
Installation#Monitoring ActiveMQ#Stopping 
ActiveMQ#Starting ActiveMQ with a different 
configuration file#Configuring ActiveMQPre-Installation 
RequirementsHardware:60 MB of free disk 
space for the ActiveMQ binary distribution.200 MB of free disk space 
for the ActiveMQ source or developer's 
distributions.Operating 
Systems:Windows: Windows XP SP2, Windows 
2000.Unix: Ubuntu Linux, Powerdog Linux, MacOS, AIX, HP-UX, Solaris, 
or any Unix platform that supports 
Java.Environment:Java Developer Kit 
(JDK) 1.7.x or greater for deployment and 1.7.x (Java 7) for 
compiling/building.The JAVA_HOME environment variable must be set to 
the directory where the JDK is installed, e.g., 

[1/2] activemq-artemis git commit: This closes #305

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master cfff68f2d -> 970800c34


This closes #305


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

Branch: refs/heads/master
Commit: 970800c345802e7193e3c427b245ef1b2dc5b598
Parents: cfff68f 66e82be
Author: Clebert Suconic 
Authored: Mon Jan 11 13:21:26 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:21:26 2016 -0500

--
 .../core/server/impl/ServerSessionImpl.java |  8 ++---
 .../jms/example/ClusteredTopicExample.java  | 13 
 .../org/apache/activemq/bugs/AMQ2401Test.java   | 35 ++--
 .../org/apache/activemq/bugs/AMQ2413Test.java   | 32 +-
 .../BridgeServerLocatorConfigurationTest.java   |  6 
 ...FlowControlOnIgnoreLargeMessageBodyTest.java | 13 
 .../tests/unit/jms/misc/ManifestTest.java   | 21 +++-
 7 files changed, 29 insertions(+), 99 deletions(-)
--

[2/2] activemq-artemis git commit: Remove dead code

[clebertsuconic]

Remove dead code


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

Branch: refs/heads/master
Commit: 66e82be652598c2c7f5a82cf292897d0e3ff732a
Parents: cfff68f
Author: Ville Skyttä 
Authored: Sat Jan 9 13:55:44 2016 +0200
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:21:26 2016 -0500

--
 .../core/server/impl/ServerSessionImpl.java |  8 ++---
 .../jms/example/ClusteredTopicExample.java  | 13 
 .../org/apache/activemq/bugs/AMQ2401Test.java   | 35 ++--
 .../org/apache/activemq/bugs/AMQ2413Test.java   | 32 +-
 .../BridgeServerLocatorConfigurationTest.java   |  6 
 ...FlowControlOnIgnoreLargeMessageBodyTest.java | 13 
 .../tests/unit/jms/misc/ManifestTest.java   | 21 +++-
 7 files changed, 29 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index ebe2f8a..c3a979b 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -623,12 +623,12 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 
@Override
public QueueQueryResult executeQueueQuery(final SimpleString name) throws 
Exception {
-  boolean autoCreateJmsQueues = 
name.toString().startsWith(ResourceNames.JMS_QUEUE) && 
server.getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues();
-
   if (name == null) {
  throw ActiveMQMessageBundle.BUNDLE.queueNameIsNull();
   }
 
+  boolean autoCreateJmsQueues = 
name.toString().startsWith(ResourceNames.JMS_QUEUE) && 
server.getAddressSettingsRepository().getMatch(name.toString()).isAutoCreateJmsQueues();
+
   QueueQueryResult response;
 
   Binding binding = postOffice.getBinding(name);
@@ -658,12 +658,12 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 
@Override
public BindingQueryResult executeBindingQuery(final SimpleString address) 
throws Exception {
-  boolean autoCreateJmsQueues = 
address.toString().startsWith(ResourceNames.JMS_QUEUE) && 
server.getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsQueues();
-
   if (address == null) {
  throw ActiveMQMessageBundle.BUNDLE.addressIsNull();
   }
 
+  boolean autoCreateJmsQueues = 
address.toString().startsWith(ResourceNames.JMS_QUEUE) && 
server.getAddressSettingsRepository().getMatch(address.toString()).isAutoCreateJmsQueues();
+
   List names = new ArrayList<>();
 
   // make an exception for the management address (see HORNETQ-29)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e82be6/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
--
diff --git 
a/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
 
b/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
index f3ce9a0..10592c9 100644
--- 
a/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
+++ 
b/examples/features/clustered/clustered-topic/src/main/java/org/apache/activemq/artemis/jms/example/ClusteredTopicExample.java
@@ -23,7 +23,6 @@ import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
-import javax.naming.InitialContext;
 
 import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
@@ -39,10 +38,6 @@ public class ClusteredTopicExample {
 
   Connection connection1 = null;
 
-  InitialContext ic0 = null;
-
-  InitialContext ic1 = null;
-
   try {
 
  // Step 1. Instantiate topic
@@ -116,14 +111,6 @@ public class ClusteredTopicExample {
  if (connection1 != null) {
 

[2/2] activemq-artemis git commit: This closes #306

[clebertsuconic]

This closes #306


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

Branch: refs/heads/master
Commit: 3a5234ee22b42f1fea9d2ffce664f93b1e07b97e
Parents: 970800c 9666e18
Author: Clebert Suconic 
Authored: Mon Jan 11 13:21:48 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:21:48 2016 -0500

--
 artemis-website/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] activemq-artemis git commit: Deprecation fixes

[clebertsuconic]

Deprecation fixes


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

Branch: refs/heads/master
Commit: f85e5e79229e3fc06288f2172265aed20ac2fa2c
Parents: 3a5234e
Author: Ville Skyttä 
Authored: Sat Jan 9 23:43:39 2016 +0200
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:22:18 2016 -0500

--
 .../impl/CompressedLargeMessageControllerImpl.java |  1 +
 .../core/remoting/impl/netty/NettyConnector.java   |  4 ++--
 .../protocol/proton/converter/ActiveMQJMSVendor.java   |  1 +
 .../activemq/artemis/rest/queue/push/UriStrategy.java  | 13 ++---
 .../core/remoting/server/impl/RemotingServiceImpl.java |  1 +
 .../artemis/core/server/ActiveMQServerLogger.java  |  1 +
 .../server/protocol/stomp/WebSocketServerHandler.java  |  2 +-
 .../activemq/broker/region/DestinationGCTest.java  |  2 +-
 .../java/org/apache/activemq/bugs/AMQ3157Test.java |  2 +-
 .../java/org/apache/activemq/bugs/AMQ3324Test.java |  2 +-
 .../usecases/RequestReplyNoAdvisoryNetworkTest.java|  2 +-
 11 files changed, 17 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f85e5e79/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
index 0cb38f6..e7cc173 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
@@ -466,6 +466,7 @@ final class CompressedLargeMessageControllerImpl implements 
LargeMessageControll
 
/** from {@link java.io.DataInput} interface */
@Override
+   @SuppressWarnings("deprecation")
public String readLine() throws IOException {
   return getStream().readLine();
}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f85e5e79/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 97c0fef..55435f5 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -62,7 +62,6 @@ import io.netty.channel.group.DefaultChannelGroup;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.socket.nio.NioSocketChannel;
 import io.netty.handler.codec.base64.Base64;
-import io.netty.handler.codec.http.ClientCookieEncoder;
 import io.netty.handler.codec.http.Cookie;
 import io.netty.handler.codec.http.CookieDecoder;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
@@ -80,6 +79,7 @@ import io.netty.handler.codec.http.HttpResponse;
 import io.netty.handler.codec.http.HttpResponseDecoder;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.codec.http.cookie.ClientCookieEncoder;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.util.AttributeKey;
 import io.netty.util.ResourceLeakDetector;
@@ -825,7 +825,7 @@ public class NettyConnector extends AbstractConnector {
 Set cookieMap = 
CookieDecoder.decode(response.headers().get(HttpHeaders.Names.SET_COOKIE));
 for (Cookie cookie : cookieMap) {
if (cookie.getName().equals("JSESSIONID")) {
-  this.cookie = ClientCookieEncoder.encode(cookie);
+  this.cookie = ClientCookieEncoder.LAX.encode(cookie);
}
 }
 active = true;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f85e5e79/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/ActiveMQJMSVendor.java
--
diff --git 

[1/2] activemq-artemis git commit: Update npm plugin to latest version

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 970800c34 -> 3a5234ee2


Update npm plugin to latest version


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

Branch: refs/heads/master
Commit: 9666e18471c5fcf41c72f4f40ae0c1d511b39e30
Parents: 970800c
Author: Paul Gallagher 
Authored: Sat Jan 9 16:19:03 2016 +
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:21:47 2016 -0500

--
 artemis-website/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9666e184/artemis-website/pom.xml
--
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index a6c1d61..2e7af02 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -81,7 +81,7 @@
   
${basedir}/target/classes/user-manual
   
${basedir}/target/classes/hacking-guide
 
-  0.0.24
+  0.0.27
   v0.10.32
   1.4.12
 

[3/3] activemq-artemis git commit: This closes #302

[clebertsuconic]

This closes #302


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

Branch: refs/heads/master
Commit: e35a01c273b00f8864159e7c7f88759d48ec626c
Parents: d81ba8f e104831
Author: Clebert Suconic 
Authored: Mon Jan 11 13:20:21 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:20:21 2016 -0500

--
 .../org/apache/activemq/artemis/cli/commands/etc/artemis.profile   | 2 +-
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

[2/2] activemq-artemis git commit: artemis.cmd, artemis.profile: Drop executable bits

[clebertsuconic]

artemis.cmd, artemis.profile: Drop executable bits


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

Branch: refs/heads/master
Commit: 9a0e6d892e7c0c8ec269488cd510175ebac65d10
Parents: e35a01c
Author: Ville Skyttä 
Authored: Sat Jan 9 13:23:36 2016 +0200
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:20:38 2016 -0500

--
 .../main/java/org/apache/activemq/artemis/cli/commands/Create.java  | 1 -
 .../org/apache/activemq/artemis/cli/commands/bin/artemis.cmd| 0
 2 files changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9a0e6d89/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index 324776e..23e0fd1 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -591,7 +591,6 @@ public class Create extends InputAbstract {
  write(BIN_ARTEMIS_SERVICE, null, true);
  makeExec(BIN_ARTEMIS_SERVICE);
  write(ETC_ARTEMIS_PROFILE, filters, true);
- makeExec(ETC_ARTEMIS_PROFILE);
   }
 
   write(ETC_LOGGING_PROPERTIES, null, false);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9a0e6d89/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
old mode 100755
new mode 100644

[1/2] activemq-artemis git commit: This closes #304

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a4648f4a9 -> cfff68f2d


This closes #304


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

Branch: refs/heads/master
Commit: cfff68f2d0d93096370b23cee9b897ee40f4bd34
Parents: a4648f4 389762c
Author: Clebert Suconic 
Authored: Mon Jan 11 13:20:57 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:20:57 2016 -0500

--
 .../artemis/core/paging/cursor/impl/PageSubscriptionImpl.java  | 1 +
 .../artemis/core/postoffice/impl/DuplicateIDCacheImpl.java | 1 +
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java  | 4 
 .../activemq/artemis/core/server/impl/ServerConsumerImpl.java  | 1 +
 .../integration/journal/NIOSequentialFileFactoryTest.java  | 6 ++
 5 files changed, 13 insertions(+)
--

[2/2] activemq-artemis git commit: Add missing @Overrides

[clebertsuconic]

Add missing @Overrides


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

Branch: refs/heads/master
Commit: 389762cb3a33db7c3f7c442ad5b968363c2da9dd
Parents: a4648f4
Author: Ville Skyttä 
Authored: Sat Jan 9 13:33:03 2016 +0200
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:20:57 2016 -0500

--
 .../artemis/core/paging/cursor/impl/PageSubscriptionImpl.java  | 1 +
 .../artemis/core/postoffice/impl/DuplicateIDCacheImpl.java | 1 +
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java  | 4 
 .../activemq/artemis/core/server/impl/ServerConsumerImpl.java  | 1 +
 .../integration/journal/NIOSequentialFileFactoryTest.java  | 6 ++
 5 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/389762cb/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index 9c1702e..243dcb6 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -555,6 +555,7 @@ final class PageSubscriptionImpl implements 
PageSubscription {
   processACK(position);
}
 
+   @Override
public void lateDeliveryRollback(PagePosition position) {
   PageCursorInfo cursorInfo = processACK(position);
   cursorInfo.decrementPendingTX();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/389762cb/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java
index cfeeb7b..fb6559c 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/DuplicateIDCacheImpl.java
@@ -196,6 +196,7 @@ public class DuplicateIDCacheImpl implements 
DuplicateIDCache {
 
}
 
+   @Override
public synchronized void addToCache(final byte[] duplID, final Transaction 
tx, boolean instantAdd) throws Exception {
   long recordID = -1;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/389762cb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index d81dd3e..268c8cd 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -330,8 +330,10 @@ public class BridgeImpl implements Bridge, 
SessionFailureListener, SendAcknowled
   }
}
 
+   @Override
public void disconnect() {
   executor.execute(new Runnable() {
+ @Override
  public void run() {
 if (session != null) {
try {
@@ -399,6 +401,7 @@ public class BridgeImpl implements Bridge, 
SessionFailureListener, SendAcknowled
   }
}
 
+   @Override
public void pause() throws Exception {
   if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) {
  ActiveMQServerLogger.LOGGER.debug("Bridge " + this.name + " being 
paused");
@@ -1068,6 +1071,7 @@ public class BridgeImpl implements Bridge, 
SessionFailureListener, SendAcknowled
  bridge = bridge2;
   }
 
+  @Override
   public void run() {
  bridge.connect();
   }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/389762cb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
--
diff --git 

[1/2] activemq-artemis git commit: This closes #303

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master e35a01c27 -> a4648f4a9


This closes #303


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

Branch: refs/heads/master
Commit: a4648f4a93230ed6d7735ddd07f0270840701f3f
Parents: e35a01c 9a0e6d8
Author: Clebert Suconic 
Authored: Mon Jan 11 13:20:38 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:20:38 2016 -0500

--
 .../main/java/org/apache/activemq/artemis/cli/commands/Create.java  | 1 -
 .../org/apache/activemq/artemis/cli/commands/bin/artemis.cmd| 0
 2 files changed, 1 deletion(-)
--

[2/3] activemq-artemis git commit: ARTEMIS-224 Add logmanager jar to artemis.profile.cmd too

[clebertsuconic]

ARTEMIS-224 Add logmanager jar to artemis.profile.cmd too


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

Branch: refs/heads/master
Commit: e104831831eb107eccc0b7280c8bbe38ee0843d8
Parents: a8c0559
Author: Ville Skyttä 
Authored: Sat Jan 9 13:12:48 2016 +0200
Committer: Ville Skyttä 
Committed: Sat Jan 9 13:20:39 2016 +0200

--
 .../apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1048318/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
index 835c7b7..1de17b5 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
@@ -21,7 +21,7 @@ rem Cluster Properties: Used to pass arguments to ActiveMQ 
Artemis which can be
 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 
-Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 
-Dactivemq.remoting.hornetq.port=5446
 
 rem Java Opts
-set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts 
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M ${login-config} ${java-opts}
+set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts 
-XX:+UseFastAccessorMethods -Xms512M -Xmx1024M 
-Xbootclasspath/a:%ARTEMIS_HOME%\lib\${logmanager} ${login-config} ${java-opts}
 
 rem Debug args: Uncomment to enable debug
 rem set 
DEBUG_ARGS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005

[1/3] activemq-artemis git commit: artemis.profile: Remove dupe -Djava.util.logging.manager, set in bin/artemis

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master d81ba8f81 -> e35a01c27


artemis.profile: Remove dupe -Djava.util.logging.manager, set in bin/artemis


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

Branch: refs/heads/master
Commit: a8c0559719ec9eea4845676159c31a8fd1545bc3
Parents: d81ba8f
Author: Ville Skyttä 
Authored: Sat Jan 9 13:12:01 2016 +0200
Committer: Ville Skyttä 
Committed: Sat Jan 9 13:12:01 2016 +0200

--
 .../org/apache/activemq/artemis/cli/commands/etc/artemis.profile   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a8c05597/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
index 76ca12f..c6ceeef 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
@@ -23,7 +23,7 @@ ARTEMIS_HOME='${artemis.home}'
 
 
 # Java Opts
-JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods 
-Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} 
-Djava.util.logging.manager=org.jboss.logmanager.LogManager ${login-config} 
${java-opts}"
+JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods 
-Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} 
${login-config} ${java-opts}"
 
 
 # Debug args: Uncomment to enable debug

[1/2] activemq-artemis git commit: This closes #307

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3a5234ee2 -> c4837c2c3


This closes #307


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

Branch: refs/heads/master
Commit: c4837c2c38fa7dae83f7b40a961595b620e663bb
Parents: 3a5234e f85e5e7
Author: Clebert Suconic 
Authored: Mon Jan 11 13:22:18 2016 -0500
Committer: Clebert Suconic 
Committed: Mon Jan 11 13:22:18 2016 -0500

--
 .../impl/CompressedLargeMessageControllerImpl.java |  1 +
 .../core/remoting/impl/netty/NettyConnector.java   |  4 ++--
 .../protocol/proton/converter/ActiveMQJMSVendor.java   |  1 +
 .../activemq/artemis/rest/queue/push/UriStrategy.java  | 13 ++---
 .../core/remoting/server/impl/RemotingServiceImpl.java |  1 +
 .../artemis/core/server/ActiveMQServerLogger.java  |  1 +
 .../server/protocol/stomp/WebSocketServerHandler.java  |  2 +-
 .../activemq/broker/region/DestinationGCTest.java  |  2 +-
 .../java/org/apache/activemq/bugs/AMQ3157Test.java |  2 +-
 .../java/org/apache/activemq/bugs/AMQ3324Test.java |  2 +-
 .../usecases/RequestReplyNoAdvisoryNetworkTest.java|  2 +-
 11 files changed, 17 insertions(+), 14 deletions(-)
--