Jenkins build is back to stable : ActiveMQ-Java8 » ActiveMQ :: MQTT Protocol #668

2016-05-03 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: ActiveMQ-Java8 #668

2016-05-03 Thread Apache Jenkins Server 
See

Jenkins build became unstable: ActiveMQ-Java8 » ActiveMQ :: KahaDB Store #668

2016-05-03 Thread Apache Jenkins Server 
See

activemq git commit: https://issues.apache.org/jira/browse/AMQ-5603 - catch interrupted on chunked zeros case

2016-05-03 Thread gtully 
Repository: activemq
Updated Branches:
  refs/heads/master 2e0089182 -> 555cd2b6b


https://issues.apache.org/jira/browse/AMQ-5603 - catch interrupted on chunked 
zeros case


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

Branch: refs/heads/master
Commit: 555cd2b6bb7f25db318e26482e4ed11cd9da7d07
Parents: 2e00891
Author: gtully 
Authored: Tue May 3 17:25:05 2016 +0100
Committer: gtully 
Committed: Tue May 3 17:25:14 2016 +0100

--
 .../org/apache/activemq/store/kahadb/disk/journal/Journal.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/555cd2b6/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
index 182a3d7..a48f8dd 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/disk/journal/Journal.java
@@ -408,6 +408,8 @@ public class Journal {
 
 channel.force(false);
 channel.position(0);
+} catch (ClosedByInterruptException ignored) {
+LOG.trace("Could not preallocate journal file with zeros", 
ignored);
 } catch (IOException e) {
 LOG.error("Could not preallocate journal file with zeros! Will 
continue without preallocation", e);
 }

[1/2] activemq-artemis git commit: ARTEMIS-503 - replace proton-jms with proton-jms from ActiveMQ

2016-05-03 Thread clebertsuconic 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 7fb603f78 -> 2a415a80e


ARTEMIS-503 - replace proton-jms with proton-jms from ActiveMQ

Ive copied over the source itself

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


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

Branch: refs/heads/master
Commit: c161ab46a607b2bddc9c7d637c950ae7b2ad1cfc
Parents: 7fb603f
Author: Andy Taylor 
Authored: Tue May 3 13:51:15 2016 +0100
Committer: Clebert Suconic 
Committed: Tue May 3 10:40:56 2016 -0400

--
 artemis-distribution/pom.xml|   4 -
 artemis-distribution/src/main/assembly/dep.xml  |   1 -
 artemis-protocols/artemis-amqp-protocol/pom.xml |   4 -
 .../AMQPNativeOutboundTransformer.java  |  56 
 .../proton/converter/ActiveMQJMSVendor.java |   2 +-
 .../converter/JMSMappingInboundTransformer.java |  49 ---
 .../JMSMappingOutboundTransformer.java  |  53 ---
 .../converter/ProtonMessageConverter.java   |   7 +-
 .../proton/converter/jms/ServerJMSMessage.java  |   7 +
 .../converter/jms/ServerJMSObjectMessage.java   |   2 +-
 .../converter/message/AMQPMessageIdHelper.java  | 257 +++
 .../message/AMQPNativeInboundTransformer.java   |  46 +++
 .../message/AMQPNativeOutboundTransformer.java  |  60 
 .../message/AMQPRawInboundTransformer.java  |  60 
 .../converter/message/EncodedMessage.java   |  67 
 .../converter/message/InboundTransformer.java   | 317 ++
 .../message/JMSMappingInboundTransformer.java   | 126 +++
 .../message/JMSMappingOutboundTransformer.java  | 329 +++
 .../proton/converter/message/JMSVendor.java |  53 +++
 .../converter/message/OutboundTransformer.java  |  69 
 .../plug/ProtonSessionIntegrationCallback.java  |   2 +-
 .../core/protocol/proton/TestConversions.java   |   2 +-
 pom.xml |  12 -
 23 files changed, 1400 insertions(+), 185 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c161ab46/artemis-distribution/pom.xml
--
diff --git a/artemis-distribution/pom.xml b/artemis-distribution/pom.xml
index 6f462b4..54cf4a0 100644
--- a/artemis-distribution/pom.xml
+++ b/artemis-distribution/pom.xml
@@ -186,10 +186,6 @@
  io.netty
  netty-codec-mqtt
   
-  
- org.apache.activemq
- activemq-amqp
-  

 


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c161ab46/artemis-distribution/src/main/assembly/dep.xml
--
diff --git a/artemis-distribution/src/main/assembly/dep.xml 
b/artemis-distribution/src/main/assembly/dep.xml
index d723bae..4a0f2da 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -80,7 +80,6 @@
 org.jboss.logging:jboss-logging
 io.netty:netty-all
 org.apache.qpid:proton-j
-org.apache.activemq:activemq-amqp
 org.apache.activemq:activemq-client
 org.slf4j:slf4j-api
 io.airlift:airline

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c161ab46/artemis-protocols/artemis-amqp-protocol/pom.xml
--
diff --git a/artemis-protocols/artemis-amqp-protocol/pom.xml 
b/artemis-protocols/artemis-amqp-protocol/pom.xml
index 78e9c3b..3f130ee 100644
--- a/artemis-protocols/artemis-amqp-protocol/pom.xml
+++ b/artemis-protocols/artemis-amqp-protocol/pom.xml
@@ -42,10 +42,6 @@
  ${project.version}
   
   
- org.apache.activemq
- activemq-amqp
-  
-  
  org.jboss.logging
  jboss-logging-processor
  provided

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c161ab46/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/AMQPNativeOutboundTransformer.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/AMQPNativeOutboundTransformer.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/AMQPNativeOutboundTransformer.java
deleted file mode 100644
index c187ad0..000
---

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

2016-05-03 Thread clebertsuconic 
This closes #501


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

Branch: refs/heads/master
Commit: 2a415a80e94cd2963722d8509847fe7fe5c301b4
Parents: 7fb603f c161ab4
Author: Clebert Suconic 
Authored: Tue May 3 10:40:57 2016 -0400
Committer: Clebert Suconic 
Committed: Tue May 3 10:40:57 2016 -0400

--
 artemis-distribution/pom.xml|   4 -
 artemis-distribution/src/main/assembly/dep.xml  |   1 -
 artemis-protocols/artemis-amqp-protocol/pom.xml |   4 -
 .../AMQPNativeOutboundTransformer.java  |  56 
 .../proton/converter/ActiveMQJMSVendor.java |   2 +-
 .../converter/JMSMappingInboundTransformer.java |  49 ---
 .../JMSMappingOutboundTransformer.java  |  53 ---
 .../converter/ProtonMessageConverter.java   |   7 +-
 .../proton/converter/jms/ServerJMSMessage.java  |   7 +
 .../converter/jms/ServerJMSObjectMessage.java   |   2 +-
 .../converter/message/AMQPMessageIdHelper.java  | 257 +++
 .../message/AMQPNativeInboundTransformer.java   |  46 +++
 .../message/AMQPNativeOutboundTransformer.java  |  60 
 .../message/AMQPRawInboundTransformer.java  |  60 
 .../converter/message/EncodedMessage.java   |  67 
 .../converter/message/InboundTransformer.java   | 317 ++
 .../message/JMSMappingInboundTransformer.java   | 126 +++
 .../message/JMSMappingOutboundTransformer.java  | 329 +++
 .../proton/converter/message/JMSVendor.java |  53 +++
 .../converter/message/OutboundTransformer.java  |  69 
 .../plug/ProtonSessionIntegrationCallback.java  |   2 +-
 .../core/protocol/proton/TestConversions.java   |   2 +-
 pom.xml |  12 -
 23 files changed, 1400 insertions(+), 185 deletions(-)
--

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

2016-05-03 Thread Apache Jenkins Server 
See

[2/2] activemq-artemis git commit: ARTEMIS-512 NPEs in LDAP authz

2016-05-03 Thread martyntaylor 
ARTEMIS-512 NPEs in LDAP authz


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

Branch: refs/heads/master
Commit: 4bab1f06442fc27770d03b18af61c23168a30d52
Parents: b863e69
Author: jbertram 
Authored: Mon May 2 08:40:02 2016 -0500
Committer: Martyn Taylor 
Committed: Tue May 3 14:22:32 2016 +0100

--
 .../activemq/artemis/core/config/impl/ConfigurationImpl.java| 5 -
 .../core/server/impl/LegacyLDAPSecuritySettingPlugin.java   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4bab1f06/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 8b898b0..bedfa56 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -1151,7 +1151,10 @@ public class ConfigurationImpl implements Configuration, 
Serializable {
@Override
public Map getSecurityRoles() {
   for (SecuritySettingPlugin securitySettingPlugin : 
securitySettingPlugins) {
- securitySettings.putAll(securitySettingPlugin.getSecurityRoles());
+ Map securitySettings = 
securitySettingPlugin.getSecurityRoles();
+ if (securitySettings != null) {
+securitySettings.putAll(securitySettings);
+ }
   }
   return securitySettings;
}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4bab1f06/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
index 60fa632..6a0710a 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
@@ -398,7 +398,9 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
   }
 
   try {
- context.close();
+ if (context != null) {
+context.close();
+ }
   }
   catch (NamingException e) {
  // ignore

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

2016-05-03 Thread martyntaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master b863e69eb -> 7fb603f78


This closes #500


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

Branch: refs/heads/master
Commit: 7fb603f78fb484a8211cc942b35e867df34e4d10
Parents: b863e69 4bab1f0
Author: Martyn Taylor 
Authored: Tue May 3 14:22:32 2016 +0100
Committer: Martyn Taylor 
Committed: Tue May 3 14:22:32 2016 +0100

--
 .../activemq/artemis/core/config/impl/ConfigurationImpl.java| 5 -
 .../core/server/impl/LegacyLDAPSecuritySettingPlugin.java   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)
--

[2/2] activemq-artemis git commit: Change keep alive ratio to 1.5 from 0.75

2016-05-03 Thread martyntaylor 
Change keep alive ratio to 1.5 from 0.75

Fixes: ARTEMIS-397

>From mqtt specs:

“If the Keep Alive value is non-zero and the Server does not receive a
Control Packet from the Client within one and a half times the Keep
Alive time period, it MUST disconnect the Network Connection to the
Client as if the network had failed [MQTT-3.1.2-24]. “


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

Branch: refs/heads/master
Commit: 75a4e78948ba30e154bd0dafa86947052942ff47
Parents: 7d0d779
Author: Diego Bes 
Authored: Fri Apr 29 08:43:25 2016 -0700
Committer: Martyn Taylor 
Committed: Tue May 3 14:14:34 2016 +0100

--
 .../activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/75a4e789/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
--
diff --git 
a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
 
b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
index 57c2b57..306d146 100644
--- 
a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
+++ 
b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
@@ -156,7 +156,7 @@ public class MQTTProtocolHandler extends 
ChannelInboundHandlerAdapter {
 */
void handleConnect(MqttConnectMessage connect, ChannelHandlerContext ctx) 
throws Exception {
   this.ctx = ctx;
-  connectionEntry.ttl = connect.variableHeader().keepAliveTimeSeconds() * 
750;
+  connectionEntry.ttl = connect.variableHeader().keepAliveTimeSeconds() * 
1500;
 
   String clientId = connect.payload().clientIdentifier();
   session.getConnectionManager().connect(clientId, 
connect.payload().userName(), connect.payload().password(), 
connect.variableHeader().isWillFlag(), connect.payload().willMessage(), 
connect.payload().willTopic(), connect.variableHeader().isWillRetain(), 
connect.variableHeader().willQos(), connect.variableHeader().isCleanSession());

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

2016-05-03 Thread martyntaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 7d0d77999 -> b863e69eb


This closes #497


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

Branch: refs/heads/master
Commit: b863e69eb77369e6ff82a049606371a5f1337300
Parents: 7d0d779 75a4e78
Author: Martyn Taylor 
Authored: Tue May 3 14:14:34 2016 +0100
Committer: Martyn Taylor 
Committed: Tue May 3 14:14:34 2016 +0100

--
 .../activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6278 - revisit LeaseDatabaseLocker log levels

2016-05-03 Thread dejanb 
Repository: activemq
Updated Branches:
  refs/heads/master ba77b9f55 -> 2e0089182


https://issues.apache.org/jira/browse/AMQ-6278 - revisit LeaseDatabaseLocker 
log levels


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

Branch: refs/heads/master
Commit: 2e00891827e6e65dd8dbb22d80d1239af3b4ce23
Parents: ba77b9f
Author: Dejan Bosanac 
Authored: Tue May 3 14:52:19 2016 +0200
Committer: Dejan Bosanac 
Committed: Tue May 3 14:53:31 2016 +0200

--
 .../org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/2e008918/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java
--
diff --git 
a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java
 
b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java
index e03fbc4..cbbc73d 100644
--- 
a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java
+++ 
b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/LeaseDatabaseLocker.java
@@ -83,7 +83,7 @@ public class LeaseDatabaseLocker extends AbstractJDBCLocker {
 reportLeasOwnerShipAndDuration(connection);
 
 } catch (Exception e) {
-LOG.debug(getLeaseHolderId() + " lease acquire failure: "+ e, 
e);
+LOG.warn(getLeaseHolderId() + " lease acquire failure: "+ e, 
e);
 if (isStopping()) {
 throw new Exception(
 "Cannot start broker as being asked to shut down. "
@@ -98,7 +98,7 @@ public class LeaseDatabaseLocker extends AbstractJDBCLocker {
 close(connection);
 }
 
-LOG.info(getLeaseHolderId() + " failed to acquire lease.  Sleeping 
for " + lockAcquireSleepInterval + " milli(s) before trying again...");
+LOG.debug(getLeaseHolderId() + " failed to acquire lease.  
Sleeping for " + lockAcquireSleepInterval + " milli(s) before trying again...");
 TimeUnit.MILLISECONDS.sleep(lockAcquireSleepInterval);
 }
 if (isStopping()) {
@@ -114,7 +114,7 @@ public class LeaseDatabaseLocker extends AbstractJDBCLocker 
{
 statement = 
connection.prepareStatement(getStatements().getLeaseOwnerStatement());
 ResultSet resultSet = statement.executeQuery();
 while (resultSet.next()) {
-LOG.info(getLeaseHolderId() + " Lease held by " + 
resultSet.getString(1) + " till " + new Date(resultSet.getLong(2)));
+LOG.debug(getLeaseHolderId() + " Lease held by " + 
resultSet.getString(1) + " till " + new Date(resultSet.getLong(2)));
 }
 } finally {
 close(statement);

svn commit: r987376 - in /websites/production/activemq/content: cache/main.pageCache kahadb.html

2016-05-03 Thread buildbot 
Author: buildbot
Date: Tue May  3 12:21:50 2016
New Revision: 987376

Log:
Production update by buildbot for activemq

Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/kahadb.html

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

Modified: websites/production/activemq/content/kahadb.html
==
--- websites/production/activemq/content/kahadb.html (original)
+++ websites/production/activemq/content/kahadb.html Tue May  3 12:21:50 2016
@@ -91,7 +91,7 @@
  /broker
 
 
-KahaDB Propertiesproperty namedefault valueCommentsdirectoryactivemq-datathe path to the directory to use to store 
the message store data and log filesIndexDirectoryIf set, configures where the KahaDB index files 
will be stored. If not set, the index files are stored in the directory 
specified by the 'directory' attr
 ibute. Available as of ActiveMQ 
5.10storeOpenWireVersion11Determines the version of OpenWire commands that are 
marshalled to the KahaDB journal. In versions prior to 5.12.0 this value 
defaulted to v6. Some features of the broker depend on information stored 
in the OpenWire commands from newer protocol revisions and these may not work 
correctly if the store version is set to a lower value. KahaDB stores 
from broker versions greater than 5.9.0 will in many cases still be readable by 
the broker but will cause the broker to continue using the 
 older store version meaning newer features may not work as intended. For 
KahaDB stores that were created in versions prior to v5.9.0 it will be 
necessary to manually set the store version to v6 in order to start a broker 
without error.indexWriteBatchSize1000number of indexes written in a 
batchindexCacheSize1number of index pages cached in 
memoryenableIndexWriteAsyncfalseif set, will asynchronously write inde
 xesjournalMaxFileLength32mba hint to set the maximum size of the message data 
logsenableJournalDiskSyncstrueensure every journal write is followed by a disk sync 
(JMS durability requirement)cleanupInterval3time (ms) before checking for a discarding/moving 
message data logs that are no longer usedcheckpointInterval5000time (ms) before checkpointing the 
journalignoreMissingJournalfilesfalseIf enabled, will ignore a missing message log 
filecheckForCorruptJournalFilesfalseIf enabled, will check for corrupted Journal files on 
startup and try and recover themchecksumJournalFilesfalse true v5.9create a checksum for a journal file - to enable checking for 
corrupted journalsarchiveDataLogsfalseIf enabled, will move a message data log to the archive 
directory instead of deleting it.directoryArchivenullDefine the directory to move data logs to when they all 
the messages they contain have been consumed.maxAsyncJobs1the maximum number of asynchronous messages that will 
be queued awaiting storage (s
 hould be the same as the number of concurrent 
MessageProducers)concurrentStoreAndDispatchTopicsfalseenable the dispatching of Topic messages to 
interested clients to happen concurrently with message storage 
(Warning: Enabling this property is not 
recommended)concurrentStoreAndDispatchQueuestrueenable the dispatching of Queue messages to 
interested clients to happen concurrently with message 
storagearchiveCorruptedIndexfalseIf enabled, corrupted indexes found at startup will be 
archived (not deleted)preallocationStrategysparse_file(as of 5.12.0) This setting configures how 
the broker will try to preallocate the journal files when a new journal file is 
needed. The default allocation strategy sets the file length, but does not 
populate it with any data. The 'os_kernel_copy' strategy delegates the 
preallocation to the Operating System. The 'zeros' strategy configures ActiveMQ 
to do the preallocation by writing 0x00 to all of the positions in the journal 
file.For tuning locking properties 
please take a look at Pluggable storage lockersSlow fil
 e system access diagnostic loggingYou can configure a non zero 
threshold in mili seconds for database updates. If database 
operation is slower than that threshold (for example if you set it to 500), you 
may see messages like
+KahaDB Propertiesproperty namedefault valueCommentsdirectoryactivemq-datathe path to the directory to use to store 
the message store data and log filesIndexDirectoryIf set, configures where the KahaDB index files 
will be stored. If not set, the index files are stored in the directory 
specified by the 'directory' attr
 ibute. Available as of ActiveMQ 
5.10storeOpenWireVersion11Determines the version of OpenWire commands that are 
marshalled to the KahaDB journal. In versions prior to 5.12.0 this value 
defaulted to v6. Some features of the broker depend on information stored 
in the OpenWire commands from newer protocol revisions

[CONF] Apache ActiveMQ > KahaDB

2016-05-03 Thread Gary Tully (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Gary Tully edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
Change comment: document PreallocationScope 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
KahaDB 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 property name  
 default value  
 Comments  
 
 
 directory  
 activemq-data  
 the path to the directory to use to store the message store data and log files  
 
 
 IndexDirectory  
  
  If set, configures where the KahaDB index files will be stored. If not set, the index files are stored in the directory specified by the 'directory' attribute.   
 
 
 
 Note 
 
 
 
 
Available as of ActiveMQ 5.10 
 
 
  
 
 
 storeOpenWireVersion  
 11  
 Determines the version of OpenWire commands that are marshalled to the KahaDB journal.  In versions prior to 5.12.0 this value defaulted to v6.  Some features of the broker depend on information stored in the OpenWire commands from newer protocol revisions and these may not work correctly if the store version is set to a lower value.  KahaDB stores from broker versions greater than 5.9.0 will in many cases still be readable by the broker but will cause the broker to continue using the older store version meaning newer features may not work as intended.  For KahaDB stores that were created in versions prior to v5.9.0 it will be necessary to manually set the store version to v6 in order to start a broker without error.  
 
 
 indexWriteBatchSize  
 1000  
 number of indexes written in a batch  
 
 
 indexCacheSize  
 1  
 number of index pages cached in memory  
 
 
 enableIndexWriteAsync  
 false  
 if set, will asynchronously write indexes  
 
 
 journalMaxFileLength  
 32mb  
 a hint to set the maximum size of the message data logs  
 
 
 enableJournalDiskSyncs  
 true  
 ensure every journal write is followed by a disk sync (JMS durability requirement)  
 
 
 cleanupInterval  
 3  
 time (ms) before checking for a discarding/moving message data logs that are no longer used  
 
 
 checkpointInterval  
 5000  
 time (ms) before checkpointing the journal  
 
 
 ignoreMissingJournalfiles  
 false  
 If enabled, will ignore a missing message log file  
 
 
 checkForCorruptJournalFiles  
 false  
 If enabled, will check for corrupted Journal files on startup and try and recover them  
 
 
 checksumJournalFiles  
  false true v5.9   
 create a checksum for a journal file - to enable checking for corrupted journals  
 
 
 archiveDataLogs  
 false  
 If enabled, will move a message data log to the archive directory instead of deleting it.  
 
 
 directoryArchive  
 null  
 Define the directory to move data logs to when they all the messages they contain have been consumed.  
 
 
 maxAsyncJobs  
 1  
 the maximum number of asynchronous messages that will be queued awaiting storage (should be the same as the number of concurrent MessageProducers)  
 
 
 concurrentStoreAndDispatchTopics  
 false  
 enable the dispatching of Topic messages to interested clients to happen concurrently with message storage (Warning: Enabling this property is not recommended)  
 
 
 concurrentStoreAndDispatchQueues  
 true  
 enable the dispatching of Queue messages to interested clients to happen concurrently with message storage  
 
 
 archiveCorruptedIndex  
 false  
 If enabled, corrupted indexes found at startup will be archived (not deleted)  
 
 
 preallocationStrategy  
 sparse_file  
 (as of 5.12.0) This setting configures how the broker will try to preallocate the journal files when a new journal file is needed. The default allocation strategy sets the file length, but does not populate it with any data. The 'os_kernel_copy' strategy delegates the preallocation to the Operating System. The 'zeros' strategy configures ActiveMQ to do the preallocation by writing 0x00 to all of the positions in the journal file.  
 
 
preallocationScope 
entire_journal_async 
(as of 5.14.0) This setting configures how the broker will preallocate the journal data files. The default preallocates the next data file in a separate thread. 'entire_journal' does preallocation on first use. 'none' disables preallocation. Using 'entire_journal_async' option avoids delaying writes pending preallocation on first use. 
 
 
 
 For tuning locking properties please take a look at Pluggable storage lockers  ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6277 - tidy up logic that determines recovery location so that we don't recovery from the end of the journal in error on normal restart.

2016-05-03 Thread gtully 
Repository: activemq
Updated Branches:
  refs/heads/master 3dd86d04e -> ba77b9f55


https://issues.apache.org/jira/browse/AMQ-6277 - tidy up logic that determines 
recovery location so that we don't recovery from the end of the journal in 
error on normal restart. This avoids suprious recovery logging


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

Branch: refs/heads/master
Commit: ba77b9f55a627846ecab63916b2667f234022d34
Parents: 3dd86d0
Author: gtully 
Authored: Tue May 3 12:47:24 2016 +0100
Committer: gtully 
Committed: Tue May 3 12:47:49 2016 +0100

--
 .../activemq/store/kahadb/MessageDatabase.java  | 23 +++-
 .../activemq/store/kahadb/KahaDBTest.java   | 37 
 2 files changed, 51 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/ba77b9f5/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
--
diff --git 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
index 3e754f7..4a23cbc 100644
--- 
a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
+++ 
b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
@@ -629,8 +629,8 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 Location ackMessageFileLocation = recoverAckMessageFileMap();
 Location lastIndoubtPosition = getRecoveryPosition();
 
-Location recoveryPosition = minimum(producerAuditPosition, 
ackMessageFileLocation);
-recoveryPosition = minimum(recoveryPosition, lastIndoubtPosition);
+Location recoveryPosition = startOfRecovery(producerAuditPosition, 
ackMessageFileLocation);
+recoveryPosition = startOfRecovery(recoveryPosition, 
lastIndoubtPosition);
 
 if (recoveryPosition != null) {
 int redoCounter = 0;
@@ -711,16 +711,21 @@ public abstract class MessageDatabase extends 
ServiceSupport implements BrokerSe
 return TransactionIdConversion.convertToLocal(tx);
 }
 
-private Location minimum(Location producerAuditPosition,
-Location lastIndoubtPosition) {
+private Location startOfRecovery(Location x,
+Location y) {
 Location min = null;
-if (producerAuditPosition != null) {
-min = producerAuditPosition;
-if (lastIndoubtPosition != null && 
lastIndoubtPosition.compareTo(producerAuditPosition) < 0) {
-min = lastIndoubtPosition;
+if (x != null) {
+min = x;
+if (y != null) {
+int compare = y.compareTo(x);
+if (compare < 0) {
+min = y;
+} else if (compare == 0) {
+min = null; // no recovery needed on a matched location
+}
 }
 } else {
-min = lastIndoubtPosition;
+min = y;
 }
 return min;
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/ba77b9f5/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBTest.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBTest.java
 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBTest.java
index 78f4c60..bd81524 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBTest.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.store.kahadb;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
@@ -31,6 +32,10 @@ import junit.framework.TestCase;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.util.DefaultTestAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.spi.LoggingEvent;
 
 /**
  * @author chirino
@@ -193,6 +198,38 @@ public class KahaDBTest extends TestCase {
 broker.stop();
 }
 
+public void

svn commit: r987373 [2/2] - in /websites/production/activemq/content: 2016/05/ 2016/05/03/ 2016/05/03/apache-activemq-5133-released.html activemq-5133-release.html cache/main.pageCache download.html i

2016-05-03 Thread buildbot 
Modified: websites/production/activemq/content/xml-reference.html
==
--- websites/production/activemq/content/xml-reference.html (original)
+++ websites/production/activemq/content/xml-reference.html Tue May  3 11:23:02 
2016
@@ -82,7 +82,7 @@
   
 
 
-ActiveMQ Xml ReferenceThis page 
contains a link to the XML reference guides and XML schema documents for Xml Configuration with ActiveMQ 
releasesReleased SchemasReference DocumentReferenceXML SchemaXML Schema namespaceXBean XML Reference 4.1http://activemq.apache.org/schema/core/
 activemq-core-4.1.2.xsd.html">Referencehttp://activemq.apache.org/schema/core/activemq-core-4.1.2.xsd;>http://activemq.apache.org/schema/core/activemq-core-4.1.2.xsdhttp://activemq.org/config/1.0; 
rel="nofollow">http://activemq.org/config/1.0XBean XML Reference 5.0http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd;>http://activemq.apache.org/sc
 hema/core/activemq-core-5.0.0.xsdhttp://activemq.org/config/1.0; 
rel="nofollow">http://activemq.org/config/1.0XBean XML Reference 
5.1http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXB
 ean XML Reference 5.2http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.3.0http://activemq.apache.org/schema/core/activemq-core-5.3.0-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.3.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.3.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.3.1http://activemq.apache.org/schema/core/activemq-core-5.3.1-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.3.1.xsdhttp://activemq.apache.org/schem
 a/core">http://activemq.apache.org/schema/coreXBean XML Reference 
5.3.2http://activemq.apache.org/schema/core/activemq-core-5.3.2-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.3.2.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.3.2.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.4.0http://activemq.apache.org/schema/core/a
 ctivemq-core-5.4.0-schema.html">Referencehttp://activemq.apache.org/schema/core/activemq-core-5.4.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.4.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.4.1http://activemq.apache.org/schema/core/activemq-core-5.4.1-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.4.1.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.4.1.xsd<
 td colspan="1" rowspan="1" class="confluenceTd">http://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.4.2http://activemq.apache.org/schema/core/activemq-core-5.4.2-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.5.0http://activemq.apache.org/schema/core/activemq-core-5.5.0-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.6.0http://activemq.apache.org/schema/core/activemq-core-5.6.0-schema.html;>Referencehttp://active
 
mq.apache.org/schema/core/activemq-core-5.6.0.xsd">http://activemq.apache.org/schema/core/activemq-core-5.6.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference 
5.7.0http://activemq.apache.org/schema/core/activemq-core-5.7.0-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.7.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.7.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/s
 chema/coreXBean XML Reference 5.8.0http://activemq.apache.org/schema/core/activemq-core-5.8.0-schema.html;>Referencehttp://activemq.apache.org/schema/core/activemq-core-5.8.0.xsd;>http://activemq.apache.org/schema/core/activemq-core-5.8.0.xsdhttp://activemq.apache.org/schema/core;>http://activemq.apache.org/schema/coreXBean XML Reference

[CONF] Apache ActiveMQ > Apache ActiveMQ 5.13.3 Released

2016-05-03 Thread Christopher L. Shannon (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon created a blog post 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Apache ActiveMQ 5.13.3 Released 
 
 
  
 
 
 
 
 
 
  The ActiveMQ team is pleased to announce the release of ActiveMQ 5.13.3   A big thanks to everyone who contributed to this release.   We look forward to your feedback.   
 
 
  
 
 
 
 
 
 
 
 
 
 

View blog post
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4

[CONF] Apache ActiveMQ > Xml Reference

2016-05-03 Thread Christopher L. Shannon (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Xml Reference 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 Reference Document  
 Reference  
 XML Schema  
 XML Schema namespace  
 
 
  XBean XML Reference 4.1   
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-4.1.2.xsd   
  http://activemq.org/config/1.0   
 
 
  XBean XML Reference 5.0   
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.0.0.xsd   
  http://activemq.org/config/1.0   
 
 
 XBean XML Reference 5.1  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.1.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.2  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.2.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.3.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.3.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.3.1  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.3.1.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.3.2  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.3.2.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.4.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.4.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.4.1  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.4.1.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.4.2  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.4.2.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.5.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.5.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.6.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.6.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.7.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.7.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.8.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.8.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.9.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.9.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
XBean XML Reference 5.10.0 
Reference 
http://activemq.apache.org/schema/core/activemq-core-5.10.0.xsd 
http://activemq.apache.org/schema/core 
 
 
 XBean XML Reference 5.10.1  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.10.1.xsd   
  http://activemq.apache.org/schema/core   
 
 
  XBean XML Reference 5.10.2   
   Reference
   http://activemq.apache.org/schema/core/activemq-core-5.11.0.xsd
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.11.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.11.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.11.1  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.11.1.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.11.2  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.11.2.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.11.3  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.11.3.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.12.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.12.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.12.1  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.12.1.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.13.0  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.13.0.xsd   
  http://activemq.apache.org/schema/core   
 
 
  XBean XML Reference 5.13.1   
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.13.1.xsd   
  http://activemq.apache.org/schema/core   
 
 
  XBean XML Reference 5.13.2   
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.13.2.xsd   
  http://activemq.apache.org/schema/core   
 
 
  XBean XML Reference 5.13.3   
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.13.3.xsd   
  http://activemq.apache.org/schema/core   
 
 
 
 Using the XSDs in configuration files If you are using XBean to parse the XML configurations, the XML validation is optional so you do not need to specify the XML Schema Locations. However if you are using Spring's 2.0 XML handling to parse the XML then you

[CONF] Apache ActiveMQ > Download

2016-05-03 Thread Christopher L. Shannon (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Download 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 Section 
 
 
 
 
 
 
 
 
 Column 
 
 
 
 
 
 
 
 
width 
20% 
 
 
  
 
 
 
 
 
 
 
 
 div 
 
 
 
 
 
 
 
 
style 
padding-right:20px;float:left; 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 Column 
 
 
 
 
 
 
 
 
width 
80% 
 
 
  
 
 
 
 
 
 
 
 
 div 
 
 
 
 
 
 
 
 
style 
min-height:200px 
 
 
  
 
 
 
 
 The latest stable release is the ActiveMQ 5.13.2 3 Release   
 
 
  
 
 
  
 
 
 Getting past releases See the Download Archives for all time releases. ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4

[CONF] Apache ActiveMQ > Index

2016-05-03 Thread Christopher L. Shannon (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Index 
 
 
  
 
 
 
 
 
 
  Download ActiveMQ 5.13.  ...  3 Today!  Apache ActiveMQ ™ is the most popular and powerful open source messaging and Integration Patterns server. ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6276 - remove fileserver webapp

2016-05-03 Thread dejanb 
Repository: activemq
Updated Branches:
  refs/heads/master 4f43a2121 -> 3dd86d04e


https://issues.apache.org/jira/browse/AMQ-6276 - remove fileserver webapp


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

Branch: refs/heads/master
Commit: 3dd86d04e8b90ba309819317d19e7260d414d9e7
Parents: 4f43a21
Author: Dejan Bosanac 
Authored: Tue May 3 12:37:05 2016 +0200
Committer: Dejan Bosanac 
Committed: Tue May 3 12:39:50 2016 +0200

--
 activemq-fileserver/pom.xml | 112 -
 .../activemq/util/FilenameGuardFilter.java  |  96 
 .../java/org/apache/activemq/util/IOHelper.java | 139 ---
 .../org/apache/activemq/util/RestFilter.java| 230 ---
 .../src/main/webapp/META-INF/LICENSE| 203 
 .../src/main/webapp/META-INF/NOTICE |   5 -
 .../src/main/webapp/WEB-INF/web.xml |  55 -
 activemq-fileserver/src/main/webapp/index.html  |  30 ---
 .../org/apache/activemq/util/HttpBlobTest.java  |  72 --
 .../apache/activemq/util/HttpTestSupport.java   | 127 --
 .../apache/activemq/util/RestFilterTest.java|  70 --
 assembly/pom.xml|   5 -
 assembly/src/main/descriptors/common-bin.xml|  17 --
 assembly/src/release/conf/jetty.xml |   5 -
 .../src/release/examples/conf/jetty-demo.xml|   6 -
 pom.xml |   7 -
 16 files changed, 1179 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/3dd86d04/activemq-fileserver/pom.xml
--
diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml
deleted file mode 100755
index 0c3f815..000
--- a/activemq-fileserver/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
-
-  4.0.0
-
-  
-org.apache.activemq
-activemq-parent
-5.14.0-SNAPSHOT
-  
-
-  activemq-fileserver
-  war
-  ActiveMQ :: File Server
-  Web File Server for out of band large message 
exchange
-
-  
-
-  
-org.eclipse.jetty
-jetty-maven-plugin
-
-  
-
-  ${jetty.port}
-  6
-
-  
-  10
-
-  
-  
-maven-surefire-plugin
-
-  
-**/RestFilterTest.*
-  
-
-  
-
-  
-
-  
-
-  org.slf4j
-  slf4j-api
-
-
-   
-   
-   org.apache.tomcat
-   tomcat-servlet-api
-   provided
-   
-
-
-
-
-  junit
-  junit
-  test
-
-
-  ${project.groupId}
-  activemq-unit-tests
-  test-jar
-  test
-
-
-  ${project.groupId}
-  activemq-broker
-  test-jar
-  test
-
-
-  org.eclipse.jetty.aggregate
-  jetty-all
-  test
-
-
-  org.slf4j
-  slf4j-log4j12
-  test
-
-
-  log4j
-  log4j
-  true
-  test
-
-  
-
-  
-8080
-  
-

http://git-wip-us.apache.org/repos/asf/activemq/blob/3dd86d04/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
--
diff --git 
a/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
 
b/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
deleted file mode 100644
index b8bcc95..000
--- 
a/activemq-fileserver/src/main/java/org/apache/activemq/util/FilenameGuardFilter.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * 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
- *
- * 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.
- * See the License for the specific language governing permissions and
- * limitations under the

[CONF] Apache ActiveMQ > ActiveMQ 5.13.3 Release

2016-05-03 Thread Christopher L. Shannon (Confluence) 
Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon created a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ActiveMQ 5.13.3 Release 
 
 
  
 
 
 
 
 
 
 
 
   
   ActiveMQ 5.13.3 Release Apache ActiveMQ 5.13.3 includes over 25 resolved issues and improvements. Getting the Binary Distributions 
 
 
 
 
 Description  
 Download Link  
  Verify   
 
 
 Windows Distribution  
  apache-activemq-5.13.3-bin.zip   
  ASC, MD5, SHA1   
 
 
 Unix/Linux/Cygwin Distribution  
  apache-activemq-5.13.3-bin.tar.gz   
  ASC, MD5, SHA1   
 
 
 
  Verify the Integrity of Downloads It is essential that you verify the integrity of the downloaded files using the PGP or MD5 signatures. The PGP signatures can be verified using PGP or GPG. Begin by following these steps: 
 
Download the KEYS  
Download the asc signature file for the relevant distribution 
 Verify the signatures using the following commands, depending on your use of PGP or GPG: 
 
 
$ pgpk -a KEYS
$ pgpv apache-activemq--bin.tar.gz.asc
 
 
 or 
 
 
$ pgp -ka KEYS
$ pgp apache-activemq--bin.tar.gz.asc
 
 
 or 
 
 
$ gpg --import KEYS
$ gpg --verify apache-activemq--bin.tar.gz.asc
 
 
  
 (Where  is replaced with the actual version, e.g., 5.1.0, 5.2.0, etc.). Alternatively, you can verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in most Linux and Unix distributions. It is also available as part of GNU Textutils. Windows users can utilize any of the following md5 programs: 
 
 md5  
 md5sums  
 SlavaSoft FSUM  
  Getting the Binaries using Maven 3 To use this release in your maven project, the simplest dependency that you can use in your Maven POM is: 
 
 

  org.apache.activemq
  activemq-all
  5.13.3

 
 
 If you need more fine grained control of your dependencies (activemq-all is an uber jar) pick and choose from the various components activemq-client, activemq-broker, activemq-xx-store etc. 

   
 Getting the Source Code Source Distributions 
 
 
 
 
 Description  
 Download Link  
 Verify  
 
 
 Source Release  
  activemq-parent-5.13.3-source-release.zip   
  ASC, MD5, SHA1   
 
 
 
 Git Tag  https://git-wip-us.apache.org/repos/asf?p=activemq.git;a=tag;h=refs/tags/activemq-5.13.3  Change Log For a more detailed view of new features and bug fixes, see the release notes  
 
 
 
This release affects applications using ObjectMessages. Please refer to http://activemq.apache.org/objectmessage.html and  AMQ-6013 for more information. 
 
     Also see the previous ActiveMQ 5.13.2 Release   
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 5.8.4

activemq git commit: https://issues.apache.org/jira/browse/AMQ-5603 - one more journal in the mix for this test with async preallocation

2016-05-03 Thread gtully 
Repository: activemq
Updated Branches:
  refs/heads/master 27799fec9 -> 4f43a2121


https://issues.apache.org/jira/browse/AMQ-5603 - one more journal in the mix 
for this test with async preallocation


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

Branch: refs/heads/master
Commit: 4f43a2121264152b09166b8a09403ee0c205233d
Parents: 27799fe
Author: gtully 
Authored: Tue May 3 11:36:47 2016 +0100
Committer: gtully 
Committed: Tue May 3 11:36:47 2016 +0100

--
 .../src/test/java/org/apache/activemq/bugs/AMQ2832Test.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/4f43a212/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
--
diff --git 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
index 1b3a4e5..c2e3895 100644
--- 
a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
+++ 
b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ2832Test.java
@@ -46,6 +46,7 @@ import org.apache.activemq.leveldb.LevelDBStore;
 import org.apache.activemq.store.PersistenceAdapter;
 import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
 import org.apache.activemq.store.kahadb.disk.journal.DataFile;
+import org.apache.activemq.store.kahadb.disk.journal.Journal;
 import org.apache.activemq.util.Wait;
 import org.junit.After;
 import org.junit.Test;
@@ -287,7 +288,7 @@ public class AMQ2832Test {
 assertTrue("Less than three journal file expected, was " + 
getNumberOfJournalFiles(), Wait.waitFor(new Wait.Condition() {
 @Override
 public boolean isSatisified() throws Exception {
-return getNumberOfJournalFiles() <= 3;
+return getNumberOfJournalFiles() <= 4;
 }
 }, TimeUnit.MINUTES.toMillis(3)));
 
@@ -302,6 +303,7 @@ public class AMQ2832Test {
 
 Collection files =
 ((KahaDBPersistenceAdapter) 
broker.getPersistenceAdapter()).getStore().getJournal().getFileMap().values();
+LOG.info("Data files: " + files);
 int reality = 0;
 for (DataFile file : files) {
 if (file != null) {

[2/2] activemq-artemis git commit: ARTEMIS-510 create queue only on route

2016-05-03 Thread andytaylor 
ARTEMIS-510 create queue only on route


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

Branch: refs/heads/master
Commit: d1a687a98f24d6ad6dce9e9659cf0d447221befa
Parents: 882b8ed
Author: jbertram 
Authored: Fri Apr 29 12:04:14 2016 -0500
Committer: Andy Taylor 
Committed: Tue May 3 10:59:51 2016 +0100

--
 .../apache/activemq/artemis/jms/client/ActiveMQSession.java | 9 ++---
 .../tests/integration/client/AutoCreateJmsQueueTest.java| 9 +++--
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d1a687a9/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 3320932..50269f5 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -298,13 +298,8 @@ public class ActiveMQSession implements QueueSession, 
TopicSession {
  if (jbd != null) {
 ClientSession.AddressQuery response = 
session.addressQuery(jbd.getSimpleAddress());
 
-if (!response.isExists()) {
-   if (response.isAutoCreateJmsQueues()) {
-  session.createQueue(jbd.getSimpleAddress(), 
jbd.getSimpleAddress(), true);
-   }
-   else {
-  throw new InvalidDestinationException("Destination " + 
jbd.getName() + " does not exist");
-   }
+if (!response.isExists() && !response.isAutoCreateJmsQueues()) {
+   throw new InvalidDestinationException("Destination " + 
jbd.getName() + " does not exist");
 }
 
 connection.addKnownDestination(jbd.getSimpleAddress());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/d1a687a9/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
index 4c29d6c..91878c8 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
@@ -66,6 +66,9 @@ public class AutoCreateJmsQueueTest extends JMSTestBase {
   }
 
   connection.close();
+
+  // make sure the JMX control was created for the JMS queue
+  
assertNotNull(server.getManagementService().getResource("jms.queue.test"));
}
 
@Test
@@ -110,10 +113,12 @@ public class AutoCreateJmsQueueTest extends JMSTestBase {
   Session session = connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
 
   javax.jms.Queue queue = ActiveMQJMSClient.createQueue("test");
+  MessageProducer producer = session.createProducer(queue);
+  TextMessage mess = session.createTextMessage("msg");
 
   try {
- MessageProducer producer = session.createProducer(queue);
- Assert.fail("Creating a producer here should throw a 
JMSSecurityException");
+ producer.send(mess);
+ Assert.fail("Sending a message here should throw a 
JMSSecurityException");
   }
   catch (Exception e) {
  Assert.assertTrue(e instanceof JMSSecurityException);

[1/2] activemq-artemis git commit: This closes #498 ARTEMIS-510 create queue only on route

2016-05-03 Thread andytaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 882b8edbd -> 7d0d77999


This closes #498 ARTEMIS-510 create queue only on route


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

Branch: refs/heads/master
Commit: 7d0d779990c72031dfe23806f76d2bb7e53079bc
Parents: 882b8ed d1a687a
Author: Andy Taylor 
Authored: Tue May 3 10:59:51 2016 +0100
Committer: Andy Taylor 
Committed: Tue May 3 10:59:51 2016 +0100

--
 .../apache/activemq/artemis/jms/client/ActiveMQSession.java | 9 ++---
 .../tests/integration/client/AutoCreateJmsQueueTest.java| 9 +++--
 2 files changed, 9 insertions(+), 9 deletions(-)
--

[4/6] activemq-artemis git commit: Individualizing logger.traces on org.apache.activemq.artemis.core.server (artemis-server project)

2016-05-03 Thread andytaylor 
Individualizing logger.traces on org.apache.activemq.artemis.core.server 
(artemis-server project)

This makes it easier to debug through loggers


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

Branch: refs/heads/master
Commit: f0df9d8c78883564c95033199bebbfd13e77e5ad
Parents: 2135911
Author: Clebert Suconic 
Authored: Wed Apr 27 18:01:41 2016 -0400
Committer: Clebert Suconic 
Committed: Thu Apr 28 14:35:11 2016 -0400

--
 .../core/paging/cursor/PagedReferenceImpl.java  |  11 +-
 .../cursor/impl/PageCursorProviderImpl.java |  43 ---
 .../impl/PageSubscriptionCounterImpl.java   |   7 +-
 .../cursor/impl/PageSubscriptionImpl.java   |  23 ++--
 .../activemq/artemis/core/paging/impl/Page.java |  16 +--
 .../core/paging/impl/PagingManagerImpl.java |  18 +--
 .../core/paging/impl/PagingStoreImpl.java   |   9 +-
 .../impl/journal/BatchingIDGenerator.java   |   5 +-
 .../impl/journal/LargeServerMessageImpl.java|   7 +-
 .../impl/journal/LargeServerMessageInSync.java  |  15 +--
 .../core/postoffice/impl/BindingsImpl.java  |  27 ++--
 .../postoffice/impl/DuplicateIDCacheImpl.java   |  43 ---
 .../core/postoffice/impl/PostOfficeImpl.java|  58 +
 .../postoffice/impl/SimpleAddressManager.java   |   8 +-
 .../core/ServerSessionPacketHandler.java|  23 ++--
 .../core/impl/ActiveMQPacketHandler.java|   9 +-
 .../protocol/core/impl/CoreProtocolManager.java |   4 +-
 .../core/remoting/impl/invm/InVMConnection.java |  11 +-
 .../core/remoting/impl/invm/InVMConnector.java  |  10 +-
 .../server/impl/RemotingServiceImpl.java|  35 ++---
 .../core/replication/ReplicationEndpoint.java   |  20 +--
 .../core/replication/ReplicationManager.java|  11 +-
 .../core/security/impl/SecurityStoreImpl.java   |  17 +--
 .../artemis/core/server/MemoryManager.java  |   9 +-
 .../core/server/cluster/BackupManager.java  |  11 +-
 .../core/server/cluster/ClusterController.java  |  13 +-
 .../core/server/cluster/ClusterManager.java |  17 ++-
 .../core/server/cluster/impl/BridgeImpl.java|  93 +++---
 .../server/cluster/impl/BroadcastGroupImpl.java |   5 +-
 .../cluster/impl/ClusterConnectionBridge.java   |  29 +++--
 .../cluster/impl/ClusterConnectionImpl.java |  97 +++---
 .../cluster/impl/RemoteQueueBindingImpl.java|   8 +-
 .../server/group/impl/LocalGroupingHandler.java |  19 +--
 .../core/server/impl/ActiveMQServerImpl.java|  15 ++-
 .../impl/AnyLiveNodeLocatorForScaleDown.java|   8 +-
 .../impl/AutoCreatedQueueManagerImpl.java   |  11 +-
 .../artemis/core/server/impl/DivertImpl.java|   8 +-
 .../core/server/impl/FileLockNodeManager.java   |  11 +-
 .../impl/LegacyLDAPSecuritySettingPlugin.java   |  22 ++--
 .../core/server/impl/LiveOnlyActivation.java|  14 +-
 .../impl/NamedLiveNodeLocatorForScaleDown.java  |   8 +-
 .../server/impl/PostOfficeJournalLoader.java|  15 ++-
 .../artemis/core/server/impl/QueueImpl.java | 127 ++-
 .../artemis/core/server/impl/RefsOperation.java |   7 +-
 .../core/server/impl/ScaleDownHandler.java  |  33 ++---
 .../impl/ScheduledDeliveryHandlerImpl.java  |  40 +++---
 .../core/server/impl/ServerConsumerImpl.java|  77 +--
 .../core/server/impl/ServerSessionImpl.java |  73 +--
 .../impl/SharedNothingBackupActivation.java |  47 ---
 .../impl/SharedNothingLiveActivation.java   |  17 ++-
 .../impl/SharedStoreBackupActivation.java   |   7 +-
 .../server/impl/SharedStoreLiveActivation.java  |  11 +-
 .../server/impl/TransientQueueManagerImpl.java  |   7 +-
 .../management/impl/ManagementServiceImpl.java  |  33 ++---
 .../impl/HierarchicalObjectRepository.java  |   5 +-
 .../core/transaction/impl/TransactionImpl.java  |  39 +++---
 .../security/ActiveMQJAASSecurityManager.java   |  12 +-
 .../security/jaas/CertificateLoginModule.java   |  12 +-
 .../core/security/jaas/GuestLoginModule.java|  16 ++-
 .../spi/core/security/jaas/InVMLoginModule.java |  13 +-
 .../spi/core/security/jaas/LDAPLoginModule.java |  51 
 .../core/security/jaas/PropertiesLoader.java|   8 +-
 .../security/jaas/PropertiesLoginModule.java|  12 +-
 .../security/jaas/ReloadableProperties.java |   7 +-
 .../artemis/tests/util/ActiveMQTestBase.java|   7 +-
 65 files changed, 805 insertions(+), 699 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0df9d8c/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PagedReferenceImpl.java

[1/6] activemq-artemis git commit: Individualizing logger.traces on org.apache.activemq.artemis.core.server (artemis-server project)

2016-05-03 Thread andytaylor 
Repository: activemq-artemis
Updated Branches:
  refs/heads/master 2135911ea -> 882b8edbd


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0df9d8c/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
index 2807aff..18a2105 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreBackupActivation.java
@@ -33,9 +33,12 @@ import 
org.apache.activemq.artemis.core.server.cluster.ha.ScaleDownPolicy;
 import 
org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreSlavePolicy;
 import org.apache.activemq.artemis.core.server.group.GroupingHandler;
 import org.apache.activemq.artemis.core.server.management.ManagementService;
+import org.jboss.logging.Logger;
 
 public final class SharedStoreBackupActivation extends Activation {
 
+   private static final Logger logger = 
Logger.getLogger(SharedStoreBackupActivation.class);
+
//this is how we act as a backup
private SharedStoreSlavePolicy sharedStoreSlavePolicy;
 
@@ -215,7 +218,7 @@ public final class SharedStoreBackupActivation extends 
Activation {
  @Override
  public void run() {
 try {
-   ActiveMQServerLogger.LOGGER.debug(activeMQServer + 
"::Stopping live node in favor of failback");
+   logger.debug(activeMQServer + "::Stopping live node 
in favor of failback");
 
NodeManager nodeManager = 
activeMQServer.getNodeManager();
activeMQServer.stop(true, false, true);
@@ -230,7 +233,7 @@ public final class SharedStoreBackupActivation extends 
Activation {
  return;
 
   
activeMQServer.setHAPolicy(sharedStoreSlavePolicy);
-  ActiveMQServerLogger.LOGGER.debug(activeMQServer 
+ "::Starting backup node now after failback");
+  logger.debug(activeMQServer + "::Starting backup 
node now after failback");
   activeMQServer.start();
}
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0df9d8c/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
index 8cdcb91..ff688d1 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedStoreLiveActivation.java
@@ -19,9 +19,12 @@ package org.apache.activemq.artemis.core.server.impl;
 import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.core.server.NodeManager;
 import 
org.apache.activemq.artemis.core.server.cluster.ha.SharedStoreMasterPolicy;
+import org.jboss.logging.Logger;
 
 public final class SharedStoreLiveActivation extends LiveActivation {
 
+   private static final Logger logger = 
Logger.getLogger(SharedStoreLiveActivation.class);
+
//this is how we act when we initially start as live
private SharedStoreMasterPolicy sharedStoreMasterPolicy;
 
@@ -39,8 +42,8 @@ public final class SharedStoreLiveActivation extends 
LiveActivation {
 
  activeMQServer.checkJournalDirectory();
 
- if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) {
-ActiveMQServerLogger.LOGGER.debug("First part initialization on " 
+ this);
+ if (logger.isDebugEnabled()) {
+logger.debug("First part initialization on " + this);
  }
 
  if (!activeMQServer.initialisePart1(false))
@@ -51,8 +54,8 @@ public final class SharedStoreLiveActivation extends 
LiveActivation {
  * looks like we've failed over at some point need to inform that 
we are the backup
  * so when the current live goes down they failover to us
  */
-if (ActiveMQServerLogger.LOGGER.isDebugEnabled()) {
-   ActiveMQServerLogger.LOGGER.debug("announcing backup to the 
former live" + this);
+if (logger.isDebugEnabled()) {
+   logger.debug("announcing backup to the former live" + this);
 }

[2/6] activemq-artemis git commit: Individualizing logger.traces on org.apache.activemq.artemis.core.server (artemis-server project)

2016-05-03 Thread andytaylor 
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/f0df9d8c/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
index 6adb2ab..60fa632 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
@@ -44,8 +44,12 @@ import org.apache.activemq.artemis.core.security.Role;
 import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.core.server.SecuritySettingPlugin;
 import org.apache.activemq.artemis.core.settings.HierarchicalRepository;
+import org.jboss.logging.Logger;
 
 public class LegacyLDAPSecuritySettingPlugin implements SecuritySettingPlugin {
+
+   private static final Logger logger = 
Logger.getLogger(LegacyLDAPSecuritySettingPlugin.class);
+
private static final long serialVersionUID = 4793109879399750045L;
 
public static final String INITIAL_CONTEXT_FACTORY = 
"initialContextFactory";
@@ -326,17 +330,17 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
  return;
   }
   LdapName searchResultLdapName = new LdapName(searchResult.getName());
-  ActiveMQServerLogger.LOGGER.debug("LDAP search result : " + 
searchResultLdapName);
+  logger.debug("LDAP search result : " + searchResultLdapName);
   String permissionType = null;
   String destination = null;
   String destinationType = "unknown";
   for (Rdn rdn : searchResultLdapName.getRdns()) {
  if (rdn.getType().equals("cn")) {
-ActiveMQServerLogger.LOGGER.debug("\tPermission type: " + 
rdn.getValue());
+logger.debug("\tPermission type: " + rdn.getValue());
 permissionType = rdn.getValue().toString();
  }
  if (rdn.getType().equals("uid")) {
-ActiveMQServerLogger.LOGGER.debug("\tDestination name: " + 
rdn.getValue());
+logger.debug("\tDestination name: " + rdn.getValue());
 destination = rdn.getValue().toString();
  }
  if (rdn.getType().equals("ou")) {
@@ -347,10 +351,10 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
 else if (rawDestinationType.toLowerCase().contains("topic")) {
destinationType = "topic";
 }
-ActiveMQServerLogger.LOGGER.debug("\tDestination type: " + 
destinationType);
+logger.debug("\tDestination type: " + destinationType);
  }
   }
-  ActiveMQServerLogger.LOGGER.debug("\tAttributes: " + attrs);
+  logger.debug("\tAttributes: " + attrs);
   Attribute attr = attrs.get(roleAttribute);
   NamingEnumeration e = attr.getAll();
   Set roles = securityRoles.get(destination);
@@ -367,7 +371,7 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
  LdapName ldapname = new LdapName(value);
  Rdn rdn = ldapname.getRdn(ldapname.size() - 1);
  String roleName = rdn.getValue().toString();
- ActiveMQServerLogger.LOGGER.debug("\tRole name: " + roleName);
+ logger.debug("\tRole name: " + roleName);
  Role role = new Role(roleName,
   
permissionType.equalsIgnoreCase(writePermissionValue),
   
permissionType.equalsIgnoreCase(readPermissionValue),
@@ -448,7 +452,7 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
 
  for (Rdn rdn : ldapName.getRdns()) {
 if (rdn.getValue().equals(writePermissionValue)) {
-   ActiveMQServerLogger.LOGGER.debug("Removing write permission");
+   logger.debug("Removing write permission");
for (Role role : roles) {
   if (role.isSend()) {
  rolesToRemove.add(role);
@@ -456,7 +460,7 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
}
 }
 else if (rdn.getValue().equals(readPermissionValue)) {
-   ActiveMQServerLogger.LOGGER.debug("Removing read permission");
+   logger.debug("Removing read permission");
for (Role role : roles) {
   if (role.isConsume()) {
  rolesToRemove.add(role);
@@ -464,7 +468,7 @@ public class LegacyLDAPSecuritySettingPlugin implements 
SecuritySettingPlugin {
}
 }
 else if (rdn.getValue().equals(adminPermissionValue)) {
-