activemq-artemis git commit: chapter about staging maven and validating releases

2015-09-09 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master fec654648 -> 3593dd54c


chapter about staging maven and validating releases


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

Branch: refs/heads/master
Commit: 3593dd54c948e97f9c853daeb98e674f1e113ebf
Parents: fec6546
Author: Clebert Suconic 
Authored: Tue Sep 8 15:45:32 2015 -0400
Committer: Clebert Suconic 
Committed: Wed Sep 9 10:18:43 2015 -0400

--
 docs/hacking-guide/en/SUMMARY.md |  1 +
 docs/hacking-guide/en/validating-releases.md | 69 +++
 2 files changed, 70 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3593dd54/docs/hacking-guide/en/SUMMARY.md
--
diff --git a/docs/hacking-guide/en/SUMMARY.md b/docs/hacking-guide/en/SUMMARY.md
index d9c7a05..2c8038f 100644
--- a/docs/hacking-guide/en/SUMMARY.md
+++ b/docs/hacking-guide/en/SUMMARY.md
@@ -6,5 +6,6 @@
 * [Building](building.md)
 * [Tests](tests.md)
 * [Code Formatting](formatting.md)
+* [Validating releases](validating-releases.md)
 * [Notes for Maintainers](maintainers.md)
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3593dd54/docs/hacking-guide/en/validating-releases.md
--
diff --git a/docs/hacking-guide/en/validating-releases.md 
b/docs/hacking-guide/en/validating-releases.md
new file mode 100644
index 000..bb5b665
--- /dev/null
+++ b/docs/hacking-guide/en/validating-releases.md
@@ -0,0 +1,69 @@
+# Validating releases
+
+## Setting up the maven repository
+
+When a release is proposed a maven repository is staged.
+
+This information here was extracted from [Guide to Testing Staged 
Releases](https://maven.apache.org/guides/development/guide-testing-releases.html)
+
+For examples, the 1.1.0 release had the Maven Repository statged as 
[https://repository.apache.org/content/repositories/orgapacheactivemq-1066](https://repository.apache.org/content/repositories/orgapacheactivemq-1066).
+
+The first thing you need to do is to be able to use this release. The easiest 
way we have found is to change your maven settings at ``~/.m2/settings.xml``, 
setting up the staged repo.
+
+
+*file ~/.m2/settings.xml:*
+
+```xml
+
+
+   
+  
+ apache-artemis-test
+ 
+
+
+   artemis-test
+   Apache Artemis Test
+   
https://repository.apache.org/content/repositories/orgapacheactivemq-1066
+   default
+   
+  true
+   
+   
+  true
+   
+
+ 
+
+ 
+
+
+   artemis-test2
+   Apache Artemis Test
+   
https://repository.apache.org/content/repositories/orgapacheactivemq-1066
+   
+  true
+   
+   
+  true
+   
+
+ 
+  
+   
+
+   
+  apache-artemis-test
+   
+
+```
+
+After you configure this, all the maven objects will be available to your 
builds.
+
+
+## Using the examples
+
+The Apache ActiveMQ Artemis examples will create servers and use most of the 
maven components as real application were supposed to do.
+You can do this by running these examples after the .m2 profile installations 
for the staged repository.
+
+Of course you can use your own applications after you have staged the maven 
repository.

activemq git commit: Fixing intermitent Karaf itest failure

2015-09-09 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/master f58683ea0 -> b17cc37ef


Fixing intermitent Karaf itest failure


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

Branch: refs/heads/master
Commit: b17cc37ef934404e6383d10c966c43fc20e48215
Parents: f58683e
Author: Christopher L. Shannon (cshannon) 
Authored: Wed Sep 9 14:27:40 2015 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Wed Sep 9 14:28:09 2015 +

--
 .../activemq/karaf/itest/ObrFeatureTest.java| 25 ++--
 1 file changed, 2 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/b17cc37e/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
--
diff --git 
a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
 
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
index 9160e3b..c59b2df 100644
--- 
a/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
+++ 
b/activemq-karaf-itest/src/test/java/org/apache/activemq/karaf/itest/ObrFeatureTest.java
@@ -16,7 +16,8 @@
  */
 package org.apache.activemq.karaf.itest;
 
-import java.util.concurrent.Callable;
+import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -24,11 +25,6 @@ import org.ops4j.pax.exam.CoreOptions;
 import org.ops4j.pax.exam.MavenUtils;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
-
-
-import static org.junit.Assert.assertTrue;
-import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
 
 
 @RunWith(PaxExam.class)
@@ -48,14 +44,6 @@ public class ObrFeatureTest extends AbstractFeatureTest {
 
 @Test(timeout=5 * 60 * 1000)
 public void testWar() throws Throwable {
-// note xbean deps manually installed above, should not be needed
-withinReason(new Callable() {
-@Override
-public Boolean call() throws Exception {
-assertTrue("xbean finder bundle installed", 
verifyBundleInstalled("org.apache.xbean.finder"));
-return true;
-}
-});
 installAndAssertFeature("war");
 }
 
@@ -71,15 +59,6 @@ public class ObrFeatureTest extends AbstractFeatureTest {
 
 @Test(timeout=5 * 60 * 1000)
 public void testBroker() throws Throwable {
-// ensure pax-war feature deps are there for web-console
-withinReason(new Callable() {
-@Override
-public Boolean call() throws Exception {
-assertTrue("xbean finder bundle installed", 
verifyBundleInstalled("org.apache.xbean.finder"));
-return true;
-}
-});
-
 installAndAssertFeature("activemq-broker");
 }

activemq-artemis git commit: small fix on doc

2015-09-09 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 890c3cc77 -> f4751afcd


small fix on doc


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

Branch: refs/heads/master
Commit: f4751afcdd662319daa134fc116f6e28b3212bfd
Parents: 890c3cc
Author: Clebert Suconic 
Authored: Wed Sep 9 11:51:21 2015 -0400
Committer: Clebert Suconic 
Committed: Wed Sep 9 11:51:21 2015 -0400

--
 docs/hacking-guide/en/validating-releases.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f4751afc/docs/hacking-guide/en/validating-releases.md
--
diff --git a/docs/hacking-guide/en/validating-releases.md 
b/docs/hacking-guide/en/validating-releases.md
index bb5b665..3154536 100644
--- a/docs/hacking-guide/en/validating-releases.md
+++ b/docs/hacking-guide/en/validating-releases.md
@@ -4,7 +4,7 @@
 
 When a release is proposed a maven repository is staged.
 
-This information here was extracted from [Guide to Testing Staged 
Releases](https://maven.apache.org/guides/development/guide-testing-releases.html)
+This information was extracted from [Guide to Testing Staged 
Releases](https://maven.apache.org/guides/development/guide-testing-releases.html)
 
 For examples, the 1.1.0 release had the Maven Repository statged as 
[https://repository.apache.org/content/repositories/orgapacheactivemq-1066](https://repository.apache.org/content/repositories/orgapacheactivemq-1066).

[1/2] activemq-artemis git commit: This closes #162 fix on RA

2015-09-09 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3593dd54c -> 890c3cc77


This closes #162 fix on RA


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

Branch: refs/heads/master
Commit: 890c3cc77001c38e6b73aa10a9ead2480d5e9d69
Parents: 3593dd5 68f5b77
Author: Clebert Suconic 
Authored: Wed Sep 9 11:47:30 2015 -0400
Committer: Clebert Suconic 
Committed: Wed Sep 9 11:47:30 2015 -0400

--
 .../ra/inflow/ActiveMQActivationSpec.java   | 66 
 1 file changed, 66 insertions(+)
--

[2/2] activemq-artemis git commit: ARTEMIS-221 - MDB endpoionts are not deactivated

2015-09-09 Thread clebertsuconic 
ARTEMIS-221 - MDB endpoionts are not deactivated

Implement equals/hashcode on ActiveMQActivationSpec

https://issues.apache.org/jira/browse/ARTEMIS-221


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

Branch: refs/heads/master
Commit: 68f5b7752a86afee156d12b6852c1989c3cd3c67
Parents: 3593dd5
Author: Andy Taylor 
Authored: Wed Sep 9 13:35:43 2015 +0100
Committer: Clebert Suconic 
Committed: Wed Sep 9 11:47:30 2015 -0400

--
 .../ra/inflow/ActiveMQActivationSpec.java   | 66 
 1 file changed, 66 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/68f5b775/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
--
diff --git 
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
 
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 4541eef..f80342b 100644
--- 
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ 
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -811,4 +811,70 @@ public class ActiveMQActivationSpec extends 
ConnectionFactoryProperties implemen
public void setMaxMessages(final Integer value) {
}
 
+   @Override
+   public boolean equals(Object o) {
+  if (this == o) return true;
+  if (o == null || getClass() != o.getClass()) return false;
+  if (!super.equals(o)) return false;
+
+  ActiveMQActivationSpec that = (ActiveMQActivationSpec) o;
+
+  if (acknowledgeMode != that.acknowledgeMode) return false;
+  if (subscriptionDurability != that.subscriptionDurability) return false;
+  if (shareSubscriptions != that.shareSubscriptions) return false;
+  if (strConnectorClassName != null ? 
!strConnectorClassName.equals(that.strConnectorClassName) : 
that.strConnectorClassName != null)
+ return false;
+  if (strConnectionParameters != null ? 
!strConnectionParameters.equals(that.strConnectionParameters) : 
that.strConnectionParameters != null)
+ return false;
+  if (ra != null ? !ra.equals(that.ra) : that.ra != null) return false;
+  if (connectionFactoryLookup != null ? 
!connectionFactoryLookup.equals(that.connectionFactoryLookup) : 
that.connectionFactoryLookup != null)
+ return false;
+  if (destination != null ? !destination.equals(that.destination) : 
that.destination != null) return false;
+  if (destinationType != null ? 
!destinationType.equals(that.destinationType) : that.destinationType != null)
+ return false;
+  if (messageSelector != null ? 
!messageSelector.equals(that.messageSelector) : that.messageSelector != null)
+ return false;
+  if (subscriptionName != null ? 
!subscriptionName.equals(that.subscriptionName) : that.subscriptionName != null)
+ return false;
+  if (user != null ? !user.equals(that.user) : that.user != null) return 
false;
+  if (password != null ? !password.equals(that.password) : that.password 
!= null) return false;
+  if (maxSession != null ? !maxSession.equals(that.maxSession) : 
that.maxSession != null) return false;
+  if (transactionTimeout != null ? 
!transactionTimeout.equals(that.transactionTimeout) : that.transactionTimeout 
!= null)
+ return false;
+  if (useJNDI != null ? !useJNDI.equals(that.useJNDI) : that.useJNDI != 
null) return false;
+  if (jndiParams != null ? !jndiParams.equals(that.jndiParams) : 
that.jndiParams != null) return false;
+  if (parsedJndiParams != null ? 
!parsedJndiParams.equals(that.parsedJndiParams) : that.parsedJndiParams != null)
+ return false;
+  if (localTx != null ? !localTx.equals(that.localTx) : that.localTx != 
null) return false;
+  if (setupAttempts != null ? !setupAttempts.equals(that.setupAttempts) : 
that.setupAttempts != null) return false;
+  return !(setupInterval != null ? 
!setupInterval.equals(that.setupInterval) : that.setupInterval != null);
+
+   }
+
+   @Override
+   public int hashCode() {
+  int result = super.hashCode();
+  result = 31 * result + (strConnectorClassName != null ? 
strConnectorClassName.hashCode() : 0);
+  result = 31 * result + (strConnectionParameters != null ? 
strConnectionParameters.hashCode() : 0);
+  result = 31 * result + (ra != null ? ra.hashCode() : 0);
+  result = 31 * result + (connectionFactoryLookup != null ?

Build failed in Jenkins: ActiveMQ-Java7 » ActiveMQ :: Unit Tests #815

2015-09-09 Thread Apache Jenkins Server 
See 


Changes:

[christopher.l.shannon] https://issues.apache.org/jira/browse/AMQ-5923

--
[...truncated 885 lines...]
Running 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithDestinationBasedBufferTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.921 sec - in 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithDestinationBasedBufferTest
Running 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.939 sec - in 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithLastImagePolicyWithWildcardTest
Running 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithSimpleMessageListTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.878 sec - in 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithSimpleMessageListTest
Running 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithTimePolicyTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.835 sec - in 
org.apache.activemq.test.retroactive.RetroactiveConsumerTestWithTimePolicyTest
Running 
org.apache.activemq.test.retroactive.RetroactiveConsumerWithMessageQueryTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.844 sec - in 
org.apache.activemq.test.retroactive.RetroactiveConsumerWithMessageQueryTest
Running org.apache.activemq.test.rollback.CloseRollbackRedeliveryQueueTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.317 sec - in 
org.apache.activemq.test.rollback.CloseRollbackRedeliveryQueueTest
Running org.apache.activemq.transport.auto.AutoNIOSslTransportBrokerTest
Tests run: 127, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.163 sec - 
in org.apache.activemq.transport.auto.AutoNIOSslTransportBrokerTest
Running org.apache.activemq.transport.auto.AutoNIOTransportBrokerTest
Tests run: 127, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.186 sec - 
in org.apache.activemq.transport.auto.AutoNIOTransportBrokerTest
Running org.apache.activemq.transport.auto.AutoSslTransportBrokerTest
Tests run: 127, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.922 sec - 
in org.apache.activemq.transport.auto.AutoSslTransportBrokerTest
Running org.apache.activemq.transport.auto.AutoTransportBrokerTest
Tests run: 127, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.123 sec - 
in org.apache.activemq.transport.auto.AutoTransportBrokerTest
Running org.apache.activemq.transport.auto.AutoTransportConfigureTest
Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.502 sec - in 
org.apache.activemq.transport.auto.AutoTransportConfigureTest
Running org.apache.activemq.transport.auto.AutoTransportMaxConnectionsTest
Tests run: 4, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 34.649 sec <<< 
FAILURE! - in org.apache.activemq.transport.auto.AutoTransportMaxConnectionsTest
testMaxConnectionControl[1](org.apache.activemq.transport.auto.AutoTransportMaxConnectionsTest)
  Time elapsed: 30.063 sec  <<< FAILURE!
java.lang.AssertionError: Expected: 20 found: 0
at org.junit.Assert.fail(Assert.java:88)
at org.junit.Assert.assertTrue(Assert.java:41)
at 
org.apache.activemq.transport.auto.AutoTransportMaxConnectionsTest.testMaxConnectionControl(AutoTransportMaxConnectionsTest.java:130)

Running org.apache.activemq.transport.auto.failover.AutoFailoverClusterTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.51 sec - in 
org.apache.activemq.transport.auto.failover.AutoFailoverClusterTest
Running org.apache.activemq.transport.auto.failover.AutoFailoverTimeoutTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.871 sec - in 
org.apache.activemq.transport.auto.failover.AutoFailoverTimeoutTest
Running org.apache.activemq.transport.auto.failover.FailoverAutoRandomTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.953 sec - in 
org.apache.activemq.transport.auto.failover.FailoverAutoRandomTest
Running 
org.apache.activemq.transport.auto.failover.FailoverAutoTransportBrokerTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.161 sec - in 
org.apache.activemq.transport.auto.failover.FailoverAutoTransportBrokerTest
Running org.apache.activemq.transport.failover.BadConnectionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.928 sec - in 
org.apache.activemq.transport.failover.BadConnectionTest
Running org.apache.activemq.transport.failover.FailoverBackupLeakTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.081 sec - in 
org.apache.activemq.transport.failover.FailoverBackupLeakTest
Running 
org.apache.activemq.transport.failover.FailoverReadInactivityBlockWriteTimeoutClientTest
Tests run: 1, Failures: 0, Errors: 0, Skipped:

Build failed in Jenkins: ActiveMQ-Java7 #815

2015-09-09 Thread Apache Jenkins Server 
See 

Changes:

[christopher.l.shannon] Fixing intermitent Karaf itest failure

[christopher.l.shannon] https://issues.apache.org/jira/browse/AMQ-5923

--
[...truncated 4014 lines...]
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-itests-spring31/5.13-SNAPSHOT/activemq-itests-spring31-5.13-SNAPSHOT.pom
Sending artifact delta relative to ActiveMQ-Java7 » ActiveMQ :: Integration 
Test :: Spring 3.1 #814
Archived 1 artifacts
Archive block size is 32768
Received 0 blocks and 3005 bytes
Compression is 0.0%
Took 36 ms
[JENKINS] Archiving 
 to 
org.apache.activemq/apache-activemq/5.13-SNAPSHOT/apache-activemq-5.13-SNAPSHOT.pom
Sending artifact delta relative to ActiveMQ-Java7 » ActiveMQ :: Assembly #814
Archived 1 artifacts
Archive block size is 32768
Received 0 blocks and 19004 bytes
Compression is 0.0%
Took 2.8 sec
[JENKINS] Archiving 
 to 
org.apache.activemq/activemq-jms-pool/5.13-SNAPSHOT/activemq-jms-pool-5.13-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-jms-pool/5.13-SNAPSHOT/activemq-jms-pool-5.13-SNAPSHOT.jar
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-jms-pool/5.13-SNAPSHOT/activemq-jms-pool-5.13-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java7 » ActiveMQ :: Generic JMS 
Pool #814
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 99691 bytes
Compression is 0.0%
Took 81 ms
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-log4j-appender/5.13-SNAPSHOT/activemq-log4j-appender-5.13-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-log4j-appender/5.13-SNAPSHOT/activemq-log4j-appender-5.13-SNAPSHOT.jar
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-log4j-appender/5.13-SNAPSHOT/activemq-log4j-appender-5.13-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java7 » ActiveMQ :: Log4j Appender 
#814
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 28503 bytes
Compression is 0.0%
Took 38 ms
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-runtime-config/5.13-SNAPSHOT/activemq-runtime-config-5.13-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-runtime-config/5.13-SNAPSHOT/activemq-runtime-config-5.13-SNAPSHOT.jar
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-runtime-config/5.13-SNAPSHOT/activemq-runtime-config-5.13-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java7 » ActiveMQ :: Runtime 
Configuration #814
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 2464313 bytes
Compression is 0.0%
Took 1.1 sec
[JENKINS] Archiving 
 to 
org.apache.activemq/activemq-pool/5.13-SNAPSHOT/activemq-pool-5.13-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-pool/5.13-SNAPSHOT/activemq-pool-5.13-SNAPSHOT.jar
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-pool/5.13-SNAPSHOT/activemq-pool-5.13-SNAPSHOT-sources.jar
Sending artifact delta relative to ActiveMQ-Java7 » ActiveMQ :: Pool #814
Archived 3 artifacts
Archive block size is 32768
Received 0 blocks and 37780 bytes
Compression is 0.0%
Took 72 ms
[JENKINS] Archiving 
 to 
org.apache.activemq/activemq-stomp/5.13-SNAPSHOT/activemq-stomp-5.13-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.activemq/activemq-stomp/5.13-SNAPSHOT/activemq-stomp-5.13-SNAPSHOT.jar
[JENKINS] Archiving

Jenkins build became unstable: ActiveMQ-Java7 » ActiveMQ :: KahaDB Store #815

2015-09-09 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java7 » ActiveMQ :: Runtime Configuration #815

2015-09-09 Thread Apache Jenkins Server 
See

[3/3] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5923

2015-09-09 Thread cshannon 
https://issues.apache.org/jira/browse/AMQ-5923

Adding metrics to track the pending message size for a queue and for
subscribers.  This is useful so that not only the pending count is
known but also the total message size left to consume. Also improving
the message size store tests as well.


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

Branch: refs/heads/master
Commit: 734fb7dda35285ada7bc57642215077e08c88e80
Parents: b17cc37
Author: Christopher L. Shannon (cshannon) 
Authored: Fri Aug 21 18:58:08 2015 +
Committer: Christopher L. Shannon (cshannon) 
Committed: Wed Sep 9 18:12:15 2015 +

--
 .../broker/region/PrefetchSubscription.java |   7 +
 .../apache/activemq/broker/region/Queue.java|  13 +
 .../activemq/broker/region/Subscription.java|   5 +
 .../broker/region/TopicSubscription.java|   7 +
 .../region/cursors/AbstractStoreCursor.java |  27 +
 .../cursors/FilePendingMessageCursor.java   |  21 +-
 .../region/cursors/OrderedPendingList.java  |  35 +-
 .../broker/region/cursors/PendingList.java  |   3 +
 .../region/cursors/PendingMessageCursor.java|  66 +--
 .../region/cursors/PendingMessageHelper.java|  68 +++
 .../region/cursors/PrioritizedPendingList.java  |  31 +-
 .../cursors/QueueDispatchPendingList.java   |   5 +
 .../region/cursors/QueueStorePrefetch.java  |  33 +-
 .../cursors/StoreDurableSubscriberCursor.java   |   9 +
 .../broker/region/cursors/StoreQueueCursor.java |  25 +
 .../region/cursors/TopicStorePrefetch.java  |  24 +-
 .../region/cursors/VMPendingMessageCursor.java  |  60 +-
 .../java/org/apache/activemq/store/PList.java   |   2 +
 .../activemq/store/ProxyTopicMessageStore.java  |  10 +
 .../activemq/store/TopicMessageStore.java   |   2 +
 .../store/memory/MemoryTopicMessageStore.java   |  10 +
 .../activemq/store/memory/MemoryTopicSub.java   |  23 +-
 .../store/jdbc/JDBCTopicMessageStore.java   |  31 +-
 .../store/journal/JournalTopicMessageStore.java |  24 +-
 .../activemq/store/kahadb/KahaDBStore.java  |  24 +
 .../activemq/store/kahadb/MessageDatabase.java  |  26 +
 .../activemq/store/kahadb/TempKahaDBStore.java  |   5 +
 .../store/kahadb/disk/index/ListIndex.java  |  20 +-
 .../store/kahadb/disk/index/ListNode.java   |  13 +-
 .../activemq/store/kahadb/plist/PListImpl.java  |  67 ++-
 .../apache/activemq/leveldb/LevelDBStore.scala  |   6 +
 .../region/QueueDuplicatesFromStoreTest.java|   7 +
 .../region/SubscriptionAddRemoveQueueTest.java  |  42 ++
 .../AbstractPendingMessageCursorTest.java   | 547 +++
 .../cursors/KahaDBPendingMessageCursorTest.java | 126 +
 .../cursors/MemoryPendingMessageCursorTest.java | 145 +
 .../MultiKahaDBPendingMessageCursorTest.java|  60 ++
 .../region/cursors/OrderPendingListTest.java|  10 +
 .../store/AbstractMessageStoreSizeStatTest.java | 244 ++---
 .../store/AbstractStoreStatTestSupport.java | 268 +
 .../kahadb/KahaDBMessageStoreSizeStatTest.java  |  22 +-
 .../MultiKahaDBMessageStoreSizeStatTest.java|  50 +-
 .../memory/MemoryMessageStoreSizeStatTest.java  |  22 +-
 43 files changed, 1919 insertions(+), 326 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/734fb7dd/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
index ef1b372..4e688cc 100755
--- 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
+++ 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java
@@ -582,6 +582,13 @@ public abstract class PrefetchSubscription extends 
AbstractSubscription {
 }
 
 @Override
+public long getPendingMessageSize() {
+synchronized (pendingLock) {
+return pending.messageSize();
+}
+}
+
+@Override
 public int getDispatchedQueueSize() {
 return dispatched.size();
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/734fb7dd/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
--
diff --git 
a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java 
b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java

[1/3] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5923

2015-09-09 Thread cshannon 
Repository: activemq
Updated Branches:
  refs/heads/master b17cc37ef -> 734fb7dda


http://git-wip-us.apache.org/repos/asf/activemq/blob/734fb7dd/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
index 28884e6..276a310 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBMessageStoreSizeStatTest.java
@@ -18,12 +18,15 @@ package org.apache.activemq.store.kahadb;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.store.AbstractMessageStoreSizeStatTest;
 import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,12 +42,13 @@ public class KahaDBMessageStoreSizeStatTest extends
 protected static final Logger LOG = LoggerFactory
 .getLogger(KahaDBMessageStoreSizeStatTest.class);
 
-File dataFileDir = new File("target/test-amq-5748/stat-datadb");
+@Rule
+public TemporaryFolder dataFileDir = new TemporaryFolder(new 
File("target"));
 
 @Override
 protected void setUpBroker(boolean clearDataDir) throws Exception {
-if (clearDataDir && dataFileDir.exists())
-FileUtils.cleanDirectory(dataFileDir);
+if (clearDataDir && dataFileDir.getRoot().exists())
+FileUtils.cleanDirectory(dataFileDir.getRoot());
 super.setUpBroker(clearDataDir);
 }
 
@@ -52,7 +56,7 @@ public class KahaDBMessageStoreSizeStatTest extends
 protected void initPersistence(BrokerService brokerService)
 throws IOException {
 broker.setPersistent(true);
-broker.setDataDirectoryFile(dataFileDir);
+broker.setDataDirectoryFile(dataFileDir.getRoot());
 }
 
 /**
@@ -63,19 +67,19 @@ public class KahaDBMessageStoreSizeStatTest extends
  */
 @Test
 public void testMessageSizeAfterRestartAndPublish() throws Exception {
-
-Destination dest = publishTestQueueMessages(200);
+AtomicLong publishedMessageSize = new AtomicLong();
+Destination dest = publishTestQueueMessages(200, publishedMessageSize);
 
 // verify the count and size
-verifyStats(dest, 200, 200 * messageSize);
+verifyStats(dest, 200, publishedMessageSize.get());
 
 // stop, restart broker and publish more messages
 stopBroker();
 this.setUpBroker(false);
-dest = publishTestQueueMessages(200);
+dest = publishTestQueueMessages(200, publishedMessageSize);
 
 // verify the count and size
-verifyStats(dest, 400, 400 * messageSize);
+verifyStats(dest, 400, publishedMessageSize.get());
 
 }
 

http://git-wip-us.apache.org/repos/asf/activemq/blob/734fb7dd/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
index 849a91b..3572acc 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/MultiKahaDBMessageStoreSizeStatTest.java
@@ -22,12 +22,15 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.region.Destination;
 import org.apache.activemq.store.AbstractMessageStoreSizeStatTest;
 import org.apache.commons.io.FileUtils;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,12 +46,13 @@ public class MultiKahaDBMessageStoreSizeStatTest extends
 protected static final Logger LOG = LoggerFactory
 .getLogger(MultiKahaDBMessageStoreSizeStatTest.class);
 
-File dataFileDir = new File("target/test-amq-5748/stat-datadb");
+@Rule
+public TemporaryFolder dataFileDir = new TemporaryFolder(new 
File("target"));
 
 @Override
 protected void

[2/3] activemq git commit: https://issues.apache.org/jira/browse/AMQ-5923

2015-09-09 Thread cshannon 
http://git-wip-us.apache.org/repos/asf/activemq/blob/734fb7dd/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java
index 6911e4f..8fed042 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/index/ListNode.java
@@ -66,14 +66,17 @@ public final class ListNode {
 this.value = value;
 }
 
+@Override
 public Key getKey() {
 return key;
 }
 
+@Override
 public Value getValue() {
 return value;
 }
 
+@Override
 public Value setValue(Value value) {
 Value oldValue = this.value;
 this.value = value;
@@ -98,10 +101,12 @@ public final class ListNode {
 index = current.getContainingList();
 }
 
+@Override
 public boolean hasNext() {
 return nextEntry != null;
 }
 
+@Override
 public ListNode next() {
 ListNode current = nextEntry;
 if (current != null) {
@@ -121,6 +126,7 @@ public final class ListNode {
 return current;
 }
 
+@Override
 public void remove() {
 throw new UnsupportedOperationException();
 }
@@ -171,6 +177,7 @@ public final class ListNode {
 return result;
 }
 
+@Override
 public boolean hasNext() {
 if (nextEntry == null) {
 nextEntry = getFromNextNode();
@@ -178,6 +185,7 @@ public final class ListNode {
 return nextEntry != null;
 }
 
+@Override
 public Entry next() {
 if (nextEntry != null) {
 entryToRemove = nextEntry;
@@ -188,6 +196,7 @@ public final class ListNode {
 }
 }
 
+@Override
 public void remove() {
 if (entryToRemove == null) {
 throw new IllegalStateException("can only remove once, call 
hasNext();next() again");
@@ -228,7 +237,7 @@ public final class ListNode {
 currentNode = previousNode;
 }
 }
-targetList.onRemove();
+targetList.onRemove(entryToRemove);
 
 if (toRemoveNode != null) {
 tx.free(toRemoveNode.getPage());
@@ -262,6 +271,7 @@ public final class ListNode {
 this.valueMarshaller = valueMarshaller;
 }
 
+@Override
 public void writePayload(ListNode node, DataOutput os) 
throws IOException {
 os.writeLong(node.next);
 short count = (short) node.entries.size(); // cast may truncate
@@ -279,6 +289,7 @@ public final class ListNode {
 }
 }
 
+@Override
 @SuppressWarnings({ "unchecked", "rawtypes" })
 public ListNode readPayload(DataInput is) throws 
IOException {
 ListNode node = new ListNode();

http://git-wip-us.apache.org/repos/asf/activemq/blob/734fb7dd/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListImpl.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListImpl.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListImpl.java
index eafb2ac..b45692a 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListImpl.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/plist/PListImpl.java
@@ -21,22 +21,22 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.NoSuchElementException;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.activemq.broker.region.MessageReference;
-import org.apache.activemq.command.Message;
+import org.apache.activemq.management.SizeStatisticImpl;
 import org.apache.activemq.store.PList;
 import org.apache.activemq.store.PListEntry;
 import org.apache.activemq.store.kahadb.disk.index.ListIndex;
+import org.apache.activemq.store.kahadb.disk.index.ListNode;
 import org.apache.activemq.store.kahadb.disk.journal.Location;
 import

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: StartUp/Stop Plugin #469

2015-09-09 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: Runtime Configuration #469

2015-09-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Karaf Integration Tests #469

2015-09-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Unit Tests #469

2015-09-09 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: HTTP Protocol Support #469

2015-09-09 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 #469

2015-09-09 Thread Apache Jenkins Server 
See