[activemq-website] branch master updated: Updating base URL

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new ece5c1a  Updating base URL
 new 7f43165  Merge pull request #5 from jbertram/master
ece5c1a is described below

commit ece5c1af72e59111987a01f41b895a0b4a1cab2b
Author: Justin Bertram 
AuthorDate: Tue Apr 2 13:56:30 2019 -0500

Updating base URL
---
 src/_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/_config.yml b/src/_config.yml
index c5fc492..de52fea 100644
--- a/src/_config.yml
+++ b/src/_config.yml
@@ -26,4 +26,4 @@ destination: site-content
 exclude: [BUILD.md, Gemfile*]
 keep_files: [.git]
 exclude: [vendor]
-baseurl: /activemq-website
+baseurl: .

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

2019-04-02 Thread Apache Jenkins Server 
See 


Changes:

[michael.andre.pearce] ARTEMIS-2292 - Fix queue level auto-delete for topic 
subscription queue

--
[...truncated 479.17 KB...]
Tests run: 5, Failures: 1, Errors: 4, Skipped: 0, Time elapsed: 52.328 sec <<< 
FAILURE! - in 
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManagerTest
shouldStartTwoIfTableNotExist(org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManagerTest)
  Time elapsed: 11.825 sec  <<< ERROR!
java.lang.Exception: test timed out after 1 milliseconds
at 
org.apache.derby.impl.sql.compile.OptimizerImpl.getNewCostEstimate(Unknown 
Source)
at org.apache.derby.impl.sql.compile.OptimizerImpl.getFinalCost(Unknown 
Source)
at 
org.apache.derby.impl.sql.compile.SelectNode.modifyAccessPaths(Unknown Source)
at 
org.apache.derby.impl.sql.compile.DMLStatementNode.optimizeStatement(Unknown 
Source)
at 
org.apache.derby.impl.sql.compile.CursorNode.optimizeStatement(Unknown Source)
at org.apache.derby.impl.sql.GenericStatement.prepMinion(Unknown Source)
at org.apache.derby.impl.sql.GenericStatement.prepare(Unknown Source)
at 
org.apache.derby.impl.sql.conn.GenericLanguageConnectionContext.prepareInternalStatement(Unknown
 Source)
at org.apache.derby.impl.jdbc.EmbedPreparedStatement.(Unknown 
Source)
at org.apache.derby.impl.jdbc.EmbedPreparedStatement42.(Unknown 
Source)
at org.apache.derby.jdbc.Driver42.newEmbedPreparedStatement(Unknown 
Source)
at org.apache.derby.impl.jdbc.EmbedConnection.prepareStatement(Unknown 
Source)
at org.apache.derby.impl.jdbc.EmbedConnection.prepareStatement(Unknown 
Source)
at 
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManager.prepareStatements(JdbcSharedStateManager.java:135)
at 
org.apache.activemq.artemis.jdbc.store.drivers.AbstractJDBCDriver.start(AbstractJDBCDriver.java:84)
at 
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManager.usingConnectionUrl(JdbcSharedStateManager.java:96)
at 
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManager.usingConnectionUrl(JdbcSharedStateManager.java:74)
at 
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManagerTest.createSharedStateManager(JdbcSharedStateManagerTest.java:52)
at 
org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManagerTest.shouldStartTwoIfTableNotExist(JdbcSharedStateManagerTest.java:98)

shouldStartIfTableNotExist(org.apache.activemq.artemis.core.server.impl.jdbc.JdbcSharedStateManagerTest)
  Time elapsed: 40.475 sec  <<< ERROR!
java.lang.Exception: test timed out after 1 milliseconds
at java.io.FileDescriptor.sync(Native Method)
at org.apache.derby.impl.io.DirRandomAccessFile.sync(Unknown Source)
at 
org.apache.derby.impl.store.raw.data.RAFContainer.writeRAFHeader(Unknown Source)
at org.apache.derby.impl.store.raw.data.RAFContainer.clean(Unknown 
Source)
at 
org.apache.derby.impl.services.cache.ConcurrentCache.cleanAndUnkeepEntry(Unknown
 Source)
at 
org.apache.derby.impl.services.cache.ConcurrentCache.cleanCache(Unknown Source)
at 
org.apache.derby.impl.services.cache.ConcurrentCache.cleanAll(Unknown Source)
at 
org.apache.derby.impl.store.raw.data.BaseDataFileFactory.checkpoint(Unknown 
Source)
at 
org.apache.derby.impl.store.raw.data.BaseDataFileFactory.createFinished(Unknown 
Source)
at org.apache.derby.impl.store.raw.RawStore.createFinished(Unknown 
Source)
at 
org.apache.derby.impl.store.access.RAMAccessManager.createFinished(Unknown 
Source)
at org.apache.derby.impl.db.BasicDatabase.createFinished(Unknown Source)
at org.apache.derby.impl.db.BasicDatabase.boot(Unknown Source)
at org.apache.derby.impl.services.monitor.BaseMonitor.boot(Unknown 
Source)
at org.apache.derby.impl.services.monitor.TopService.bootModule(Unknown 
Source)
at 
org.apache.derby.impl.services.monitor.BaseMonitor.bootService(Unknown Source)
at 
org.apache.derby.impl.services.monitor.BaseMonitor.createPersistentService(Unknown
 Source)
at 
org.apache.derby.impl.services.monitor.FileMonitor.createPersistentService(Unknown
 Source)
at 
org.apache.derby.iapi.services.monitor.Monitor.createPersistentService(Unknown 
Source)
at org.apache.derby.impl.jdbc.EmbedConnection.createDatabase(Unknown 
Source)
at org.apache.derby.impl.jdbc.EmbedConnection.(Unknown Source)
at org.apache.derby.jdbc.InternalDriver.getNewEmbedConnection(Unknown 
Source)
at org.apache.derby.jdbc.InternalDriver.connect(Unknown Source)
at org.apache.derby.jdbc.InternalDriver.connect(Unknown Source)
at org.apache.derby.jdbc.EmbeddedDriver.connect(Unknown

[activemq-artemis] branch master updated: ARTEMIS-2292 - Fix queue level auto-delete for topic subscription queue

2019-04-02 Thread michaelpearce 
This is an automated email from the ASF dual-hosted git repository.

michaelpearce pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new 369c429  ARTEMIS-2292 - Fix queue level auto-delete for topic 
subscription queue
 new d72e6e4  This closes #2604
369c429 is described below

commit 369c429d8a64fa952c4c3a5f4673606665110224
Author: Michael André Pearce 
AuthorDate: Tue Apr 2 19:04:43 2019 +0100

ARTEMIS-2292 - Fix queue level auto-delete for topic subscription queue

Adjust auto-delete defaults based on if queue autocreated
---
 .../artemis/api/config/ActiveMQDefaultConfiguration.java   | 10 ++
 .../impl/journal/codec/PersistentQueueBindingEncoding.java |  2 +-
 .../org/apache/activemq/artemis/core/server/QueueConfig.java   |  2 +-
 .../activemq/artemis/core/server/impl/QueueFactoryImpl.java|  2 +-
 .../apache/activemq/artemis/core/server/impl/QueueImpl.java|  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

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 acd586d..7ea952b 100644
--- 
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
@@ -509,6 +509,8 @@ public final class ActiveMQDefaultConfiguration {
 
public static final boolean DEFAULT_QUEUE_AUTO_DELETE = true;
 
+   public static final boolean DEFAULT_CREATED_QUEUE_AUTO_DELETE = false;
+
public static final long DEFAULT_QUEUE_AUTO_DELETE_DELAY = 0;
 
public static final long DEFAULT_QUEUE_AUTO_DELETE_MESSAGE_COUNT = 0;
@@ -1392,10 +1394,18 @@ public final class ActiveMQDefaultConfiguration {
   return DEFAULT_PURGE_ON_NO_CONSUMERS;
}
 
+   public static boolean getDefaultQueueAutoDelete(boolean autoCreated) {
+  return autoCreated ? getDefaultQueueAutoDelete() : 
getDefaultCreatedQueueAutoDelete();
+   }
+
public static boolean getDefaultQueueAutoDelete() {
   return DEFAULT_QUEUE_AUTO_DELETE;
}
 
+   public static boolean getDefaultCreatedQueueAutoDelete() {
+  return DEFAULT_CREATED_QUEUE_AUTO_DELETE;
+   }
+
public static long getDefaultQueueAutoDeleteDelay() {
   return DEFAULT_QUEUE_AUTO_DELETE_DELAY;
}
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
index b72ad7f..1e104c1 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
@@ -419,7 +419,7 @@ public class PersistentQueueBindingEncoding implements 
EncodingSupport, QueueBin
   if (buffer.readableBytes() > 0) {
  autoDelete = buffer.readBoolean();
   } else {
- autoDelete = ActiveMQDefaultConfiguration.getDefaultQueueAutoDelete();
+ autoDelete = 
ActiveMQDefaultConfiguration.getDefaultQueueAutoDelete(autoCreated);
   }
   if (buffer.readableBytes() > 0) {
  autoDeleteDelay = buffer.readLong();
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
index ebf332d..0d8e4da 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
@@ -104,7 +104,7 @@ public final class QueueConfig {
  this.delayBeforeDispatch = 
ActiveMQDefaultConfiguration.getDefaultDelayBeforeDispatch();
  this.groupRebalance = 
ActiveMQDefaultConfiguration.getDefaultGroupRebalance();
  this.groupBuckets = 
ActiveMQDefaultConfiguration.getDefaultGroupBuckets();
- this.autoDelete = 
ActiveMQDefaultConfiguration.getDefaultQueueAutoDelete();
+ this.autoDelete = 
ActiveMQDefaultConfiguration.getDefaultQueueAutoDelete(autoCreated);
  this.autoDeleteDelay = 
ActiveMQDefaultConfiguration.getDefaultQueueAutoDeleteDelay();
  this.autoDeleteMessageCount = 
ActiveMQDefaultConfiguration.getDefaultQueueAutoDeleteMessageCount();
  this.configurationManaged = false;
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java

[activemq-website] branch master updated: Fix Typos

2019-04-02 Thread cshannon 
This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 172850e  Fix Typos
172850e is described below

commit 172850e94e170ef129546c45f353d6ebdcf8cf22
Author: Christopher L. Shannon (cshannon) 
AuthorDate: Tue Apr 2 13:49:25 2019 -0400

Fix Typos
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9348e03..66a3ca5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Apache ActiveMQ Webiste
+Apache ActiveMQ Website
 ===
 
 This is the repository for the Apache ActiveMQ website, hosted at 
[activemq.apache.org](http://activemq.apache.org/).
@@ -15,7 +15,7 @@ files are taken from the `asf-site` branch and pushed to the 
live server.
 To Build the site
 -
 
-Before building the site you will need to install 
[Jekyll](https://jekyllrb.com/).  The Jekyll site has [installation 
isntructions](https://jekyllrb.com/docs/installation/) shuold help get you 
started.
+Before building the site you will need to install 
[Jekyll](https://jekyllrb.com/).  The Jekyll site has [installation 
instructions](https://jekyllrb.com/docs/installation/) shuold help get you 
started.
 
 3. run the build script ./build.sh

[activemq-website] branch asf-site created (now 92d302b)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at 92d302b  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new 92d302b  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

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

2019-04-02 Thread Apache Jenkins Server 
See 


Changes:

[clebertsuconic] NO-JIRA Fix test 
ReplicatedAsynchronousFailoverTest.testTransactional

[clebertsuconic] NO-JIRA Fixing markdown format in intercepting-operations.md

[clebertsuconic] ARTEMIS-2288 add remote IP to handshake timeout error

[clebertsuconic] NO-JIRA Avoid NPE during backup shutdown

[clebertsuconic] ARTEMIS-2286 AMQP to Core Conversion doesn't map routing type 
always

[michael.andre.pearce] ARTEMIS-2292 - Fix queue level auto-delete for topic 
subscription queue

--
[...truncated 1.15 MB...]
*¾Ñ~Ñ(
vϪuIšYE?§¨?ÚÈDŽN6زe?oj??ŸÛÿnüœº?Hì 
d¨Ð4F´A[ƒž:«?g·¬Ÿ?DvÄ÷*V?eéÐxê?øz¹Œ5Fâü£= 
?aýÔ©?0åÑ5%ó?N—+h¤?¶`.0¡›~0??§Â??ç%Î?O?_—ãGŒU³t-͎•8¦’_;qóºv+jz%’¨ïèÚadpQAŽóo²€ýÎ8uû‚Kz?\À??ÐiX²0—›b?ØޛXb
 ÐȀC´,·¢ë¾ÙJãšub}Ø*ò?jÅ$¤µË+ÚýÊáhÐ??)R>º¶¦(À 
ê‰Ë$¿Š2w«?Äe“€?29¥?½žõ¸¨ô?,giï]ÄÎþ6`üD$?x;$Y†v¨½ë?o?­]Rk‹²—Qɶ®=ÂP0>0!0 
??+¶Wgfh?ô??f?ÊD?Äd,?Ĉ??ËCB Îî):†f&ɗƒú>üÿ!´???† 

=
== File: 

=
0‚
)???0‚  â?  *†H†÷
??? ‚   Ó?‚ Ï0‚ Ë0‚?g?  *†H†÷
??? ‚?X?‚?T0‚?P0‚?L??*†H†÷
??
?? ‚?û0‚?÷0)?
*†H†÷
0???½/ 
DÛüo¶7?E\"Øê?Ò¶???ÃP?‚?ÈèÐF玀8§©òct¦$X„öCCâ?yï5?Q?‡?ÀcKÖ??§ÐLù²ÅŸûÑ??˜eÛ~w†ÛÆk?Yîwuú#°KSï:8¨ß¾uv9CGö?FV5bŸ?\’°Õ¨e$VCŸÜÄ??¼Àç?®SÝ{ž?|à?7AÈ4±?éÃCi?°¯n¾µŒÖÍP
 oßá=`0tœuê9?ó®rê÷ˆFÞ?%äþV7ÁîKüHíí—ÀP?ï
å?CŽ¶f?ÿØÌúށu¤ÖAéuèoXç˜Í1?9UE}·€ù:·O™‰ó»ÊKž¸?‘?ÀBG?{X@kòËÕº;O?Y|WA†Î§?° 
‰ŽÀBsî`"d?„öŒ³?þ^–·ÂÁò?ý?¥ñJ쉝1êÅ°´žë¥`Ĭ‰št€3÷õ‹Þ€½Û®zfœòbÅ¡«7O•¥BÚ×#ÑÙÑ?êÇ?“.¿??&?÷L'ó/Þ?,?W¹+Ÿ`?Ï{֒S¸3Ÿç?ÝÐ@?Õ¿U¸=î?#Y†AÁu-zãúµn¥¸??75µ?7mûíG)1À?X?!n>)¶¿b#n—$QòŠùÙ-⽕¸Œ:èñ?¹(OÖ?Ž`:ýñÏ_
…ÅŽ?.Öú½Y4N…
¥çÍ?p¼6g»ÉKzå?Ö?q?ƒ'L>çï?=Ovx™¦™ºX¨ŸÎèx©¤Gä—?W(ãX®€¼Fð$/Š—?Ý>??„¼ˆ?z"ùø‚ÙzæRAâV?9j‘÷µš?¯)?B4(ý:ä÷Pƒ'‡ÛéTLBtš^GuõX?‡?Æ»Š?E¸5s–éôh¾0??*†H†÷
?   ?1??
?m?y?k?e?y0!?   *†H†÷
?   ?1???Time 15270966159850‚?\?*†H†÷
??? ‚?M0‚?I???0‚?B? *†H†÷
???0)?
*†H†÷
0???9?`fPˆ¬IM›Å
Ä?Ê÷Q”‡Ç???ÃP€‚??m¾WÇ
^’[â8?l€0_z¸0TÐԝò9o?£H?€÷öªÚ?ºÉ?ÆÇ+˘½?=ðcå%Q#~0ääþiwOÿvgAïæú?sò†1;`U(?cñøñ+>üùD?Sk?Ëöä?ËSöp?”±¼$÷qd?kÂ?0?8`?Êe?V?ËÛ²ÄP?æÕ???›ðîñµ½`?ˆ,hþj¦û[”T?5ü“öØ·n7äNŸþÁ»ÀF5NÉlZáŨñ©¬?€ÁSë'œ?6yX?z"£àüÑñeÞ÷m???¯wSü®g©?DX?5Ê]?¥?1y?n
²¶÷0!0
??+u?é?É?áڅ¨ú?¢4ºÝbκ??¯?ƒƒÄ?õ?›2?¿–3[Ž?Ú»#???† 

=
== File: 

=
0‚?†???0‚???*†H†÷
??? ‚?0?‚?,0‚?(0‚?$?*†H†÷
??? ‚??0‚?0‚?
?   *†H†÷
???0)?
*†H†÷
0???8,?¿¹lÓ;°hXš.j·¡Û.À7???ÃP€‚?Ъ24zÅi‚ H±?u¡zåûH>pæÇôj?¦? 
Š"Èò(?Á|Ê&$rö1~ñ ì×W?÷
»??N½^@éÙvVEËÓwÍ?'?éÛbpãu?ÿ‚X?z¡xܝ€‘4=6?5'´6X%ŽÇ?™¦“S4¼òKhüèή×ÀÝ%m`×òí¦dŠ?Ì9
…`,4gêÆk늶ÐRˆ?lyݜF÷#š´ 
"YvîÌ`äùñ4?­®ñúL™ÛÊ!æV{v?2>ÛBL?tÖUŸpÁœøž*+fDÖ?iŠ?ÄI«Mп'W&:§??Ðt÷?v¢í…
½?†ã>Ã?Y×ómüO?¥)³êEŽ¸ê»Ø?
gìZs}.»‰'6ò¡àU?و?ªtÀÖù²?Þ÷??@«õ«¸@§?RòçÎ9(çQ?þv?'ê?¼–Yú?'Ðû×ê§ÀáÉv6¹êM‘å¥O·—2Ñ]™4ß+ëŒ?OŸAwŒ?ö)‚Xt
 ?›éf’]É?!.&ÁTS𙠳&¡Y 
ÕgLƒˆm?™—¢q×m8I?þ—¢ÏØm??oå]ÙÉѾ=ª]d›?tpçëˆ#©ÚÑàH+Æã¥éhaÁ‘$ñ?¬=??e—Ÿ?…Ms 
àÓ¤X›K#0>0!0 ??+?8ÔôÑ?ÉÚºûëÕ¤ HTê?Ÿ??¡Þ…
ßü…H܌àËð„„>† 

=
== File: 

=
0‚
0‚  Ò?  *†H†÷
??? ‚   Ã?‚ ¿0‚ »0‚?g?  *†H†÷
??? ‚?X?‚?T0‚?P0‚?L??*†H†÷
??
?? ‚?û0‚?÷0)?
*†H†÷
0???5?“s?Lù‹nbáQ%ÔÍ?£?á???ÃP?‚?È}‡N%M/5fє?D¹-™ÝîUÈy©? QÔÜ
lÿçtÂãn@u‚ùÁù×2V{ ™Þ–ÅÉÁò,áf6…î´ðÞ!á?ƒ>íô Þ>‡ïßv’Î?<)ˆû>?i&§Æ¡„ÐÆU}O?‡É¡©„
Æôɐ*®‹Õß?U?ÛÓ´"UûMØ–?i¼$þ@Õe®?±m?kâAFW>¦þIº??¬õè?h"Ü?ƒb¥&»%yÈúÔ?Q?ë2Ñ%¦Ô†Çµ\?&
ò@è¤÷mfjÏÒ«]=‰É
?—?–÷ìµxůxkB?û™¥?2?‹¤?GØÞu_
-tëL±BO³,?Àé¥??ˤ`î˜í2Ôu‹?]a!u
o?Fø\ÂÐÏ?e³
·+¨??¸dn?6“?ƒxÄ??­0½x??.Um?Ø"Â
8?Ë4_??è@??:³ßühdðº¶6æ±?‹‰RÐ^Ÿîò˦g–3ñÌ,»aô녰œúpé4Tq²I‡i<â\?2?˜?˜??”ªdxþàb
iRc•|Œ¸wšV?©úœµf
9]?p¸?橀ß#¿î|&›¸2BCÒ%!¡??dK½î™»­??0ûP?³¼?„´3Ñ"?wR¤Ek[Ô脚.¤‰(Ä|]?ô?’^­ÏèWñ&Üxç´:´”?Õ
   
Í"ŽI–"ô|ýéÞ·;µ•Ô}¹??2F?(à²z[Ž‰Pcͼ?z¸`?Cž¡àKn?Lተ¢Í?~Ä?z×6÷áW¶??³?މø"fm3û(?K*ÏcWÅÒwÍé´Wؖ?-§uL?¥b_à@s&؛eÞ?G?04ÿ'°œ?aÄgq!¥È?à¸ñ¡?'`÷¢-*?d÷‹½ßÒ¦"Š‹AoÛ»¢)l+ýº’?•:mÓ¶d’»??º7i±´º¢¯N¯u,??äÓfw?¸ûÉ?8d毿uÿ4?®Šr­/X?;wø²Í'W÷SM4æчԥÍÏTG¦‚’w[?"•mÁm¸îŠB°Œs\¢^ë?Äk?Ì}?3'Ô°“˜¤§{ÑMX©ŒY0Y8·ÙÏmÞñ
 þ???¿·
Ê?4`ÒĹH±X«„‘ÀãíŽóóÚçe•õ4õ¥
XÊÔ?֗Wx?x-¨š[@·ù°Õ{T k>&˜˜‚n"?ďÇƼ’N„üD=¸wÊ才Ç?•} ý݅
vzœ{?$K@M?Þßî¾Á?‚Rž?É»tý2m´A²eÀ$.F?þ›._-?ï“?f†?%cZšY?þ9%)b…k¢g™ß1>0?? *†H†÷
?   ?1??
?m?y?k?e?y0!?   *†H†÷
?   ?1???Time 15270978378910‚?L?*†H†÷
??? ‚?=0‚?9???0‚?2? *†H†÷
???0)?
*†H†÷
0???’M©o©?›k?³?ÂщÀ?xc?ü¥f1??+4†^Á×¥?ã³?Â\ò?áý³ÓÅ?Ìãþ„u'é??㫝õ¹ÉO¹¥

[activemq-website] branch asf-site deleted (was acc7f15)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


 was acc7f15  from c88f6f932138648b611c1b83296748c8c6343c34

This change permanently discards the following revisions:

 discard acc7f15  from c88f6f932138648b611c1b83296748c8c6343c34

[activemq-website] branch asf-site created (now acc7f15)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at acc7f15  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new acc7f15  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[activemq-website] branch asf-site deleted (was d8a8636)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


 was d8a8636  from c88f6f932138648b611c1b83296748c8c6343c34

This change permanently discards the following revisions:

 discard d8a8636  from c88f6f932138648b611c1b83296748c8c6343c34

[activemq-website] branch asf-site created (now d8a8636)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at d8a8636  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new d8a8636  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[activemq-website] branch asf-site created (now cfe9a07)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at cfe9a07  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new cfe9a07  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[activemq-website] branch asf-site deleted (was c4ee7fd)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


 was c4ee7fd  from c88f6f932138648b611c1b83296748c8c6343c34

This change permanently discards the following revisions:

 discard c4ee7fd  from c88f6f932138648b611c1b83296748c8c6343c34

[activemq-website] branch asf-site created (now c4ee7fd)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at c4ee7fd  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new c4ee7fd  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[activemq-website] branch asf-site deleted (was e77626f)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


 was e77626f  from c88f6f932138648b611c1b83296748c8c6343c34

This change permanently discards the following revisions:

 discard e77626f  from c88f6f932138648b611c1b83296748c8c6343c34

[activemq-website] branch asf-site created (now e77626f)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at e77626f  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new e77626f  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[activemq-website] branch asf-site deleted (was 788b10d)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


 was 788b10d  from c88f6f932138648b611c1b83296748c8c6343c34

This change permanently discards the following revisions:

 discard 788b10d  from c88f6f932138648b611c1b83296748c8c6343c34

[activemq-artemis] branch master updated: ARTEMIS-2292 - Fix queue level auto-delete for topic subscription queue

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new 0df9205  ARTEMIS-2292 - Fix queue level auto-delete for topic 
subscription queue
 new 5b0a795  This closes #2603
0df9205 is described below

commit 0df9205aca1686d3b827ee64b5553e72bfd486b7
Author: Michael André Pearce 
AuthorDate: Tue Apr 2 16:28:47 2019 +0100

ARTEMIS-2292 - Fix queue level auto-delete for topic subscription queue

Additional bits missed
---
 .../activemq/artemis/core/server/impl/ActiveMQServerImpl.java  |  2 +-
 .../activemq/artemis/core/server/impl/ServerSessionImpl.java   | 10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

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 0009f1e..7e8f3a3 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
@@ -1774,7 +1774,7 @@ public class ActiveMQServerImpl implements ActiveMQServer 
{
   return createQueue(addressInfo, queueName, filter, user, durable, 
temporary, false, false, autoCreated, maxConsumers, purgeOnNoConsumers, 
exclusive, groupRebalance, groupBuckets, lastValue, lastValueKey, 
nonDestructive, consumersBeforeDispatch, delayBeforeDispatch, autoDelete, 
autoDeleteDelay, autoDeleteMessageCount, autoCreateAddress, false);
}
 
-   private static boolean isAutoDelete(boolean autoCreated, AddressSettings 
addressSettings) {
+   static boolean isAutoDelete(boolean autoCreated, AddressSettings 
addressSettings) {
   return autoCreated ? addressSettings.isAutoDeleteQueues() : 
addressSettings.isAutoDeleteCreatedQueues();
}
 
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 9c5ceeb..ec1c79d 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
@@ -614,7 +614,7 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
@Override
public Queue createQueue(AddressInfo addressInfo, SimpleString name, 
SimpleString filterString, boolean temporary, boolean durable) throws Exception 
{
   AddressSettings as = 
server.getAddressSettingsRepository().getMatch(addressInfo.getName().toString());
-  return createQueue(addressInfo, name, filterString, temporary, durable, 
as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), 
as.isDefaultExclusiveQueue(), as.isDefaultGroupRebalance(), 
as.getDefaultGroupBuckets(), as.isDefaultLastValueQueue(), 
as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), 
as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), 
as.isAutoDeleteQueues(), as.getAutoDeleteQueuesDelay(), 
as.getAutoDeleteQueuesMessageCount(), false);
+  return createQueue(addressInfo, name, filterString, temporary, durable, 
as.getDefaultMaxConsumers(), as.isDefaultPurgeOnNoConsumers(), 
as.isDefaultExclusiveQueue(), as.isDefaultGroupRebalance(), 
as.getDefaultGroupBuckets(), as.isDefaultLastValueQueue(), 
as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), 
as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), 
ActiveMQServerImpl.isAutoDelete(false, as), as.getAutoDeleteQueuesDelay(), 
as.getAutoDeleteQueues [...]
}
 
public Queue createQueue(final AddressInfo addressInfo,
@@ -700,7 +700,7 @@ public class ServerSessionImpl implements ServerSession, 
FailureListener {
 final boolean purgeOnNoConsumers,
 final boolean autoCreated) throws Exception {
   AddressSettings as = 
server.getAddressSettingsRepository().getMatch(address.toString());
-  return createQueue(new AddressInfo(address, routingType), name, 
filterString, temporary, durable, maxConsumers, purgeOnNoConsumers, 
as.isDefaultExclusiveQueue(), as.isDefaultGroupRebalance(), 
as.getDefaultGroupBuckets(), as.isDefaultLastValueQueue(), 
as.getDefaultLastValueKey(), as.isDefaultNonDestructive(), 
as.getDefaultConsumersBeforeDispatch(), as.getDefaultDelayBeforeDispatch(), 
as.isAutoDeleteQueues(), as.getAutoDeleteQueuesDelay(), 
as.getAutoDeleteQueuesMessageCount(), autoCreated);
+  return createQueue(new AddressInfo(address, routingType), name, 
filterString, temporary, durable, maxConsumers, purgeOnNoConsumers, 
as.isDefaultExclusiveQueue(),

[activemq-website] branch asf-site created (now 788b10d)

2019-04-02 Thread jbertram 
This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/activemq-website.git.


  at 788b10d  from c88f6f932138648b611c1b83296748c8c6343c34

This branch includes the following new commits:

 new 788b10d  from c88f6f932138648b611c1b83296748c8c6343c34

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[activemq-artemis] branch master updated: ARTEMIS-2286 AMQP to Core Conversion doesn't map routing type always

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new d9b3d0f  ARTEMIS-2286 AMQP to Core Conversion doesn't map routing type 
always
 new f62bfba  This closes #2594
d9b3d0f is described below

commit d9b3d0fe4c68879b8a28d039eddc001ec20d0c24
Author: Michael André Pearce 
AuthorDate: Wed Mar 27 15:56:46 2019 +

ARTEMIS-2286 AMQP to Core Conversion doesn't map routing type always

Add test that exhibits the issue when sending AMQP (non JMS) to Artemis 
that one mapping to Core JMS the destination is not resolving as the 
RoutingType can be missing.
Add fix.
---
 .../jms/client/ActiveMQMessageConsumer.java|  4 ++
 .../artemis/protocol/amqp/broker/AMQPMessage.java  |  6 +-
 .../protocol/amqp/converter/AmqpCoreConverter.java |  1 +
 .../integration/amqp/AmqpMessageRoutingTest.java   | 69 ++
 .../integration/amqp/JMSMessageTypesTest.java  |  4 +-
 5 files changed, 79 insertions(+), 5 deletions(-)

diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
index dac8e57..86c808c 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
@@ -28,6 +28,7 @@ import javax.jms.TopicSubscriber;
 
 import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
+import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.api.core.client.ClientConsumer;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
@@ -220,6 +221,9 @@ public final class ActiveMQMessageConsumer implements 
QueueReceiver, TopicSubscr
ackMode == ActiveMQJMSConstants.INDIVIDUAL_ACKNOWLEDGE ||
coreMessage.getType() == ActiveMQObjectMessage.TYPE;
 
+if (coreMessage.getRoutingType() == null) {
+   coreMessage.setRoutingType(destination.isQueue() ? 
RoutingType.ANYCAST : RoutingType.MULTICAST);
+}
 if (session.isEnable1xPrefixes()) {
jmsMsg = ActiveMQCompatibleMessage.createMessage(coreMessage, 
needSession ? coreSession : null, options);
 } else {
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 66e1d24..a122d7b 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -1097,13 +1097,13 @@ public class AMQPMessage extends RefCountMessage {
   Object routingType = 
getMessageAnnotation(AMQPMessageSupport.ROUTING_TYPE);
 
   if (routingType != null) {
- return RoutingType.getType((byte) routingType);
+ return RoutingType.getType(((Number) routingType).byteValue());
   } else {
  routingType = 
getMessageAnnotation(AMQPMessageSupport.JMS_DEST_TYPE_MSG_ANNOTATION);
  if (routingType != null) {
-if (AMQPMessageSupport.QUEUE_TYPE == (byte) routingType || 
AMQPMessageSupport.TEMP_QUEUE_TYPE == (byte) routingType) {
+if (AMQPMessageSupport.QUEUE_TYPE == ((Number) 
routingType).byteValue() || AMQPMessageSupport.TEMP_QUEUE_TYPE == ((Number) 
routingType).byteValue()) {
return RoutingType.ANYCAST;
-} else if (AMQPMessageSupport.TOPIC_TYPE == (byte) routingType || 
AMQPMessageSupport.TEMP_TOPIC_TYPE == (byte) routingType) {
+} else if (AMQPMessageSupport.TOPIC_TYPE == ((Number) 
routingType).byteValue() || AMQPMessageSupport.TEMP_TOPIC_TYPE == ((Number) 
routingType).byteValue()) {
return RoutingType.MULTICAST;
 }
  } else {
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
index 17ec6a2..8e854ab 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AmqpCoreConverter.java
+++

[activemq-artemis] branch master updated: NO-JIRA Avoid NPE during backup shutdown

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new 375f383  NO-JIRA Avoid NPE during backup shutdown
 new 8b3eeaf  This closes #2596
375f383 is described below

commit 375f383e90306f768350003be6c83796b54a8cf0
Author: Howard Gao 
AuthorDate: Fri Mar 29 16:02:53 2019 +0800

NO-JIRA Avoid NPE during backup shutdown

When a backup starts without a live, it's nodeID is null.
Added a null check in ClusterConnection's stop() to avoid
NPE if it's shut down.
---
 .../artemis/core/server/cluster/impl/ClusterConnectionImpl.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index aa68b81..1950418 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -439,7 +439,9 @@ public final class ClusterConnectionImpl implements 
ClusterConnection, AfterConn
   if (managementService != null) {
  TypedProperties props = new TypedProperties();
  props.putSimpleStringProperty(new SimpleString("name"), name);
- Notification notification = new 
Notification(nodeManager.getNodeId().toString(), 
CoreNotificationType.CLUSTER_CONNECTION_STOPPED, props);
+ //nodeID can be null if there's only a backup
+ SimpleString nodeId = nodeManager.getNodeId();
+ Notification notification = new Notification(nodeId == null ? null : 
nodeId.toString(), CoreNotificationType.CLUSTER_CONNECTION_STOPPED, props);
  managementService.sendNotification(notification);
   }
   executor.execute(new Runnable() {

[activemq-artemis] branch master updated: ARTEMIS-2288 add remote IP to handshake timeout error

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new d2dc04c  ARTEMIS-2288 add remote IP to handshake timeout error
 new 54cfeed  This closes #2595
d2dc04c is described below

commit d2dc04c712716142de8c27c7b879e22ae257186a
Author: Justin Bertram 
AuthorDate: Wed Mar 27 12:00:04 2019 -0500

ARTEMIS-2288 add remote IP to handshake timeout error
---
 .../org/apache/activemq/artemis/core/protocol/ProtocolHandler.java| 2 +-
 .../org/apache/activemq/artemis/core/server/ActiveMQServerLogger.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
index e68e814..387e9e6 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
@@ -116,7 +116,7 @@ public class ProtocolHandler {
   public void channelActive(ChannelHandlerContext ctx) throws Exception {
  if (handshakeTimeout > 0) {
 timeoutFuture = scheduledThreadPool.schedule( () -> {
-   ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout);
+   ActiveMQServerLogger.LOGGER.handshakeTimeout(handshakeTimeout, 
ctx.channel().remoteAddress().toString());
ctx.channel().close();
 }, handshakeTimeout, TimeUnit.SECONDS);
  }
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 9ed1419..a8e9e3d 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
@@ -1960,8 +1960,8 @@ public interface ActiveMQServerLogger extends BasicLogger 
{
void errorAnnouncingBackup(String backupManager);
 
@LogMessage(level = Logger.Level.ERROR)
-   @Message(id = 224088, value = "Timeout ({0} seconds) while handshaking has 
occurred.", format = Message.Format.MESSAGE_FORMAT)
-   void handshakeTimeout(int timeout);
+   @Message(id = 224088, value = "Timeout ({0} seconds) while handshaking with 
{1} has occurred.", format = Message.Format.MESSAGE_FORMAT)
+   void handshakeTimeout(int timeout, String remoteAddress);
 
@LogMessage(level = Logger.Level.WARN)
@Message(id = 224089, value = "Failed to calculate persistent size", format 
= Message.Format.MESSAGE_FORMAT)

[activemq-artemis] branch master updated: NO-JIRA Fixing markdown format in intercepting-operations.md

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new eb177fd  NO-JIRA Fixing markdown format in intercepting-operations.md
 new 02c0283  This closes #2599
eb177fd is described below

commit eb177fde905e3c7e3540e8f280961f46af670d27
Author: Jiří Daněk 
AuthorDate: Sat Mar 30 17:52:29 2019 +0100

NO-JIRA Fixing markdown format in intercepting-operations.md

Both the old and new versions render OK on GitHub, but on
https://activemq.apache.org/artemis/docs/latest/intercepting-operations.html
the old version was not parsed correctly, as can be now seen.
---
 docs/user-manual/en/intercepting-operations.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/user-manual/en/intercepting-operations.md 
b/docs/user-manual/en/intercepting-operations.md
index 43e186d..b8caab3 100644
--- a/docs/user-manual/en/intercepting-operations.md
+++ b/docs/user-manual/en/intercepting-operations.md
@@ -37,7 +37,8 @@ public interface StompFrameInterceptor extends 
BaseInterceptor
 Likewise for MQTT protocol, an interceptor must implement the interface
 `MQTTInterceptor`:
  
-```java package org.apache.activemq.artemis.core.protocol.mqtt;
+```java
+package org.apache.activemq.artemis.core.protocol.mqtt;
 
 public interface MQTTInterceptor extends BaseInterceptor
 {

[activemq-artemis] branch master updated: NO-JIRA Fix test ReplicatedAsynchronousFailoverTest.testTransactional

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new a68c661  NO-JIRA Fix test 
ReplicatedAsynchronousFailoverTest.testTransactional
 new 4af2fe4  This closes #2601
a68c661 is described below

commit a68c661944bccad4296db4b1bb85a39472e0320e
Author: Howard Gao 
AuthorDate: Tue Apr 2 12:58:32 2019 +0800

NO-JIRA Fix test ReplicatedAsynchronousFailoverTest.testTransactional

Fix random failures.
---
 .../cluster/failover/AsynchronousFailoverTest.java | 64 +++---
 .../cluster/util/SameProcessActiveMQServer.java| 15 -
 2 files changed, 69 insertions(+), 10 deletions(-)

diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
index cc8a021..82b6286 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/AsynchronousFailoverTest.java
@@ -20,8 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import 
org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException;
 import org.apache.activemq.artemis.api.core.ActiveMQDuplicateIdException;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQObjectClosedException;
 import 
org.apache.activemq.artemis.api.core.ActiveMQTransactionOutcomeUnknownException;
 import 
org.apache.activemq.artemis.api.core.ActiveMQTransactionRolledBackException;
 import org.apache.activemq.artemis.api.core.ActiveMQUnBlockedException;
@@ -137,7 +139,9 @@ public class AsynchronousFailoverTest extends 
FailoverTestBase {
   try {
  for (int i = 0; i < numIts; i++) {
 AsynchronousFailoverTest.log.info("Iteration " + i);
-ServerLocator locator = 
getServerLocator().setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setReconnectAttempts(15).setConfirmationWindowSize(10
 * 1024 * 1024);
+//set block timeout to 10 sec to reduce test time.
+ServerLocator locator = 
getServerLocator().setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setReconnectAttempts(30).setRetryInterval(100).setConfirmationWindowSize(10
 * 1024 * 1024).setCallTimeout(1).setCallFailoverTimeout(1);
+
 sf = createSessionFactoryAndWaitForTopology(locator, 2);
 try {
 
@@ -180,7 +184,7 @@ public class AsynchronousFailoverTest extends 
FailoverTestBase {
 
AsynchronousFailoverTest.log.info("Fail complete");
 
-   t.join(TimeUnit.SECONDS.toMillis(60));
+   t.join(TimeUnit.SECONDS.toMillis(120));
if (t.isAlive()) {
   System.out.println(threadDump("Thread still running from the 
test"));
   t.interrupt();
@@ -331,12 +335,29 @@ public class AsynchronousFailoverTest extends 
FailoverTestBase {
 
 final int numMessages = 1000;
 
-session = sf.createSession(false, false);
+int retryCreateSession = 4;
+//session creation may fail in the middle of failover
+while (session == null) {
+   try {
+  //if autoCommitSends is false, send will be non-blocking
+  session = sf.createSession(true, false);
+   } catch (ActiveMQException e) {
+  if (retryCreateSession == 0) {
+ throw e;
+  }
+  retryCreateSession--;
+  Thread.sleep(2000);
+   }
+}
 
 listener = new CountDownSessionFailureListener(session);
 session.addFailureListener(listener);
 
 do {
+   if (runner.isFailed()) {
+  //test ends, return
+  return;
+   }
try {
   ClientProducer producer = 
session.createProducer(FailoverTestBase.ADDRESS);
 
@@ -379,6 +400,16 @@ public class AsynchronousFailoverTest extends 
FailoverTestBase {
   log.info("#test transaction rollback retrying on sending");
   // OK
   retry = true;
+   } catch (ActiveMQObjectClosedException closedException) {
+  log.info("#test producer closed, retrying on sending...");
+  Thread.sleep(2000);
+  // OK
+  retry = true;
+   } catch (ActiveMQConnectionTimedOutException

[activemq-artemis] branch master updated: ARTEMIS-2292 - Fix queue level auto-delete for topic subscription queue

2019-04-02 Thread clebertsuconic 
This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new c4fce10  ARTEMIS-2292 - Fix queue level auto-delete for topic 
subscription queue
 new 71ec3c6  This closes #2602
c4fce10 is described below

commit c4fce10fac380c019c63d38eb9090d1628937da5
Author: Michael André Pearce 
AuthorDate: Tue Apr 2 08:29:40 2019 +0100

ARTEMIS-2292 - Fix queue level auto-delete for topic subscription queue
---
 .../deployers/impl/FileConfigurationParser.java|   4 +
 .../management/impl/ActiveMQServerControlImpl.java |   2 +-
 .../core/postoffice/impl/PostOfficeImpl.java   |   2 +-
 .../core/server/impl/ActiveMQServerImpl.java   |  18 +--
 .../artemis/core/server/impl/QueueManagerImpl.java |   8 +-
 .../core/server/impl/ServerSessionImpl.java|   2 +-
 .../core/settings/impl/AddressSettings.java|  34 +-
 .../resources/schema/artemis-configuration.xsd |   8 ++
 docs/user-manual/en/address-model.md   |   6 +
 docs/user-manual/en/configuration-index.md |   1 +
 .../jms/client/QueueAutoDeleteTest.java| 121 +
 11 files changed, 190 insertions(+), 16 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index 0a838cb..ffd598d 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -222,6 +222,8 @@ public final class FileConfigurationParser extends 
XMLConfigurationUtil {
 
private static final String AUTO_DELETE_QUEUES = "auto-delete-queues";
 
+   private static final String AUTO_DELETE_CREATED_QUEUES = 
"auto-delete-created-queues";
+
private static final String AUTO_DELETE_QUEUES_DELAY = 
"auto-delete-queues-delay";
 
private static final String AUTO_DELETE_QUEUES_MESSAGE_COUNT = 
"auto-delete-queues-message-count";
@@ -1074,6 +1076,8 @@ public final class FileConfigurationParser extends 
XMLConfigurationUtil {
 addressSettings.setAutoCreateQueues(XMLUtil.parseBoolean(child));
  } else if (AUTO_DELETE_QUEUES.equalsIgnoreCase(name)) {
 addressSettings.setAutoDeleteQueues(XMLUtil.parseBoolean(child));
+ } else if (AUTO_DELETE_CREATED_QUEUES.equalsIgnoreCase(name)) {
+
addressSettings.setAutoDeleteCreatedQueues(XMLUtil.parseBoolean(child));
  } else if (AUTO_DELETE_QUEUES_DELAY.equalsIgnoreCase(name)) {
 long autoDeleteQueuesDelay = XMLUtil.parseLong(child);
 Validators.GE_ZERO.validate(AUTO_DELETE_QUEUES_DELAY, 
autoDeleteQueuesDelay);
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 917b18c..d14a358 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
@@ -955,7 +955,7 @@ public class ActiveMQServerControlImpl extends 
AbstractControl implements Active
   addressSettings.isDefaultNonDestructive(),
   addressSettings.getDefaultConsumersBeforeDispatch(),
   addressSettings.getDefaultDelayBeforeDispatch(),
-  addressSettings.isAutoDeleteQueues(),
+  addressSettings.isAutoDeleteCreatedQueues(),
   addressSettings.getAutoDeleteQueuesDelay(),
   addressSettings.getAutoDeleteQueuesMessageCount(),
   autoCreateAddress
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 671d4f0..5425c1b 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
@@ -1582,7 +1582,7 @@ public class PostOfficeImpl implements PostOffice, 
NotificationListener, Binding
   public void run() {
  for (Queue queue : getLocalQueues()) {
 if (!queue.isInternalQueue() && 
QueueManagerImpl.isAutoDelete(queue) && 
QueueManagerImpl.consumerCountCheck(queue) && 
QueueManagerImpl.delayCheck(queue) && 
QueueManagerImpl.messageCountCheck(queue)) {
-

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

2019-04-02 Thread Apache Jenkins Server 
See 


Changes:

[howard.gao] ARTEMIS-2289 SUBSCRIBE w/receipt returns 2 receipt-ids

--
[...truncated 1.20 MB...]
*¾Ñ~Ñ(
vϪuIšYE?§¨?ÚÈDŽN6زe?oj??ŸÛÿnüœº?Hì 
d¨Ð4F´A[ƒž:«?g·¬Ÿ?DvÄ÷*V?eéÐxê?øz¹Œ5Fâü£= 
?aýÔ©?0åÑ5%ó?N—+h¤?¶`.0¡›~0??§Â??ç%Î?O?_—ãGŒU³t-͎•8¦’_;qóºv+jz%’¨ïèÚadpQAŽóo²€ýÎ8uû‚Kz?\À??ÐiX²0—›b?ØޛXb
 ÐȀC´,·¢ë¾ÙJãšub}Ø*ò?jÅ$¤µË+ÚýÊáhÐ??)R>º¶¦(À 
ê‰Ë$¿Š2w«?Äe“€?29¥?½žõ¸¨ô?,giï]ÄÎþ6`üD$?x;$Y†v¨½ë?o?­]Rk‹²—Qɶ®=ÂP0>0!0 
??+¶Wgfh?ô??f?ÊD?Äd,?Ĉ??ËCB Îî):†f&ɗƒú>üÿ!´???† 

=
== File: 

=
0‚
)???0‚  â?  *†H†÷
??? ‚   Ó?‚ Ï0‚ Ë0‚?g?  *†H†÷
??? ‚?X?‚?T0‚?P0‚?L??*†H†÷
??
?? ‚?û0‚?÷0)?
*†H†÷
0???½/ 
DÛüo¶7?E\"Øê?Ò¶???ÃP?‚?ÈèÐF玀8§©òct¦$X„öCCâ?yï5?Q?‡?ÀcKÖ??§ÐLù²ÅŸûÑ??˜eÛ~w†ÛÆk?Yîwuú#°KSï:8¨ß¾uv9CGö?FV5bŸ?\’°Õ¨e$VCŸÜÄ??¼Àç?®SÝ{ž?|à?7AÈ4±?éÃCi?°¯n¾µŒÖÍP
 oßá=`0tœuê9?ó®rê÷ˆFÞ?%äþV7ÁîKüHíí—ÀP?ï
å?CŽ¶f?ÿØÌúށu¤ÖAéuèoXç˜Í1?9UE}·€ù:·O™‰ó»ÊKž¸?‘?ÀBG?{X@kòËÕº;O?Y|WA†Î§?° 
‰ŽÀBsî`"d?„öŒ³?þ^–·ÂÁò?ý?¥ñJ쉝1êÅ°´žë¥`Ĭ‰št€3÷õ‹Þ€½Û®zfœòbÅ¡«7O•¥BÚ×#ÑÙÑ?êÇ?“.¿??&?÷L'ó/Þ?,?W¹+Ÿ`?Ï{֒S¸3Ÿç?ÝÐ@?Õ¿U¸=î?#Y†AÁu-zãúµn¥¸??75µ?7mûíG)1À?X?!n>)¶¿b#n—$QòŠùÙ-⽕¸Œ:èñ?¹(OÖ?Ž`:ýñÏ_
…ÅŽ?.Öú½Y4N…
¥çÍ?p¼6g»ÉKzå?Ö?q?ƒ'L>çï?=Ovx™¦™ºX¨ŸÎèx©¤Gä—?W(ãX®€¼Fð$/Š—?Ý>??„¼ˆ?z"ùø‚ÙzæRAâV?9j‘÷µš?¯)?B4(ý:ä÷Pƒ'‡ÛéTLBtš^GuõX?‡?Æ»Š?E¸5s–éôh¾0??*†H†÷
?   ?1??
?m?y?k?e?y0!?   *†H†÷
?   ?1???Time 15270966159850‚?\?*†H†÷
??? ‚?M0‚?I???0‚?B? *†H†÷
???0)?
*†H†÷
0???9?`fPˆ¬IM›Å
Ä?Ê÷Q”‡Ç???ÃP€‚??m¾WÇ
^’[â8?l€0_z¸0TÐԝò9o?£H?€÷öªÚ?ºÉ?ÆÇ+˘½?=ðcå%Q#~0ääþiwOÿvgAïæú?sò†1;`U(?cñøñ+>üùD?Sk?Ëöä?ËSöp?”±¼$÷qd?kÂ?0?8`?Êe?V?ËÛ²ÄP?æÕ???›ðîñµ½`?ˆ,hþj¦û[”T?5ü“öØ·n7äNŸþÁ»ÀF5NÉlZáŨñ©¬?€ÁSë'œ?6yX?z"£àüÑñeÞ÷m???¯wSü®g©?DX?5Ê]?¥?1y?n
²¶÷0!0
??+u?é?É?áڅ¨ú?¢4ºÝbκ??¯?ƒƒÄ?õ?›2?¿–3[Ž?Ú»#???† 

=
== File: 

=
0‚?†???0‚???*†H†÷
??? ‚?0?‚?,0‚?(0‚?$?*†H†÷
??? ‚??0‚?0‚?
?   *†H†÷
???0)?
*†H†÷
0???8,?¿¹lÓ;°hXš.j·¡Û.À7???ÃP€‚?Ъ24zÅi‚ H±?u¡zåûH>pæÇôj?¦? 
Š"Èò(?Á|Ê&$rö1~ñ ì×W?÷
»??N½^@éÙvVEËÓwÍ?'?éÛbpãu?ÿ‚X?z¡xܝ€‘4=6?5'´6X%ŽÇ?™¦“S4¼òKhüèή×ÀÝ%m`×òí¦dŠ?Ì9
…`,4gêÆk늶ÐRˆ?lyݜF÷#š´ 
"YvîÌ`äùñ4?­®ñúL™ÛÊ!æV{v?2>ÛBL?tÖUŸpÁœøž*+fDÖ?iŠ?ÄI«Mп'W&:§??Ðt÷?v¢í…
½?†ã>Ã?Y×ómüO?¥)³êEŽ¸ê»Ø?
gìZs}.»‰'6ò¡àU?و?ªtÀÖù²?Þ÷??@«õ«¸@§?RòçÎ9(çQ?þv?'ê?¼–Yú?'Ðû×ê§ÀáÉv6¹êM‘å¥O·—2Ñ]™4ß+ëŒ?OŸAwŒ?ö)‚Xt
 ?›éf’]É?!.&ÁTS𙠳&¡Y 
ÕgLƒˆm?™—¢q×m8I?þ—¢ÏØm??oå]ÙÉѾ=ª]d›?tpçëˆ#©ÚÑàH+Æã¥éhaÁ‘$ñ?¬=??e—Ÿ?…Ms 
àÓ¤X›K#0>0!0 ??+?8ÔôÑ?ÉÚºûëÕ¤ HTê?Ÿ??¡Þ…
ßü…H܌àËð„„>† 

=
== File: 

=
0‚
0‚  Ò?  *†H†÷
??? ‚   Ã?‚ ¿0‚ »0‚?g?  *†H†÷
??? ‚?X?‚?T0‚?P0‚?L??*†H†÷
??
?? ‚?û0‚?÷0)?
*†H†÷
0???5?“s?Lù‹nbáQ%ÔÍ?£?á???ÃP?‚?È}‡N%M/5fє?D¹-™ÝîUÈy©? QÔÜ
lÿçtÂãn@u‚ùÁù×2V{ ™Þ–ÅÉÁò,áf6…î´ðÞ!á?ƒ>íô Þ>‡ïßv’Î?<)ˆû>?i&§Æ¡„ÐÆU}O?‡É¡©„
Æôɐ*®‹Õß?U?ÛÓ´"UûMØ–?i¼$þ@Õe®?±m?kâAFW>¦þIº??¬õè?h"Ü?ƒb¥&»%yÈúÔ?Q?ë2Ñ%¦Ô†Çµ\?&
ò@è¤÷mfjÏÒ«]=‰É
?—?–÷ìµxůxkB?û™¥?2?‹¤?GØÞu_
-tëL±BO³,?Àé¥??ˤ`î˜í2Ôu‹?]a!u
o?Fø\ÂÐÏ?e³
·+¨??¸dn?6“?ƒxÄ??­0½x??.Um?Ø"Â
8?Ë4_??è@??:³ßühdðº¶6æ±?‹‰RÐ^Ÿîò˦g–3ñÌ,»aô녰œúpé4Tq²I‡i<â\?2?˜?˜??”ªdxþàb
iRc•|Œ¸wšV?©úœµf
9]?p¸?橀ß#¿î|&›¸2BCÒ%!¡??dK½î™»­??0ûP?³¼?„´3Ñ"?wR¤Ek[Ô脚.¤‰(Ä|]?ô?’^­ÏèWñ&Üxç´:´”?Õ
   
Í"ŽI–"ô|ýéÞ·;µ•Ô}¹??2F?(à²z[Ž‰Pcͼ?z¸`?Cž¡àKn?Lተ¢Í?~Ä?z×6÷áW¶??³?މø"fm3û(?K*ÏcWÅÒwÍé´Wؖ?-§uL?¥b_à@s&؛eÞ?G?04ÿ'°œ?aÄgq!¥È?à¸ñ¡?'`÷¢-*?d÷‹½ßÒ¦"Š‹AoÛ»¢)l+ýº’?•:mÓ¶d’»??º7i±´º¢¯N¯u,??äÓfw?¸ûÉ?8d毿uÿ4?®Šr­/X?;wø²Í'W÷SM4æчԥÍÏTG¦‚’w[?"•mÁm¸îŠB°Œs\¢^ë?Äk?Ì}?3'Ô°“˜¤§{ÑMX©ŒY0Y8·ÙÏmÞñ
 þ???¿·
Ê?4`ÒĹH±X«„‘ÀãíŽóóÚçe•õ4õ¥
XÊÔ?֗Wx?x-¨š[@·ù°Õ{T k>&˜˜‚n"?ďÇƼ’N„üD=¸wÊ才Ç?•} ý݅
vzœ{?$K@M?Þßî¾Á?‚Rž?É»tý2m´A²eÀ$.F?þ›._-?ï“?f†?%cZšY?þ9%)b…k¢g™ß1>0?? *†H†÷
?   ?1??
?m?y?k?e?y0!?   *†H†÷
?   ?1???Time 15270978378910‚?L?*†H†÷
??? ‚?=0‚?9???0‚?2? *†H†÷
???0)?
*†H†÷
0???’M©o©?›k?³?ÂщÀ?xc?ü¥f1??+4†^Á×¥?ã³?Â\ò?áý³ÓÅ?Ìãþ„u'é??㫝õ¹ÉO¹¥
 }êÅð×?Nq.ìÃØËф¡öÊ@FÅ4û^ï“Q8Õ­½Cř©æ?
?JÝ(Df¦?Êóm·3Ûäã ùµyÌ@
Ƕ0!?>qΨH‚N?…Jþfk?õiRÏç?Xp?l_ÍÙ?gL%¤7ÏßNÀ0fº(´Úê]IəD ??õÓân„û?¤©}P}@,*op4
”?ç;·¯‚Ü?zþÉoo…?àäVmà?{?&º#ŠB’gùòx?ËnC7×x—ÁúÜúÆh1A2ˆÔ§·?ÈJð ObßMÖëP
?‹ˆ_`?Úz-$z<¯?ƒ¨ˆ?LbjwÎ`Ädlé/dcÑ=1ÛrÊÝçÏ/uE‰kræρ?1±ÀÄÓ?K±ˆ:?ƒ_Z7-J9l0ýò<8Ò«??š9€Ñ«“?þ46´W?!pC´“ûãŒ?rwjõ?–˜r¬ërþ?÷ÆSŸ½vבDrü±Oà$‡€?ôûÿò„?ó‰
 "Ðó0Læ;

[activemq-artemis] branch master updated: ARTEMIS-2289 SUBSCRIBE w/receipt returns 2 receipt-ids

2019-04-02 Thread gaohoward 
This is an automated email from the ASF dual-hosted git repository.

gaohoward pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
 new 304ff79  ARTEMIS-2289 SUBSCRIBE w/receipt returns 2 receipt-ids
 new 279f655  This closes #2600
304ff79 is described below

commit 304ff797123be2f79db1abfdccd9b2374202a371
Author: Justin Bertram 
AuthorDate: Sat Mar 30 14:36:02 2019 -0500

ARTEMIS-2289 SUBSCRIBE w/receipt returns 2 receipt-ids
---
 .../core/protocol/stomp/VersionedStompFrameHandler.java   |  3 ---
 .../artemis/tests/integration/stomp/v12/StompV12Test.java | 11 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
 
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
index 75c1ea3..bac1c24 100644
--- 
a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
+++ 
b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/VersionedStompFrameHandler.java
@@ -126,9 +126,6 @@ public abstract class VersionedStompFrameHandler {
   try {
  StompPostReceiptFunction postProcessFunction = onSubscribe(request);
  response = postprocess(request);
- if (request.hasHeader(Stomp.Headers.RECEIPT_REQUESTED)) {
-response.addHeader(Stomp.Headers.Response.RECEIPT_ID, 
request.getHeader(Stomp.Headers.RECEIPT_REQUESTED));
- }
  connection.sendFrame(response, postProcessFunction);
  return null;
   } catch (ActiveMQStompException e) {
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 e3b61b3..3e6e46c 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,6 +33,7 @@ import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Pattern;
 
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
@@ -98,6 +99,16 @@ public class StompV12Test extends StompTestBase {
}
 
@Test
+   public void testSubscribeWithReceipt() throws Exception {
+  conn.connect(defUser, defPass);
+
+  Pattern p = Pattern.compile("receipt-id:.*\\nreceipt-id");
+  assertFalse(p.matcher(subscribe(conn, null).toString()).find());
+
+  conn.disconnect();
+   }
+
+   @Test
public void testConnection() throws Exception {
   server.getSecurityStore().setSecurityEnabled(true);
   StompClientConnection connection = 
StompClientConnectionFactory.createClientConnection(v10Uri);