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

[buildbot]

Author: buildbot
Date: Fri Dec  9 23:22:45 2016
New Revision: 1002541

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 Fri Dec  9 23:22:45 2016
@@ -88,11 +88,11 @@
 /persistenceAdapter
  /broker
 
-KahaDB Propertiesproperty namedefault valueCommentsarchiveCorruptedIndexfalseIf 
true, corrupted indexes found at startup will be 
archived (not deleted).archiveDataLogsfalseIf true, will 
move a message data log t
 o the archive directory instead of deleting it.checkForCorruptJournalFilesfalseIf 
true, will check for corrupt journal files on 
startup and try and recover them.checkpointInterval5000Time (ms) before check-pointing the 
journal.checksumJournalFilestrueCreate a checksum for a journal 
file. The presence of a checks
 um is required in order for the persistence adapter to be able to detect 
corrupt journal files.Before ActiveMQ 5.9.0: the 
default is false.cleanupInterval3The interval (in ms) between consecutive 
checks that determine which journal files, if any, are eligible for removal 
from the message store. An eligible journal file is one that has no outstanding 
references.compactAcksAfterNoGC10From ActiveMQ 
5.14.0: when the acknowledgement compaction feature is enabled this 
value controls how 
 many store GC cycles must be completed with no other files being cleaned up 
before the compaction logic is triggered to possibly compact older 
acknowledgements spread across journal files into a new log file. The 
lower the value set the faster the compaction may occur which can impact 
performance if it runs to often.compactAcksIgnoresStoreGrowthfalseFrom ActiveMQ 
5.14.0:when the acknowledgement compaction feature is enabled 
this value controls whether compaction is run when the store is still growing 
or if it should only occur when the store has stopped growing (either due to 
idle or store limits reached). If enabled the compaction runs regardless 
of the store still having room or being active which can decrease overall 
performance bu
 t reclaim space faster.concurrentStoreAndDispatchQueuestrueEnable the dispatching of Queue 
messages to interested clients to happen concurrently with message 
storage.concurrentStoreAndDispatchTopicsfalseEnable the dispatching of Topic 
messages to interested clients to happen concurrently with message 
storageEnabling this prop
 erty is not recommended.directoryactivemq-dataThe path to the directory to 
use to store the message store data and log files.directoryArchivenullDefine the directory to move data logs to 
when they all the messages they contain have been 
consumed.enableAckCompactiontrueFrom ActiveMQ 
5.14.0: this setting controls wheth
 er the store will perform periodic compaction of older journal log files that 
contain only Message acknowledgements. By compacting these older 
acknowledgements into new journal log files the older files can be removed 
freeing space and allowing the message store to continue to operate without 
hitting store size limits.enableIndexWriteAsyncfalseIf 
true, the index is updated 
asynchronously.enableJournalDiskSyncstrueEnsure every journal 
write is followed by a disk sync (JMS durability requirement).This property is deprecated as of 
ActiveMQ 5.14.0.From 
ActiveMQ 5.14.0: see journalDiskSyncStrategy.journalDiskSyncStrategyalwaysFrom ActiveMQ 
5.14.0: this setting configures the disk sync policy. The list of 
available sync strategies are (in order of decreasing safety, and increasing 
performance):always Ensure 
every journal write is follow
 ed by a disk sync (JMS durability requirement). This is the safest option but 
is also the slowest because it requires a sync after every message write. This 
is equivalent to the deprecated 
propertyenableJournalDiskSyncs=true.periodic
 The disk will be synced at set intervals 
(if a write has occurred) instead of after every journal write which will 
reduce the load on the disk and should improve throughput. The disk will 
also be synced when rolling over to a new journal file. The default interval is 
1 second. The default interval offers very good performance, whilst being safer 
thannever disk syncing, as data loss is 
limited to a maximum of 1 second's worth. See 
journalDiskSyncInterval to change the frequency 
of disk syncs.never A sync will never be 
explicitly
  called and it will be up to the operating system to flush to disk. This is 
equivalent to setting the deprecated property 

[CONF] Apache ActiveMQ > KahaDB

[Paul Gale (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Paul Gale edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
Change comment: Font formatting 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
KahaDB 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 Code Block 
 
 
 
 
 
 
 
 
language 
xml 
 
 
  
 
 
 
 
  

  

 
  
 
 
 KahaDB Properties 
 
 
 
 
  property nameProperty   
  default valueDefault   
 Comments  
 
 
  archiveCorruptedIndex   
  false   
 If true, corrupted indexes found at startup will be archived (not deleted).  
 
 
  archiveDataLogs   
  false   
 If true, will move a message data log to the archive directory instead of deleting it.  
 
 
  checkForCorruptJournalFiles   
  false   
 If true, will check for corrupt journal files on startup and try and recover them.  
 
 
  checkpointInterval   
  5000   
 Time (ms) before check-pointing the journal.  
 
 
  checksumJournalFiles   
  true   
 Create a checksum for a journal file. The presence of a checksum is required in order for the persistence adapter to be able to detect corrupt journal files. Before ActiveMQ 5.9.0: the default is false.  
 
 
  cleanupInterval   
  3   
 The interval (in ms) between consecutive checks that determine which journal files, if any, are eligible for removal from the message store. An eligible journal file is one that has no outstanding references.  
 
 
  compactAcksAfterNoGC   
  10   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls how many store GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.  The lower the value set the faster the compaction may occur which can impact performance if it runs to often.  
 
 
  compactAcksIgnoresStoreGrowth   
  false   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).  If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim space faster.   
 
 
  concurrentStoreAndDispatchQueues   
  true   
 Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.  
 
 
  concurrentStoreAndDispatchTopics   
  false   
 Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage 
 
 
 
 Warning 
 
 
 
 
  Enabling this property is not recommended.   
 
 
  
 
 
  directory   
  activemq-data   
 The path to the directory to use to store the message store data and log files.  
 
 
  directoryArchive   
  null   
 Define the directory to move data logs to when they all the messages they contain have been consumed.  
 
 
  enableAckCompaction   
  true   
 From ActiveMQ 5.14.0: this setting controls whether the store will perform periodic compaction of older journal log files that contain only Message acknowledgements. By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.  
 
 
  enableIndexWriteAsync   
  false   
 If true, the index is updated asynchronously.  
 
 
  enableJournalDiskSyncs   
  true   
  Ensure every journal write is followed by a disk sync (JMS durability requirement).  
 
 
 
 Warning 
 
 
 
 
 This property is deprecated as of ActiveMQ 5.14.0. From ActiveMQ 5.14.0: see journalDiskSyncStrategy.   
 
 
  
 
 
  journalDiskSyncStrategy   
  always   
 From ActiveMQ 5.14.0: this setting configures the disk sync policy. The list of available sync strategies are (in order of decreasing safety, and increasing performance): 
 
  always Ensure every journal write is followed by a disk sync (JMS durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write. This is equivalent to the deprecated property enableJournalDiskSyncs=true.   
  periodic The disk will be synced at set intervals (if a write has occurred) instead of after every journal write which will reduce the load on the disk and should improve throughput. The disk will also be synced when rolling over to a new journal file. The default interval is 1 second. The default interval offers very good performance, whilst being safer than never disk syncing, as data loss is limited to a maximum of 1 second's worth. See journalDiskSyncInterval to change the frequency of disk syncs.   
  never A sync will never be explicitly called and it will be up to the operating system to flush to disk. This is equivalent to setting the deprecated property enableJournalDiskSyncs=false. This is the fastest option but is the least safe as there's no guarantee as to 

Jenkins build is unstable: ActiveMQ-Artemis-Master #761

[Apache Jenkins Server]

See 

activemq-artemis git commit: ARTEMIS-882 fixing checkstyle

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 78042ba0e -> 16f871d5d


ARTEMIS-882 fixing checkstyle

(cherry picked from commit 66e7e6645dbae90984f9096a7a0056090c8ce193)


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

Branch: refs/heads/1.x
Commit: 16f871d5d5e93bed490f39a74a2a6392b5d533ce
Parents: 78042ba
Author: Clebert Suconic 
Authored: Fri Dec 9 16:58:02 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Dec 9 16:58:29 2016 -0500

--
 .../apache/activemq/artemis/api/core/client/ActiveMQClient.java   | 1 -
 .../artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/16f871d5/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index a07ef6d..bfb86d0 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.artemis.api.core.client;
 
-import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.concurrent.ExecutorService;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/16f871d5/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
index 5a2724e..70bfcdd 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
@@ -30,8 +30,7 @@ import org.apache.activemq.artemis.utils.IPV6Util;
 import org.apache.activemq.artemis.utils.uri.BeanSupport;
 import org.apache.activemq.artemis.utils.uri.SchemaConstants;
 
-public class
-TCPServerLocatorSchema extends AbstractServerLocatorSchema {
+public class TCPServerLocatorSchema extends AbstractServerLocatorSchema {
 
@Override
public String getSchemaName() {

activemq-artemis git commit: ARTEMIS-882 fixing checkstyle

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 12f4e5eec -> 66e7e6645


ARTEMIS-882 fixing checkstyle


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

Branch: refs/heads/master
Commit: 66e7e6645dbae90984f9096a7a0056090c8ce193
Parents: 12f4e5e
Author: Clebert Suconic 
Authored: Fri Dec 9 16:58:02 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Dec 9 16:58:02 2016 -0500

--
 .../apache/activemq/artemis/api/core/client/ActiveMQClient.java   | 1 -
 .../artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e7e664/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index a07ef6d..bfb86d0 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -16,7 +16,6 @@
  */
 package org.apache.activemq.artemis.api.core.client;
 
-import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.concurrent.ExecutorService;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/66e7e664/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
index 5a2724e..70bfcdd 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
@@ -30,8 +30,7 @@ import org.apache.activemq.artemis.utils.IPV6Util;
 import org.apache.activemq.artemis.utils.uri.BeanSupport;
 import org.apache.activemq.artemis.utils.uri.SchemaConstants;
 
-public class
-TCPServerLocatorSchema extends AbstractServerLocatorSchema {
+public class TCPServerLocatorSchema extends AbstractServerLocatorSchema {
 
@Override
public String getSchemaName() {

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

[Apache Jenkins Server]

See 

Changes:

[clebertsuconic] ARTEMIS-882 Supporting lists on URIs

--
[...truncated 561 lines...]
at java.net.Socket.connect(Socket.java:538) [rt.jar:1.8.0_102]
at sun.net.NetworkClient.doConnect(NetworkClient.java:180) 
[rt.jar:1.8.0_102]
at sun.net.www.http.HttpClient.openServer(HttpClient.java:432) 
[rt.jar:1.8.0_102]
at sun.net.www.http.HttpClient.openServer(HttpClient.java:527) 
[rt.jar:1.8.0_102]
at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:781) 
[rt.jar:1.8.0_102]
at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:647) 
[rt.jar:1.8.0_102]
at 
sun.net.www.protocol.http.HttpURLConnection.getInputStream0(HttpURLConnection.java:1536)
 [rt.jar:1.8.0_102]
at 
sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1441)
 [rt.jar:1.8.0_102]
at 
org.apache.activemq.artemis.core.server.NetworkHealthCheck.check(NetworkHealthCheck.java:392)
 [:]
at 
org.apache.activemq.artemis.utils.NetworkHealthTest.testCheckUsingHTTP(NetworkHealthTest.java:204)
 [:]
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) 
[rt.jar:1.8.0_102]
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) 
[rt.jar:1.8.0_102]
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 [rt.jar:1.8.0_102]
at java.lang.reflect.Method.invoke(Method.java:498) [rt.jar:1.8.0_102]
at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
 [junit-4.11.jar:]
at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
 [junit-4.11.jar:]
at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
 [junit-4.11.jar:]
at 
org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
 [junit-4.11.jar:]
at 
org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26) 
[junit-4.11.jar:]
at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) 
[junit-4.11.jar:]
at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:271) 
[junit-4.11.jar:]
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:70)
 [junit-4.11.jar:]
at 
org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:50)
 [junit-4.11.jar:]
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238) 
[junit-4.11.jar:]
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63) 
[junit-4.11.jar:]
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236) 
[junit-4.11.jar:]
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53) 
[junit-4.11.jar:]
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229) 
[junit-4.11.jar:]
at org.junit.runners.ParentRunner.run(ParentRunner.java:309) 
[junit-4.11.jar:]
at 
org.apache.maven.surefire.junit4.JUnit4Provider.execute(JUnit4Provider.java:283)
 [surefire-junit4-2.18.1.jar:2.18.1]
at 
org.apache.maven.surefire.junit4.JUnit4Provider.executeWithRerun(JUnit4Provider.java:173)
 [surefire-junit4-2.18.1.jar:2.18.1]
at 
org.apache.maven.surefire.junit4.JUnit4Provider.executeTestSet(JUnit4Provider.java:153)
 [surefire-junit4-2.18.1.jar:2.18.1]
at 
org.apache.maven.surefire.junit4.JUnit4Provider.invoke(JUnit4Provider.java:128) 
[surefire-junit4-2.18.1.jar:2.18.1]
at 
org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203)
 [surefire-booter-2.18.1.jar:2.18.1]
at 
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155)
 [surefire-booter-2.18.1.jar:2.18.1]
at 
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103) 
[surefire-booter-2.18.1.jar:2.18.1]

[main] 21:39:46,014 WARN  
[org.apache.activemq.artemis.core.server.NetworkHealthCheck] Connection 
refused: java.net.ConnectException: Connection refused
at java.net.PlainSocketImpl.socketConnect(Native Method) 
[rt.jar:1.8.0_102]
at 
java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) 
[rt.jar:1.8.0_102]
at 
java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206)
 [rt.jar:1.8.0_102]
at 
java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) 
[rt.jar:1.8.0_102]
at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) 
[rt.jar:1.8.0_102]
at java.net.Socket.connect(Socket.java:589) [rt.jar:1.8.0_102]
at java.net.Socket.connect(Socket.java:538) [rt.jar:1.8.0_102]
at sun.net.NetworkClient.doConnect(NetworkClient.java:180) 
[rt.jar:1.8.0_102]
at 

activemq-artemis git commit: ARTEMIS-882 Supporting lists on URIs

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x 3758f2a0c -> 78042ba0e


ARTEMIS-882 Supporting lists on URIs

(cherry picked from commit dc472192f41875bd390f3f2f00af0f98b7c08c6c)


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

Branch: refs/heads/1.x
Commit: 78042ba0e1bfb6be056e1f98ca6d893779a4d3ab
Parents: 3758f2a
Author: Clebert Suconic 
Authored: Fri Dec 9 12:47:40 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Dec 9 16:24:45 2016 -0500

--
 .../artemis/api/core/client/ActiveMQClient.java |  2 +-
 .../core/client/impl/ServerLocatorImpl.java |  4 +-
 .../serverLocator/TCPServerLocatorSchema.java   |  7 +--
 .../jms/client/ActiveMQConnectionFactory.java   |  2 +-
 .../artemis/tests/integration/jms/URITest.java  | 46 
 5 files changed, 55 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/78042ba0/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index 0ad80fc..a07ef6d 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -289,7 +289,7 @@ public final class ActiveMQClient {
 */
public static ServerLocator createServerLocator(final String url) throws 
Exception {
   ServerLocatorParser parser = new ServerLocatorParser();
-  return parser.newObject(new URI(url), null);
+  return parser.newObject(parser.expandURI(url), null);
}
 
/**

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/78042ba0/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index beb1b13..949ef90 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -397,7 +397,9 @@ public final class ServerLocatorImpl implements 
ServerLocatorInternal, Discovery
 
public static ServerLocator newLocator(String uri) {
   try {
- return newLocator(new URI(uri));
+ ServerLocatorParser parser = new ServerLocatorParser();
+ URI newURI = parser.expandURI(uri);
+ return parser.newObject(newURI, null);
   } catch (Exception e) {
  throw new RuntimeException(e);
   }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/78042ba0/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
index 9468a50..5a2724e 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
@@ -30,7 +30,8 @@ import org.apache.activemq.artemis.utils.IPV6Util;
 import org.apache.activemq.artemis.utils.uri.BeanSupport;
 import org.apache.activemq.artemis.utils.uri.SchemaConstants;
 
-public class TCPServerLocatorSchema extends AbstractServerLocatorSchema {
+public class
+TCPServerLocatorSchema extends AbstractServerLocatorSchema {
 
@Override
public String getSchemaName() {
@@ -45,9 +46,9 @@ public class TCPServerLocatorSchema extends 
AbstractServerLocatorSchema {
   TransportConfiguration[] tcs = new 
TransportConfiguration[configurations.size()];
   configurations.toArray(tcs);
   if (options.isHa()) {
- return ActiveMQClient.createServerLocatorWithHA(tcs);
+ return 

[1/2] activemq-artemis git commit: ARTEMIS-882 Supporting lists on URIs

[jbertram]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 6682072da -> 12f4e5eec


ARTEMIS-882 Supporting lists on URIs


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

Branch: refs/heads/master
Commit: dc472192f41875bd390f3f2f00af0f98b7c08c6c
Parents: 6682072
Author: Clebert Suconic 
Authored: Fri Dec 9 12:47:40 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Dec 9 16:20:01 2016 -0500

--
 .../artemis/api/core/client/ActiveMQClient.java |  2 +-
 .../core/client/impl/ServerLocatorImpl.java |  4 +-
 .../serverLocator/TCPServerLocatorSchema.java   |  7 +--
 .../jms/client/ActiveMQConnectionFactory.java   |  2 +-
 .../artemis/tests/integration/jms/URITest.java  | 46 
 5 files changed, 55 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dc472192/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
index 0ad80fc..a07ef6d 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ActiveMQClient.java
@@ -289,7 +289,7 @@ public final class ActiveMQClient {
 */
public static ServerLocator createServerLocator(final String url) throws 
Exception {
   ServerLocatorParser parser = new ServerLocatorParser();
-  return parser.newObject(new URI(url), null);
+  return parser.newObject(parser.expandURI(url), null);
}
 
/**

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dc472192/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
index beb1b13..949ef90 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ServerLocatorImpl.java
@@ -397,7 +397,9 @@ public final class ServerLocatorImpl implements 
ServerLocatorInternal, Discovery
 
public static ServerLocator newLocator(String uri) {
   try {
- return newLocator(new URI(uri));
+ ServerLocatorParser parser = new ServerLocatorParser();
+ URI newURI = parser.expandURI(uri);
+ return parser.newObject(newURI, null);
   } catch (Exception e) {
  throw new RuntimeException(e);
   }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dc472192/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
index 9468a50..5a2724e 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/uri/schema/serverLocator/TCPServerLocatorSchema.java
@@ -30,7 +30,8 @@ import org.apache.activemq.artemis.utils.IPV6Util;
 import org.apache.activemq.artemis.utils.uri.BeanSupport;
 import org.apache.activemq.artemis.utils.uri.SchemaConstants;
 
-public class TCPServerLocatorSchema extends AbstractServerLocatorSchema {
+public class
+TCPServerLocatorSchema extends AbstractServerLocatorSchema {
 
@Override
public String getSchemaName() {
@@ -45,9 +46,9 @@ public class TCPServerLocatorSchema extends 
AbstractServerLocatorSchema {
   TransportConfiguration[] tcs = new 
TransportConfiguration[configurations.size()];
   configurations.toArray(tcs);
   if (options.isHa()) {
- return ActiveMQClient.createServerLocatorWithHA(tcs);
+ return BeanSupport.setData(uri, 

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

[jbertram]

This closes #906


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

Branch: refs/heads/master
Commit: 12f4e5eec8df59b1cb2d1285be8f1c55ba36e03c
Parents: 6682072 dc47219
Author: jbertram 
Authored: Fri Dec 9 15:21:32 2016 -0600
Committer: jbertram 
Committed: Fri Dec 9 15:21:32 2016 -0600

--
 .../artemis/api/core/client/ActiveMQClient.java |  2 +-
 .../core/client/impl/ServerLocatorImpl.java |  4 +-
 .../serverLocator/TCPServerLocatorSchema.java   |  7 +--
 .../jms/client/ActiveMQConnectionFactory.java   |  2 +-
 .../artemis/tests/integration/jms/URITest.java  | 46 
 5 files changed, 55 insertions(+), 6 deletions(-)
--

Jenkins build is still unstable: ActiveMQ-Artemis-Master #759

[Apache Jenkins Server]

See 

activemq-artemis git commit: NO-JIRA: script to merge 1.x

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x ebbc91c72 -> 3758f2a0c


NO-JIRA: script to merge 1.x


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

Branch: refs/heads/1.x
Commit: 3758f2a0c2631eecec7bb137cdb4297112a7bfab
Parents: ebbc91c
Author: Clebert Suconic 
Authored: Fri Dec 9 14:51:31 2016 -0500
Committer: Clebert Suconic 
Committed: Fri Dec 9 14:51:31 2016 -0500

--
 scripts/merge-PR.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3758f2a0/scripts/merge-PR.sh
--
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index dc42761..99623bd 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -39,9 +39,9 @@ git fetch $ARTEMIS_USER_REMOTE_NAME
 git fetch $ARTEMIS_APACHE_REMOTE_NAME
 git fetch $ARTEMIS_GITHUB_REMOTE_NAME
 
-git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master
+git checkout $ARTEMIS_APACHE_REMOTE_NAME/1.x -B master
 git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
-git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master
-git checkout master
+git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME 1.x
+git checkout 1.x
 git merge --no-ff $1 -m "This closes #$*"
 git branch -D $1

[activemq-artemis] Git Push Summary

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/1.x [created] ebbc91c72

[41/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix TopicDestinationResource look up on Addr

[clebertsuconic]

ARTEMIS-789 Fix TopicDestinationResource look up on Addr


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

Branch: refs/heads/master
Commit: 61aec1ba747656d2c35c2e26958ae6d1c83cdd0f
Parents: 2dc6482
Author: Martyn Taylor 
Authored: Wed Nov 30 14:44:15 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/rest/topic/TopicDestinationsResource.java| 11 ++-
 .../tests/integration/rest/RestDeserializationTest.java  |  6 ++
 2 files changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/61aec1ba/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java
--
diff --git 
a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java
 
b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java
index af3e9c7..641bfb8 100644
--- 
a/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java
+++ 
b/artemis-rest/src/main/java/org/apache/activemq/artemis/rest/topic/TopicDestinationsResource.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
 import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
 import org.apache.activemq.artemis.jms.server.config.TopicConfiguration;
@@ -55,7 +56,7 @@ public class TopicDestinationsResource {
 
@POST
@Consumes("application/activemq.jms.topic+xml")
-   public Response createJmsQueue(@Context UriInfo uriInfo, Document document) 
{
+   public Response createJmsTopic(@Context UriInfo uriInfo, Document document) 
{
   ActiveMQRestLogger.LOGGER.debug("Handling POST request for \"" + 
uriInfo.getPath() + "\"");
 
   try {
@@ -65,9 +66,9 @@ public class TopicDestinationsResource {
  ClientSession session = 
manager.getSessionFactory().createSession(false, false, false);
  try {
 
-ClientSession.QueueQuery query = session.queueQuery(new 
SimpleString(topicName));
+ClientSession.AddressQuery query = session.addressQuery(new 
SimpleString(topicName));
 if (!query.isExists()) {
-   session.createQueue(topicName, topicName, "__AMQX=-1", true);
+   session.createAddress(SimpleString.toSimpleString(topicName), 
RoutingType.MULTICAST, true);
 
 } else {
throw new 
WebApplicationException(Response.status(412).type("text/plain").entity("Queue 
already exists.").build());
@@ -93,13 +94,13 @@ public class TopicDestinationsResource {
   if (topic == null) {
  ClientSession session = 
manager.getSessionFactory().createSession(false, false, false);
  try {
-ClientSession.QueueQuery query = session.queueQuery(new 
SimpleString(name));
+ClientSession.AddressQuery query = session.addressQuery(new 
SimpleString(name));
 if (!query.isExists()) {
System.err.println("Topic '" + name + "' does not exist");
throw new 
WebApplicationException(Response.status(404).type("text/plain").entity("Topic 
'" + name + "' does not exist").build());
 }
 DestinationSettings queueSettings = manager.getDefaultSettings();
-boolean defaultDurable = queueSettings.isDurableSend() || 
query.isDurable();
+boolean defaultDurable = queueSettings.isDurableSend();
 
 topic = createTopicResource(name, defaultDurable, 
queueSettings.getConsumerSessionTimeoutSeconds(), 
queueSettings.isDuplicatesAllowed());
  } finally {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/61aec1ba/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/rest/RestDeserializationTest.java
index 64086e2..b1472a4 100644
--- 

[activemq-artemis] Git Push Summary

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/ARTEMIS-780 [deleted] c148f7347

[49/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fixed a number of failing tests

[clebertsuconic]

ARTEMIS-789 Fixed a number of failing tests


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

Branch: refs/heads/master
Commit: fa67d40b9d5efd57f90a732722195665de20c027
Parents: fe52ca6
Author: jbertram 
Authored: Thu Dec 8 14:52:19 2016 -0600
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../apache/activemq/cli/test/ArtemisTest.java   |  2 +-
 .../core/management/ActiveMQServerControl.java  |  2 +-
 .../amqp/broker/AMQPSessionCallback.java|  6 +-
 .../amqp/proton/ProtonServerSenderContext.java  |  4 ++
 .../core/protocol/mqtt/MQTTSessionCallback.java |  2 +-
 .../core/protocol/openwire/amq/AMQSession.java  |  2 +-
 .../core/protocol/stomp/StompSession.java   |  2 +-
 .../core/postoffice/impl/PostOfficeImpl.java|  8 ++-
 .../protocol/core/impl/CoreSessionCallback.java |  2 +-
 .../core/server/impl/ActiveMQServerImpl.java|  2 +
 .../core/server/impl/QueueFactoryImpl.java  |  4 --
 .../core/server/impl/ServerConsumerImpl.java|  2 +-
 .../management/impl/ManagementServiceImpl.java  |  2 +-
 .../spi/core/protocol/SessionCallback.java  |  2 +-
 .../resources/schema/artemis-configuration.xsd  | 58 ++-
 .../integration/client/HangConsumerTest.java|  2 +-
 .../clientcrash/PendingDeliveriesTest.java  |  2 +
 .../jms/cluster/ReplicatedJMSFailoverTest.java  | 61 
 .../ActiveMQServerControlUsingCoreTest.java |  5 +-
 .../integration/openwire/BasicOpenWireTest.java |  8 +--
 .../integration/openwire/OpenWireTestBase.java  |  1 +
 .../openwire/SimpleOpenWireTest.java|  8 +--
 .../openwire/VerySimpleOenwireTest.java |  5 +-
 .../integration/paging/PagingCounterTest.java   | 15 +++--
 .../integration/paging/PagingOrderTest.java | 21 ---
 .../integration/paging/PagingReceiveTest.java   |  5 +-
 .../integration/paging/PagingSyncTest.java  |  5 +-
 .../tests/integration/paging/PagingTest.java| 11 ++--
 .../integration/security/SecurityTest.java  | 17 --
 .../unit/core/postoffice/impl/FakeQueue.java|  3 +-
 30 files changed, 151 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fa67d40b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
--
diff --git 
a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java 
b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
index 85d194a..af5aaae 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/ArtemisTest.java
@@ -621,7 +621,7 @@ public class ArtemisTest {
 
   // This is usually set when run from the command line via artemis.profile
   Run.setEmbedded(true);
-  Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", 
"--silent", "--no-web", "--queues", queues, "--topics", topics, 
"--no-autotune", "--require-login", "--ping", "127.0.0.1");
+  Artemis.main("create", instanceFolder.getAbsolutePath(), "--force", 
"--silent", "--no-web", "--queues", queues, "--addresses", topics, 
"--no-autotune", "--require-login", "--ping", "127.0.0.1");
   System.setProperty("artemis.instance", instanceFolder.getAbsolutePath());
 
   FileConfiguration fc = new FileConfiguration();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/fa67d40b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index bec85ce..38bf200 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -436,7 +436,7 @@ public interface ActiveMQServerControl {
 
@Operation(desc = "create an address", impact = MBeanOperationInfo.ACTION)
void createAddress(@Parameter(name = "name", desc = "The name of the 
address") String name,
-  @Parameter(name = "routingTypes", desc = "Comma 
separated list of Routing Typles (anycast/multicast)") String routingTypes) 
throws Exception;
+  

[50/50] [abbrv] activemq-artemis git commit: ARTEMIS-813 Ensure no duplicate journal records on address update

[clebertsuconic]

ARTEMIS-813 Ensure no duplicate journal records on address update


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

Branch: refs/heads/master
Commit: af277140264ea741996dcb8aa270dd2b3f5d
Parents: 6ab133a
Author: jbertram 
Authored: Mon Dec 5 20:40:46 2016 -0600
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/core/postoffice/AddressManager.java | 12 -
 .../artemis/core/postoffice/PostOffice.java | 12 -
 .../core/postoffice/impl/PostOfficeImpl.java| 32 +++-
 .../postoffice/impl/SimpleAddressManager.java   | 30 +---
 .../artemis/core/server/ActiveMQServer.java |  6 +--
 .../core/server/impl/ActiveMQServerImpl.java| 51 
 .../server/impl/PostOfficeJournalLoader.java|  6 +--
 .../core/server/impl/ServerSessionImpl.java |  6 ++-
 .../core/server/impl/fakes/FakePostOffice.java  |  8 +--
 9 files changed, 84 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af277140/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
index 6ba205b..a5a1109 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
@@ -58,12 +58,20 @@ public interface AddressManager {
 
Set getAddresses();
 
-   AddressInfo addAddressInfo(AddressInfo addressInfo);
+   /**
+* @param addressInfo
+* @return true if the address was added, false if it wasn't added
+*/
+   boolean addAddressInfo(AddressInfo addressInfo);
 
AddressInfo updateAddressInfoIfPresent(SimpleString addressName,
   BiFunction remappingFunction);
 
-   AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo);
+   /**
+* @param addressInfo
+* @return true if the address was added, false if it was updated
+*/
+   boolean addOrUpdateAddressInfo(AddressInfo addressInfo);
 
AddressInfo removeAddressInfo(SimpleString address);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af277140/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
index 3c40475..cb787c7 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
@@ -45,9 +45,17 @@ import 
org.apache.activemq.artemis.core.transaction.Transaction;
  */
 public interface PostOffice extends ActiveMQComponent {
 
-   AddressInfo addAddressInfo(AddressInfo addressInfo);
+   /**
+* @param addressInfo
+* @return true if the address was added, false if it wasn't added
+*/
+   boolean addAddressInfo(AddressInfo addressInfo);
 
-   AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo);
+   /**
+* @param addressInfo
+* @return true if the address was added, false if it was updated
+*/
+   boolean addOrUpdateAddressInfo(AddressInfo addressInfo);
 
AddressInfo removeAddressInfo(SimpleString address) throws Exception;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af277140/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index c7df757..69256f2 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -424,26 +424,34 @@ public class PostOfficeImpl implements PostOffice, 
NotificationListener, Binding
// PostOffice implementation 

[15/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
index aa07145..cfc8f92 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/util/StompClientConnectionV11.java
@@ -17,55 +17,40 @@
 package org.apache.activemq.artemis.tests.integration.stomp.util;
 
 import java.io.IOException;
+import java.util.UUID;
 
-public class StompClientConnectionV11 extends AbstractStompClientConnection {
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+
+public class StompClientConnectionV11 extends StompClientConnectionV10 {
 
public StompClientConnectionV11(String host, int port) throws IOException {
   super("1.1", host, port);
}
 
-   @Override
-   public ClientStompFrame connect(String username, String passcode) throws 
IOException, InterruptedException {
-  ClientStompFrame frame = factory.newFrame(CONNECT_COMMAND);
-  frame.addHeader(ACCEPT_HEADER, "1.1");
-  frame.addHeader(HOST_HEADER, "localhost");
-  if (username != null) {
- frame.addHeader(LOGIN_HEADER, username);
- frame.addHeader(PASSCODE_HEADER, passcode);
-  }
-
-  ClientStompFrame response = this.sendFrame(frame);
-
-  if (response.getCommand().equals(CONNECTED_COMMAND)) {
- String version = response.getHeader(VERSION_HEADER);
- assert (version.equals("1.1"));
-
- this.username = username;
- this.passcode = passcode;
- this.connected = true;
-  } else {
- connected = false;
-  }
-  return response;
+   public StompClientConnectionV11(String version, String host, int port) 
throws IOException {
+  super(version, host, port);
}
 
@Override
-   public void connect(String username, String passcode, String clientID) 
throws IOException, InterruptedException {
-  ClientStompFrame frame = factory.newFrame(CONNECT_COMMAND);
-  frame.addHeader(ACCEPT_HEADER, "1.1");
-  frame.addHeader(HOST_HEADER, "localhost");
-  frame.addHeader(CLIENT_ID_HEADER, clientID);
+   public ClientStompFrame connect(String username, String passcode, String 
clientID) throws IOException, InterruptedException {
+  ClientStompFrame frame = factory.newFrame(Stomp.Commands.CONNECT);
+  frame.addHeader(Stomp.Headers.Connect.ACCEPT_VERSION, getVersion());
+  frame.addHeader(Stomp.Headers.Connect.HOST, "localhost");
+  if (clientID != null) {
+ frame.addHeader(Stomp.Headers.Connect.CLIENT_ID, clientID);
+  }
 
   if (username != null) {
- frame.addHeader(LOGIN_HEADER, username);
- frame.addHeader(PASSCODE_HEADER, passcode);
+ frame.addHeader(Stomp.Headers.Connect.LOGIN, username);
+ frame.addHeader(Stomp.Headers.Connect.PASSCODE, passcode);
   }
 
   ClientStompFrame response = this.sendFrame(frame);
 
-  if (response.getCommand().equals(CONNECTED_COMMAND)) {
- String version = response.getHeader(VERSION_HEADER);
- assert (version.equals("1.1"));
+  if (Stomp.Responses.CONNECTED.equals(response.getCommand())) {
+ String version = response.getHeader(Stomp.Headers.Connected.VERSION);
+ if (!version.equals(getVersion()))
+throw new IllegalStateException("incorrect version!");
 
  this.username = username;
  this.passcode = passcode;
@@ -73,22 +58,24 @@ public class StompClientConnectionV11 extends 
AbstractStompClientConnection {
   } else {
  connected = false;
   }
+  return response;
}
 
public void connect1(String username, String passcode) throws IOException, 
InterruptedException {
-  ClientStompFrame frame = factory.newFrame(STOMP_COMMAND);
-  frame.addHeader(ACCEPT_HEADER, "1.0,1.1");
-  frame.addHeader(HOST_HEADER, "127.0.0.1");
+  ClientStompFrame frame = factory.newFrame(Stomp.Commands.STOMP);
+  frame.addHeader(Stomp.Headers.Connect.ACCEPT_VERSION, "1.0,1.1");
+  frame.addHeader(Stomp.Headers.Connect.HOST, "127.0.0.1");
   if (username != null) {
- frame.addHeader(LOGIN_HEADER, username);
- frame.addHeader(PASSCODE_HEADER, passcode);
+ frame.addHeader(Stomp.Headers.Connect.LOGIN, username);
+ frame.addHeader(Stomp.Headers.Connect.PASSCODE, passcode);
   }
 
   ClientStompFrame response = this.sendFrame(frame);
 
-  if 

[25/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix various failing tests due to addressing changes

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
--
diff --git 
a/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
 
b/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
index 702fe41..da47577 100644
--- 
a/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
+++ 
b/examples/features/standard/large-message/src/main/java/org/apache/activemq/artemis/jms/example/LargeMessageExample.java
@@ -46,7 +46,7 @@ public class LargeMessageExample {
 * This may take some considerable time to create, send and consume - if it 
takes too long or you
 * don't have enough disk space just reduce the file size here
 */
-   private static final long FILE_SIZE = 2L * 1024 * 1024 * 1024; // 2 GiB 
message
+   private static final long FILE_SIZE = 2L;// * 1024 * 1024 * 1024; // 2 GiB 
message
 
public static void main(final String[] args) throws Exception {
   Process server = null;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml
--
diff --git 
a/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml
 
b/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml
index 267d8c9..18eb207 100644
--- 
a/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/features/standard/last-value-queue/src/main/resources/activemq/server0/broker.xml
@@ -46,7 +46,7 @@ under the License.
 
   
  
- 
+ 
 
 
 
@@ -58,7 +58,7 @@ under the License.
   
 
   
- 
+ 
 true
  
   

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml
--
diff --git 
a/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml
 
b/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml
index 279f2d2..e74c8bb 100644
--- 
a/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/features/standard/management-notifications/src/main/resources/activemq/server0/broker.xml
@@ -41,7 +41,7 @@ under the License.
   ./data/messaging/paging
 
 
-  
jms.topic.notificationsTopic
+  
notificationsTopic
 
   
   
@@ -52,7 +52,7 @@ under the License.
 
   
  
- 
+ 
 
 
 
@@ -62,7 +62,7 @@ under the License.
  
 
  
- 
+ 
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
--
diff --git 
a/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
 
b/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
index f1ceb3a..a463a13 100644
--- 
a/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
+++ 
b/examples/features/standard/management/src/main/java/org/apache/activemq/artemis/jms/example/ManagementExample.java
@@ -30,6 +30,8 @@ import javax.naming.InitialContext;
 
 import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
 import org.apache.activemq.artemis.api.jms.management.JMSManagementHelper;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import org.apache.activemq.artemis.api.core.FilterConstants;
 
 /**
  * An example that shows how to manage ActiveMQ Artemis using JMS messages.
@@ -81,7 +83,7 @@ public class ManagementExample {
  // Step 13. Use a helper class to fill the JMS message with 
management information:
  // * the name of the resource to manage
  // * in this case, we want to retrieve the value of the messageCount 
of the queue
- JMSManagementHelper.putAttribute(m, "exampleQueue", "messageCount");
+ JMSManagementHelper.putAttribute(m, ResourceNames.QUEUE + 
"exampleQueue", "messageCount");
 
  // Step 14. Use the 

[45/50] [abbrv] activemq-artemis git commit: ARTEMIS-880 Add support for address prefixing

[clebertsuconic]

ARTEMIS-880 Add support for address prefixing


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

Branch: refs/heads/master
Commit: 8f532cc25d4179b4014f2136e2861bd73f6b5d61
Parents: a5031b5
Author: Martyn Taylor 
Authored: Fri Dec 9 18:04:54 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../activemq/artemis/api/core/SimpleString.java |   6 +-
 .../impl/wireformat/CreateQueueMessage_V2.java  |   2 +-
 .../activemq/artemis/utils/PrefixUtil.java  |  65 +
 .../amqp/broker/AMQPSessionCallback.java|   2 +-
 .../amqp/broker/ProtonProtocolManager.java  |  25 
 .../protocol/mqtt/MQTTConnectionManager.java|   2 +-
 .../core/protocol/mqtt/MQTTProtocolHandler.java |  10 +-
 .../mqtt/MQTTProtocolManagerFactory.java|   5 +-
 .../artemis/core/protocol/mqtt/MQTTSession.java |  12 +-
 .../protocol/openwire/OpenWireConnection.java   |   4 +-
 .../openwire/OpenWireProtocolManager.java   |  23 
 .../core/protocol/openwire/amq/AMQSession.java  |  12 +-
 .../protocol/stomp/StompProtocolManager.java|   4 +-
 .../core/postoffice/impl/LocalQueueBinding.java |  12 +-
 .../core/postoffice/impl/PostOfficeImpl.java|   6 +-
 .../core/impl/ActiveMQPacketHandler.java|   2 +-
 .../protocol/core/impl/CoreProtocolManager.java |  24 
 .../artemis/core/server/ActiveMQServer.java |   4 +-
 .../artemis/core/server/RoutingContext.java |   8 ++
 .../artemis/core/server/ServerSession.java  |  11 +-
 .../core/server/impl/ActiveMQServerImpl.java|  18 +--
 .../artemis/core/server/impl/DivertImpl.java|   2 +-
 .../core/server/impl/RoutingContextImpl.java|  25 
 .../core/server/impl/ServerSessionImpl.java | 134 ---
 .../core/protocol/AbstractProtocolManager.java  |  25 
 .../spi/core/protocol/ProtocolManager.java  |   9 ++
 .../integration/client/CoreClientTest.java  |  99 ++
 .../integration/client/HangConsumerTest.java|   6 +-
 .../core/server/impl/fakes/FakePostOffice.java  |  18 +--
 29 files changed, 469 insertions(+), 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8f532cc2/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index b4a02ea..decd189 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -118,6 +118,11 @@ public final class SimpleString implements CharSequence, 
Serializable, Comparabl
 
@Override
public CharSequence subSequence(final int start, final int end) {
+  return subSeq(start, end);
+   }
+
+
+   public SimpleString subSeq(final int start, final int end) {
   int len = data.length >> 1;
 
   if (end < start || start < 0 || end > len) {
@@ -399,5 +404,4 @@ public final class SimpleString implements CharSequence, 
Serializable, Comparabl
  dst[d++] = (char) (low | high);
   }
}
-
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8f532cc2/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
index e2867ab..d9def3c 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
@@ -107,7 +107,7 @@ public class CreateQueueMessage_V2 extends 
CreateQueueMessage {
public void encodeRest(final ActiveMQBuffer buffer) {
   super.encodeRest(buffer);
   buffer.writeBoolean(autoCreated);
-  buffer.writeByte(routingType.getType());
+  buffer.writeByte(routingType == null ? -1 : routingType.getType());
   buffer.writeInt(maxConsumers);
   buffer.writeBoolean(deleteOnNoConsumers);
}

[17/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
index 90d18ae..e7dcc91 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTest.java
@@ -25,6 +25,7 @@ import javax.jms.MessageProducer;
 import javax.jms.TextMessage;
 import java.io.ByteArrayOutputStream;
 import java.nio.charset.StandardCharsets;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -40,50 +41,73 @@ import 
org.apache.activemq.artemis.api.core.client.ServerLocator;
 import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
 import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
 import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import 
org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
 import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import 
org.apache.activemq.artemis.tests.integration.mqtt.imported.FuseMQTTClientProvider;
 import 
org.apache.activemq.artemis.tests.integration.mqtt.imported.MQTTClientProvider;
+import 
org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
+import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
+import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
 import org.apache.activemq.artemis.tests.util.Wait;
 import org.apache.activemq.artemis.utils.RandomUtil;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 
 public class StompTest extends StompTestBase {
 
private static final transient IntegrationTestLogger log = 
IntegrationTestLogger.LOGGER;
+   protected StompClientConnection conn;
+
+   @Override
+   @Before
+   public void setUp() throws Exception {
+  super.setUp();
+  conn = StompClientConnectionFactory.createClientConnection("1.0", 
hostname, port);
+   }
+
+   @Override
+   @After
+   public void tearDown() throws Exception {
+  try {
+ boolean connected = conn != null && conn.isConnected();
+ log.debug("Connection 1.0 connected: " + connected);
+ if (connected) {
+conn.disconnect();
+ }
+  } finally {
+ super.tearDown();
+  }
+   }
 
@Test
public void testConnectionTTL() throws Exception {
-  int index = 1;
   int port = 61614;
 
   server.getActiveMQServer().getRemotingService().createAcceptor("test", 
"tcp://127.0.0.1:" + port + "?connectionTtl=1000").start();
-  createBootstrap(index, port);
-  String frame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n\n" 
+ Stomp.NULL;
-  sendFrame(index, frame);
-  frame = receiveFrame(index, 1);
-
-  Assert.assertTrue(frame.startsWith("CONNECTED"));
+  conn = StompClientConnectionFactory.createClientConnection("1.0", 
hostname, port);
+  conn.connect("brianm", "wombats");
 
   Thread.sleep(5000);
 
-  assertTrue(receiveFrame(index, 1).indexOf(Stomp.Responses.ERROR) != 
-1);
+  ClientStompFrame frame = conn.receiveFrame();
+
+  assertEquals(Stomp.Responses.ERROR, frame.getCommand());
 
-  assertChannelClosed(index);
+  assertFalse(conn.isConnected());
}
 
@Test
public void testSendManyMessages() throws Exception {
-  MessageConsumer consumer = session.createConsumer(queue);
+  conn.connect(defUser, defPass);
 
-  String frame = "CONNECT\n" + "login: brianm\n" + "passcode: wombats\n\n" 
+ Stomp.NULL;
-  sendFrame(frame);
-  frame = receiveFrame(1);
+  MessageConsumer consumer = session.createConsumer(queue);
 
-  Assert.assertTrue(frame.startsWith("CONNECTED"));
   int count = 1000;
   final CountDownLatch latch = new CountDownLatch(count);
   consumer.setMessageListener(new MessageListener() {
@@ -94,11 +118,8 @@ public class StompTest extends StompTestBase {
  }
   });
 
-  frame = "SEND\n" + "destination:" + getQueuePrefix() + getQueueName() + 
"\n\n" + "Hello World" + Stomp.NULL;
   for (int i = 1; i <= count; i++) {
- // Thread.sleep(1);
- // 

[36/50] [abbrv] activemq-artemis git commit: ARTEMIS-787 Update CORE Protocol/Client Packets

[clebertsuconic]

ARTEMIS-787 Update CORE Protocol/Client Packets


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

Branch: refs/heads/master
Commit: a20b23bf370c9c011f64f722c318498c9c6dfc15
Parents: 279383a
Author: Martyn Taylor 
Authored: Fri Dec 9 17:59:25 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/api/core/client/ClientSession.java  |  10 +-
 .../core/client/impl/ClientSessionImpl.java |   8 +-
 .../core/client/impl/QueueQueryImpl.java|  59 +-
 .../core/impl/ActiveMQSessionContext.java   |   9 +-
 .../core/protocol/core/impl/ChannelImpl.java|   2 +
 .../core/protocol/core/impl/PacketDecoder.java  |   6 +
 .../core/protocol/core/impl/PacketImpl.java |   2 +
 .../SessionQueueQueryResponseMessage.java   |  12 +-
 .../SessionQueueQueryResponseMessage_V2.java|  41 ++--
 .../SessionQueueQueryResponseMessage_V3.java| 191 +++
 .../artemis/core/server/QueueQueryResult.java   |  56 --
 .../activemq/artemis/reader/MessageUtil.java|  13 +-
 .../artemis/jms/client/ActiveMQMessage.java |  18 +-
 .../jms/client/ActiveMQMessageConsumer.java |   2 -
 .../jms/client/ActiveMQMessageProducer.java |   3 +-
 .../artemis/jms/client/ActiveMQQueue.java   |  20 ++
 .../artemis/jms/client/ActiveMQSession.java |   4 +-
 .../jms/client/ActiveMQTemporaryQueue.java  |  20 ++
 .../jms/client/ActiveMQTemporaryTopic.java  |  20 ++
 .../artemis/jms/client/ActiveMQTopic.java   |  20 ++
 .../impl/ActiveMQServerControlImpl.java |   4 +-
 .../core/persistence/QueueBindingInfo.java  |   4 +
 .../journal/AbstractJournalStorageManager.java  |   2 +-
 .../codec/PersistentQueueBindingEncoding.java   |  29 ++-
 .../core/postoffice/impl/LocalQueueBinding.java |   6 +-
 .../core/postoffice/impl/PostOfficeImpl.java|   4 -
 .../core/ServerSessionPacketHandler.java|   9 +-
 .../artemis/core/server/QueueConfig.java|   2 +-
 .../core/server/impl/ActiveMQServerImpl.java|  17 +-
 .../artemis/core/server/impl/AddressInfo.java   |   5 +
 .../server/impl/PostOfficeJournalLoader.java|   4 +-
 31 files changed, 505 insertions(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a20b23bf/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
index a414f95..c8d483c 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/client/ClientSession.java
@@ -100,7 +100,7 @@ public interface ClientSession extends XAResource, 
AutoCloseable {
* Returns true if auto-creation for this queue is enabled 
and if the queue queried is a JMS queue,
* false else.
*/
-  boolean isAutoCreateJmsQueues();
+  boolean isAutoCreateQueues();
 
   /**
* Returns the number of consumers attached to the queue.
@@ -128,6 +128,14 @@ public interface ClientSession extends XAResource, 
AutoCloseable {
* @return
*/
   SimpleString getName();
+
+  RoutingType getRoutingType();
+
+  int getMaxConsumers();
+
+  boolean isDeleteOnNoConsumers();
+
+  boolean isAutoCreated();
}
 
// Lifecycle operations --

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a20b23bf/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 1ed825b..dd10e5b 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -422,7 +422,7 @@ public final class ClientSessionImpl implements 
ClientSessionInternal, FailureLi
 
@Override
public void createTemporaryQueue(final String address, final RoutingType 

[42/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix Failing Tests

[clebertsuconic]

ARTEMIS-789 Fix Failing Tests


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

Branch: refs/heads/master
Commit: 683ae6898936056faedb228b8e2b89cf91df1c1e
Parents: 61aec1b
Author: jbertram 
Authored: Wed Nov 30 08:19:32 2016 -0600
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../core/client/impl/ClientSessionImpl.java |   2 +-
 .../jms/client/ActiveMQMessageProducer.java |   6 +-
 .../artemis/jms/client/ActiveMQSession.java |  29 ++-
 .../core/protocol/mqtt/MQTTPublishManager.java  |  16 +-
 .../protocol/mqtt/MQTTSubscriptionManager.java  |   2 +-
 .../codec/PersistentAddressBindingEncoding.java |   4 +
 .../core/server/impl/ActiveMQServerImpl.java|  19 +-
 .../addressing/AddressConfigTest.java   |   2 +-
 .../integration/addressing/AnycastTest.java | 188 +++
 .../client/JmsNettyNioStressTest.java   |   8 +-
 .../clientcrash/PendingDeliveriesTest.java  |   3 +-
 .../jms/cluster/JMSFailoverTest.java|   7 +-
 .../integration/mqtt/imported/MQTTTest.java |  11 +-
 .../openwire/SimpleOpenWireTest.java|   3 +-
 .../integration/server/ResourceLimitTest.java   |   2 +-
 .../activemq/artemis/common/AbstractAdmin.java  |   2 +-
 16 files changed, 262 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/683ae689/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index dd10e5b..f1b9cef 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -535,7 +535,7 @@ public final class ClientSessionImpl implements 
ClientSessionInternal, FailureLi
   queueName,
   routingType,
   null,
-  true,
+  false,
   false,
   
ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers(),
   
ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers(),

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/683ae689/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index 4c1d335..b814bc2 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -36,6 +36,7 @@ import javax.jms.TopicPublisher;
 
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
+import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientProducer;
@@ -421,7 +422,10 @@ public class ActiveMQMessageProducer implements 
MessageProducer, QueueSender, To
} else {
   connection.addKnownDestination(address);
}
-} catch (ActiveMQException e) {
+} catch (ActiveMQQueueExistsException e) {
+   // The queue was created by another client/admin between the 
query check and send create queue packet
+}
+catch (ActiveMQException e) {
throw JMSExceptionHelper.convertFromActiveMQException(e);
 }
  }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/683ae689/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
--
diff --git 

[20/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

ARTEMIS-788 Stomp refactor + track autocreation for addresses


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

Branch: refs/heads/master
Commit: a88853fe5390ef254ad3f3be51c55f33dfaf9ced
Parents: 0189f15
Author: jbertram 
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../apache/activemq/cli/test/ArtemisTest.java   |4 +-
 .../artemis/api/core/client/ClientSession.java  |2 +-
 .../core/client/impl/ClientSessionImpl.java |4 +-
 .../core/impl/ActiveMQSessionContext.java   |4 +-
 .../impl/wireformat/CreateAddressMessage.java   |   14 +
 .../remoting/impl/netty/TransportConstants.java |   10 +
 .../spi/core/remoting/SessionContext.java   |2 +-
 .../jms/client/ActiveMQMessageProducer.java |   26 +-
 .../artemis/jms/client/ActiveMQSession.java |   41 +-
 .../protocol/mqtt/MQTTSubscriptionManager.java  |2 +-
 .../protocol/stomp/ActiveMQStompException.java  |4 +-
 .../ActiveMQStompProtocolMessageBundle.java |7 +-
 .../artemis/core/protocol/stomp/Stomp.java  |   34 +-
 .../core/protocol/stomp/StompConnection.java|   63 +-
 .../protocol/stomp/StompProtocolManager.java|   16 +-
 .../stomp/VersionedStompFrameHandler.java   |   43 +-
 .../management/impl/AddressControlImpl.java |2 +-
 .../core/management/impl/QueueControlImpl.java  |2 +-
 .../journal/AbstractJournalStorageManager.java  |7 +-
 .../codec/PersistentAddressBindingEncoding.java |   20 +-
 .../artemis/core/postoffice/PostOffice.java |7 +-
 .../core/postoffice/impl/PostOfficeImpl.java|   30 +-
 .../artemis/core/server/ActiveMQServer.java |   26 +-
 .../artemis/core/server/QueueCreator.java   |   32 -
 .../artemis/core/server/QueueDeleter.java   |   28 -
 .../artemis/core/server/QueueFactory.java   |2 +-
 .../artemis/core/server/ServerSession.java  |5 +-
 .../core/server/impl/ActiveMQServerImpl.java|   63 +-
 .../artemis/core/server/impl/AddressInfo.java   |   12 +
 .../impl/AutoCreatedQueueManagerImpl.java   |   32 +-
 .../artemis/core/server/impl/DivertImpl.java|2 +-
 .../server/impl/PostOfficeJournalLoader.java|4 +-
 .../artemis/core/server/impl/QueueImpl.java |4 +-
 .../core/server/impl/ServerSessionImpl.java |   25 +-
 .../management/impl/ManagementServiceImpl.java  |3 +-
 .../core/config/impl/FileConfigurationTest.java |8 +-
 .../vertx/IncomingVertxEventHandler.java|2 +-
 .../tests/extras/jms/bridge/BridgeTestBase.java |5 +-
 .../tests/integration/amqp/ProtonTest.java  |4 +-
 .../client/AutoCreateJmsDestinationTest.java|9 +-
 .../integration/client/HangConsumerTest.java|4 +-
 .../tests/integration/client/SessionTest.java   |2 +
 .../jms/cluster/AutoCreateQueueClusterTest.java |6 +-
 .../jms/jms2client/NonExistentQueueTest.java|   16 +-
 .../persistence/XmlImportExportTest.java|  161 --
 .../integration/stomp/ConcurrentStompTest.java  |  136 --
 .../tests/integration/stomp/ExtraStompTest.java |  848 -
 .../stomp/StompConnectionCleanupTest.java   |   52 +-
 .../integration/stomp/StompOverHttpTest.java|   78 -
 .../stomp/StompOverWebsocketTest.java   |  151 --
 .../tests/integration/stomp/StompTest.java  | 1674 ++--
 .../tests/integration/stomp/StompTestBase.java  |  550 +++---
 .../stomp/StompTestWithInterceptors.java|  159 ++
 .../stomp/StompTestWithLargeMessages.java   |  416 
 .../stomp/StompTestWithMessageID.java   |   78 +
 .../stomp/StompTestWithSecurity.java|   28 +-
 .../stomp/util/AbstractClientStompFrame.java|   77 +-
 .../util/AbstractStompClientConnection.java |  100 +-
 .../stomp/util/ClientStompFrame.java|   10 +-
 .../stomp/util/ClientStompFrameV10.java |   10 +-
 .../stomp/util/ClientStompFrameV11.java |   22 +-
 .../stomp/util/ClientStompFrameV12.java |   38 +-
 .../stomp/util/StompClientConnection.java   |5 +-
 .../stomp/util/StompClientConnectionV10.java|   43 +-
 .../stomp/util/StompClientConnectionV11.java|  104 +-
 .../stomp/util/StompClientConnectionV12.java|   79 +-
 .../stomp/util/StompFrameFactory.java   |2 +
 .../stomp/util/StompFrameFactoryV10.java|   11 +-
 .../stomp/util/StompFrameFactoryV11.java|   28 +-
 .../stomp/util/StompFrameFactoryV12.java|   38 +-
 .../integration/stomp/v11/ExtraStompTest.java   |  341 +---
 .../integration/stomp/v11/StompV11Test.java | 1800 +++---
 

[07/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java
--
diff --git 
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java
 
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java
deleted file mode 100644
index 2b3f7a2..000
--- 
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/management/impl/JMSManagementServiceImpl.java
+++ /dev/null
@@ -1,155 +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 License.
- */
-package org.apache.activemq.artemis.jms.server.management.impl;
-
-import javax.management.ObjectName;
-
-import org.apache.activemq.artemis.api.core.management.AddressControl;
-import org.apache.activemq.artemis.api.core.management.QueueControl;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
-import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl;
-import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
-import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
-import org.apache.activemq.artemis.api.jms.management.TopicControl;
-import org.apache.activemq.artemis.core.messagecounter.MessageCounter;
-import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.Queue;
-import org.apache.activemq.artemis.core.server.management.ManagementService;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
-import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
-import 
org.apache.activemq.artemis.jms.management.impl.JMSConnectionFactoryControlImpl;
-import org.apache.activemq.artemis.jms.management.impl.JMSQueueControlImpl;
-import org.apache.activemq.artemis.jms.management.impl.JMSServerControlImpl;
-import org.apache.activemq.artemis.jms.management.impl.JMSTopicControlImpl;
-import org.apache.activemq.artemis.jms.server.JMSServerManager;
-import 
org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
-import org.apache.activemq.artemis.jms.server.management.JMSManagementService;
-
-public class JMSManagementServiceImpl implements JMSManagementService {
-
-   // Constants -
-
-   // Attributes 
-
-   private final ManagementService managementService;
-
-   private final JMSServerManager jmsServerManager;
-
-   // Static 
-
-   public JMSManagementServiceImpl(final ManagementService managementService,
-   final ActiveMQServer server,
-   final JMSServerManager jmsServerManager) {
-  this.managementService = managementService;
-  this.jmsServerManager = jmsServerManager;
-   }
-
-   // Public 
-
-   // JMSManagementRegistration implementation --
-
-   @Override
-   public synchronized JMSServerControl registerJMSServer(final 
JMSServerManager server) throws Exception {
-  ObjectName objectName = 
managementService.getObjectNameBuilder().getJMSServerObjectName();
-  JMSServerControlImpl control = new JMSServerControlImpl(server);
-  managementService.registerInJMX(objectName, control);
-  managementService.registerInRegistry(ResourceNames.JMS_SERVER, control);
-  return control;
-   }
-
-   @Override
-   public synchronized void unregisterJMSServer() throws Exception {
-  ObjectName objectName = 
managementService.getObjectNameBuilder().getJMSServerObjectName();
-  managementService.unregisterFromJMX(objectName);
-  managementService.unregisterFromRegistry(ResourceNames.JMS_SERVER);
-   }
-
-   @Override
-   public synchronized void registerQueue(final ActiveMQQueue 

[05/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
deleted file mode 100644
index a105a57..000
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java
+++ /dev/null
@@ -1,409 +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 License.
- */
-package org.apache.activemq.artemis.tests.integration.jms.server.management;
-
-import javax.jms.QueueConnection;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.management.openmbean.CompositeData;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.management.Parameter;
-import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.artemis.api.jms.JMSFactoryType;
-import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
-import 
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * A JMSQueueControlUsingJMSTest
- */
-public class JMSQueueControlUsingJMSTest extends JMSQueueControlTest {
-   // Constants -
-
-   // Attributes 
-
-   private QueueConnection connection;
-
-   private QueueSession session;
-
-   // Static 
-
-   // Constructors --
-
-   // Public 
-
-   @Override
-   @Before
-   public void setUp() throws Exception {
-  super.setUp();
-
-  ActiveMQConnectionFactory cf = 
ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new 
TransportConfiguration(InVMConnectorFactory.class.getName()));
-  connection = cf.createQueueConnection();
-  session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
-  connection.start();
-   }
-
-   @Ignore
-   @Override
-   @Test
-   public void testListDeliveringMessages() throws Exception {
-  // I'm not implementing the required proxy for this test on this JMS test
-   }
-
-   @Override
-   protected JMSQueueControl createManagementControl() throws Exception {
-  ActiveMQQueue managementQueue = (ActiveMQQueue) 
ActiveMQJMSClient.createQueue("activemq.management");
-
-  final JMSMessagingProxy proxy = new JMSMessagingProxy(session, 
managementQueue, queue.getQueueName());
-
-  return new JMSQueueControl() {
-
- @Override
- public void flushExecutor() {
-try {
-   proxy.invokeOperation("flushExecutor");
-} catch (Exception e) {
-   throw new RuntimeException(e.getMessage(), e);
-}
- }
-
- @Override
- public boolean changeMessagePriority(final String messageID, final 
int newPriority) throws Exception {
-return (Boolean) proxy.invokeOperation("changeMessagePriority", 
messageID, newPriority);
- }
-
- @Override
- public int changeMessagesPriority(final String filter, final int 
newPriority) throws Exception {
-return (Integer) proxy.invokeOperation(Integer.class, 
"changeMessagesPriority", filter, newPriority);
- }
-
- @Override
- public long countMessages(final String filter) throws Exception {
-return ((Number) proxy.invokeOperation("countMessages", 
filter)).intValue();
-   

[32/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Added ability to define 2 Routing Types on a single addres

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
index 01f0b08..79635d9 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.spi.core.remoting;
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.Xid;
 import java.util.HashMap;
+import java.util.Set;
 import java.util.concurrent.Executor;
 
 import org.apache.activemq.artemis.api.core.ActiveMQException;
@@ -33,6 +34,7 @@ import 
org.apache.activemq.artemis.core.client.impl.ClientMessageInternal;
 import org.apache.activemq.artemis.core.client.impl.ClientProducerCreditsImpl;
 import org.apache.activemq.artemis.core.client.impl.ClientSessionInternal;
 import org.apache.activemq.artemis.core.message.impl.MessageInternal;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.utils.IDGenerator;
 import org.apache.activemq.artemis.utils.SimpleIDGenerator;
@@ -64,7 +66,7 @@ public abstract class SessionContext {
public abstract int getReconnectID();
 
/**
-* it will eather reattach or reconnect, preferably reattaching it.
+* it will either reattach or reconnect, preferably reattaching it.
 *
 * @param newConnection
 * @return true if it was possible to reattach
@@ -159,20 +161,49 @@ public abstract class SessionContext {
 
public abstract void setSendAcknowledgementHandler(final 
SendAcknowledgementHandler handler);
 
+   /**
+* Creates a shared queue using the routing type set by the Address.  If 
the Address supports more than one type of delivery
+* then the default delivery mode (MULTICAST) is used.
+*
+* @param address
+* @param queueName
+* @param routingType
+* @param filterString
+* @param durable
+* @throws ActiveMQException
+*/
public abstract void createSharedQueue(SimpleString address,
   SimpleString queueName,
+  RoutingType routingType,
   SimpleString filterString,
   boolean durable) throws 
ActiveMQException;
 
+   public abstract void createSharedQueue(SimpleString address,
+   SimpleString queueName,
+   SimpleString filterString,
+   boolean durable) throws ActiveMQException;
+
public abstract void deleteQueue(SimpleString queueName) throws 
ActiveMQException;
 
-   public abstract void createAddress(SimpleString address, boolean multicast, 
boolean autoCreated) throws ActiveMQException;
+   public abstract void createAddress(SimpleString address, Set 
routingTypes, boolean autoCreated) throws ActiveMQException;
+
+
+   @Deprecated
+   public abstract void createQueue(SimpleString address,
+SimpleString queueName,
+SimpleString filterString,
+boolean durable,
+boolean temp,
+boolean autoCreated) throws 
ActiveMQException;
 
public abstract void createQueue(SimpleString address,
+RoutingType routingType,
 SimpleString queueName,
 SimpleString filterString,
 boolean durable,
 boolean temp,
+int maxConsumers,
+boolean deleteOnNoConsumers,
 boolean autoCreated) throws 
ActiveMQException;
 
public abstract ClientSession.QueueQuery queueQuery(SimpleString queueName) 
throws ActiveMQException;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index 3d3fa66..47d9ff2 100644
--- 

[03/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
deleted file mode 100644
index 9a71e8d..000
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/TopicControlTest.java
+++ /dev/null
@@ -1,669 +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 License.
- */
-package org.apache.activemq.artemis.tests.integration.jms.server.management;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSContext;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.TopicSubscriber;
-import javax.json.JsonArray;
-import javax.management.Notification;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.core.JsonUtil;
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
-import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
-import org.apache.activemq.artemis.api.jms.management.SubscriptionInfo;
-import org.apache.activemq.artemis.api.jms.management.TopicControl;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.postoffice.Binding;
-import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
-import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
-import 
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServers;
-import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
-import org.apache.activemq.artemis.jms.client.ActiveMQTopic;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.artemis.jms.server.management.JMSNotificationType;
-import 
org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
-import 
org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.artemis.utils.RandomUtil;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class TopicControlTest extends ManagementTestBase {
-
-   // Constants -
-
-   // Attributes 
-
-   private ActiveMQServer server;
-
-   private JMSServerManagerImpl serverManager;
-
-   private String clientID;
-
-   private String subscriptionName;
-
-   protected ActiveMQTopic topic;
-
-   private String topicBinding = "/topic/" + RandomUtil.randomString();
-
-   // Static 
-
-   // Constructors --
-
-   // Public 
-
-   @Test
-   public void testGetAttributes() throws Exception {
-  TopicControl topicControl = createManagementControl();
-
-  Assert.assertEquals(topic.getTopicName(), topicControl.getName());
-  Assert.assertEquals(topic.getAddress(), topicControl.getAddress());
-  Assert.assertEquals(topic.isTemporary(), topicControl.isTemporary());
-  Object[] bindings = topicControl.getRegistryBindings();
-  Assert.assertEquals(1, bindings.length);
-  Assert.assertEquals(topicBinding, bindings[0]);
-   }
-
-   @Test
-   public void 

[40/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix OpenWire tests due to missing RoutingType

[clebertsuconic]

ARTEMIS-789 Fix OpenWire tests due to missing RoutingType


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

Branch: refs/heads/master
Commit: 2dc6482c9101cd783f1faca99fb94b197cf68794
Parents: 74d0a1a
Author: Howard Gao 
Authored: Wed Nov 30 15:42:57 2016 +0800
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/core/protocol/openwire/OpenWireConnection.java| 3 ++-
 .../activemq/artemis/core/protocol/openwire/amq/AMQSession.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2dc6482c/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
--
diff --git 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index ff9ac70..fb7a364 100644
--- 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
@@ -721,7 +722,7 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
CheckType checkType = dest.isTemporary() ? 
CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
server.getSecurityStore().check(qName, checkType, this);
server.checkQueueCreationLimit(getUsername());
-   server.createQueue(qName, null, qName, connInfo == null ? null 
: SimpleString.toSimpleString(connInfo.getUserName()), true, false);
+   server.createQueue(qName, 
ActiveMQDefaultConfiguration.DEFAULT_ROUTING_TYPE, qName, connInfo == null ? 
null : SimpleString.toSimpleString(connInfo.getUserName()), true, false);
 }
  }
   }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2dc6482c/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
--
diff --git 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
index 67870b6..a92a379 100644
--- 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
+++ 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.paging.PagingStore;
 import org.apache.activemq.artemis.core.postoffice.RoutingStatus;
@@ -172,7 +173,7 @@ public class AMQSession implements SessionCallback {
 
  if (!queueBinding.isExists()) {
 if (isAutoCreate) {
-   server.createQueue(queueName, null, queueName, null, true, 
isTemporary);
+   server.createQueue(queueName, 
ActiveMQDefaultConfiguration.DEFAULT_ROUTING_TYPE, queueName, null, true, 
isTemporary);
connection.addKnownDestination(queueName);
 } else {
hasQueue = false;

[13/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
deleted file mode 100644
index 341b583..000
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11TestBase.java
+++ /dev/null
@@ -1,167 +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 License.
- */
-package org.apache.activemq.artemis.tests.integration.stomp.v11;
-
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.core.config.Configuration;
-import 
org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
-import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
-import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
-import 
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
-import 
org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServers;
-import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
-import org.apache.activemq.artemis.jms.server.JMSServerManager;
-import org.apache.activemq.artemis.jms.server.config.JMSConfiguration;
-import org.apache.activemq.artemis.jms.server.config.impl.JMSConfigurationImpl;
-import 
org.apache.activemq.artemis.jms.server.config.impl.JMSQueueConfigurationImpl;
-import 
org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.junit.Before;
-
-public abstract class StompV11TestBase extends ActiveMQTestBase {
-
-   protected String hostname = "127.0.0.1";
-
-   protected int port = 61613;
-
-   private ConnectionFactory connectionFactory;
-
-   private Connection connection;
-
-   protected Session session;
-
-   protected Queue queue;
-
-   protected Topic topic;
-
-   protected JMSServerManager server;
-
-   protected String defUser = "brianm";
-
-   protected String defPass = "wombats";
-
-   protected boolean persistenceEnabled = false;
-
-   // Implementation methods
-   // -
-   @Override
-   @Before
-   public void setUp() throws Exception {
-  super.setUp();
-
-  server = createServer();
-  server.start();
-  connectionFactory = createConnectionFactory();
-
-  connection = connectionFactory.createConnection();
-  session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
-  queue = session.createQueue(getQueueName());
-  topic = session.createTopic(getTopicName());
-  connection.start();
-   }
-
-   /**
-* @return
-* @throws Exception
-*/
-   protected JMSServerManager createServer() throws Exception {
-  Map params = new HashMap<>();
-  params.put(TransportConstants.PROTOCOLS_PROP_NAME, 
StompProtocolManagerFactory.STOMP_PROTOCOL_NAME);
-  params.put(TransportConstants.PORT_PROP_NAME, 
TransportConstants.DEFAULT_STOMP_PORT);
-  params.put(TransportConstants.STOMP_CONSUMERS_CREDIT, "-1");
-  TransportConfiguration 

[18/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
deleted file mode 100644
index 95801f7..000
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompOverWebsocketTest.java
+++ /dev/null
@@ -1,151 +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 License.
- */
-package org.apache.activemq.artemis.tests.integration.stomp;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelDuplexHandler;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelPromise;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpClientCodec;
-import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.websocketx.BinaryWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.CloseWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.PongWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
-import io.netty.handler.codec.http.websocketx.WebSocketFrame;
-import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import io.netty.handler.codec.string.StringDecoder;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
-public class StompOverWebsocketTest extends StompTest {
-
-   private ChannelPromise handshakeFuture;
-
-   private final boolean useBinaryFrames;
-
-   @Parameterized.Parameters(name = "useBinaryFrames={0}")
-   public static Collection data() {
-  List list = Arrays.asList(new Object[][]{{Boolean.TRUE}, 
{Boolean.FALSE}});
-  return list;
-   }
-
-   public StompOverWebsocketTest(Boolean useBinaryFrames) {
-  super();
-  this.useBinaryFrames = useBinaryFrames;
-   }
-
-   @Override
-   protected void addChannelHandlers(int index, SocketChannel ch) throws 
URISyntaxException {
-  ch.pipeline().addLast("http-codec", new HttpClientCodec());
-  ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));
-  ch.pipeline().addLast(new 
WebsocketHandler(WebSocketClientHandshakerFactory.newHandshaker(new 
URI("ws://localhost:8080/websocket"), WebSocketVersion.V13, null, false, 
null)));
-  ch.pipeline().addLast("decoder", new 
StringDecoder(StandardCharsets.UTF_8));
-  ch.pipeline().addLast(new StompClientHandler(index));
-   }
-
-   @Override
-   protected void handshake() throws InterruptedException {
-  handshakeFuture.sync();
-   }
-
-   class WebsocketHandler extends ChannelDuplexHandler {
-
-  private WebSocketClientHandshaker handshaker;
-
-  WebsocketHandler(WebSocketClientHandshaker webSocketClientHandshaker) {
- this.handshaker = webSocketClientHandshaker;
-  }
-
-  @Override
-  public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
- handshakeFuture = ctx.newPromise();
-  }
-
-  @Override
-  public void channelActive(ChannelHandlerContext ctx) throws Exception {
- handshaker.handshake(ctx.channel());
-  }
-
-  @Override
-  public void channelInactive(ChannelHandlerContext ctx) throws Exception {
- System.out.println("WebSocket Client disconnected!");
-  }
-
-  @Override
-  public void channelRead(ChannelHandlerContext ctx, Object msg) throws 
Exception {
- Channel ch 

[01/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Internalise Cluster Namespace and remove JMS Prefix

[clebertsuconic]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master ebbc91c72 -> 6682072da


ARTEMIS-876 Internalise Cluster Namespace and remove JMS Prefix


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

Branch: refs/heads/master
Commit: 0006627d120a9010f85aed16d8678e0a61073585
Parents: 84e8a87
Author: Martyn Taylor 
Authored: Mon Nov 7 11:36:18 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/cli/commands/etc/broker.xml | 26 +---
 .../cli/commands/etc/cluster-settings.txt   |  1 -
 .../config/ActiveMQDefaultConfiguration.java|  6 ++
 .../artemis/jms/client/ActiveMQSession.java | 32 ++---
 .../artemis/core/config/Configuration.java  |  3 +
 .../core/config/impl/ConfigurationImpl.java | 13 
 .../deployers/impl/FileConfigurationParser.java |  4 ++
 .../artemis/core/server/ActiveMQServer.java |  4 ++
 .../cluster/impl/ClusterConnectionBridge.java   | 22 +-
 .../cluster/impl/ClusterConnectionImpl.java | 10 ++-
 .../core/server/impl/ActiveMQServerImpl.java| 34 +++---
 .../core/server/impl/ScaleDownHandler.java  |  3 +-
 .../resources/schema/artemis-configuration.xsd  | 70 +++-
 .../test/resources/artemis-configuration.xsd|  2 +-
 .../crossprotocol/AMQPToOpenwireTest.java   | 13 ++--
 .../integration/mqtt/imported/MQTTTest.java |  6 +-
 .../integration/server/ScaleDown3NodeTest.java  |  4 +-
 .../tests/integration/server/ScaleDownTest.java |  2 +-
 18 files changed, 148 insertions(+), 107 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0006627d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 23f2109..0871ab6 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -22,12 +22,8 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="urn:activemq 
/schema/artemis-configuration.xsd">
 
-   
-  
-  ${jms-list.settings}
-   
-
-   
+   http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="urn:activemq:core ">
 
   ${name}
 
@@ -89,8 +85,8 @@ 
${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
   
  
  
-jms.queue.DLQ
-jms.queue.ExpiryQueue
+DLQ
+ExpiryQueue
 0
 
 -1
@@ -98,5 +94,19 @@ 
${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
 PAGE
  
   
+
+  
+ 
+
+   
+
+ 
+ 
+
+   
+
+ 
+  
+

 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0006627d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
index b7afbca..f639735 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/cluster-settings.txt
@@ -18,7 +18,6 @@
 
   
  
-jms
 artemis
 
${message-load-balancing}
 ${max-hops}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0006627d/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index 9791634..e9212f2 100644
--- 

[28/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix various failing tests due to addressing changes

[clebertsuconic]

ARTEMIS-789 Fix various failing tests due to addressing changes


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

Branch: refs/heads/master
Commit: 0861be14c15fef9e87235d5d56abbf1bda9f14dc
Parents: 796550d
Author: jbertram 
Authored: Tue Nov 15 17:10:17 2016 -0600
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/cli/commands/AbstractAction.java|   1 -
 .../activemq/artemis/cli/commands/Create.java   |  37 ++-
 .../cli/commands/address/CreateAddress.java |   1 -
 .../cli/commands/address/ShowAddress.java   |   3 +-
 .../artemis/cli/commands/etc/broker.xml |   4 +-
 .../apache/activemq/cli/test/ArtemisTest.java   |  18 +-
 .../config/ActiveMQDefaultConfiguration.java|   4 +-
 .../artemis/api/core/client/ClientSession.java  |  28 +++
 .../core/management/ActiveMQServerControl.java  |  33 ++-
 .../api/core/management/ObjectNameBuilder.java  |   2 +-
 .../core/client/impl/ClientSessionImpl.java |  37 ++-
 .../core/impl/ActiveMQSessionContext.java   |   6 +-
 .../core/protocol/core/impl/PacketDecoder.java  |   6 +
 .../core/protocol/core/impl/PacketImpl.java |   2 +
 .../impl/wireformat/CreateQueueMessage.java |  26 ++-
 .../impl/wireformat/CreateQueueMessage_V2.java  |  99 
 .../activemq/artemis/core/security/Role.java|  23 +-
 .../spi/core/remoting/SessionContext.java   |   3 +-
 .../artemis/utils/SecurityFormatter.java|   7 +-
 .../src/test/scripts/validate-instalation.sh|   4 +-
 artemis-features/src/main/resources/artemis.xml |   4 +-
 .../jms/client/ActiveMQMessageProducer.java |   2 +-
 .../artemis/jms/client/ActiveMQSession.java |   9 +-
 .../jms/server/impl/JMSServerManagerImpl.java   |   4 +-
 .../protocol/openwire/OpenWireConnection.java   |   1 -
 .../core/protocol/openwire/amq/AMQSession.java  |   2 +-
 .../core/protocol/stomp/StompConnection.java|  26 ++-
 .../deployers/impl/FileConfigurationParser.java |  26 +++
 .../impl/ActiveMQServerControlImpl.java |  91 ++--
 .../core/persistence/config/PersistedRoles.java |  29 ++-
 .../journal/AbstractJournalStorageManager.java  |   1 +
 .../core/postoffice/impl/PostOfficeImpl.java|   4 +-
 .../core/ServerSessionPacketHandler.java|  13 +-
 .../artemis/core/server/ActiveMQServer.java |   1 -
 .../artemis/core/server/ServerSession.java  |   2 +-
 .../core/server/impl/ActiveMQServerImpl.java|  27 ++-
 .../artemis/core/server/impl/AddressInfo.java   |  11 +
 .../impl/AutoCreatedQueueManagerImpl.java   |   8 +-
 .../artemis/core/server/impl/QueueImpl.java |   2 +-
 .../core/server/impl/ServerSessionImpl.java |   7 +-
 .../core/settings/impl/AddressSettings.java | 167 +++--
 .../resources/schema/artemis-configuration.xsd  |  43 +++-
 .../core/config/impl/FileConfigurationTest.java |   4 +-
 .../artemis/core/security/RoleTest.java |  20 +-
 .../core/settings/AddressSettingsTest.java  |  10 +-
 .../artemis/core/settings/RepositoryTest.java   |  14 +-
 .../resources/ConfigurationTest-full-config.xml |   8 +
 artemis-tools/pom.xml   |   2 +-
 docs/user-manual/en/queue-attributes.md |  32 ++-
 .../clustered-durable-subscription/readme.html  |   1 -
 .../ClusteredDurableSubscriptionExample.java|   2 +
 .../main/resources/activemq/server0/broker.xml  |   3 +-
 .../main/resources/activemq/server1/broker.xml  |   3 +-
 .../clustered/clustered-grouping/readme.html|   2 -
 .../main/resources/activemq/server0/broker.xml  |   5 +-
 .../main/resources/activemq/server1/broker.xml  |   5 +-
 .../main/resources/activemq/server2/broker.xml  |   5 +-
 .../main/resources/activemq/server0/broker.xml  |   3 +-
 .../main/resources/activemq/server1/broker.xml  |   3 +-
 .../clustered/clustered-queue/readme.html   |   1 -
 .../main/resources/activemq/server0/broker.xml  |   3 +-
 .../main/resources/activemq/server1/broker.xml  |   3 +-
 .../clustered-static-discovery-uri/readme.html  |   1 -
 .../main/resources/activemq/server0/broker.xml  |   2 +-
 .../main/resources/activemq/server1/broker.xml  |   2 +-
 .../main/resources/activemq/server2/broker.xml  |   2 +-
 .../main/resources/activemq/server3/broker.xml  |   2 +-
 .../clustered-static-discovery/readme.html  |   1 -
 .../main/resources/activemq/server0/broker.xml  |   3 +-
 .../main/resources/activemq/server1/broker.xml  |   3 +-
 .../main/resources/activemq/server2/broker.xml  |   3 +-
 .../main/resources/activemq/server3/broker.xml  |   3 +-
 .../clustered-static-oneway/readme.html |   1 -
 

[43/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Deprecate JMSServerManager and update JMS bootstrap

[clebertsuconic]

ARTEMIS-876 Deprecate JMSServerManager and update JMS bootstrap


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

Branch: refs/heads/master
Commit: b742a357c51dbdda3dd8575cd04b4c9ae9546da2
Parents: 683ae68
Author: jbertram 
Authored: Thu Dec 1 15:59:17 2016 -0600
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/integration/FileBroker.java |  42 ++
 .../config/ActiveMQDefaultConfiguration.java|  10 ++
 .../core/management/ActiveMQServerControl.java  |  10 ++
 .../api/core/management/DivertControl.java  |   6 +
 .../artemis/core/server/RoutingType.java|  10 +-
 .../jms/client/ActiveMQMessageProducer.java |   3 +-
 .../artemis/jms/client/ActiveMQSession.java |   6 +-
 .../artemis/jms/server/JMSServerManager.java|   1 +
 .../config/impl/FileJMSConfiguration.java   |   6 +-
 .../jms/server/impl/JMSServerManagerImpl.java   |   1 +
 .../core/config/CoreAddressConfiguration.java   |   2 +-
 .../core/config/CoreQueueConfiguration.java |   3 +-
 .../core/config/DivertConfiguration.java|  21 +++
 .../artemis/core/config/impl/Validators.java|  14 ++
 .../deployers/impl/FileConfigurationParser.java |   8 +-
 .../impl/ActiveMQServerControlImpl.java |  14 +-
 .../core/management/impl/DivertControlImpl.java |  10 ++
 .../postoffice/impl/SimpleAddressManager.java   |   5 +
 .../core/server/ActiveMQMessageBundle.java  |   3 +
 .../core/server/impl/ActiveMQServerImpl.java|   3 +-
 .../artemis/core/server/impl/DivertImpl.java|  23 +++-
 .../resources/schema/artemis-configuration.xsd  |  16 +++
 .../main/resources/activemq/server0/broker.xml  |   5 -
 .../tests/integration/divert/DivertTest.java| 136 +++
 .../ActiveMQServerControlUsingCoreTest.java |  12 ++
 .../management/DivertControlUsingCoreTest.java  |   5 +
 26 files changed, 351 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b742a357/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
index 82224b9..0556ccc 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/integration/FileBroker.java
@@ -18,14 +18,20 @@ package org.apache.activemq.artemis.integration;
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
+import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
 import org.apache.activemq.artemis.core.config.FileDeploymentManager;
 import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
 import org.apache.activemq.artemis.core.server.ActiveMQComponent;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.dto.ServerDTO;
 import 
org.apache.activemq.artemis.integration.bootstrap.ActiveMQBootstrapLogger;
+import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
+import org.apache.activemq.artemis.jms.server.config.TopicConfiguration;
 import org.apache.activemq.artemis.jms.server.config.impl.FileJMSConfiguration;
 import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
 
@@ -52,12 +58,48 @@ public class FileBroker implements Broker {
 
   //todo if we start to pullout more configs from the main config then we 
should pull out the configuration objects from factories if available
   FileConfiguration configuration = new FileConfiguration();
+
+  // Keep this as we still want to parse destinations in the  element
   FileJMSConfiguration jmsConfiguration = new FileJMSConfiguration();
 
   FileDeploymentManager fileDeploymentManager = new 
FileDeploymentManager(configurationUrl);
   
fileDeploymentManager.addDeployable(configuration).addDeployable(jmsConfiguration);
   fileDeploymentManager.readConfiguration();
 
+  /**
+   * This is a bit of a hack for backwards config compatibility since we 
no longer want to start the broker
+   * using the JMSServerManager which would normally deploy JMS 
destinations. Here we take the 

[27/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix various failing tests due to addressing changes

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index c38b2cf..f524062 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -67,7 +67,6 @@ import org.apache.activemq.artemis.core.postoffice.Binding;
 import org.apache.activemq.artemis.core.postoffice.Bindings;
 import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache;
 import org.apache.activemq.artemis.core.postoffice.PostOffice;
-import org.apache.activemq.artemis.core.postoffice.QueueBinding;
 import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
 import org.apache.activemq.artemis.core.remoting.server.RemotingService;
 import org.apache.activemq.artemis.core.security.CheckType;
@@ -75,7 +74,6 @@ import org.apache.activemq.artemis.core.security.Role;
 import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
-import org.apache.activemq.artemis.core.server.BindingQueryResult;
 import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
 import org.apache.activemq.artemis.core.server.Consumer;
 import org.apache.activemq.artemis.core.server.JournalType;
@@ -789,12 +787,18 @@ public class ActiveMQServerControlImpl extends 
AbstractControl implements Active
 
@Override
public String getAddressInfo(String address) throws 
ActiveMQAddressDoesNotExistException {
-  AddressInfo addressInfo = 
server.getAddressInfo(SimpleString.toSimpleString(address));
-  if (addressInfo == null) {
- throw 
ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(SimpleString.toSimpleString(address));
-  }
-  else {
- return addressInfo.toString();
+  checkStarted();
+
+  clearIO();
+  try {
+ AddressInfo addressInfo = 
server.getAddressInfo(SimpleString.toSimpleString(address));
+ if (addressInfo == null) {
+throw 
ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(SimpleString.toSimpleString(address));
+ } else {
+return addressInfo.toString();
+ }
+  } finally {
+ blockOnIO();
   }
}
 
@@ -1600,7 +1604,7 @@ public class ActiveMQServerControlImpl extends 
AbstractControl implements Active
final String deleteNonDurableQueueRoles,
final String manageRoles,
final String browseRoles) throws Exception {
-  addSecuritySettings(addressMatch, sendRoles, consumeRoles, 
createDurableQueueRoles, deleteDurableQueueRoles, createNonDurableQueueRoles, 
deleteNonDurableQueueRoles, manageRoles, browseRoles, "");
+  addSecuritySettings(addressMatch, sendRoles, consumeRoles, 
createDurableQueueRoles, deleteDurableQueueRoles, createNonDurableQueueRoles, 
deleteNonDurableQueueRoles, manageRoles, browseRoles, "", "");
}
 
@Override
@@ -1613,16 +1617,17 @@ public class ActiveMQServerControlImpl extends 
AbstractControl implements Active
final String deleteNonDurableQueueRoles,
final String manageRoles,
final String browseRoles,
-   final String createAddressRoles) throws 
Exception {
+   final String createAddressRoles,
+   final String deleteAddressRoles) throws 
Exception {
   checkStarted();
 
   clearIO();
   try {
- Set roles = SecurityFormatter.createSecurity(sendRoles, 
consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, 
createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles, 
browseRoles, createAddressRoles);
+ Set roles = SecurityFormatter.createSecurity(sendRoles, 
consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, 
createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles, 
browseRoles, createAddressRoles, deleteAddressRoles);
 
  server.getSecurityRepository().addMatch(addressMatch, roles);
 
- PersistedRoles persistedRoles = new PersistedRoles(addressMatch, 
sendRoles, consumeRoles, createDurableQueueRoles, deleteDurableQueueRoles, 
createNonDurableQueueRoles, deleteNonDurableQueueRoles, manageRoles, 
browseRoles, createAddressRoles);
+ 

[22/50] [abbrv] activemq-artemis git commit: ARTEMIS-878 Update the CLI to incorporate Addresses and new Queue

[clebertsuconic]

ARTEMIS-878 Update the CLI to incorporate Addresses and new Queue


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

Branch: refs/heads/master
Commit: ec8f06138c3f93c568934a859044125321a2fa47
Parents: a88853f
Author: Martyn Taylor 
Authored: Fri Nov 11 14:08:49 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../apache/activemq/artemis/cli/Artemis.java|  15 +-
 .../artemis/cli/commands/AbstractAction.java|  62 +
 .../cli/commands/address/CreateAddress.java | 101 
 .../cli/commands/address/DeleteAddress.java |  67 ++
 .../cli/commands/address/HelpAddress.java   |  56 +
 .../cli/commands/address/ShowAddress.java   |  84 +++
 .../commands/destination/CreateDestination.java | 147 
 .../commands/destination/DeleteDestination.java | 121 --
 .../commands/destination/DestinationAction.java | 128 ---
 .../commands/destination/HelpDestination.java   |  56 -
 .../artemis/cli/commands/queue/CreateQueue.java | 117 ++
 .../artemis/cli/commands/queue/DeleteQueue.java |  85 +++
 .../artemis/cli/commands/queue/HelpQueue.java   |  56 +
 .../apache/activemq/cli/test/ArtemisTest.java   |   5 +-
 .../ActiveMQAddressDoesNotExistException.java   |  31 +++
 .../core/ActiveMQDeleteAddressException.java|  31 +++
 .../artemis/api/core/ActiveMQException.java |   1 -
 .../artemis/api/core/ActiveMQExceptionType.java |  12 +
 .../core/management/ActiveMQServerControl.java  |  42 
 .../impl/ActiveMQServerControlImpl.java |  72 +-
 .../artemis/core/postoffice/PostOffice.java |   3 +
 .../core/postoffice/impl/PostOfficeImpl.java|  59 +++--
 .../core/server/ActiveMQMessageBundle.java  |  12 +
 .../artemis/core/server/ActiveMQServer.java |  24 +-
 .../core/server/ActiveMQServerLogger.java   |   2 +-
 .../core/server/impl/ActiveMQServerImpl.java| 117 +-
 .../artemis/core/server/impl/AddressInfo.java   |   4 +-
 .../artemis/core/server/impl/QueueImpl.java |   9 +-
 .../core/server/impl/ServerSessionImpl.java |   2 +-
 .../management/impl/ManagementServiceImpl.java  |   1 -
 .../integration/addressing/AddressingTest.java  |  10 +-
 .../integration/cli/AddressCommandTest.java | 155 +
 .../integration/cli/DestinationCommandTest.java | 226 --
 .../integration/cli/DummyServerConsumer.java| 204 +
 .../tests/integration/cli/QueueCommandTest.java | 228 +++
 .../ActiveMQServerControlUsingCoreTest.java |  36 +++
 .../integration/mqtt/imported/MQTTTest.java |   4 +-
 .../core/server/impl/fakes/FakePostOffice.java  |   6 +
 38 files changed, 1614 insertions(+), 777 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec8f0613/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
index 17c4457..94779fc 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
@@ -30,9 +30,11 @@ import org.apache.activemq.artemis.cli.commands.Kill;
 import org.apache.activemq.artemis.cli.commands.Mask;
 import org.apache.activemq.artemis.cli.commands.Run;
 import org.apache.activemq.artemis.cli.commands.Stop;
-import org.apache.activemq.artemis.cli.commands.destination.CreateDestination;
-import org.apache.activemq.artemis.cli.commands.destination.DeleteDestination;
-import org.apache.activemq.artemis.cli.commands.destination.HelpDestination;
+import org.apache.activemq.artemis.cli.commands.address.CreateAddress;
+import org.apache.activemq.artemis.cli.commands.address.DeleteAddress;
+import org.apache.activemq.artemis.cli.commands.queue.CreateQueue;
+import org.apache.activemq.artemis.cli.commands.queue.DeleteQueue;
+import org.apache.activemq.artemis.cli.commands.queue.HelpQueue;
 import org.apache.activemq.artemis.cli.commands.messages.Browse;
 import org.apache.activemq.artemis.cli.commands.messages.Consumer;
 import org.apache.activemq.artemis.cli.commands.messages.Producer;
@@ -128,8 +130,11 @@ public class Artemis {
   String instance = artemisInstance != null ? 
artemisInstance.getAbsolutePath() : System.getProperty("artemis.instance");
   Cli.CliBuilder builder = 

[37/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Fixes a number of broken tests

[clebertsuconic]

ARTEMIS-780 Fixes a number of broken tests


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

Branch: refs/heads/master
Commit: 1339c930de25a54c688e3e7a3475f04aae3271e5
Parents: a20b23b
Author: Martyn Taylor 
Authored: Fri Dec 9 18:00:06 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../amqp/broker/AMQPSessionCallback.java|  4 ++--
 .../integration/cli/AddressCommandTest.java |  6 +-
 .../tests/integration/client/SessionTest.java   |  2 +-
 .../AnycastRoutingWithClusterTest.java  | 10 -
 .../cluster/distribution/ClusterTestBase.java   | 22 +++-
 .../interceptors/InterceptorTest.java   |  3 ++-
 .../jms/ActiveMQConnectionFactoryTest.java  |  5 +++--
 .../jms/cluster/JMSFailoverListenerTest.java|  5 +++--
 .../jms/cluster/JMSReconnectTest.java   |  3 ++-
 .../ActiveMQServerControlUsingCoreTest.java |  2 +-
 .../integration/security/SecurityTest.java  |  4 ++--
 .../activemq/artemis/jms/tests/QueueTest.java   |  2 +-
 .../jms/tests/message/MessageHeaderTest.java|  2 +-
 .../activemq/artemis/common/AbstractAdmin.java  |  3 ++-
 14 files changed, 51 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1339c930/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 1fc8511..6d4abc4 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -207,13 +207,13 @@ public class AMQPSessionCallback implements 
SessionCallback {
public QueueQueryResult queueQuery(String queueName, boolean autoCreate) 
throws Exception {
   QueueQueryResult queueQueryResult = 
serverSession.executeQueueQuery(SimpleString.toSimpleString(queueName));
 
-  if (!queueQueryResult.isExists() && 
queueQueryResult.isAutoCreateJmsQueues() && autoCreate) {
+  if (!queueQueryResult.isExists() && 
queueQueryResult.isAutoCreateQueues() && autoCreate) {
  try {
 serverSession.createQueue(new SimpleString(queueName), new 
SimpleString(queueName), null, false, true);
  } catch (ActiveMQQueueExistsException e) {
 // The queue may have been created by another thread in the mean 
time.  Catch and do nothing.
  }
- queueQueryResult = new QueueQueryResult(queueQueryResult.getName(), 
queueQueryResult.getAddress(), queueQueryResult.isDurable(), 
queueQueryResult.isTemporary(), queueQueryResult.getFilterString(), 
queueQueryResult.getConsumerCount(), queueQueryResult.getMessageCount(), 
queueQueryResult.isAutoCreateJmsQueues(), true);
+ queueQueryResult = new QueueQueryResult(queueQueryResult.getName(), 
queueQueryResult.getAddress(), queueQueryResult.isDurable(), 
queueQueryResult.isTemporary(), queueQueryResult.getFilterString(), 
queueQueryResult.getConsumerCount(), queueQueryResult.getMessageCount(), 
queueQueryResult.isAutoCreateQueues(), true, queueQueryResult.isAutoCreated(), 
queueQueryResult.isDeleteOnNoConsumers(), queueQueryResult.getRoutingType(), 
queueQueryResult.getMaxConsumers());
   }
   return queueQueryResult;
}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1339c930/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java
index c04fc0b..6c373ec 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cli/AddressCommandTest.java
@@ -51,9 +51,13 @@ public class AddressCommandTest extends JMSTestBase {
   

[12/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
index fcb9884..9b1ad93 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v12/StompV12Test.java
@@ -33,14 +33,15 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.stomp.StompTestBase;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV11;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionV12;
-import 
org.apache.activemq.artemis.tests.integration.stomp.v11.StompV11TestBase;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -49,28 +50,28 @@ import org.junit.Test;
 /**
  * Testing Stomp version 1.2 functionalities
  */
-public class StompV12Test extends StompV11TestBase {
+public class StompV12Test extends StompTestBase {
 
private static final transient IntegrationTestLogger log = 
IntegrationTestLogger.LOGGER;
public static final String CLIENT_ID = "myclientid";
 
-   private StompClientConnectionV12 connV12;
+   private StompClientConnectionV12 conn;
 
@Override
@Before
public void setUp() throws Exception {
   super.setUp();
-  connV12 = (StompClientConnectionV12) 
StompClientConnectionFactory.createClientConnection("1.2", hostname, port);
+  conn = (StompClientConnectionV12) 
StompClientConnectionFactory.createClientConnection("1.2", hostname, port);
}
 
@Override
@After
public void tearDown() throws Exception {
   try {
- boolean connected = connV12 != null && connV12.isConnected();
+ boolean connected = conn != null && conn.isConnected();
  log.debug("Connection 1.2 : " + connected);
  if (connected) {
-connV12.disconnect();
+conn.disconnect();
  }
   } finally {
  super.tearDown();
@@ -119,32 +120,32 @@ public class StompV12Test extends StompV11TestBase {
public void testConnectionAsInSpec() throws Exception {
   StompClientConnection conn = 
StompClientConnectionFactory.createClientConnection("1.0", hostname, port);
 
-  ClientStompFrame frame = conn.createFrame("CONNECT");
-  frame.addHeader("login", this.defUser);
-  frame.addHeader("passcode", this.defPass);
-  frame.addHeader("accept-version", "1.2");
-  frame.addHeader("host", "127.0.0.1");
+  ClientStompFrame frame = conn.createFrame(Stomp.Commands.CONNECT);
+  frame.addHeader(Stomp.Headers.Connect.LOGIN, this.defUser);
+  frame.addHeader(Stomp.Headers.Connect.PASSCODE, this.defPass);
+  frame.addHeader(Stomp.Headers.ACCEPT_VERSION, "1.2");
+  frame.addHeader(Stomp.Headers.Connect.HOST, "127.0.0.1");
 
   ClientStompFrame reply = conn.sendFrame(frame);
 
-  Assert.assertEquals("CONNECTED", reply.getCommand());
-  Assert.assertEquals("1.2", reply.getHeader("version"));
+  Assert.assertEquals(Stomp.Responses.CONNECTED, reply.getCommand());
+  Assert.assertEquals("1.2", reply.getHeader(Stomp.Headers.Error.VERSION));
 
   conn.disconnect();
 
   //need 1.2 client
   conn = StompClientConnectionFactory.createClientConnection("1.2", 
hostname, port);
 
-  frame = conn.createFrame("STOMP");
-  frame.addHeader("login", this.defUser);
-  frame.addHeader("passcode", this.defPass);
-  frame.addHeader("accept-version", "1.2");
-  frame.addHeader("host", "127.0.0.1");
+  frame = conn.createFrame(Stomp.Commands.STOMP);
+  frame.addHeader(Stomp.Headers.Connect.LOGIN, this.defUser);
+  frame.addHeader(Stomp.Headers.Connect.PASSCODE, this.defPass);
+  frame.addHeader(Stomp.Headers.ACCEPT_VERSION, "1.2");
+  frame.addHeader(Stomp.Headers.Connect.HOST, "127.0.0.1");
 
   reply = conn.sendFrame(frame);
 
-  

[06/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredMessageCounterTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredMessageCounterTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredMessageCounterTest.java
index a8ad897..6540559 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredMessageCounterTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusteredMessageCounterTest.java
@@ -132,7 +132,7 @@ public class ClusteredMessageCounterTest extends 
ClusterTestBase {
 
  verifyReceiveAllOnSingleConsumer(true, numMsg, 1);
 
- QueueControl control = (QueueControl) 
servers[1].getManagementService().getResource(ResourceNames.CORE_QUEUE + 
"queue0");
+ QueueControl control = (QueueControl) 
servers[1].getManagementService().getResource(ResourceNames.QUEUE + "queue0");
 
  //wait up to 30sec to allow the counter get updated
  long timeout = 3;
@@ -173,8 +173,8 @@ public class ClusteredMessageCounterTest extends 
ClusterTestBase {
 }
  });
 
- QueueControl control = (QueueControl) 
servers[1].getManagementService().getResource(ResourceNames.CORE_QUEUE + 
"queue0");
- ActiveMQServerControl serverControl = (ActiveMQServerControl) 
servers[1].getManagementService().getResource(ResourceNames.CORE_SERVER);
+ QueueControl control = (QueueControl) 
servers[1].getManagementService().getResource(ResourceNames.QUEUE + "queue0");
+ ActiveMQServerControl serverControl = (ActiveMQServerControl) 
servers[1].getManagementService().getResource(ResourceNames.BROKER);
  serverControl.setMessageCounterSamplePeriod(300);
 
  CountDownLatch resultLatch = new CountDownLatch(40);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
index 0bc3e28..1a0a997 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/crossprotocol/AMQPToOpenwireTest.java
@@ -35,7 +35,6 @@ import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.jms.server.JMSServerManager;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.After;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
index 03e3d07..b5091dc 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
@@ -22,7 +22,8 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.artemis.api.jms.management.TopicControl;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
 import org.apache.activemq.artemis.core.config.Configuration;
 import 
org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
 import org.apache.activemq.artemis.tests.util.JMSTestBase;
@@ -47,7 +48,7 @@ public class ExpiryMessageTest extends JMSTestBase {
@Test
public void testSendTopicNoSubscription() throws Exception {
   Topic topic = 

[31/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Added ability to define 2 Routing Types on a single addres

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
index 184462b..5c43683 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
@@ -33,7 +33,9 @@ import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ActiveMQEx
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateAddressMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage_V2;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateQueueMessage_V3;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage;
+import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.CreateSharedQueueMessage_V2;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.NullResponseMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.RollbackMessage;
 import 
org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
@@ -78,7 +80,9 @@ import 
org.apache.activemq.artemis.core.remoting.impl.netty.NettyConnection;
 import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
 import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.core.server.BindingQueryResult;
+import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.core.server.QueueQueryResult;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.core.server.ServerMessage;
 import org.apache.activemq.artemis.core.server.ServerSession;
 import org.apache.activemq.artemis.spi.core.remoting.Connection;
@@ -87,7 +91,9 @@ import org.jboss.logging.Logger;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_ADDRESS;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_QUEUE;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_QUEUE_V2;
+import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_QUEUE_V3;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE;
+import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.CREATE_SHARED_QUEUE_V2;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.DELETE_QUEUE;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE;
 import static 
org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY;
@@ -227,7 +233,7 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
case CREATE_ADDRESS: {
   CreateAddressMessage request = (CreateAddressMessage) packet;
   requiresResponse = request.isRequiresResponse();
-  session.createAddress(request.getAddress(), 
request.isMulticast(), request.isAutoCreated());
+  session.createAddress(request.getAddress(), 
request.getRoutingTypes(), request.isAutoCreated());
   if (requiresResponse) {
  response = new NullResponseMessage();
   }
@@ -236,7 +242,7 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
case CREATE_QUEUE: {
   CreateQueueMessage request = (CreateQueueMessage) packet;
   requiresResponse = request.isRequiresResponse();
-  session.createQueue(request.getAddress(), 
request.getQueueName(), request.getFilterString(), request.isTemporary(), 
request.isDurable());
+  session.createQueue(request.getAddress(), 
request.getQueueName(), RoutingType.MULTICAST, request.getFilterString(), 
request.isTemporary(), request.isDurable());
   if (requiresResponse) {
  response = new NullResponseMessage();
   }
@@ -245,7 +251,25 @@ public class ServerSessionPacketHandler implements 
ChannelHandler {
case CREATE_QUEUE_V2: {
   CreateQueueMessage_V2 request = (CreateQueueMessage_V2) 
packet;
   requiresResponse = request.isRequiresResponse();
-  

[33/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Added ability to define 2 Routing Types on a single addres

[clebertsuconic]

ARTEMIS-780 Added ability to define 2 Routing Types on a single addres


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

Branch: refs/heads/master
Commit: 7a51491c3235d5bcbc0407f38b7b080b926eaf00
Parents: 0861be1
Author: Martyn Taylor 
Authored: Fri Nov 25 13:06:21 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../cli/commands/address/CreateAddress.java |  20 +-
 .../config/ActiveMQDefaultConfiguration.java|   7 +
 .../artemis/api/core/client/ClientSession.java  | 201 -
 .../core/management/ActiveMQServerControl.java  |  42 +--
 .../api/core/management/AddressControl.java |   9 +-
 .../core/client/impl/ClientSessionImpl.java | 290 +--
 .../core/impl/ActiveMQSessionContext.java   |  41 ++-
 .../core/protocol/core/impl/PacketDecoder.java  |  12 +
 .../core/protocol/core/impl/PacketImpl.java |   4 +
 .../impl/wireformat/CreateAddressMessage.java   |  39 ++-
 .../impl/wireformat/CreateQueueMessage_V2.java  |   6 +-
 .../impl/wireformat/CreateQueueMessage_V3.java  | 134 +
 .../wireformat/CreateSharedQueueMessage.java|  16 +-
 .../wireformat/CreateSharedQueueMessage_V2.java | 134 +
 .../artemis/core/server/RoutingType.java|  44 +++
 .../spi/core/remoting/SessionContext.java   |  35 ++-
 .../jms/client/ActiveMQMessageProducer.java |   9 +-
 .../artemis/jms/client/ActiveMQSession.java |  17 +-
 .../jms/server/impl/JMSServerManagerImpl.java   |   8 +-
 .../artemis/junit/ActiveMQConsumerResource.java |   6 +
 .../artemis/junit/EmbeddedActiveMQResource.java |   6 +-
 .../protocol/mqtt/MQTTSubscriptionManager.java  |   7 +-
 .../protocol/openwire/OpenWireConnection.java   |   2 +-
 .../core/protocol/openwire/amq/AMQConsumer.java |   7 +-
 .../core/protocol/openwire/amq/AMQSession.java  |   2 +-
 .../core/protocol/stomp/StompConnection.java|  22 +-
 .../core/protocol/stomp/StompSession.java   |   6 +-
 .../stomp/VersionedStompFrameHandler.java   |  16 +-
 .../artemis/ra/ActiveMQRAMessageProducer.java   |   4 +-
 .../artemis/rest/test/FindDestinationTest.java  |   5 +-
 .../activemq/artemis/rest/test/RawAckTest.java  |   8 +-
 .../core/config/CoreAddressConfiguration.java   |  88 +-
 .../core/config/CoreQueueConfiguration.java |  23 +-
 .../artemis/core/config/impl/Validators.java|  10 +
 .../deployers/impl/FileConfigurationParser.java |  49 ++--
 .../impl/ActiveMQServerControlImpl.java |  34 +--
 .../management/impl/AddressControlImpl.java |   5 +-
 .../core/persistence/AddressBindingInfo.java|   9 +-
 .../journal/AbstractJournalStorageManager.java  |   4 +-
 .../codec/PersistentAddressBindingEncoding.java |  68 ++---
 .../core/postoffice/impl/LocalQueueBinding.java |  25 +-
 .../postoffice/impl/SimpleAddressManager.java   |   7 +-
 .../core/ServerSessionPacketHandler.java|  39 ++-
 .../core/impl/ActiveMQPacketHandler.java|   2 +-
 .../core/server/ActiveMQMessageBundle.java  |  12 +-
 .../artemis/core/server/ActiveMQServer.java |  86 +++---
 .../activemq/artemis/core/server/Queue.java |   8 +
 .../artemis/core/server/QueueConfig.java|  35 ++-
 .../artemis/core/server/ServerSession.java  |  52 +++-
 .../cluster/impl/ClusterConnectionImpl.java |   3 +-
 .../core/server/impl/ActiveMQServerImpl.java| 134 +
 .../artemis/core/server/impl/AddressInfo.java   | 123 
 .../core/server/impl/LastValueQueue.java|   4 +-
 .../server/impl/PostOfficeJournalLoader.java|   6 +-
 .../core/server/impl/QueueFactoryImpl.java  |   7 +-
 .../artemis/core/server/impl/QueueImpl.java |  26 +-
 .../core/server/impl/ServerSessionImpl.java |  79 -
 .../resources/schema/artemis-configuration.xsd  |  45 +--
 .../core/config/impl/FileConfigurationTest.java |  37 ++-
 .../core/message/impl/MessagePropertyTest.java  |   6 +-
 .../impl/ScheduledDeliveryHandlerTest.java  |  11 +
 .../resources/ConfigurationTest-full-config.xml |  22 +-
 .../addressing/AddressConfigTest.java   |   9 +-
 .../integration/addressing/AddressingTest.java  |  53 +---
 .../integration/cli/AddressCommandTest.java |   9 +-
 .../integration/client/HangConsumerTest.java|  10 +-
 .../tests/integration/client/ProducerTest.java  |   3 +-
 .../AnycastRoutingWithClusterTest.java  |  10 +-
 .../cluster/distribution/ClusterTestBase.java   |   8 +-
 .../failover/AsynchronousFailoverTest.java  |   2 +-
 .../cluster/failover/BackupSyncJournalTest.java |   3 +-
 .../cluster/failover/FailoverTest.java  |  49 ++--
 

[26/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix various failing tests due to addressing changes

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml
--
diff --git 
a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml
 
b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml
index eb30a90..e0ee6e6 100644
--- 
a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server0/broker.xml
@@ -67,7 +67,6 @@ under the License.
 
   
  
-jms
 netty-connector
 500
 true
@@ -81,7 +80,7 @@ under the License.
 
   
  
- 
+ 
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml
--
diff --git 
a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml
 
b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml
index 531fed1..84a8014 100644
--- 
a/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/features/clustered/clustered-queue/src/main/resources/activemq/server1/broker.xml
@@ -68,7 +68,6 @@ under the License.
 
   
  
-jms
 netty-connector
 500
 true
@@ -82,7 +81,7 @@ under the License.
 
   
  
- 
+ 
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/clustered/clustered-static-discovery-uri/readme.html
--
diff --git 
a/examples/features/clustered/clustered-static-discovery-uri/readme.html 
b/examples/features/clustered/clustered-static-discovery-uri/readme.html
index 88931b9..0dc1205 100644
--- a/examples/features/clustered/clustered-static-discovery-uri/readme.html
+++ b/examples/features/clustered/clustered-static-discovery-uri/readme.html
@@ -40,7 +40,6 @@ under the License.
  and to load balance the messages between the nodes.
  
  cluster-connection name="my-cluster"
-addressjms/address
 connector-ref>netty-connector/connector-ref>
 retry-interval500/retry-interval
 use-duplicate-detectiontrue/use-duplicate-detection

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml
--
diff --git 
a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml
 
b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml
index be093ab..90ae4a1 100644
--- 
a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server0/broker.xml
@@ -56,7 +56,7 @@ under the License.
 
   
  
- 
+ 
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml
--
diff --git 
a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml
 
b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml
index fc3bb2d..5245e12 100644
--- 
a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server1/broker.xml
@@ -56,7 +56,7 @@ under the License.
 
   
  
- 
+ 
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml
--
diff --git 
a/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml
 
b/examples/features/clustered/clustered-static-discovery-uri/src/main/resources/activemq/server2/broker.xml
index 608796f..5f3f611 100644
--- 

[30/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Added ability to define 2 Routing Types on a single addres

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
--
diff --git 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
index 11b11ab..d4ec32a 100644
--- 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -41,6 +41,7 @@ import org.apache.activemq.artemis.core.message.BodyEncoder;
 import org.apache.activemq.artemis.core.paging.PagingStore;
 import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
 import org.apache.activemq.artemis.core.server.Consumer;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.core.server.MessageReference;
 import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.core.server.RoutingContext;
@@ -886,6 +887,16 @@ public class ScheduledDeliveryHandlerTest extends Assert {
   }
 
   @Override
+  public RoutingType getRoutingType() {
+ return null;
+  }
+
+  @Override
+  public void setRoutingType(RoutingType routingType) {
+
+  }
+
+  @Override
   public boolean isDurable() {
  return false;
   }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
--
diff --git 
a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml 
b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
index 81829f5..9cfcb56 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -307,8 +307,8 @@
   
 
   
- 
-
+ 
+

   false
   
@@ -317,17 +317,27 @@
   true
   

-
+
  
- 
-
+ 
+

   


   true

-
+
+ 
+ 
+
+   
+   
+
+
+   
+   
+
  
   
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
index f3a0beb..4e3f689 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
@@ -17,9 +17,13 @@
 
 package org.apache.activemq.artemis.tests.integration.addressing;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.config.Configuration;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Before;
@@ -45,6 +49,9 @@ public class AddressConfigTest extends ActiveMQTestBase {
   server.start();
   AddressInfo addressInfo = 
server.getAddressInfo(SimpleString.toSimpleString("myAddress"));
   assertNotNull(addressInfo);
-  assertEquals(AddressInfo.RoutingType.MULTICAST, 
addressInfo.getRoutingType());
+
+  Set routingTypeSet = new HashSet<>();
+  routingTypeSet.add(RoutingType.MULTICAST);
+  assertEquals(RoutingType.MULTICAST, addressInfo.getRoutingTypes());
}
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
--
diff --git 

[21/50] [abbrv] activemq-artemis git commit: ARTEMIS-878 Update the CLI to incorporate Addresses and new Queue

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec8f0613/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
index 7e219c6..564aabd 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java
@@ -785,7 +785,7 @@ public interface ActiveMQServerLogger extends BasicLogger {
   format = Message.Format.MESSAGE_FORMAT)
void noQueueIdDefined(ServerMessage message, ServerMessage messageCopy, 
SimpleString idsHeaderName);
 
-   @LogMessage(level = Logger.Level.WARN)
+   @LogMessage(level = Logger.Level.TRACE)
@Message(id = 222111, value = "exception while invoking {0} on {1}",
   format = Message.Format.MESSAGE_FORMAT)
void managementOperationError(@Cause Exception e, String op, String 
resourceName);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec8f0613/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 7aa802b..ea72bea 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -48,6 +48,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.ActiveMQDeleteAddressException;
 import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
@@ -1476,8 +1477,9 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 final boolean durable,
 final boolean temporary,
 final Integer maxConsumers,
-final Boolean deleteOnNoConsumers) throws 
Exception {
-  return createQueue(address, queueName, filterString, null, durable, 
temporary, false, false, false, maxConsumers, deleteOnNoConsumers);
+final Boolean deleteOnNoConsumers,
+final boolean autoCreateAddress) throws Exception {
+  return createQueue(address, queueName, filterString, null, durable, 
temporary, false, false, false, maxConsumers, deleteOnNoConsumers, 
autoCreateAddress);
}
 
@Override
@@ -1498,8 +1500,9 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 boolean durable,
 boolean temporary,
 Integer maxConsumers,
-Boolean deleteOnNoConsumers) throws Exception {
-  return createQueue(address, queueName, filter, user, durable, temporary, 
false, false, false, maxConsumers, deleteOnNoConsumers);
+Boolean deleteOnNoConsumers,
+boolean autoCreateAddress) throws Exception {
+  return createQueue(address, queueName, filter, user, durable, temporary, 
false, false, false, maxConsumers, deleteOnNoConsumers, autoCreateAddress);
}
 
@Override
@@ -1522,8 +1525,9 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 boolean temporary,
 boolean autoCreated,
 Integer maxConsumers,
-Boolean deleteOnNoConsumers) throws Exception {
-  return createQueue(address, queueName, filter, user, durable, temporary, 
false, false, autoCreated, maxConsumers, deleteOnNoConsumers);
+Boolean deleteOnNoConsumers,
+boolean autoCreateAddress) throws Exception {
+  return createQueue(address, queueName, filter, user, durable, temporary, 
false, false, autoCreated, maxConsumers, deleteOnNoConsumers, 
autoCreateAddress);
}
 
@Override
@@ -1585,7 +1589,7 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
 final boolean durable,
 final boolean temporary,
 final boolean autoCreated) throws Exception {
-  return deployQueue(address, queueName, 

[14/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
index 407df80..d4158ac 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
@@ -32,8 +32,9 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
-import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.stomp.StompTestBase;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
 import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
@@ -46,28 +47,28 @@ import org.junit.Test;
 /*
  *
  */
-public class StompV11Test extends StompV11TestBase {
+public class StompV11Test extends StompTestBase {
 
private static final transient IntegrationTestLogger log = 
IntegrationTestLogger.LOGGER;
public static final String CLIENT_ID = "myclientid";
 
-   private StompClientConnection connV11;
+   private StompClientConnection conn;
 
@Override
@Before
public void setUp() throws Exception {
   super.setUp();
-  connV11 = StompClientConnectionFactory.createClientConnection("1.1", 
hostname, port);
+  conn = StompClientConnectionFactory.createClientConnection("1.1", 
hostname, port);
}
 
@Override
@After
public void tearDown() throws Exception {
   try {
- boolean connected = connV11 != null && connV11.isConnected();
- log.debug("Connection 11 : " + connected);
+ boolean connected = conn != null && conn.isConnected();
+ log.debug("Connection 1.1 : " + connected);
  if (connected) {
-connV11.disconnect();
+conn.disconnect();
  }
   } finally {
  super.tearDown();
@@ -115,276 +116,234 @@ public class StompV11Test extends StompV11TestBase {
   conn = (StompClientConnectionV11) 
StompClientConnectionFactory.createClientConnection("1.1", hostname, port);
   ClientStompFrame frame = conn.connect("invaliduser", defPass);
   assertFalse(conn.isConnected());
-  assertTrue("ERROR".equals(frame.getCommand()));
+  assertTrue(Stomp.Responses.ERROR.equals(frame.getCommand()));
   assertTrue(frame.getBody().contains("Security Error occurred"));
}
 
@Test
public void testNegotiation() throws Exception {
   // case 1 accept-version absent. It is a 1.0 connect
-  ClientStompFrame frame = connV11.createFrame("CONNECT");
-  frame.addHeader("host", "127.0.0.1");
-  frame.addHeader("login", this.defUser);
-  frame.addHeader("passcode", this.defPass);
+  ClientStompFrame frame = conn.createFrame(Stomp.Commands.CONNECT)
+   .addHeader(Stomp.Headers.Connect.HOST, 
"127.0.0.1")
+   .addHeader(Stomp.Headers.Connect.LOGIN, 
this.defUser)
+   .addHeader(Stomp.Headers.Connect.PASSCODE, 
this.defPass);
 
-  ClientStompFrame reply = connV11.sendFrame(frame);
+  ClientStompFrame reply = conn.sendFrame(frame);
 
-  assertEquals("CONNECTED", reply.getCommand());
+  assertEquals(Stomp.Responses.CONNECTED, reply.getCommand());
 
   //reply headers: version, session, server
   assertEquals(null, reply.getHeader("version"));
 
-  connV11.disconnect();
+  conn.disconnect();
 
   // case 2 accept-version=1.0, result: 1.0
-  connV11 = StompClientConnectionFactory.createClientConnection("1.1", 
hostname, port);
-  frame = connV11.createFrame("CONNECT");
-  frame.addHeader("accept-version", "1.0");
-  frame.addHeader("host", "127.0.0.1");
-  frame.addHeader("login", this.defUser);
-  frame.addHeader("passcode", this.defPass);
+  conn = StompClientConnectionFactory.createClientConnection("1.1", 
hostname, port);
+  frame = conn.createFrame(Stomp.Commands.CONNECT)
+  .addHeader(Stomp.Headers.Connect.ACCEPT_VERSION, "1.0")
+  .addHeader(Stomp.Headers.Connect.HOST, "127.0.0.1")
+  .addHeader(Stomp.Headers.Connect.LOGIN, 

[44/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Add OpenWire Tests for MULTICAST, ANYCAST

[clebertsuconic]

ARTEMIS-789 Add OpenWire Tests for MULTICAST,ANYCAST


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

Branch: refs/heads/master
Commit: a182a135e963c1a4355c3f7d7d72d5ee6b70ed14
Parents: b742a35
Author: Howard Gao 
Authored: Thu Dec 1 20:01:57 2016 +0800
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../protocol/openwire/OpenWireConnection.java   |   6 +-
 .../core/protocol/openwire/amq/AMQConsumer.java |   7 +-
 .../core/protocol/openwire/amq/AMQSession.java  |  10 +-
 .../integration/addressing/MulticastTest.java   | 189 +++
 .../integration/openwire/BasicOpenWireTest.java |   9 +-
 5 files changed, 211 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a182a135/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
--
diff --git 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index fb7a364..d6add20 100644
--- 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -35,7 +35,6 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.activemq.advisory.AdvisorySupport;
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
@@ -63,6 +62,7 @@ import 
org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
 import org.apache.activemq.artemis.core.server.BindingQueryResult;
 import org.apache.activemq.artemis.core.server.MessageReference;
 import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.core.server.ServerConsumer;
 import org.apache.activemq.artemis.core.server.ServerSession;
 import org.apache.activemq.artemis.core.server.SlowConsumerDetectionListener;
@@ -716,13 +716,13 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
  QueueBinding binding = (QueueBinding) 
server.getPostOffice().getBinding(qName);
  if (binding == null) {
 if (dest.isTemporary()) {
-   internalSession.createQueue(qName, qName, null, 
dest.isTemporary(), false);
+   internalSession.createQueue(qName, qName, RoutingType.ANYCAST, 
null, dest.isTemporary(), false);
 } else {
ConnectionInfo connInfo = getState().getInfo();
CheckType checkType = dest.isTemporary() ? 
CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
server.getSecurityStore().check(qName, checkType, this);
server.checkQueueCreationLimit(getUsername());
-   server.createQueue(qName, 
ActiveMQDefaultConfiguration.DEFAULT_ROUTING_TYPE, qName, connInfo == null ? 
null : SimpleString.toSimpleString(connInfo.getUserName()), true, false);
+   server.createQueue(qName, RoutingType.ANYCAST, qName, connInfo 
== null ? null : SimpleString.toSimpleString(connInfo.getUserName()), true, 
false);
 }
  }
   }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a182a135/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
--
diff --git 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
index 1803cc8..ef54b59 100644
--- 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQConsumer.java
+++ 

[02/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
--
diff --git 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
 
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
index f309c16..3fae952 100644
--- 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
+++ 
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ActiveMQServerTestCase.java
@@ -228,27 +228,6 @@ public abstract class ActiveMQServerTestCase {
   queue4 = (Queue) ic.lookup("/queue/Queue4");
}
 
-   protected void undeployAdministeredObjects() throws Exception {
-  removeAllMessages("Topic1", false);
-  removeAllMessages("Topic2", false);
-  removeAllMessages("Topic3", false);
-  removeAllMessages("Queue1", true);
-  removeAllMessages("Queue2", true);
-  removeAllMessages("Queue3", true);
-  removeAllMessages("Queue4", true);
-
-  destroyTopic("Topic1");
-  destroyTopic("Topic2");
-  destroyTopic("Topic3");
-  destroyQueue("Queue1");
-  destroyQueue("Queue2");
-  destroyQueue("Queue3");
-  destroyQueue("Queue4");
-
-  undeployConnectionFactory("ConnectionFactory");
-  undeployConnectionFactory("CF_TOPIC");
-  undeployConnectionFactory("CF_XA_TRUE");
-   }
 
@AfterClass
public static final void tearDownAllServers() {
@@ -362,7 +341,7 @@ public abstract class ActiveMQServerTestCase {
}
 
protected void removeAllMessages(final String destName, final boolean 
isQueue) throws Exception {
-  ActiveMQServerTestCase.servers.get(0).removeAllMessages(destName, 
isQueue);
+  ActiveMQServerTestCase.servers.get(0).removeAllMessages(destName);
}
 
protected boolean assertRemainingMessages(final int expected) throws 
Exception {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
--
diff --git 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
 
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
index 0fe7b47..64f6626 100644
--- 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
+++ 
b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
@@ -28,12 +28,14 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.management.AddressControl;
 import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
+import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.api.core.management.ResourceNames;
 import org.apache.activemq.artemis.api.jms.JMSFactoryType;
-import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
-import org.apache.activemq.artemis.api.jms.management.TopicControl;
 import org.apache.activemq.artemis.core.config.FileDeploymentManager;
 import org.apache.activemq.artemis.core.config.impl.FileConfiguration;
 import org.apache.activemq.artemis.core.config.impl.SecurityConfiguration;
@@ -328,7 +330,7 @@ public class LocalTestServer implements Server, Runnable {
 
@Override
public Long getMessageCountForQueue(final String queueName) throws 
Exception {
-  JMSQueueControl queue = (JMSQueueControl) 
getActiveMQServer().getManagementService().getResource(queueName);
+  QueueControl queue = (QueueControl) 
getActiveMQServer().getManagementService().getResource("queue." + queueName);
   if (queue != null) {
  queue.flushExecutor();
  return queue.getMessageCount();
@@ -338,25 +340,19 @@ public class LocalTestServer implements Server, Runnable {
}
 
@Override
-   public void removeAllMessages(final String destination, final boolean 
isQueue) throws Exception {
-  if (isQueue) {
- JMSQueueControl queue = (JMSQueueControl) 
getActiveMQServer().getManagementService().getResource(destination);
- queue.removeMessages(null);
-  } else {
- TopicControl topic = (TopicControl) 
getActiveMQServer().getManagementService().getResource(destination);
- topic.removeMessages(null);
-  }
+   public void removeAllMessages(final String queueName) throws Exception {
+  QueueControl queue = (QueueControl) 

[16/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
index 26f2a2f..bcac436 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/StompTestBase.java
@@ -26,34 +26,17 @@ import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 import java.io.IOException;
-import java.net.Socket;
-import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.TimeUnit;
-
-import io.netty.bootstrap.Bootstrap;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.Unpooled;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.SimpleChannelInboundHandler;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioSocketChannel;
-import io.netty.handler.codec.string.StringDecoder;
-import io.netty.handler.codec.string.StringEncoder;
+import java.util.UUID;
+
 import org.apache.activemq.artemis.api.core.TransportConfiguration;
 import org.apache.activemq.artemis.core.config.Configuration;
+import 
org.apache.activemq.artemis.core.protocol.mqtt.MQTTProtocolManagerFactory;
+import org.apache.activemq.artemis.core.protocol.stomp.Stomp;
 import 
org.apache.activemq.artemis.core.protocol.stomp.StompProtocolManagerFactory;
 import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
 import org.apache.activemq.artemis.core.remoting.impl.invm.InVMAcceptorFactory;
@@ -63,6 +46,7 @@ import 
org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
 import org.apache.activemq.artemis.core.security.Role;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
 import org.apache.activemq.artemis.jms.client.ActiveMQJMSConnectionFactory;
 import org.apache.activemq.artemis.jms.server.JMSServerManager;
@@ -73,13 +57,16 @@ import 
org.apache.activemq.artemis.jms.server.config.impl.TopicConfigurationImpl
 import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import 
org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import 
org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame;
+import 
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
 import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.junit.After;
 import org.junit.Before;
 
 public abstract class StompTestBase extends ActiveMQTestBase {
 
+   protected String hostname = "127.0.0.1";
+
protected final int port = 61613;
 
private ConnectionFactory connectionFactory;
@@ -98,98 +85,56 @@ public abstract class StompTestBase extends 
ActiveMQTestBase {
 
protected String defPass = "wombats";
 
-   protected boolean autoCreateServer = true;
-
-   private List bootstraps = new ArrayList<>();
-
-   //   private Channel channel;
-
-   private List priorityQueues = new ArrayList<>();
-
-   private List groups = new ArrayList<>();
-
-   private List channels = new ArrayList<>();
-
// Implementation methods
// -
-   @Override
-   @Before
-   public void setUp() throws Exception {
-  super.setUp();
-  if (autoCreateServer) {
- server = createServer();
- addServer(server.getActiveMQServer());
- server.start();
- connectionFactory = createConnectionFactory();
- createBootstrap();
-
- if (isSecurityEnabled()) {
-connection = connectionFactory.createConnection("brianm", 
"wombats");
- } else {
-connection = connectionFactory.createConnection();
- }
- session = 

[29/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Added ability to define 2 Routing Types on a single addres

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
index bd63ca2..e678893 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ExpiryRunnerTest.java
@@ -32,6 +32,7 @@ import 
org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ActiveMQServers;
 import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Assert;
@@ -71,7 +72,7 @@ public class ExpiryRunnerTest extends ActiveMQTestBase {
@Test
public void testExpireFromMultipleQueues() throws Exception {
   ClientProducer producer = clientSession.createProducer(qName);
-  clientSession.createQueue(qName2, qName2, null, false);
+  clientSession.createQueue(qName2, RoutingType.MULTICAST, qName2, null, 
false);
   AddressSettings addressSettings = new 
AddressSettings().setExpiryAddress(expiryAddress);
   server.getAddressSettingsRepository().addMatch(qName2.toString(), 
addressSettings);
   ClientProducer producer2 = clientSession.createProducer(qName2);
@@ -136,8 +137,8 @@ public class ExpiryRunnerTest extends ActiveMQTestBase {
   AddressSettings addressSettings = new 
AddressSettings().setExpiryAddress(expiryAddress);
   server.getAddressSettingsRepository().addMatch(qName2.toString(), 
addressSettings);
   clientSession.deleteQueue(qName);
-  clientSession.createQueue(qName, qName, null, false);
-  clientSession.createQueue(qName, qName2, null, false);
+  clientSession.createQueue(qName, RoutingType.MULTICAST, qName, null, 
false);
+  clientSession.createQueue(qName, RoutingType.MULTICAST, qName2, null, 
false);
   ClientProducer producer = clientSession.createProducer(qName);
   int numMessages = 100;
   long expiration = System.currentTimeMillis();
@@ -241,13 +242,13 @@ public class ExpiryRunnerTest extends ActiveMQTestBase {
   ClientSessionFactory sessionFactory = createSessionFactory(locator);
 
   clientSession = sessionFactory.createSession(false, true, true);
-  clientSession.createQueue(qName, qName, null, false);
+  clientSession.createQueue(qName, RoutingType.MULTICAST, qName, null, 
false);
   expiryAddress = new SimpleString("EA");
   expiryQueue = new SimpleString("expiryQ");
   AddressSettings addressSettings = new 
AddressSettings().setExpiryAddress(expiryAddress);
   server.getAddressSettingsRepository().addMatch(qName.toString(), 
addressSettings);
   server.getAddressSettingsRepository().addMatch(qName2.toString(), 
addressSettings);
-  clientSession.createQueue(expiryAddress, expiryQueue, null, false);
+  clientSession.createQueue(expiryAddress, RoutingType.MULTICAST, 
expiryQueue, null, false);
}
 
private static class DummyMessageHandler implements Runnable {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7a51491c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
index a3c8243..93eec9c 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/PredefinedQueueTest.java
@@ -33,6 +33,7 @@ import 
org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
 import org.apache.activemq.artemis.core.postoffice.Bindings;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.ActiveMQServers;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.junit.Assert;
@@ -87,7 +88,7 @@ public class PredefinedQueueTest 

[09/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
deleted file mode 100644
index 8e93c6e..000
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/api/jms/management/JMSServerControl.java
+++ /dev/null
@@ -1,381 +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 License.
- */
-package org.apache.activemq.artemis.api.jms.management;
-
-import javax.management.MBeanOperationInfo;
-
-import org.apache.activemq.artemis.api.core.management.Attribute;
-import org.apache.activemq.artemis.api.core.management.Operation;
-import org.apache.activemq.artemis.api.core.management.Parameter;
-
-/**
- * A JMSSserverControl is used to manage ActiveMQ Artemis JMS server.
- */
-public interface JMSServerControl {
-   // Attributes 
-
-   /**
-* Returns whether this server is started.
-*/
-   @Attribute(desc = "whether this server is started")
-   boolean isStarted();
-
-   /**
-* Returns this server's version
-*/
-   @Attribute(desc = "server's version")
-   String getVersion();
-
-   /**
-* Returns the names of the JMS topics available on this server.
-*/
-   @Attribute(desc = "names of the JMS topics available on this server")
-   String[] getTopicNames();
-
-   /**
-* Returns the names of the JMS queues available on this server.
-*/
-   @Attribute(desc = "names of the JMS queues available on this server")
-   String[] getQueueNames();
-
-   /**
-* Returns the names of the JMS connection factories available on this 
server.
-*/
-   @Attribute(desc = "names of the JMS connection factories available on this 
server")
-   String[] getConnectionFactoryNames();
-
-   /**
-* Returns the server's nodeId
-*/
-   @Attribute(desc = "server's nodeId")
-   String getNodeID();
-
-   // Operations 
-
-   /**
-* Creates a durable JMS Queue.
-*
-* @return {@code true} if the queue was created, {@code false} else
-*/
-   @Operation(desc = "Create a JMS Queue", impact = MBeanOperationInfo.ACTION)
-   boolean createQueue(@Parameter(name = "name", desc = "Name of the queue to 
create") String name) throws Exception;
-
-   /**
-* Creates a durable JMS Queue with the specified name and JNDI binding.
-*
-* @return {@code true} if the queue was created, {@code false} else
-*/
-   @Operation(desc = "Create a JMS Queue", impact = MBeanOperationInfo.ACTION)
-   boolean createQueue(@Parameter(name = "name", desc = "Name of the queue to 
create") String name,
-   @Parameter(name = "jndiBindings", desc = 
"comma-separated list of JNDI bindings (use '' if u need to use commas 
in your jndi name)") String jndiBindings) throws Exception;
-
-   /**
-* Creates a durable JMS Queue with the specified name, JNDI binding and 
selector.
-*
-* @return {@code true} if the queue was created, {@code false} else
-*/
-   @Operation(desc = "Create a JMS Queue", impact = MBeanOperationInfo.ACTION)
-   boolean createQueue(@Parameter(name = "name", desc = "Name of the queue to 
create") String name,
-   @Parameter(name = "jndiBindings", desc = 
"comma-separated list of JNDI bindings (use '' if u need to use commas 
in your jndi name)") String jndiBindings,
-   @Parameter(name = "selector", desc = "the jms 
selector") String selector) throws Exception;
-
-   /**
-* Creates a JMS Queue with the specified name, durability, selector and 
JNDI binding.
-*
-* @return {@code true} if the queue was created, {@code false} else
-*/
-   @Operation(desc = "Create a JMS Queue", impact = MBeanOperationInfo.ACTION)
-   boolean createQueue(@Parameter(name = "name", desc = "Name of the queue to 
create") String name,
-   

[38/50] [abbrv] activemq-artemis git commit: ARTEMIS-784 Add new JMX methods and update JMX API

[clebertsuconic]

ARTEMIS-784 Add new JMX methods and update JMX API


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

Branch: refs/heads/master
Commit: 74d0a1a8182947741a3eedb2e52d51ddcee475d7
Parents: 3abfd9f
Author: Andy Taylor 
Authored: Wed Nov 30 13:56:37 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../api/core/management/ActiveMQServerControl.java   |  2 +-
 .../api/core/management/ObjectNameBuilder.java   | 15 +--
 .../management/impl/ActiveMQServerControlImpl.java   |  6 ++
 .../artemis/core/postoffice/impl/PostOfficeImpl.java |  3 ++-
 .../core/server/management/ManagementService.java|  3 ++-
 .../management/impl/ManagementServiceImpl.java   |  7 ---
 .../server/group/impl/ClusteredResetMockTest.java|  3 ++-
 .../management/ActiveMQServerControlTest.java|  2 +-
 .../ActiveMQServerControlUsingCoreTest.java  |  2 +-
 .../management/ManagementControlHelper.java  |  3 ++-
 .../timing/jms/bridge/impl/JMSBridgeImplTest.java|  3 ++-
 11 files changed, 32 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74d0a1a8/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index b6b5b5e..cd257c6 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -436,7 +436,7 @@ public interface ActiveMQServerControl {
 
@Operation(desc = "delete an address", impact = MBeanOperationInfo.ACTION)
void createAddress(@Parameter(name = "name", desc = "The name of the 
address") String name,
-  @Parameter(name = "deliveryMode", desc = "The delivery 
modes enabled for this address'") Object[] routingTypes) throws Exception;
+  @Parameter(name = "routingType", desc = "Comma separated 
list of Routing Typles (anycast/multicast)") String routingTypes) throws 
Exception;
 
@Operation(desc = "delete an address", impact = MBeanOperationInfo.ACTION)
void deleteAddress(@Parameter(name = "name", desc = "The name of the 
address") String name) throws Exception;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74d0a1a8/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
index 3bbd456..00a95e1 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
@@ -20,6 +20,7 @@ import javax.management.ObjectName;
 
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.RoutingType;
 
 /**
  * Helper class to build ObjectNames for ActiveMQ Artemis resources.
@@ -98,10 +99,20 @@ public final class ObjectNameBuilder {
 *
 * @see QueueControl
 */
+   public ObjectName getQueueObjectName(final SimpleString address, final 
SimpleString name, RoutingType routingType) throws Exception {
+  return ObjectName.getInstance(String.format("%s:" + 
getBrokerProperties() + "parentType=%s,parentName=%s," + getObjectType() + 
"=%s, routingType=%s,name=%s", domain, "Address", 
ObjectName.quote(address.toString()), "Queue", routingType.toString(), 
ObjectName.quote(name.toString(;
+   }
+
+   /**
+* Returns the ObjectName used by QueueControl.
+*
+* @see QueueControl
+*/
public ObjectName getQueueObjectName(final SimpleString address, final 
SimpleString name) throws Exception {
-  return ObjectName.getInstance(String.format("%s:" + 
getBrokerProperties() + "parentType=%s,parentName=%s," + getObjectType() + 
"=%s,name=%s", 

[11/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index edf0397..30fdfd4 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -169,11 +169,24 @@ public class JMSClusteredTestBase extends 
ActiveMQTestBase {
   final String destinationLabel = "toServer" + destination;
   final String sourceLabel = "server" + source;
 
-  Configuration configuration = 
createDefaultInVMConfig(source).setSecurityEnabled(false).setJMXManagementEnabled(true).setPersistenceEnabled(false).addConnectorConfiguration(destinationLabel,
 new TransportConfiguration(InVMConnectorFactory.class.getName(), 
generateInVMParams(destination))).addConnectorConfiguration(sourceLabel, new 
TransportConfiguration(InVMConnectorFactory.class.getName(), 
generateInVMParams(source))).addClusterConfiguration(new 
ClusterConnectionConfiguration().setName(destinationLabel).setAddress("jms").setConnectorName(sourceLabel).setRetryInterval(250).setMaxHops(MAX_HOPS).setConfirmationWindowSize(1024).setMessageLoadBalancingType(MessageLoadBalancingType.ON_DEMAND).setStaticConnectors(new
 ArrayList() {
- {
-add(destinationLabel);
- }
-  }));
+  Configuration configuration = 
createDefaultInVMConfig(source).setSecurityEnabled(false)
+   
.setJMXManagementEnabled(true)
+   
.setPersistenceEnabled(false)
+   
.addConnectorConfiguration(destinationLabel, new 
TransportConfiguration(InVMConnectorFactory.class.getName(), 
generateInVMParams(destination)))
+   
.addConnectorConfiguration(sourceLabel, new 
TransportConfiguration(InVMConnectorFactory.class.getName(), 
generateInVMParams(source)))
+   
.addClusterConfiguration(new 
ClusterConnectionConfiguration().setName(destinationLabel)
+   
 // TODO should this be changed?
+   
 .setAddress("jms")
+   
 .setConnectorName(sourceLabel)
+   
 .setRetryInterval(250)
+   
 .setMaxHops(MAX_HOPS)
+   
 
.setConfirmationWindowSize(1024)
+   
 
.setMessageLoadBalancingType(MessageLoadBalancingType.ON_DEMAND)
+   
 .setStaticConnectors(new 
ArrayList() {
+   
{
+   
   add(destinationLabel);
+   
}
+   
 }));
 
   configuration.getAddressesSettings().put("#", new 
AddressSettings().setRedistributionDelay(0));
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
--
diff --git 
a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
 

[47/50] [abbrv] activemq-artemis git commit: ARTEMIS-877 Add Consumer support for AMQP for new addressing schema

[clebertsuconic]

ARTEMIS-877 Add Consumer support for AMQP for new addressing schema


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

Branch: refs/heads/master
Commit: 224f62b295db26eaa0bca0f7798178f025d737c0
Parents: a182a13
Author: Andy Taylor 
Authored: Sat Dec 3 09:03:43 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../activemq/cli/test/FileBrokerTest.java   |  24 --
 .../core/management/ActiveMQServerControl.java  |  59 
 .../artemis/core/server/AddressQueryResult.java |  66 
 .../amqp/broker/AMQPSessionCallback.java|  64 +++-
 .../protocol/amqp/proton/AmqpSupport.java   |   1 +
 .../proton/ProtonServerReceiverContext.java |  14 +-
 .../amqp/proton/ProtonServerSenderContext.java  | 217 +---
 .../amqp/proton/handler/ExtCapability.java  |   2 +-
 .../artemis/rest/test/FindDestinationTest.java  |   3 +
 .../impl/ActiveMQServerControlImpl.java | 120 ---
 .../artemis/core/postoffice/AddressManager.java |   6 +
 .../artemis/core/postoffice/PostOffice.java |   7 +-
 .../core/postoffice/impl/CompositeAddress.java  |  50 +++
 .../core/postoffice/impl/PostOfficeImpl.java|  11 +
 .../postoffice/impl/SimpleAddressManager.java   |  31 ++
 .../artemis/core/server/ActiveMQServer.java |   2 +
 .../artemis/core/server/ServerSession.java  |   8 +
 .../cluster/impl/ClusterConnectionImpl.java |   2 +-
 .../core/server/impl/ActiveMQServerImpl.java|  21 +-
 .../core/server/impl/ServerSessionImpl.java |  21 ++
 .../transport/amqp/client/AmqpClient.java   |  38 +++
 .../transport/amqp/client/AmqpConnection.java   |   9 +-
 .../transport/amqp/client/AmqpSession.java  |  63 +++-
 .../integration/amqp/AmqpClientTestSupport.java |  32 ++
 .../amqp/AmqpDurableReceiverTest.java   |   7 +-
 .../amqp/AmqpTempDestinationTest.java   |   2 -
 .../integration/amqp/AmqpTransactionTest.java   |   7 -
 .../amqp/BrokerDefinedAnycastConsumerTest.java  | 240 ++
 .../BrokerDefinedMulticastConsumerTest.java | 119 +++
 .../amqp/ClientDefinedAnycastConsumerTest.java  |  52 +++
 .../amqp/ClientDefinedMultiConsumerTest.java| 327 +++
 .../integration/amqp/ProtonPubSubTest.java  |   4 +
 .../tests/integration/amqp/ProtonTest.java  |  58 +++-
 .../amqp/SendingAndReceivingTest.java   |   4 +
 .../management/ActiveMQServerControlTest.java   |  87 ++---
 .../ActiveMQServerControlUsingCoreTest.java |  15 +
 .../management/ManagementControlHelper.java |   8 +
 .../integration/openwire/BasicOpenWireTest.java |   1 -
 .../core/server/impl/fakes/FakePostOffice.java  |  12 +
 39 files changed, 1611 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/224f62b2/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java
--
diff --git 
a/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java 
b/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java
index a50a49f..b04b540 100644
--- a/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java
+++ b/artemis-cli/src/test/java/org/apache/activemq/cli/test/FileBrokerTest.java
@@ -45,30 +45,6 @@ import static org.junit.Assert.fail;
 public class FileBrokerTest {
 
@Test
-   public void startWithJMS() throws Exception {
-  ServerDTO serverDTO = new ServerDTO();
-  serverDTO.configuration = "broker.xml";
-  FileBroker broker = null;
-  try {
- broker = new FileBroker(serverDTO, new ActiveMQJAASSecurityManager());
- broker.start();
- JMSServerManagerImpl jmsServerManager = (JMSServerManagerImpl) 
broker.getComponents().get("jms");
- Assert.assertNotNull(jmsServerManager);
- Assert.assertTrue(jmsServerManager.isStarted());
- //this tells us the jms server is activated
- 
Assert.assertTrue(jmsServerManager.getJMSStorageManager().isStarted());
- ActiveMQServerImpl activeMQServer = (ActiveMQServerImpl) 
broker.getComponents().get("core");
- Assert.assertNotNull(activeMQServer);
- Assert.assertTrue(activeMQServer.isStarted());
- Assert.assertTrue(broker.isStarted());
-  } finally {
- if (broker != null) {
-broker.stop();
- }
-  }
-   }
-
-   @Test
public void startWithoutJMS() throws Exception {
   ServerDTO serverDTO = new ServerDTO();
   serverDTO.configuration = 

[48/50] [abbrv] activemq-artemis git commit: ARTEMIS-878 Added/Modified CLI commands and tests

[clebertsuconic]

ARTEMIS-878 Added/Modified CLI commands and tests


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

Branch: refs/heads/master
Commit: 6ab133ab896874c2bbcdc0bbbe56b879764f25a4
Parents: 8f532cc
Author: Francesco Nigro 
Authored: Mon Dec 5 19:04:21 2016 +0100
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../apache/activemq/artemis/cli/Artemis.java|  8 +-
 .../cli/commands/address/AddRoutingType.java| 78 +
 .../cli/commands/address/CreateAddress.java | 34 +---
 .../cli/commands/address/DeleteAddress.java |  2 +-
 .../cli/commands/address/RemoveRoutingType.java | 78 +
 .../cli/commands/address/ShowAddress.java   |  4 +-
 .../artemis/cli/commands/queue/CreateQueue.java | 13 ++-
 .../core/management/ActiveMQServerControl.java  | 15 +++-
 .../impl/ActiveMQServerControlImpl.java | 48 ---
 .../artemis/core/postoffice/AddressManager.java |  4 +
 .../artemis/core/postoffice/PostOffice.java |  5 ++
 .../core/postoffice/impl/PostOfficeImpl.java| 34 
 .../postoffice/impl/SimpleAddressManager.java   |  7 ++
 .../core/server/ActiveMQMessageBundle.java  |  3 +
 .../artemis/core/server/ActiveMQServer.java | 20 +
 .../core/server/impl/ActiveMQServerImpl.java| 13 +++
 .../integration/cli/AddressCommandTest.java | 90 
 .../tests/integration/cli/QueueCommandTest.java | 12 ++-
 .../ActiveMQServerControlUsingCoreTest.java | 15 +++-
 .../core/server/impl/fakes/FakePostOffice.java  | 12 +++
 20 files changed, 443 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6ab133ab/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
index 94779fc..13e2f7c 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
@@ -30,8 +30,12 @@ import org.apache.activemq.artemis.cli.commands.Kill;
 import org.apache.activemq.artemis.cli.commands.Mask;
 import org.apache.activemq.artemis.cli.commands.Run;
 import org.apache.activemq.artemis.cli.commands.Stop;
+import org.apache.activemq.artemis.cli.commands.address.AddRoutingType;
 import org.apache.activemq.artemis.cli.commands.address.CreateAddress;
 import org.apache.activemq.artemis.cli.commands.address.DeleteAddress;
+import org.apache.activemq.artemis.cli.commands.address.HelpAddress;
+import org.apache.activemq.artemis.cli.commands.address.RemoveRoutingType;
+import org.apache.activemq.artemis.cli.commands.address.ShowAddress;
 import org.apache.activemq.artemis.cli.commands.queue.CreateQueue;
 import org.apache.activemq.artemis.cli.commands.queue.DeleteQueue;
 import org.apache.activemq.artemis.cli.commands.queue.HelpQueue;
@@ -133,8 +137,8 @@ public class Artemis {
   builder.withGroup("queue").withDescription("Queue tools group 
(create|delete) (example ./artemis queue create)").
  withDefaultCommand(HelpQueue.class).withCommands(CreateQueue.class, 
DeleteQueue.class);
 
-  builder.withGroup("address").withDescription("Queue tools group 
(create|delete) (example ./artemis queue create)").
- withDefaultCommand(HelpQueue.class).withCommands(CreateAddress.class, 
DeleteAddress.class);
+  builder.withGroup("address").withDescription("Address tools group 
(create|delete|addRoutingType|removeRoutingType|show) (example ./artemis 
address create)").
+ 
withDefaultCommand(HelpAddress.class).withCommands(CreateAddress.class, 
DeleteAddress.class, AddRoutingType.class, RemoveRoutingType.class, 
ShowAddress.class);
 
   if (instance != null) {
  builder.withGroup("data").withDescription("data tools group 
(print|exp|imp|exp|encode|decode|compact) (example ./artemis data print)").

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6ab133ab/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/AddRoutingType.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/AddRoutingType.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/AddRoutingType.java
new file mode 100644
index 000..fd79620
--- /dev/null
+++ 

[04/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
deleted file mode 100644
index 7ac53d2..000
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSServerControlTest.java
+++ /dev/null
@@ -1,1113 +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 License.
- */
-package org.apache.activemq.artemis.tests.integration.jms.server.management;
-
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.jms.XAConnection;
-import javax.jms.XAConnectionFactory;
-import javax.jms.XASession;
-import javax.json.JsonArray;
-import javax.naming.NamingException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
-import org.apache.activemq.artemis.api.core.JsonUtil;
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
-import org.apache.activemq.artemis.api.core.management.AddressControl;
-import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
-import org.apache.activemq.artemis.api.core.management.ResourceNames;
-import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
-import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
-import org.apache.activemq.artemis.core.config.Configuration;
-import org.apache.activemq.artemis.core.postoffice.QueueBinding;
-import org.apache.activemq.artemis.core.registry.JndiBindingRegistry;
-import 
org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.ActiveMQServers;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
-import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
-import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
-import org.apache.activemq.artemis.jms.client.ActiveMQMessageConsumer;
-import org.apache.activemq.artemis.jms.client.ActiveMQQueueConnectionFactory;
-import org.apache.activemq.artemis.jms.persistence.JMSStorageManager;
-import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
-import 
org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
-import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
-import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
-import 
org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
-import 
org.apache.activemq.artemis.tests.integration.management.ManagementTestBase;
-import org.apache.activemq.artemis.tests.unit.util.InVMNamingContext;
-import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.apache.activemq.artemis.utils.RandomUtil;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class JMSServerControlTest extends ManagementTestBase {
-   // Attributes 
-
-   protected InVMNamingContext context;
-
-  

[39/50] [abbrv] activemq-artemis git commit: ARTEMIS-878 Use Strings in CLI JMX interaction

[clebertsuconic]

ARTEMIS-878 Use Strings in CLI JMX interaction


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

Branch: refs/heads/master
Commit: 8057ec4b27fca60ccfe7d83e5b19e23e37169cc3
Parents: 1339c93
Author: jbertram 
Authored: Fri Dec 9 18:00:53 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../artemis/cli/commands/address/CreateAddress.java | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8057ec4b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/CreateAddress.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/CreateAddress.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/CreateAddress.java
index ac1a9a9..42f721a 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/CreateAddress.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/address/CreateAddress.java
@@ -17,9 +17,6 @@
 
 package org.apache.activemq.artemis.cli.commands.address;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import io.airlift.airline.Command;
 import io.airlift.airline.Option;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -35,7 +32,7 @@ public class CreateAddress extends AbstractAction {
String name;
 
@Option(name = "--routingTypes", description = "The routing types supported 
by this address, options are 'anycast' or 'multicast', enter comma separated 
list, defaults to 'multicast' only")
-   Set routingTypes = new HashSet<>();
+   String[] routingTypes = new String[] {RoutingType.MULTICAST.toString()};
 
@Option(name = "--defaultMaxConsumers", description = "Sets the default max 
consumers for any queues created under this address, default = -1 (no limit)")
int defaultMaxConsumers = -1;
@@ -54,7 +51,7 @@ public class CreateAddress extends AbstractAction {
   performCoreManagement(new ManagementCallback() {
  @Override
  public void setUpInvocation(ClientMessage message) throws Exception {
-ManagementHelper.putOperationInvocation(message, "broker", 
"createAddress", getName(), routingTypes, defaultDeleteOnNoConsumers, 
defaultMaxConsumers);
+ManagementHelper.putOperationInvocation(message, "broker", 
"createAddress", getName(), routingTypes);
  }
 
  @Override
@@ -78,13 +75,16 @@ public class CreateAddress extends AbstractAction {
   return name;
}
 
-   public Set getRoutingTypes() {
+   public String[] getRoutingTypes() {
   return routingTypes;
}
 
public void setRoutingTypes(String routingTypes) {
-  for (String s : routingTypes.split(",")) {
- this.routingTypes.add(RoutingType.valueOf(s.trim()));
+  String[] split = routingTypes.split(",");
+  this.routingTypes = new String[split.length];
+  for (int i = 0; i < split.length; i++) {
+ RoutingType.valueOf(split[i].trim());
+ this.routingTypes[i] = split[i].trim();
   }
}
 

[23/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 OpenWire queue auto-creation failure

[clebertsuconic]

ARTEMIS-789 OpenWire queue auto-creation failure


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

Branch: refs/heads/master
Commit: 796550d16b30d9033ff02b9520b19ee042e7cb15
Parents: ec8f061
Author: Howard Gao 
Authored: Fri Nov 11 19:40:36 2016 +0800
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../protocol/openwire/OpenWireConnection.java   | 19 --
 .../core/protocol/openwire/amq/AMQConsumer.java |  2 +-
 .../core/protocol/openwire/amq/AMQSession.java  | 40 
 .../protocol/openwire/util/OpenWireUtil.java| 17 -
 4 files changed, 48 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/796550d1/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
--
diff --git 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index 725733c..e823d0e 100644
--- 
a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ 
b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -74,6 +74,7 @@ import 
org.apache.activemq.artemis.spi.core.protocol.AbstractRemotingConnection;
 import org.apache.activemq.artemis.spi.core.protocol.ConnectionEntry;
 import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
 import org.apache.activemq.artemis.spi.core.remoting.Connection;
+import org.apache.activemq.artemis.utils.ConcurrentHashSet;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQMessage;
@@ -179,6 +180,8 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
private boolean useKeepAlive;
private long maxInactivityDuration;
 
+   private final Set knownDestinations = new 
ConcurrentHashSet<>();
+
// TODO-NOW: check on why there are two connections created for every 
createConnection on the client.
public OpenWireConnection(Connection connection,
  ActiveMQServer server,
@@ -708,7 +711,7 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
public void addDestination(DestinationInfo info) throws Exception {
   ActiveMQDestination dest = info.getDestination();
   if (dest.isQueue()) {
- SimpleString qName = OpenWireUtil.toCoreAddress(dest);
+ SimpleString qName = new SimpleString(dest.getPhysicalName());
  QueueBinding binding = (QueueBinding) 
server.getPostOffice().getBinding(qName);
  if (binding == null) {
 if (dest.isTemporary()) {
@@ -790,6 +793,14 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
   checkInactivity();
}
 
+   public void addKnownDestination(final SimpleString address) {
+  knownDestinations.add(address);
+   }
+
+   public boolean containsKnownDestination(final SimpleString address) {
+  return knownDestinations.contains(address);
+   }
+
@Override
public void tempQueueDeleted(SimpleString bindingName) {
   ActiveMQDestination dest = new ActiveMQTempQueue(bindingName.toString());
@@ -862,7 +873,7 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
public void removeDestination(ActiveMQDestination dest) throws Exception {
   if (dest.isQueue()) {
  try {
-server.destroyQueue(OpenWireUtil.toCoreAddress(dest));
+server.destroyQueue(new SimpleString(dest.getPhysicalName()));
  } catch (ActiveMQNonExistentQueueException neq) {
 //this is ok, ActiveMQ 5 allows this and will actually do it quite 
often
 ActiveMQServerLogger.LOGGER.debug("queue never existed");
@@ -870,7 +881,7 @@ public class OpenWireConnection extends 
AbstractRemotingConnection implements Se
 
 
   } else {
- Bindings bindings = 
server.getPostOffice().getBindingsForAddress(OpenWireUtil.toCoreAddress(dest));
+ Bindings bindings = server.getPostOffice().getBindingsForAddress(new 
SimpleString(dest.getPhysicalName()));
 
  

[34/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Consolodate protocol packets and new Address/Queue commands

[clebertsuconic]

ARTEMIS-780 Consolodate protocol packets and new Address/Queue commands


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

Branch: refs/heads/master
Commit: c480351c11e038dac210cd921d618d2906a8ab72
Parents: 7a51491
Author: jbertram 
Authored: Wed Nov 23 13:34:00 2016 -0600
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../activemq/artemis/cli/commands/Create.java   |   8 +-
 .../artemis/cli/commands/etc/broker.xml |  12 +-
 .../core/management/ActiveMQServerControl.java  |  47 +--
 .../api/core/management/QueueControl.java   |  12 ++
 .../core/impl/ActiveMQSessionContext.java   |   4 +-
 .../core/protocol/core/impl/PacketDecoder.java  |   6 -
 .../core/protocol/core/impl/PacketImpl.java |   4 +-
 .../impl/wireformat/CreateAddressMessage.java   |   5 +-
 .../impl/wireformat/CreateQueueMessage_V2.java  |  64 -
 .../impl/wireformat/CreateQueueMessage_V3.java  | 134 --
 .../wireformat/CreateSharedQueueMessage_V2.java |   1 -
 .../artemis/junit/ActiveMQConsumerResource.java |   4 -
 .../impl/ActiveMQServerControlImpl.java |  31 ++--
 .../core/management/impl/QueueControlImpl.java  |  24 
 .../core/ServerSessionPacketHandler.java|  20 ---
 .../artemis/core/security/CheckType.java|   6 +
 .../artemis/core/server/ActiveMQServer.java |   2 +-
 .../core/server/impl/ActiveMQServerImpl.java|  15 +-
 .../artemis/core/server/impl/AddressInfo.java   |   1 -
 .../management/impl/ManagementServiceImpl.java  |   3 +-
 .../client/AutoDeleteJmsDestinationTest.java|   2 +-
 .../tests/integration/client/SessionTest.java   |   2 +-
 .../management/ActiveMQServerControlTest.java   |  37 +
 .../ActiveMQServerControlUsingCoreTest.java |  27 ++--
 .../management/QueueControlUsingCoreTest.java   |  10 ++
 .../integration/server/PredefinedQueueTest.java |   1 -
 .../tests/integration/stomp/StompTest.java  |   6 +-
 .../jms/tests/AutoAckMesageListenerTest.java| 141 ---
 .../jms/tests/AutoAckMessageListenerTest.java   | 141 +++
 .../activemq/artemis/common/AbstractAdmin.java  |   4 +-
 30 files changed, 391 insertions(+), 383 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c480351c/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
index ff2753a..7175c8d 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
@@ -799,14 +799,14 @@ public class Create extends InputAbstract {
   printWriter.println();
 
   for (String str : getQueueList()) {
- printWriter.println(" ");
- printWriter.println("");
+ printWriter.println(" ");
+ printWriter.println("");
  printWriter.println("   ");
- printWriter.println("");
+ printWriter.println("");
  printWriter.println(" ");
   }
   for (String str : getAddressList()) {
- printWriter.println(" ");
+ printWriter.println(" ");
   }
   filters.put("${address-queue.settings}", writer.toString());
}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c480351c/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
index 6c7f91c..ea51eb0 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/broker.xml
@@ -98,15 +98,15 @@ 
${cluster-security.settings}${cluster.settings}${replicated.settings}${shared-st
   
 
   
- 
-
+ 
+

-
+
  
- 
-
+ 
+

-
+
  ${address-queue.settings}
   
 

[24/50] [abbrv] activemq-artemis git commit: ARTEMIS-789 Fix various failing tests due to addressing changes

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
index 15cb8b6..877d5a7 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/mqtt/imported/MQTTTestSupport.java
@@ -132,7 +132,8 @@ public class MQTTTestSupport extends ActiveMQTestBase {
   addMQTTConnector();
   AddressSettings addressSettings = new AddressSettings();
   addressSettings.setMaxSizeBytes(9);
-  addressSettings.setAutoCreateJmsQueues(true);
+  addressSettings.setAutoCreateQueues(true);
+  addressSettings.setAutoCreateAddresses(true);
 
   server.getAddressSettingsRepository().addMatch("#", addressSettings);
   server.start();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
index 52f090d..ac995c2 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/OpenWireTestBase.java
@@ -64,7 +64,7 @@ public class OpenWireTestBase extends ActiveMQTestBase {
 
   Configuration serverConfig = server.getConfiguration();
 
-  serverConfig.getAddressesSettings().put("#", new 
AddressSettings().setAutoCreateJmsQueues(false).setDeadLetterAddress(new 
SimpleString("ActiveMQ.DLQ")));
+  serverConfig.getAddressesSettings().put("#", new 
AddressSettings().setAutoCreateQueues(false).setAutoCreateAddresses(false).setDeadLetterAddress(new
 SimpleString("ActiveMQ.DLQ")));
 
   serverConfig.setSecurityEnabled(enableSecurity);
 
@@ -75,23 +75,23 @@ public class OpenWireTestBase extends ActiveMQTestBase {
  securityManager.getConfiguration().addRole("openwireSender", 
"sender");
  securityManager.getConfiguration().addUser("openwireSender", 
"SeNdEr");
  //sender cannot receive
- Role senderRole = new Role("sender", true, false, false, false, true, 
true, false, false, true);
+ Role senderRole = new Role("sender", true, false, false, false, true, 
true, false, false, true, true);
 
  securityManager.getConfiguration().addRole("openwireReceiver", 
"receiver");
  securityManager.getConfiguration().addUser("openwireReceiver", 
"ReCeIvEr");
  //receiver cannot send
- Role receiverRole = new Role("receiver", false, true, false, false, 
true, true, false, true, false);
+ Role receiverRole = new Role("receiver", false, true, false, false, 
true, true, false, true, false, false);
 
  securityManager.getConfiguration().addRole("openwireGuest", "guest");
  securityManager.getConfiguration().addUser("openwireGuest", "GuEsT");
 
  //guest cannot do anything
- Role guestRole = new Role("guest", false, false, false, false, false, 
false, false, false, false);
+ Role guestRole = new Role("guest", false, false, false, false, false, 
false, false, false, false, false);
 
  
securityManager.getConfiguration().addRole("openwireDestinationManager", 
"manager");
  
securityManager.getConfiguration().addUser("openwireDestinationManager", 
"DeStInAtIoN");
 
- Role destRole = new Role("manager", false, false, false, false, true, 
true, false, false, false);
+ Role destRole = new Role("manager", false, false, false, false, true, 
true, false, false, false, false);
 
  Set roles = new HashSet<>();
  roles.add(senderRole);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0861be14/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index 

[35/50] [abbrv] activemq-artemis git commit: ARTEMIS-780 Update Shared Queue API to use Address model

[clebertsuconic]

ARTEMIS-780 Update Shared Queue API to use Address model


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

Branch: refs/heads/master
Commit: 279383a7985dd9b92ab89584bf7eda7029343be8
Parents: c480351
Author: Martyn Taylor 
Authored: Tue Nov 29 14:11:27 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../activemq/artemis/api/core/Message.java  |  5 +++
 .../wireformat/CreateSharedQueueMessage_V2.java |  1 -
 .../jms/client/ActiveMQMessageProducer.java |  4 ++
 .../core/postoffice/impl/LocalQueueBinding.java | 18 ++--
 .../core/postoffice/impl/PostOfficeImpl.java|  5 +++
 .../core/server/impl/ActiveMQServerImpl.java| 19 +++-
 .../artemis/jms/tests/MessageProducerTest.java  | 46 
 7 files changed, 92 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/279383a7/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
index 1ea9309..80116ed 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java
@@ -112,6 +112,11 @@ public interface Message {
 */
SimpleString HDR_VALIDATED_USER = new SimpleString("_AMQ_VALIDATED_USER");
 
+   /**
+* The Routing Type for this message.  Ensures that this message is only 
routed to queues with matching routing type.
+*/
+   SimpleString HDR_ROUTING_TYPE = new SimpleString("_AMQ_ROUTING_TYPE");
+
byte DEFAULT_TYPE = 0;
 
byte OBJECT_TYPE = 2;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/279383a7/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java
index 40b9cb5..c8bf86e 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage_V2.java
@@ -64,7 +64,6 @@ public class CreateSharedQueueMessage_V2 extends 
CreateSharedQueueMessage {
   return buff.toString();
}
 
-
@Override
public void encodeRest(final ActiveMQBuffer buffer) {
   buffer.writeSimpleString(address);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/279383a7/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index 47d9ff2..aa4754b 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -41,6 +41,7 @@ import 
org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientProducer;
 import org.apache.activemq.artemis.api.core.client.ClientSession;
 import org.apache.activemq.artemis.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.artemis.core.message.impl.MessageImpl;
 import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.utils.UUID;
 import org.apache.activemq.artemis.utils.UUIDGenerator;
@@ -491,6 +492,9 @@ public class ActiveMQMessageProducer implements 
MessageProducer, QueueSender, To
   ClientMessage coreMessage = activeMQJmsMessage.getCoreMessage();
   
coreMessage.putStringProperty(ActiveMQConnection.CONNECTION_ID_PROPERTY_NAME, 
connID);
 
+  byte routingType = destination.isQueue() ? RoutingType.ANYCAST.getType() 
: 

[19/50] [abbrv] activemq-artemis git commit: ARTEMIS-788 Stomp refactor + track autocreation for addresses

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a88853fe/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 000c72a..b3fc5ac 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -68,7 +68,6 @@ import 
org.apache.activemq.artemis.core.server.BindingQueryResult;
 import org.apache.activemq.artemis.core.server.LargeServerMessage;
 import org.apache.activemq.artemis.core.server.MessageReference;
 import org.apache.activemq.artemis.core.server.Queue;
-import org.apache.activemq.artemis.core.server.QueueCreator;
 import org.apache.activemq.artemis.core.server.QueueQueryResult;
 import org.apache.activemq.artemis.core.server.RoutingContext;
 import org.apache.activemq.artemis.core.server.ServerConsumer;
@@ -167,8 +166,6 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 
private final OperationContext context;
 
-   private QueueCreator queueCreator;
-
// Session's usage should be by definition single threaded, hence it's not 
needed to use a concurrentHashMap here
protected final Map> 
targetAddressInfos = new HashMap<>();
 
@@ -203,7 +200,6 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 final SimpleString defaultAddress,
 final SessionCallback callback,
 final OperationContext context,
-final QueueCreator queueCreator,
 final PagingManager pagingManager) throws 
Exception {
   this.username = username;
 
@@ -251,8 +247,6 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
   remotingConnection.addFailureListener(this);
   this.context = context;
 
-  this.queueCreator = queueCreator;
-
   if (!xa) {
  tx = newTransaction();
   }
@@ -390,11 +384,6 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
   }
}
 
-   @Override
-   public QueueCreator getQueueCreator() {
-  return queueCreator;
-   }
-
protected void securityCheck(SimpleString address, CheckType checkType, 
SecurityAuth auth) throws Exception {
   if (securityEnabled) {
  securityStore.check(address, checkType, auth);
@@ -500,7 +489,7 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 final SimpleString filterString,
 final boolean temporary,
 final boolean durable) throws Exception {
-  return createQueue(address, name, filterString, temporary, durable, 
null, null);
+  return createQueue(address, name, filterString, temporary, durable, 
null, null, false);
}
 
@Override
@@ -510,7 +499,8 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 final boolean temporary,
 final boolean durable,
 final Integer maxConsumers,
-final Boolean deleteOnNoConsumers) throws 
Exception {
+final Boolean deleteOnNoConsumers,
+final Boolean autoCreated) throws Exception {
   if (durable) {
  // make sure the user has privileges to create this queue
  securityCheck(address, CheckType.CREATE_DURABLE_QUEUE, this);
@@ -520,7 +510,7 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 
   server.checkQueueCreationLimit(getUsername());
 
-  Queue queue = server.createQueue(address, name, filterString, 
SimpleString.toSimpleString(getUsername()), durable, temporary, maxConsumers, 
deleteOnNoConsumers);
+  Queue queue = server.createQueue(address, name, filterString, 
SimpleString.toSimpleString(getUsername()), durable, temporary, autoCreated, 
maxConsumers, deleteOnNoConsumers);
 
   if (temporary) {
  // Temporary queue in core simply means the queue will be deleted if
@@ -1485,7 +1475,6 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
}
 
private void installJMSHooks() {
-  this.queueCreator = server.getJMSDestinationCreator();
}
 
private Map> cloneTargetAddresses() {
@@ -1605,11 +1594,7 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
   }
 
   try {
- if (noAutoCreateQueue) {
-

[10/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects


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

Branch: refs/heads/master
Commit: 0189f156ec951824e7a0f0ca93f1d7ae28db754c
Parents: 0006627
Author: Andy Taylor 
Authored: Sun Nov 6 10:43:16 2016 +
Committer: Martyn Taylor 
Committed: Fri Dec 9 18:43:15 2016 +

--
 .../cli/commands/tools/XmlDataImporter.java |   21 +-
 .../core/management/ActiveMQServerControl.java  |   20 +
 .../api/core/management/AddressControl.java |   30 +
 .../api/core/management/ObjectNameBuilder.java  |   34 +-
 .../api/core/management/QueueControl.java   |5 +-
 .../api/core/management/ResourceNames.java  |   29 +-
 .../management/ConnectionFactoryControl.java|  399 -
 .../api/jms/management/DestinationControl.java  |   79 -
 .../api/jms/management/JMSConnectionInfo.java   |   87 -
 .../api/jms/management/JMSConsumerInfo.java |  120 --
 .../api/jms/management/JMSQueueControl.java |  443 -
 .../api/jms/management/JMSServerControl.java|  381 
 .../api/jms/management/JMSSessionInfo.java  |   54 -
 .../api/jms/management/SubscriptionInfo.java|  130 --
 .../api/jms/management/TopicControl.java|  153 --
 .../impl/JMSConnectionFactoryControlImpl.java   |  471 -
 .../management/impl/JMSQueueControlImpl.java|  532 --
 .../management/impl/JMSServerControlImpl.java   |  876 -
 .../management/impl/JMSTopicControlImpl.java|  370 
 .../openmbean/JMSCompositeDataConstants.java|   57 -
 .../impl/openmbean/JMSOpenTypeSupport.java  |  357 
 .../jms/server/impl/JMSServerManagerImpl.java   |   32 +-
 .../server/management/JMSManagementService.java |   48 -
 .../impl/JMSManagementServiceImpl.java  |  155 --
 .../config/ClusterConnectionConfiguration.java  |7 -
 .../deployers/impl/FileConfigurationParser.java |2 +-
 .../impl/ActiveMQServerControlImpl.java |   72 +-
 .../management/impl/AddressControlImpl.java |  132 +-
 .../core/management/impl/QueueControlImpl.java  |   12 +-
 .../artemis/core/postoffice/PostOffice.java |2 +-
 .../core/postoffice/impl/PostOfficeImpl.java|6 +-
 .../artemis/core/server/ActiveMQServer.java |2 +-
 .../core/server/cluster/ClusterManager.java |2 +-
 .../cluster/impl/ClusterConnectionBridge.java   |4 +-
 .../cluster/impl/ClusterConnectionImpl.java |2 +-
 .../core/server/impl/ActiveMQServerImpl.java|8 +-
 .../artemis/core/server/impl/AddressInfo.java   |7 +
 .../server/impl/PostOfficeJournalLoader.java|4 +-
 .../core/server/impl/ScaleDownHandler.java  |4 +-
 .../server/management/ManagementService.java|5 +-
 .../management/impl/ManagementServiceImpl.java  |   49 +-
 .../resources/schema/artemis-configuration.xsd  |2 +-
 .../group/impl/ClusteredResetMockTest.java  |5 +-
 .../artemis/jms/example/JMXExample.java |9 +-
 .../jms/example/MessageCounterExample.java  |4 +-
 .../artemiswrapper/OpenwireArtemisBaseTest.java |   12 -
 .../org/apache/activemq/JMSConsumerTest.java|   42 +-
 .../failover/FailoverBackupLeakTest.java|5 +-
 .../tests/extras/jms/bridge/BridgeTestBase.java |   13 +-
 .../client/AutoCreateJmsDestinationTest.java|8 +-
 .../client/JMSMessageCounterTest.java   |7 +-
 .../client/MultipleProducersTest.java   |7 +-
 .../cluster/bridge/BridgeReconnectTest.java |2 +-
 .../ClusteredMessageCounterTest.java|6 +-
 .../crossprotocol/AMQPToOpenwireTest.java   |1 -
 .../jms/client/ExpiryMessageTest.java   |5 +-
 .../ConnectionFactoryControlTest.java   |  170 --
 .../server/management/JMSMessagingProxy.java|   95 -
 .../server/management/JMSQueueControlTest.java  | 1688 --
 .../management/JMSQueueControlUsingJMSTest.java |  409 -
 .../management/JMSServerControl2Test.java   | 1150 
 .../management/JMSServerControlRestartTest.java |  157 --
 .../server/management/JMSServerControlTest.java | 1113 
 .../JMSServerControlUsingJMSTest.java   |  436 -
 .../management/TopicControlClusterTest.java |   13 +-
 .../jms/server/management/TopicControlTest.java |  669 ---
 .../management/TopicControlUsingJMSTest.java|  436 -
 .../AcceptorControlUsingCoreTest.java   |2 +-
 .../management/ActiveMQServerControlTest.java   |   12 +-
 .../ActiveMQServerControlUsingCoreTest.java |   22 +-
 .../management/AddressControlUsingCoreTest.java |2 +-
 

[46/50] [abbrv] activemq-artemis git commit: ARTEMIS-877 Add Consumer support for AMQP for new addressing schema

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/224f62b2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
index 1e12d4c..0d5c874 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpClientTestSupport.java
@@ -22,14 +22,21 @@ import java.util.LinkedList;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
 import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.RoutingType;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.jms.server.JMSServerManager;
 import org.apache.activemq.artemis.jms.server.impl.JMSServerManagerImpl;
 import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
 import org.apache.activemq.transport.amqp.client.AmqpClient;
 import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpMessage;
+import org.apache.activemq.transport.amqp.client.AmqpSender;
+import org.apache.activemq.transport.amqp.client.AmqpSession;
+import org.apache.qpid.proton.amqp.Symbol;
 import org.junit.After;
 import org.junit.Before;
 
@@ -39,6 +46,10 @@ import org.junit.Before;
  */
 public class AmqpClientTestSupport extends ActiveMQTestBase {
 
+   protected static Symbol SHARED = Symbol.getSymbol("shared");
+   protected static Symbol GLOBAL = Symbol.getSymbol("global");
+
+
private boolean useSSL;
 
protected JMSServerManager serverManager;
@@ -86,6 +97,12 @@ public class AmqpClientTestSupport extends ActiveMQTestBase {
   ActiveMQServer server = createServer(true, true);
   serverManager = new JMSServerManagerImpl(server);
   Configuration serverConfig = server.getConfiguration();
+  CoreAddressConfiguration address = new CoreAddressConfiguration();
+  
address.setName(getTestName()).getRoutingTypes().add(RoutingType.ANYCAST);
+  CoreQueueConfiguration queueConfig = new CoreQueueConfiguration();
+  
queueConfig.setName(getTestName()).setAddress(getTestName()).setRoutingType(RoutingType.ANYCAST);
+  address.getQueueConfigurations().add(queueConfig);
+  serverConfig.addAddressConfiguration(address);
   serverConfig.getAddressesSettings().put("#", new 
AddressSettings().setAutoCreateQueues(true).setAutoCreateAddresses(true).setDeadLetterAddress(new
 SimpleString("ActiveMQ.DLQ")));
   serverConfig.setSecurityEnabled(false);
   serverManager.start();
@@ -179,4 +196,19 @@ public class AmqpClientTestSupport extends 
ActiveMQTestBase {
public AmqpClient createAmqpClient(URI brokerURI, String username, String 
password) throws Exception {
   return new AmqpClient(brokerURI, username, password);
}
+
+
+   protected void sendMessages(int numMessages, String address) throws 
Exception {
+  AmqpClient client = createAmqpClient();
+  AmqpConnection connection = addConnection(client.connect());
+  AmqpSession session = connection.createSession();
+  AmqpSender sender = session.createSender(address);
+  for (int i = 0; i < numMessages; i++) {
+ AmqpMessage message = new AmqpMessage();
+ message.setText("message-" +  i);
+ sender.send(message);
+  }
+  sender.close();
+  connection.connect();
+   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/224f62b2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
index abc422b..e760d77 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
@@ -24,6 +24,8 @@ import java.util.concurrent.TimeUnit;
 
 import 

[08/50] [abbrv] activemq-artemis git commit: ARTEMIS-876 Remove JMS JMX Objects and add new Address JMX objects

[clebertsuconic]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0189f156/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
--
diff --git 
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
 
b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
deleted file mode 100644
index e9e2f3c..000
--- 
a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSServerControlImpl.java
+++ /dev/null
@@ -1,876 +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 License.
- */
-package org.apache.activemq.artemis.jms.management.impl;
-
-import javax.json.JsonArray;
-import javax.json.JsonArrayBuilder;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
-import javax.management.ListenerNotFoundException;
-import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanNotificationInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.Notification;
-import javax.management.NotificationBroadcasterSupport;
-import javax.management.NotificationEmitter;
-import javax.management.NotificationFilter;
-import javax.management.NotificationListener;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.TransportConfiguration;
-import org.apache.activemq.artemis.api.core.client.ClientSession;
-import org.apache.activemq.artemis.api.core.management.Parameter;
-import org.apache.activemq.artemis.api.jms.JMSFactoryType;
-import org.apache.activemq.artemis.api.jms.management.ConnectionFactoryControl;
-import org.apache.activemq.artemis.api.jms.management.DestinationControl;
-import org.apache.activemq.artemis.api.jms.management.JMSQueueControl;
-import org.apache.activemq.artemis.api.jms.management.JMSServerControl;
-import org.apache.activemq.artemis.api.jms.management.TopicControl;
-import org.apache.activemq.artemis.core.client.impl.Topology;
-import org.apache.activemq.artemis.core.client.impl.TopologyMemberImpl;
-import org.apache.activemq.artemis.core.filter.Filter;
-import org.apache.activemq.artemis.core.management.impl.AbstractControl;
-import org.apache.activemq.artemis.core.management.impl.MBeanInfoHelper;
-import org.apache.activemq.artemis.core.server.Queue;
-import org.apache.activemq.artemis.core.server.ServerConsumer;
-import org.apache.activemq.artemis.core.server.ServerSession;
-import org.apache.activemq.artemis.core.server.cluster.ClusterConnection;
-import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
-import org.apache.activemq.artemis.core.server.impl.AddressInfo;
-import org.apache.activemq.artemis.jms.server.ActiveMQJMSServerLogger;
-import org.apache.activemq.artemis.jms.server.JMSServerManager;
-import 
org.apache.activemq.artemis.jms.server.config.ConnectionFactoryConfiguration;
-import 
org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfigurationImpl;
-import org.apache.activemq.artemis.jms.server.management.JMSNotificationType;
-import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
-import org.apache.activemq.artemis.utils.JsonLoader;
-import org.apache.activemq.artemis.utils.TypedProperties;
-
-public class JMSServerControlImpl extends AbstractControl implements 
JMSServerControl, NotificationEmitter, 
org.apache.activemq.artemis.core.server.management.NotificationListener {
-
-   // Constants -
-
-   // Attributes 
-
-   private final JMSServerManager server;
-
-   private final NotificationBroadcasterSupport broadcaster;
-
-   private final AtomicLong notifSeq = new AtomicLong(0);
-
-   // Static 
-
-   private static String[] convert(final Object[] bindings) {
-  String[] theBindings 

Jenkins build is still unstable: ActiveMQ-Java8 #915

[Apache Jenkins Server]

See 

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

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: MQTT Protocol #915

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Runtime Configuration #915

[Apache Jenkins Server]

See 

Jenkins build is still unstable: ActiveMQ-Java8 » ActiveMQ :: Web #915

[Apache Jenkins Server]

See 

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

[buildbot]

Author: buildbot
Date: Fri Dec  9 16:22:55 2016
New Revision: 1002515

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 Fri Dec  9 16:22:55 2016
@@ -81,23 +81,21 @@
   
 
 
-KahaDB is a file based persistence 
database that is local to the message broker that is using it. It has been 
optimised for fast persistence and is the the default storage mechanism from 
ActiveMQ 5.4 onwards. KahaDB uses less file descriptors and provides faster 
recovery than its predecessor, the AMQ Message Store.ConfigurationYou can configure ActiveMQ to 
use KahaDB for its persistence adapter - like below:
- 
- broker brokerName="broker" ... 
+KahaDB is a file based persistence 
database that is local to the message broker that is using it. It has been 
optimized for fast persistence. It is the the default storage mechanism since 
ActiveMQ 5.4. KahaDB uses less file descriptors and provides 
faster recovery than its predecessor, the AMQ Message Store.ConfigurationTo use KahaDB as the broker's 
persistence adapter configure ActiveMQ as follows (example):
+ broker brokerName="broker"
 persistenceAdapter
   kahaDB directory="activemq-data" journalMaxFileLength="32mb"/
 /persistenceAdapter
-...
  /broker
-
 
-KahaDB Propertiesproperty namedefault valueCommentsarchiveCorruptedIndexfalseIf enabled, corrupted indexes 
found at startup will be archived (not deleted).archiveDataLogsfalseIf enabled, will move a message data log to 
the archive directory instead of deleting it.checkForCorruptJournalFilesfalseIf enabled, will check for 
corrupted Journal files on startup and try and recover 
them.checkpointInterval5000Time (ms) before check-pointing the 
journal.checksumJournalFilestrueCreate a checksum for a journal 
file - to enable checking for corrupted journals.Before ActiveMQ 
5.9.0: the default i
 s false.cleanupInterval3Time (ms) before checking for a 
discarding/moving message data logs that are no longer 
used.compactAcksAfterNoGC10From ActiveMQ 
5.14.0: when the acknowledgement compaction feature is enabled this 
value controls how many store GC cycles must be completed with no other files 
being cleaned up before the compaction logic is triggered to possibly compact 
older acknowledgements spread across journal files into a new log file. 
The lower the value set the faster the compaction may oc
 cur which can impact performance if it runs to often.compactAcksIgnoresStoreGrowthfalseFrom ActiveMQ 
5.14.0:when the acknowledgement compaction feature is enabled 
this value controls whether compaction is run when the store is still growing 
or if it should only occur when the store has stopped growing (either due to 
idle or store limits reached). If enabled the compaction runs regardless 
of the store still having room or being active which can decrease overall 
performance but reclaim space faster.concurrentStoreAndDispatchQueuestrueEnable the dispatching of Queue messages to interested clients to 
happen concurrently with message storage.concurrentStoreAndDispatchTopicsfalseEnable the dispatching of Topic 
messages to interested clients to happen concurrently with message 
storageEnabling this property is not 
recommended.directoryactivemq-dataThe path to the directory to use to store the message store data and log 
 >files.class="confluenceTd">directoryArchiverowspan="1" class="confluenceTd">nullrowspan="1" class="confluenceTd">Define the directory to move data logs to 
 >when they all the messages they contain have been 
 >consumed.class="confluenceTd">enableAckCompactioncolspan="1" rowspan="1" class="confluenceTd">truecolspan="1" rowspan="1" class="confluenceTd">From ActiveMQ 
 >5.14.0: this setting controls whether the store will perform 
 >periodic compaction of older journal log files that contain only Message 
 >acknowledgements. By compacting these older acknowledgements into new 
 >journal log files the older files can be removed freeing space and allowing 
 >the message store to
  continue to operate without hitting store size limits.enableIndexWriteAsyncfalseIf set, will asynchronously 
write indexes.enableJournalDiskSyncstrueEnsure every journal 
write is followed by a disk sync (JMS durability requirement).This property is deprecated as of 
ActiveMQ 5.14.0, see journalDiskSyncStrategy for version 5.14.0 and 
newer.journalDiskSyncStrategyalwaysFrom ActiveMQ 5.14.0: this 
setting configures the disk sync policy. The default strategy 

[CONF] Apache ActiveMQ > KahaDB

[Paul Gale (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Paul Gale edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
Change comment: Minor typos etc. 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
KahaDB 
 
 
  
 
 
 
 
 
 
 KahaDB is a file based persistence database that is local to the message broker that is using it. It has been optimised optimized for fast persistence and . It is the the default storage mechanism from since ActiveMQ 5.4 onwards. KahaDB uses less file descriptors and provides faster recovery than its predecessor, the AMQ Message Store. Configuration  You can configure ActiveMQ to To use KahaDB for its persistence adapter - like belowas the broker's persistence adapter configure ActiveMQ as follows (example): 
 
 
 
 Code Block 
 
 
 
 
 
 
 
 
language 
xml 
 
 
  
 
 
 
 
  

  ... >

  

...
 


  
 
 
 KahaDB Properties 
 
 
 
 
 property name  
 default value  
 Comments  
 
 
  archiveCorruptedIndex   
  false   
 If enabled true, corrupted indexes found at startup will be archived (not deleted).  
 
 
  archiveDataLogs   
  false   
 If enabled true, will move a message data log to the archive directory instead of deleting it.  
 
 
  checkForCorruptJournalFiles   
  false   
 If enabled true, will check for corrupted Journal corrupt journal files on startup and try and recover them.  
 
 
  checkpointInterval   
  5000   
 Time (ms) before check-pointing the journal.  
 
 
  checksumJournalFiles   
  true   
 Create a checksum for a journal file - to enable checking for corrupted journals. The presence of a checksum is required in order for the persistence adapter to be able to detect corrupt journal files. Before ActiveMQ 5.9.0: the default is false.  
 
 
  cleanupInterval   
  3   
  Time The interval (in ms) before checking for a discarding/moving message data logs that are no longer usedbetween consecutive checks that determine which journal files, if any, are eligible for removal from the message store. An eligible journal file is one that has no outstanding references.  
 
 
  compactAcksAfterNoGC   
  10   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls how many store GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.  The lower the value set the faster the compaction may occur which can impact performance if it runs to often.  
 
 
  compactAcksIgnoresStoreGrowth   
  false   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).  If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim space faster.   
 
 
  concurrentStoreAndDispatchQueues   
  true   
 Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.  
 
 
  concurrentStoreAndDispatchTopics   
  false   
 Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage 
 
 
 
 Warning 
 
 
 
 
Enabling this property is not recommended. 
 
 
  
 
 
  directory   
  activemq-data   
 The path to the directory to use to store the message store data and log files.  
 
 
  directoryArchive   
  null   
 Define the directory to move data logs to when they all the messages they contain have been consumed.  
 
 
  enableAckCompaction   
  true   
 From ActiveMQ 5.14.0: this setting controls whether the store will perform periodic compaction of older journal log files that contain only Message acknowledgements.   By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.  
 
 
  enableIndexWriteAsync   
  false   
 If set, will asynchronously write indexes true, the index is updated asynchronously.  
 
 
  enableJournalDiskSyncs   
  true   
  Ensure every journal write is followed by a disk sync (JMS durability requirement).  
 
 
 
 Warning 
 
 
 
 
  This property is deprecated as of ActiveMQ 5.14.0  , see journalDiskSyncStrategy for version   .   From ActiveMQ 5.14.0   and newer  : see journalDiskSyncStrategy.   
 
 
  
 
 
journalDiskSyncStrategy 
always 
 From ActiveMQ 5.14.0: this setting configures the disk sync policy. The default strategy is set to always.list of available sync strategies are (in order of decreasing safety, and increasing performance):  
 
 always Ensure every journal write is followed by a disk sync (JMS durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write. This is equivalent to the deprecated property 

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6521

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/activemq-5.14.x d3c5e8188 -> 80b5fdcf2


https://issues.apache.org/jira/browse/AMQ-6521

Fixing support for Jetty 9.3 and Jetty 9.2.  The previous attempt at a
fix had the wrong class instance.

(cherry picked from commit 29b4db5c34fbb7087bc6a08f3e393da32b39ce66)


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

Branch: refs/heads/activemq-5.14.x
Commit: 80b5fdcf2ff48f4ac55cabd86addc0267478573e
Parents: d3c5e81
Author: Christopher L. Shannon (cshannon) 
Authored: Fri Dec 9 09:45:53 2016 -0500
Committer: Christopher L. Shannon (cshannon) 
Committed: Fri Dec 9 09:47:59 2016 -0500

--
 .../apache/activemq/transport/http/HttpTransportServer.java | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/80b5fdcf/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
--
diff --git 
a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
 
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
index f9774f3..ca3bed8 100755
--- 
a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
+++ 
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
@@ -30,6 +30,7 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
@@ -124,13 +125,13 @@ public class HttpTransportServer extends 
WebTransportServerSupport {
 }
 
 private void addGzipHandler(ServletContextHandler contextHandler) throws 
Exception {
-Handler handler = null;
+HandlerWrapper handler = null;
 try {
-handler = (Handler) 
forName("org.eclipse.jetty.server.handler.GzipHandler").newInstance();
+handler = (HandlerWrapper) 
forName("org.eclipse.jetty.servlets.gzip.GzipHandler").newInstance();
 } catch (Throwable t) {
-handler = (Handler) 
forName("org.eclipse.jetty.servlets.gzip.GzipHandler").newInstance();
+handler = (HandlerWrapper) 
forName("org.eclipse.jetty.server.handler.gzip.GzipHandler").newInstance();
 }
-contextHandler.setHandler(handler);
+contextHandler.insertHandler(handler);
 }
 
 private Class forName(String name) throws ClassNotFoundException {

activemq git commit: https://issues.apache.org/jira/browse/AMQ-6521

[cshannon]

Repository: activemq
Updated Branches:
  refs/heads/master 1a2e3eb0c -> 29b4db5c3


https://issues.apache.org/jira/browse/AMQ-6521

Fixing support for Jetty 9.3 and Jetty 9.2.  The previous attempt at a
fix had the wrong class instance.


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

Branch: refs/heads/master
Commit: 29b4db5c34fbb7087bc6a08f3e393da32b39ce66
Parents: 1a2e3eb
Author: Christopher L. Shannon (cshannon) 
Authored: Fri Dec 9 09:45:53 2016 -0500
Committer: Christopher L. Shannon (cshannon) 
Committed: Fri Dec 9 09:47:16 2016 -0500

--
 .../apache/activemq/transport/http/HttpTransportServer.java | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq/blob/29b4db5c/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
--
diff --git 
a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
 
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
index f9774f3..ca3bed8 100644
--- 
a/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
+++ 
b/activemq-http/src/main/java/org/apache/activemq/transport/http/HttpTransportServer.java
@@ -30,6 +30,7 @@ import org.eclipse.jetty.security.ConstraintSecurityHandler;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
@@ -124,13 +125,13 @@ public class HttpTransportServer extends 
WebTransportServerSupport {
 }
 
 private void addGzipHandler(ServletContextHandler contextHandler) throws 
Exception {
-Handler handler = null;
+HandlerWrapper handler = null;
 try {
-handler = (Handler) 
forName("org.eclipse.jetty.server.handler.GzipHandler").newInstance();
+handler = (HandlerWrapper) 
forName("org.eclipse.jetty.servlets.gzip.GzipHandler").newInstance();
 } catch (Throwable t) {
-handler = (Handler) 
forName("org.eclipse.jetty.servlets.gzip.GzipHandler").newInstance();
+handler = (HandlerWrapper) 
forName("org.eclipse.jetty.server.handler.gzip.GzipHandler").newInstance();
 }
-contextHandler.setHandler(handler);
+contextHandler.insertHandler(handler);
 }
 
 private Class forName(String name) throws ClassNotFoundException {

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

[buildbot]

Author: buildbot
Date: Fri Dec  9 14:22:33 2016
New Revision: 1002502

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 Fri Dec  9 14:22:33 2016
@@ -91,7 +91,7 @@
  /broker
 
 
-KahaDB Propertiesproperty namedefault valueCommentsarchiveCorruptedIndexfalseIf enabled, corrupted indexes 
found at startup will be archived (not deleted).archiveDataLogsfalseIf enabled, will move a message data log to 
the archive directory instead of deleting it.checkForCorruptJournalFilesfalseIf enabled, will check for 
corrupted Journal files on startup and try and recover 
them.checkpointInterval5000Time (ms) before check-pointing the 
journal.checksumJournalFilestrueCreate a checksum for a journal 
file - to enable checking for corrupted journals.Before ActiveMQ 
5.9.0: the default i
 s false.cleanupInterval3Time (ms) before checking for a 
discarding/moving message data logs that are no longer 
used.compactAcksAfterNoGC10From ActiveMQ 
5.14.0: when the acknowledgement compaction feature is enabled this 
value controls how many store GC cycles must be completed with no other files 
being cleaned up before the compaction logic is triggered to possibly compact 
older acknowledgements spread across journal files into a new log file. 
The lower the value set the faster the compaction may oc
 cur which can impact performance if it runs to often.compactAcksIgnoresStoreGrowthfalseFrom ActiveMQ 
5.14.0:when the acknowledgement compaction feature is enabled 
this value controls whether compaction is run when the store is still growing 
or if it should only occur when the store has stopped growing (either due to 
idle or store limits reached). If enabled the compaction runs regardless 
of the store still having room or being active which can decrease overall 
performance but reclaim space faster.concurrentStoreAndDispatchQueuestrueEnable the dispatching of Queue messages to interested clients to 
happen concurrently with message storage.concurrentStoreAndDispatchTopicsfalseEnable the dispatching of Topic 
messages to interested clients to happen concurrently with message 
storageEnabling this property is not 
recommended.directoryactivemq-dataThe path to the directory to use to store the message store data and log 
 >files.class="confluenceTd">directoryArchiverowspan="1" class="confluenceTd">nullrowspan="1" class="confluenceTd">Define the directory to move data logs to 
 >when they all the messages they contain have been 
 >consumed.class="confluenceTd">enableAckCompactioncolspan="1" rowspan="1" class="confluenceTd">truecolspan="1" rowspan="1" class="confluenceTd">From ActiveMQ 
 >5.14.0: this setting controls whether the store will perform 
 >periodic compaction of older journal log files that contain only Message 
 >acknowledgements. By compacting these older acknowledgements into new 
 >journal log files the older files can be removed freeing space and allowing 
 >the message store to
  continue to operate without hitting store size limits.enableIndexWriteAsyncfalseIf set, will asynchronously 
write indexes.enableJournalDiskSyncstrueEnsure every journal write is 
followed by a disk sync (JMS durability requirement).ignoreMissingJournalfilesfalseIf enabled, will ignore a 
missing message log file.indexCacheSize1Number of index pages cached in 
memory.indexDirectoryFrom ActiveMQ 5.10.0: If set, 
configures where the KahaDB index files (db.data 
anddb.redo) will be stored. If not set, the 
index files are stored in the directory specified by 
thedirectory 
attribute.indexWriteBatchSize1000Number of indexes written in a 
batch.journalMaxFileLength32mbA hint to set the maximum size 
of the message data logs.maxAsyncJobs1The maximum number of asynchronous messages 
that will be queued awaiting storage (should be the same as the number of 
concurrent MessageProducers).preallocationScopeentire_journal<
 p>From ActiveMQ 5.14.0: this setting configures how journal 
data files are preallocated. The default strategy preallocates the journal file 
on first use using the appender 
thread.entire_journal_async 
will use preallocate ahead of time in a separate 
thread.none disables 
preallocation.On SSD, 
usingentire_journal_async avoids delaying 
writes pending preallocation on first use.Note: on HDD 
the additional thread contention for disk has a negative impact. Therefore use 
the default.preallocationStrategysparse_fileFrom ActiveMQ 
5.12.0:This setting configures how the broker 

[CONF] Apache ActiveMQ > KahaDB

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
KahaDB 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 property name  
 default value  
 Comments  
 
 
  archiveCorruptedIndex   
  false   
 If enabled, corrupted indexes found at startup will be archived (not deleted).  
 
 
  archiveDataLogs   
  false   
 If enabled, will move a message data log to the archive directory instead of deleting it.  
 
 
  checkForCorruptJournalFiles   
  false   
 If enabled, will check for corrupted Journal files on startup and try and recover them.  
 
 
  checkpointInterval   
  5000   
 Time (ms) before check-pointing the journal.  
 
 
  checksumJournalFiles   
  true   
 Create a checksum for a journal file - to enable checking for corrupted journals. Before ActiveMQ 5.9.0: the default is false.  
 
 
  cleanupInterval   
  3   
 Time (ms) before checking for a discarding/moving message data logs that are no longer used.  
 
 
  compactAcksAfterNoGC   
  10   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls how many store GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.  The lower the value set the faster the compaction may occur which can impact performance if it runs to often.  
 
 
  compactAcksIgnoresStoreGrowth   
  false   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).  If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim space faster.   
 
 
  concurrentStoreAndDispatchQueues   
  true   
 Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.  
 
 
  concurrentStoreAndDispatchTopics   
  false   
 Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage 
 
 
 
 Warning 
 
 
 
 
Enabling this property is not recommended. 
 
 
  
 
 
  directory   
  activemq-data   
 The path to the directory to use to store the message store data and log files.  
 
 
  directoryArchive   
  null   
 Define the directory to move data logs to when they all the messages they contain have been consumed.  
 
 
  enableAckCompaction   
  true   
 From ActiveMQ 5.14.0: this setting controls whether the store will perform periodic compaction of older journal log files that contain only Message acknowledgements.  By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.  
 
 
  enableIndexWriteAsync   
  false   
 If set, will asynchronously write indexes.  
 
 
  enableJournalDiskSyncs   
  true   
  Ensure every journal write is followed by a disk sync (JMS durability requirement).  
 
 
 
 Warning 
 
 
 
 
This property is deprecated as of ActiveMQ 5.14.0, see journalDiskSyncStrategy for version 5.14.0 and newer. 
 
 
  
 
 
journalDiskSyncStrategy 
always 
 From ActiveMQ 5.14.0: this setting configures the disk sync policy. The default strategy is set to always. 
 
 always Ensure every journal write is followed by a disk sync (JMS durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write. This is equivalent to the deprecated property enableJournalDiskSyncs being set to true.  
 periodic The disk will be synced at set intervals (if a write has occurred) instead of after every journal write which will reduce the load on the disk and should improve throughput. The disk will also be synced when rolling over to a new journal file. The default setting is set to 1 second which generally provides very good performance while being safer than never disk syncing as only up to 1 second of data can be lost. See journalDiskSyncInterval to change the frequency of disk syncs. 
 never A sync will never be explicitly called and it will be up to the operating system to flush to disk. This is equivalent to setting the deprectated enableJournalDiskSyncs property to false. This is the fastest option but is the least safe as there's no guarantee as to when data is flushed to disk so message loss can occur on failure. 
  
 
 
journalDiskSyncInterval 
1000 
Interval (ms) for when to perform a disk sync when journalDiskSyncStrategy is set to periodic. A sync will only be performed if a write has occurred to the journal since the last disk sync or when the journal rolls over to a new journal file. 
 
 
  ignoreMissingJournalfiles   
  false   
 If enabled, will ignore a missing 

[CONF] Apache ActiveMQ > KahaDB

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
KahaDB 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 property name  
 default value  
 Comments  
 
 
  archiveCorruptedIndex   
  false   
 If enabled, corrupted indexes found at startup will be archived (not deleted).  
 
 
  archiveDataLogs   
  false   
 If enabled, will move a message data log to the archive directory instead of deleting it.  
 
 
  checkForCorruptJournalFiles   
  false   
 If enabled, will check for corrupted Journal files on startup and try and recover them.  
 
 
  checkpointInterval   
  5000   
 Time (ms) before check-pointing the journal.  
 
 
  checksumJournalFiles   
  true   
 Create a checksum for a journal file - to enable checking for corrupted journals. Before ActiveMQ 5.9.0: the default is false.  
 
 
  cleanupInterval   
  3   
 Time (ms) before checking for a discarding/moving message data logs that are no longer used.  
 
 
  compactAcksAfterNoGC   
  10   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls how many store GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.  The lower the value set the faster the compaction may occur which can impact performance if it runs to often.  
 
 
  compactAcksIgnoresStoreGrowth   
  false   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).  If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim space faster.   
 
 
  concurrentStoreAndDispatchQueues   
  true   
 Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.  
 
 
  concurrentStoreAndDispatchTopics   
  false   
 Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage 
 
 
 
 Warning 
 
 
 
 
Enabling this property is not recommended. 
 
 
  
 
 
  directory   
  activemq-data   
 The path to the directory to use to store the message store data and log files.  
 
 
  directoryArchive   
  null   
 Define the directory to move data logs to when they all the messages they contain have been consumed.  
 
 
  enableAckCompaction   
  true   
 From ActiveMQ 5.14.0: this setting controls whether the store will perform periodic compaction of older journal log files that contain only Message acknowledgements.  By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.  
 
 
  enableIndexWriteAsync   
  false   
 If set, will asynchronously write indexes.  
 
 
  enableJournalDiskSyncs   
  true   
  Ensure every journal write is followed by a disk sync (JMS durability requirement).  
 
 
 
 Warning 
 
 
 
 
This property is deprecated as of ActiveMQ 5.14.0, see journalDiskSyncStrategy for version 5.14.0 and newer. 
 
 
  
 
 
journalDiskSyncStrategy 
always 
 From ActiveMQ 5.14.0: this setting configures the disk sync policy. The default strategy is set to always. 
 
 always Ensure every journal write is followed by a disk sync (JMS durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write.  
 periodic The disk will be synced at set intervals (if a write has occurred) instead of after every journal write which will reduce the load on the disk and should improve throughput. The disk will also be synced when rolling over to a new journal file. The default setting is set to 1 second which generally provides very good performance while being safer than never disk syncing as only up to 1 second of data can be lost. See journalDiskSyncInterval to change the frequency of disk syncs. 
 never A sync will never be explicitly called and it will be up to the operating system to flush to disk. This is equivalent to setting the deprectated enableJournalDiskSyncs property to false. This is the fastest option but is the least safe as there's no guarantee as to when data is flushed to disk so message loss can occur on failure. 
  On SSD, using entire_journal_async avoids delaying writes pending preallocation on first use.   Note: on HDD the additional thread contention for disk has a negative impact. Therefore use the default.   
 
 
journalDiskSyncInterval 
1000 
Interval (ms) for when to perform a disk sync when journalDiskSyncStrategy is set to periodic. A sync will only be performed if a write has occurred to the journal since the last disk sync or when the journal 

[CONF] Apache ActiveMQ > KahaDB

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
KahaDB 
 
 
  
 
 
 
 
 
 
 ... 
 
 
 
 
 property name  
 default value  
 Comments  
 
 
  archiveCorruptedIndex   
  false   
 If enabled, corrupted indexes found at startup will be archived (not deleted).  
 
 
  archiveDataLogs   
  false   
 If enabled, will move a message data log to the archive directory instead of deleting it.  
 
 
  checkForCorruptJournalFiles   
  false   
 If enabled, will check for corrupted Journal files on startup and try and recover them.  
 
 
  checkpointInterval   
  5000   
 Time (ms) before check-pointing the journal.  
 
 
  checksumJournalFiles   
  true   
 Create a checksum for a journal file - to enable checking for corrupted journals. Before ActiveMQ 5.9.0: the default is false.  
 
 
  cleanupInterval   
  3   
 Time (ms) before checking for a discarding/moving message data logs that are no longer used.  
 
 
  compactAcksAfterNoGC   
  10   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls how many store GC cycles must be completed with no other files being cleaned up before the compaction logic is triggered to possibly compact older acknowledgements spread across journal files into a new log file.  The lower the value set the faster the compaction may occur which can impact performance if it runs to often.  
 
 
  compactAcksIgnoresStoreGrowth   
  false   
 From ActiveMQ 5.14.0: when the acknowledgement compaction feature is enabled this value controls whether compaction is run when the store is still growing or if it should only occur when the store has stopped growing (either due to idle or store limits reached).  If enabled the compaction runs regardless of the store still having room or being active which can decrease overall performance but reclaim space faster.   
 
 
  concurrentStoreAndDispatchQueues   
  true   
 Enable the dispatching of Queue messages to interested clients to happen concurrently with message storage.  
 
 
  concurrentStoreAndDispatchTopics   
  false   
 Enable the dispatching of Topic messages to interested clients to happen concurrently with message storage 
 
 
 
 Warning 
 
 
 
 
Enabling this property is not recommended. 
 
 
  
 
 
  directory   
  activemq-data   
 The path to the directory to use to store the message store data and log files.  
 
 
  directoryArchive   
  null   
 Define the directory to move data logs to when they all the messages they contain have been consumed.  
 
 
  enableAckCompaction   
  true   
 From ActiveMQ 5.14.0: this setting controls whether the store will perform periodic compaction of older journal log files that contain only Message acknowledgements.  By compacting these older acknowledgements into new journal log files the older files can be removed freeing space and allowing the message store to continue to operate without hitting store size limits.  
 
 
  enableIndexWriteAsync   
  false   
 If set, will asynchronously write indexes.  
 
 
  enableJournalDiskSyncs   
  true   
  Ensure every journal write is followed by a disk sync (JMS durability requirement).  
 
 
 
 Warning 
 
 
 
 
This property is deprecated as of ActiveMQ 5.14.0, see journalDiskSyncStrategy for version 5.14.0 and newer. 
 
 
  
 
 
journalDiskSyncStrategy 
always 
  From ActiveMQ 5.14.0: this setting configures the disk sync policy. The default strategy is set to always.  
 
 always Ensure every journal write is followed by a disk sync (JMS durability requirement). This is the safest option but is also the slowest because it requires a sync after every message write.  
 periodic The disk will be synced at set intervals (if a write has occurred) instead of after every journal write which will reduce the load on the disk and should improve throughput. The disk will also be synced when rolling over to a new journal file. The default setting is set to 1 second which generally provides very good performance while being safer than never disk syncing as only up to 1 second of data can be lost. See journalDiskSyncInterval to change the frequency of disk syncs.  
 never A sync will never be explicitly called and it will be up to the operating system to flush to disk. This is equivalent to setting the deprectated enableJournalDiskSyncs property to false. This is the fastest option but is the least safe as there's no guarantee as to when data is flushed to disk so message loss can occur on failure.  
  On SSD, using entire_journal_async avoids delaying writes pending preallocation on first use.   Note: on HDD the additional thread contention for disk has a negative impact. Therefore use the default.   
 
 
journalDiskSyncInterval 
1000 
Interval (ms) for when to perform a disk sync when journalDiskSyncStrategy is set to periodic. A sync will only be performed if a write has occurred to the journal since the last disk sync or when the journal 

svn commit: r1002500 - in /websites/production/activemq/content: cache/main.pageCache security-advisories.data/CVE-2016-3088-announcement.txt security-advisories.data/CVE-2016-6810-announcement.txt se

[buildbot]

Author: buildbot
Date: Fri Dec  9 13:22:58 2016
New Revision: 1002500

Log:
Production update by buildbot for activemq

Added:

websites/production/activemq/content/security-advisories.data/CVE-2016-6810-announcement.txt
Modified:
websites/production/activemq/content/cache/main.pageCache

websites/production/activemq/content/security-advisories.data/CVE-2016-3088-announcement.txt
websites/production/activemq/content/security-advisories.html

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

Modified: 
websites/production/activemq/content/security-advisories.data/CVE-2016-3088-announcement.txt
==
--- 
websites/production/activemq/content/security-advisories.data/CVE-2016-3088-announcement.txt
 (original)
+++ 
websites/production/activemq/content/security-advisories.data/CVE-2016-3088-announcement.txt
 Fri Dec  9 13:22:58 2016
@@ -5,7 +5,7 @@ Vendor:
 The Apache Software Foundation
 
 Versions Affected:
-Apache ActiveMQ 5.0.0 - 5.13.2
+Apache ActiveMQ 5.0.0 - 5.13.x
 
 Description:
 

Added: 
websites/production/activemq/content/security-advisories.data/CVE-2016-6810-announcement.txt
==
--- 
websites/production/activemq/content/security-advisories.data/CVE-2016-6810-announcement.txt
 (added)
+++ 
websites/production/activemq/content/security-advisories.data/CVE-2016-6810-announcement.txt
 Fri Dec  9 13:22:58 2016
@@ -0,0 +1,19 @@
+CVE-2016-6810: ActiveMQ Web Console - Cross-Site Scripting
+
+Severity: Important
+
+Vendor:
+The Apache Software Foundation
+
+Versions Affected:
+Apache ActiveMQ 5.0.0 - 5.14.1
+
+Description:
+An instance of a cross-site scripting vulnerability was identified to be 
present in the web based administration console. The root cause of this issue 
is improper user data output validation.
+
+
+Mitigation:
+Upgrade to Apache ActiveMQ 5.14.2
+
+Credit:
+This issue was discovered by Toshitsugu Yoneyama of Mitsui Bussan Secure 
Directions, Inc. and was reported byJPCERT/CC.

Modified: websites/production/activemq/content/security-advisories.html
==
--- websites/production/activemq/content/security-advisories.html (original)
+++ websites/production/activemq/content/security-advisories.html Fri Dec  9 
13:22:58 2016
@@ -72,7 +72,7 @@
   
 
 
-Apache ActiveMQ2016CVE-2016-0734-ActiveMQ
 Web Console - ClickjackingCVE-2016-0782-ActiveMQ
 Web Console - Cross-Site ScriptingCVE-2016-3088 -ActiveMQ 
Fileserver web application vulnerabilities2015CVE-2015-5254 -Unsafe 
deserialization in ActiveMQCVE-2015-1830 - Path traversal 
leading to unauthenticated RCE in ActiveMQ2014CVE-2014-3576 -Remote 
Unauthenticated Shutdown of Broker (DoS)CVE-2014-3600-Apache
 ActiveMQ XXE with XPath selectorsCVE-2014-3612 -ActiveMQ 
JAAS: LDAPLoginModule allows empty password authentication and Wildcard 
InterpretationCVE-2014-8110 -ActiveMQ Web Console - Cross-Site 
ScriptingActiveMQ Apollo2014CVE-2014-3579 -ActiveMQ Apollo XXE with XPath 
selectors
+Apache ActiveMQ2016CVE-2016-6810-ActiveMQ
 Web Console - Cross-Site ScriptingCVE-2016-0734-ActiveMQ
 Web Console - ClickjackingCVE-2016-0782-ActiveMQ
 Web Console - Cross-Site ScriptingCVE-2016-3088 -ActiveMQ 
Fileserver web application vulnerabilities2015CVE-2015-5254 -Unsafe 
deserialization in ActiveMQCVE-2015-1830 - Path traversal 
leading to unauthenticated RCE in ActiveMQ2014CVE-2014-3576 
-Remote Unauthenticated Shutdown of Broker (DoS)CVE-2014-3600-Apache
 ActiveMQ XXE with XPath selectorsCVE-2014-3612 -ActiveMQ 
JAAS: LDAPLoginModule allows empty password authentication and Wildcard 
InterpretationCVE-2014-8110 -ActiveMQ Web Console - Cross-Site 
ScriptingActiveMQ Apolloid="SecurityAdvisories-2014.1">2014shape="rect" 
 >href="security-advisories.data/CVE-2014-3579-announcement.txt?version=1modificationDate=1423054118000api=v2"
 > data-linked-resource-id="52035737" data-linked-resource-version="1" 
 >data-linked-resource-type="attachment" 
 >data-linked-resource-default-alias="CVE-2014-3579-announcement.txt" 
 >data-nice-type="Text File" data-linked-resource-content-type="text/plain" 
 >data-linked-resource-container-id="51808957" 
 >data-linked-resource-container-version="11">CVE-2014-3579style="line-height: 1.4285715;"> -ActiveMQ Apollo XXE with XPath 
 >selectors
 
 
   

[CONF] Apache ActiveMQ > Security Advisories

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Security Advisories 
 
 
  
 
 
 
 
 
 
 Apache ActiveMQ 2016 
 
 CVE-2016-6810 - ActiveMQ Web Console - Cross-Site Scripting  
 CVE-2016-0734 - ActiveMQ Web Console - Clickjacking 
 CVE-2016-0782 - ActiveMQ Web Console - Cross-Site Scripting 
 CVE-2016-3088 - ActiveMQ Fileserver web application vulnerabilities 
 ...  
 
 
  
 
 
 
 
 
 
 
 
 
 

View page
• 
 
 
 
 
 
 

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

svn commit: r1002498 [1/2] - in /websites/production/activemq/content: 2016/12/ 2016/12/09/ 2016/12/09/apache-activemq-5142-released.html activemq-5142-release.html cache/main.pageCache download.html

[buildbot]

Author: buildbot
Date: Fri Dec  9 12:22:53 2016
New Revision: 1002498

Log:
Production update by buildbot for activemq

Added:
websites/production/activemq/content/2016/12/
websites/production/activemq/content/2016/12/09/

websites/production/activemq/content/2016/12/09/apache-activemq-5142-released.html
websites/production/activemq/content/activemq-5142-release.html
Modified:
websites/production/activemq/content/cache/main.pageCache
websites/production/activemq/content/download.html
websites/production/activemq/content/index.html
websites/production/activemq/content/news.html
websites/production/activemq/content/overview.html
websites/production/activemq/content/xml-reference.html

Added: 
websites/production/activemq/content/2016/12/09/apache-activemq-5142-released.html
==
--- 
websites/production/activemq/content/2016/12/09/apache-activemq-5142-released.html
 (added)
+++ 
websites/production/activemq/content/2016/12/09/apache-activemq-5142-released.html
 Fri Dec  9 12:22:53 2016
@@ -0,0 +1,138 @@
+http://www.w3.org/TR/html4/loose.dtd;>
+
+
+
+http://activemq.apache.org/styles/site.css; rel="stylesheet" 
type="text/css"/>
+http://activemq.apache.org/styles/type-settings.css; 
rel="stylesheet" type="text/css"/>
+http://activemq.apache.org/styles/prototype.js"; 
type="text/javascript">
+http://activemq.apache.org/styles/rico.js"; 
type="text/javascript">
+http://activemq.apache.org/styles/site.js"; 
type="text/javascript">
+
+  .maincontent { overflow:hidden; }
+
+
+
+
+
+Apache ActiveMQ  -- Apache ActiveMQ 5.14.2 Released
+
+
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+
+
+   
+   
+http://activemq.apache.org; 
title="The most popular and powerful open source Message Broker">ActiveMQ 

+http://www.apache.org; title="The 
Apache Software Foundation">ASF
+   
+
+
+
+  
+Index20161209Apache ActiveMQ 5.14.2 Released
+  
+  
+Download | http://activemq.apache.org/maven/apidocs/index.html;>JavaDocs More... | Source | Forums | Support
+  
+
+
+  
+  
+
+
+The ActiveMQ team is pleased to announce the release 
ofhttp://activemq.apache.org/activemq-5142-release.html;>ActiveMQ 
5.14.2A big thanks to everyone 
who contributed to this release.We look forward to your feedback.
+
+
+  
+
+  
+https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35985;>OverviewIndexNewsNew FeaturesGetting StartedFAQArticlesBooksDownloadhttp://www.apache.org/licenses/;>LicenseSearch
+http://www.google.com/search; style="font-size: 10px;">
+
+
+  
+  
+  
+  
+
+
+Sub Projectshttp://activemq.apache.org/artemis/;>Artemishttp://activemq.apache.org/apollo; title="ActiveMQ 
Apollo">Apollohttp://activemq.apache.org/cms/;>CMShttp://activemq.apache.org/nms/; title="NMS is the 
.Net Messaging API">NMShttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=36130;>CommunitySupportContributingDiscussion ForumsMailing ListsIRChttp://javabot.evanchooly.com/logs/%23apache-activemq/today; 
rel="nofollow">IRC LogSecurity AdvisoriesSitehttp://www.apache.org/foundation/sponsorship.html;>SponsorshipProjects Using 
ActiveMQUsersTeamThankshttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35883;>FeaturesAdvisory 
MessageClusteringCross Language ClientsEnterprise Integration 
PatternsJMXJMS to JMS BridgeMasterSlaveMessage GroupsNetworks of BrokersPerformancePersistenceSecurityVirtual DestinationsVisualisationMore ...https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=3616
 7">ConnectivityAjaxAMQPAxis and CXF SupportC IntegrationC++http://activemq.apache.org/nms/;>C# and .Net 
Integrationhttp://activemq.apache.org/cms/;>CMSJ2EEJBoss Integrationhttp://docs.codehaus.org/display/JETTY/Integrating+with+ActiveMQ; 
rel="nofollow">JettyJNDI 
SupportNMSRESTRSS and AtomSpring SupportStompTomcatUnix ServiceWebLogic IntegrationXMPPMore ...https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=71176;>Using ActiveMQ 5Getting StartedInitial Configuration<
 /a>Running a 
BrokerEmbedded 
BrokersCommand Line 
ToolsConfiguring 
TransportsExamplesWeb SamplesMonitoring the BrokerXml 
ConfigurationXml 
ReferenceMore 
...https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35912;>ToolsWeb ConsoleMaven2 
Performance Pluginhttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35919;>Supporthttp://issues.apache.org/jira/browse/AMQ;>Issueshttp://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:roadmap-panel;>Roadmaphttp://issues.apache.org/activemq/browse/AMQ?report=com.atlassian.jira.plugin.system.project:changelog-panel;>Change
 loghttps://cwiki.apache.org/confluence/pages/viewpage.action?pageId=35903;>Developers
 

svn commit: r1002498 [2/2] - in /websites/production/activemq/content: 2016/12/ 2016/12/09/ 2016/12/09/apache-activemq-5142-released.html activemq-5142-release.html cache/main.pageCache download.html

[buildbot]

Modified: websites/production/activemq/content/xml-reference.html
==
--- websites/production/activemq/content/xml-reference.html (original)
+++ websites/production/activemq/content/xml-reference.html Fri Dec  9 12:22:53 
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.14.2 Released

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon created a blog post 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Apache ActiveMQ 5.14.2 Released 
 
 
  
 
 
 
 
 
 
  The ActiveMQ team is pleased to announce the release of ActiveMQ 5.14.2   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

[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   
 
 
 XBean XML Reference 5.13.4  
  Reference   
  http://activemq.apache.org/schema/core/activemq-core-5.13.4.xsd   
  http://activemq.apache.org/schema/core   
 
 
 XBean XML Reference 5.14.0  
  Reference   
  

[CONF] Apache ActiveMQ > Index

[Christopher L. Shannon (Confluence)]

Title: Message Title



 
 
 
 
 
 
 

Christopher L. Shannon edited a page 
 
 
  
 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Index 
 
 
  
 
 
 
 
 
 
  Download ActiveMQ 5.14.  ...  2 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  
 
 
  
 
 
 
 
 
 
 
 
 

[CONF] Apache ActiveMQ > Download

[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.14.1 2 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