svn commit: r1036766 - /websites/production/activemq/content/index.html

[martyntaylor]

Author: martyntaylor
Date: Tue Nov  6 16:43:11 2018
New Revision: 1036766

Log:
Link to new ActiveMQ Website from current home page

Modified:
websites/production/activemq/content/index.html

Modified: websites/production/activemq/content/index.html
==
--- websites/production/activemq/content/index.html (original)
+++ websites/production/activemq/content/index.html Tue Nov  6 16:43:11 2018
@@ -66,10 +66,17 @@
 Download | http://activemq.apache.org/maven/apidocs/index.html;>JavaDocs More... | Source | Forums | Support
   
 
-
   
   
 
+
+
+   NEW SITE UNDER 
CONSTRUCTION
+   We're currently in the process of updating the Apache 
ActiveMQ website.  The new website is currently under construction, the work in 
progress is staged here.  The source 
code can be found https://github.com/apache/activemq-website/;>here.  We very much 
welcome contributions :).
+
+
+
+
 
 Download ActiveMQ 5.15.7 Today!http://activemq.apache.org/;>Apache 
ActiveMQ  is the most popular and powerful open source messaging and 
Integration 
Patterns server.Apache ActiveMQ is fast, supports many Cross Language Clients and 
Protocols, comes with easy to use Enterprise Integration Patterns 
and many advanced features while fully 
supporting http://java.sun.com/products/jms/; rel="nofollow">JMS 1.1 and J2EE 
1.4. Apache ActiveMQ is released under the Apache http://www.apache.org/licenses/LICENSE-2.0.html;>2.0 
LicenseGrab yourself a Download, try our Getting Started Guide, surf our FAQ or start Contributing and join us on our Discussion Forums.FeaturesSupports a variety of Cross Language Clients and 
Protocols from Java, C, C++, C#, Ruby, Perl, Python, PHPOpenWire for high performance clients in 
Java, C, C++, C#Stomp support so 
that clients can be written easily in C, Ruby, Perl, Python, PHP, 
ActionScript/Flash, Smalltalk to talk to ActiveMQ 
 as well as any other popular Message BrokerAMQP v1.0 supportMQTT v3.1 support allowing for connections in an IoT 
environment.full support for the Enterprise Integration Patterns 
both in the JMS client and the Message BrokerSupports many advanced features such as Message Groups, Virtual Destinations, Wildcards and Composite DestinationsFully 
supports JMS 1.1 and J2EE 1.4 with support for transient, persistent, 
transactional and XA messagingSpring Support so that ActiveMQ can be easily 
embedded into Spring 
 applications and configured using Spring's XML configuration 
mechanismTested inside popular J2EE servers such as http://tomee.apache.org/;>TomEE, http://geronimo.apache.org/;>Geronimo, JBoss, GlassFish and 
WebLogicIncludes JCA 1.5 
resource adaptors for inbound  outbound messaging so that ActiveMQ 
should auto-deploy in any J2EE 1.4 compliant serverSupports 
pluggable transport protocols 
such as in-VM, TCP, SSL, 
NIO, UDP, multicast, JGroups and JXTA transportsSupports very fast persistence using JDBC along with a 
high performance journalDesigned for high performance clustering, 
client-server, peer based communication
 REST API to provide technology 
agnostic and language neutral web based API to messagingAjax to support web streaming support to web 
browsers using pure DHTML, allowing web browsers to be part of the messaging 
fabricCXF and Axis 
Support so that ActiveMQ can be easily dropped into either of these web 
service stacks to provide reliable messagingCan be used as an in 
memory JMS provider, ideal for unit testing JMSNews
 

svn commit: r1036765 - in /websites/production/activemq/content/activemq-website: ./ assets/ assets/img/ assets/img/customers/ assets/img/features/ clients/ clients/amqp/ clients/mqtt/ contact/ contac

[martyntaylor]

Author: martyntaylor
Date: Tue Nov  6 16:11:56 2018
New Revision: 1036765

Log:
Check in new ActiveMQ Site Under construction


[This commit notification would consist of 532 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

[activemq-website] 37/45: further fix

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 396f560f5816ec06832ca03161392fb05839b0ab
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 12:21:14 2018 +0100

further fix
---
 _includes/nav.html  | 26 +-
 index.html  |  8 
 projects/artemis/index.html | 12 ++--
 projects/classic/index.html | 12 ++--
 projects/nms/index.html | 12 ++--
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index 798d6f9..85d6a34 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -9,7 +9,7 @@
 
 
 
-Home
+Home
 
 
 http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Projects
@@ -19,10 +19,10 @@
 
 Projects
 
-ActiveMQ Artemis
-ActiveMQ 5
-NMS Clients
-CMS Client
+ActiveMQ Artemis
+ActiveMQ 5
+NMS Clients
+CMS Client
 
 
 
@@ -37,11 +37,11 @@
 
 Contact
 
-Mailing Lists
-IRC
-Report Issues
-Contributing
-Social Media
+Mailing Lists
+IRC
+Report Issues
+Contributing
+Social Media
 
 
   
@@ -56,9 +56,9 @@
 
 Team
 
-Committers
-PMC
-Reports
+Committers
+PMC
+Reports
 
 
 
diff --git a/index.html b/index.html
index 27bf761..f3bdba3 100644
--- a/index.html
+++ b/index.html
@@ -54,7 +54,7 @@ layout: default
 Feature 3
 Feature 4
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -71,7 +71,7 @@ layout: default
 Feature 3
 Feature 4
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -88,7 +88,7 @@ layout: default
 Feature 3
 Feature 4
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -105,7 +105,7 @@ layout: default
 Feature 3
 Feature 4
   
-  Find out more
+  Find out more
   Download 
Latest
 
   
diff --git a/projects/artemis/index.html b/projects/artemis/index.html
index ecd0879..045481d 100644
--- a/projects/artemis/index.html
+++ b/projects/artemis/index.html
@@ -22,13 +22,13 @@ latest_version: 2.6.0
   Feature Title
   Short description of feature
   Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua. Ut enim ad minim veniam,"
-  Find out more
+  Find out more
 
 
   
   
 
-  
+  
 
   
 
@@ -55,13 +55,13 @@ latest_version: 2.6.0
   Feature Title
   Short description of feature
   Lorem ipsum dolor sit amet, 
consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
dolore magna aliqua. Ut enim ad minim veniam,"
-  Find out more

[activemq-website] 38/45: Set Base Url for Site

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit e1eb1fe92e6605f58f554ac36a8c2c20c8dd723f
Author: Martyn Taylor 
AuthorDate: Thu Sep 27 13:28:46 2018 +0100

Set Base Url for Site
---
 _config.yml |  1 +
 _includes/features.html |  6 +++---
 _includes/footer.html   |  4 ++--
 _includes/head.html |  4 ++--
 _includes/nav.html  | 28 ++--
 _includes/splash.html   |  4 ++--
 _includes/users.html| 24 
 index.html  | 12 ++--
 projects/artemis/index.html | 12 ++--
 projects/classic/index.html | 12 ++--
 projects/cms/index.html | 12 ++--
 projects/nms/index.html | 12 ++--
 12 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/_config.yml b/_config.yml
index 590c47e..91bf659 100644
--- a/_config.yml
+++ b/_config.yml
@@ -25,3 +25,4 @@ destination: target
 exclude: [BUILD.md, Gemfile*]
 keep_files: [.git]
 exclude: [vendor]
+baseurl: /activemq-website
diff --git a/_includes/features.html b/_includes/features.html
index 8c4b5e6..21e7a92 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -34,7 +34,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -59,7 +59,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -84,7 +84,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/_includes/footer.html b/_includes/footer.html
index 0d050a3..694fef6 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -6,7 +6,7 @@
   
 
   
-
+
   
 
 
@@ -14,7 +14,7 @@
 
 
   
-
+
   
 
   
diff --git a/_includes/head.html b/_includes/head.html
index ad80860..cd01a1f 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,9 +3,9 @@
 
 
 ActiveMQ
-
+
 
-
+
 https://use.fontawesome.com/releases/v5.0.8/js/all.js&quot</a>; 
integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ"
 crossorigin="anonymous">
 https://code.jquery.com/jquery-3.2.1.slim.min.js&quot</a>; 
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
 crossorigin="anonymous">
 https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js&quot</a>; 
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
 crossorigin="anonymous">
diff --git a/_includes/nav.html b/_includes/nav.html
index 6f320f3..cd8c445 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
@@ -9,7 +9,7 @@
 
 
 
-Home
+Home
 
 
 http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expand

[activemq-website] 30/45: Add styling to contact page

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit c1bc867b97acc45c2774f1b8b3dbf38f65ea979b
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 17:33:50 2018 +0100

Add styling to contact page
---
 contact/contact.html | 173 +++
 contact/contact.md   |  61 --
 css/main.scss|  16 +
 3 files changed, 189 insertions(+), 61 deletions(-)

diff --git a/contact/contact.html b/contact/contact.html
new file mode 100644
index 000..ad8d4a1
--- /dev/null
+++ b/contact/contact.html
@@ -0,0 +1,173 @@
+---
+layout: default
+title: Team
+breadcrumb: Team
+---
+
+
+  
+CONTACT US
+  
+
+
+
+
+  
+
+  Contributing
+  We really want you to get involved in Apache ActiveMQ and welcome all 
contributions. These can be made by raising a Pull Request via Github here:
+  
+
+  ActiveMQ Artemis GitHub Page
+  https://github.com/apache/activemq-artemis;>https://github.com/apache/activemq-artemis
+
+
+  ActiveMQ 5 GitHub Page
+  https://github.com/apache/activemq;>https://github.com/apache/activemq
+
+  
+
+  
+
+  
+
+  Chat
+  We really want you to get involved in Apache ActiveMQ and welcome all 
contributions. These can be made by raising a Pull Request via Github here:
+
+
+  irc.freenode.net
+  #apache-activemq
+
+  
+
+  
+
+  
+
+  Report Issues
+  
+
+  ActiveMQ Artemis JIRA
+  https://issues.apache.org/jira/browse/ARTEMIS;>https://issues.apache.org/jira/browse/ARTEMIS
+
+
+  ActiveMQ 5 JIRA
+  https://issues.apache.org/jira/browse/AMQ;>https://issues.apache.org/jira/browse/AMQ
+
+  
+
+  
+
+  
+
+  
+
+  ActiveMQ User Mailing List
+  This mailing list is end users to ask general questions about 
ActiveMQ
+  
+
+  Subscribe
+  mailto:users-subscr...@activemq.apache.org;>users-subscr...@activemq.apache.org
+
+
+  Unsubscribe
+  mailto:users-unsubscr...@activemq.apache.org;>users-unsubscr...@activemq.apache.org
+
+
+  Apache Archive
+  http://mail-archives.apache.org/mod_mbox/activemq-users/;>http://mail-archives.apache.org/mod_mbox/activemq-users/
+
+
+  Mark Mail Archive
+  http://activemq.markmail.org/search/list:org.apache.activemq.users;>http://activemq.markmail.org/search/list:org.apache.activemq.users
+
+
+  Nabble Forum
+  http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html;>http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html;
+
+  
+
+  
+
+
+  
+
+  ActiveMQ Developer Mailing List
+  This mailing list is end users to ask general questions about the 
development of ActiveMQ
+  
+
+  Subscribe
+  mailto:dev-subscr...@activemq.apache.org;>dev-subscr...@activemq.apache.org
+
+
+  Unsubscribe
+  mailto:dev-unsubscr...@activemq.apache.org;>dev-unsubscr...@activemq.apache.org
+
+
+  Apache Archive
+  http://mail-archives.apache.org/mod_mbox/activemq-dev/;>http://mail-archives.apache.org/mod_mbox/activemq-dev/
+
+
+  Mark Mail Archive
+  http://activemq.markmail.org/search/list:org.apache.activemq.dev;>http://activemq.markmail.org/search/list:org.apache.activemq.dev
+
+
+  Nabble Forum
+  http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html;>http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html;
+
+  
+
+  
+
+  
+
+  ActiveMQ Commits Mailing List
+  This mailing list get automatically notified when when the 
project source code gets updated.
+  
+
+  Subscribe
+  mailto:commits-subscr...@activemq.apache.org;>commits-subscr...@activemq.apache.org
+
+
+  Unsubscribe
+  mailto:commits-unsubscr...@activemq.apache.org;>commits-unsubscr...@activemq.apache.org
+
+
+  Apache Archive
+  http://mail-archives.apache.org/mod_mbox/activemq-commits/;>http://mail-archives.apache.org/mod_mbox/activemq-commits/
+
+
+  Mark Mail Archive
+  http://activemq.markmail.org/search/list:org.apache.ac

[activemq-website] 02/45: Initial Import of ActiveMQ Website

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 33cde8c167bfb36939246eb9c9411dc896cc0a61
Author: Martyn Taylor 
AuthorDate: Wed Jul 25 11:10:01 2018 +0100

Initial Import of ActiveMQ Website
---
 .../_variables.scssc   | Bin 1227 -> 3994 bytes
 _includes/features.html| 121 ++
 _includes/footer.html  |  52 +++
 _includes/head.html|   4 +-
 _includes/users.html   |  49 +++
 _site/assets/img/apache-logo.png   | Bin 0 -> 25977 bytes
 _site/assets/img/customers/igindex.png | Bin 0 -> 2268 bytes
 _site/assets/img/features/protocol-translation.png | Bin 0 -> 10058 bytes
 _site/assets/img/main-logo.png | Bin 14576 -> 14583 bytes
 _site/css/main.css | 461 ++---
 _site/index.html   | 312 +-
 assets/img/apache-logo.png | Bin 0 -> 25977 bytes
 assets/img/customers/igindex.png   | Bin 0 -> 2268 bytes
 assets/img/features/protocol-translation.png   | Bin 0 -> 10058 bytes
 assets/img/main-logo.png   | Bin 14576 -> 14583 bytes
 css/custom/_variables.scss |  15 +-
 css/main.scss  | 201 +
 index.html |  85 
 18 files changed, 1143 insertions(+), 157 deletions(-)

diff --git 
a/.sass-cache/85ac98fe8c4c43833c0e54c39e78b7d4dbd6d975/_variables.scssc 
b/.sass-cache/85ac98fe8c4c43833c0e54c39e78b7d4dbd6d975/_variables.scssc
index e2b77a6..df1156e 100644
Binary files 
a/.sass-cache/85ac98fe8c4c43833c0e54c39e78b7d4dbd6d975/_variables.scssc and 
b/.sass-cache/85ac98fe8c4c43833c0e54c39e78b7d4dbd6d975/_variables.scssc differ
diff --git a/_includes/features.html b/_includes/features.html
new file mode 100644
index 000..5505b83
--- /dev/null
+++ b/_includes/features.html
@@ -0,0 +1,121 @@
+
+
+  
+
+  
+  
+
+  
+
+  Create messaging infrastructure for any environment! 
Internet of Things, Cloud Messaging, Micro Services or Enterprise,
+we have all the bells and whistles required.  Read about some 
of our core features below.
+
+  
+
+  
+
+  
+
+
+
+
+  
+
+  
+
+  
+
+  PROTOCOL TRANSLATION
+
+
+  SEND IN ONE PROTOCOL RECIEVE IN ANOTHER
+
+
+  
+
+  
+
+
+  Applications and deployment environments are varied
+  by their very nature.  Use protocols that best suit your  
specific
+  applications and let ActiveMQ do the work of integrating the
+  specific tecnologies for you.
+
+  Produce telemetry data using MQTT for devices with limited
+  resources.  Process via AMQP or JMS in your enterprise 
application.
+
+
+  
+Find out more
+  
+
+  
+
+  
+
+
+  
+
+  BUILT IN REPLICATION
+
+
+  SEND IN ONE PROTOCOL RECIEVE IN ANOTHER
+
+
+  
+
+  
+
+
+  Applications and deployment environments are varied
+  by their very nature.  Use protocols that best suit your  
specific
+  applications and let ActiveMQ do the work of integrating the
+  specific tecnologies for you.
+
+  Produce telemetry data using MQTT for devices with limited
+  resources.  Process via AMQP or JMS in your enterprise 
application.
+
+
+  
+Find out more
+  
+
+  
+
+  
+
+
+  
+
+  BUILT IN REPLICATION
+
+
+  SEND IN ONE PROTOCOL RECIEVE IN ANOTHER
+
+
+  
+
+  
+
+
+  Applications and deployment environments are varied
+  by their very nature.  Use protocols that best suit your  
specific
+  applications and let ActiveMQ do the work of integrating the
+  s

[activemq-website] 06/45: first pass at project landing pages

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit cebf8339ff66a88c30b7408e03a39769e95616c6
Author: andytaylor 
AuthorDate: Fri Jul 27 16:03:34 2018 +0100

first pass at project landing pages
---
 _includes/features.html  |  6 +--
 _includes/nav.html   |  4 +-
 _includes/{nav.html => project-nav.html} | 14 ++
 _includes/splash.html| 49 +
 _includes/users.html | 24 +--
 _layouts/project_default.html| 12 ++
 _site/css/main.css   | 31 +
 _site/index.html | 42 +-
 css/main.scss| 37 
 index.html   |  8 ++--
 projects/activemq/index.html | 65 
 projects/artemis/index.html  | 74 
 projects/cms/index.html  | 65 
 projects/nms/index.html  | 65 
 14 files changed, 443 insertions(+), 53 deletions(-)

diff --git a/_includes/features.html b/_includes/features.html
index 5505b83..b15a99f 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -33,7 +33,7 @@
 
   
 
-  
+  
 
 
   Applications and deployment environments are varied
@@ -64,7 +64,7 @@
 
   
 
-  
+  
 
 
   Applications and deployment environments are varied
@@ -95,7 +95,7 @@
 
   
 
-  
+  
 
 
   Applications and deployment environments are varied
diff --git a/_includes/nav.html b/_includes/nav.html
index 6500188..81a808e 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -2,7 +2,7 @@
 
   
 
-
+
 
   
 
@@ -10,7 +10,7 @@
 
   
 
-Home
+Home
 
 
 Projects
diff --git a/_includes/nav.html b/_includes/project-nav.html
similarity index 58%
copy from _includes/nav.html
copy to _includes/project-nav.html
index 6500188..912ca86 100644
--- a/_includes/nav.html
+++ b/_includes/project-nav.html
@@ -1,8 +1,7 @@
 
 
   
-
-
+ {{ page.project_name }}
 
   
 
@@ -10,13 +9,10 @@
 
   
 
-Home
+Home
 
 
-Projects
-
-
-Clients
+Documentation
 
 
 Community
@@ -24,10 +20,6 @@
 
 Team
 
-
-Getting Started
-
   
 
-  
 
diff --git a/_includes/splash.html b/_includes/splash.html
new file mode 100644
index 000..9863669
--- /dev/null
+++ b/_includes/splash.html
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+{{ 
page.project_info }}
+
+
+
+
+
+
+
+
+
+Artemis 
is ActiveMQ's next generation message broker
+
+
+
+
+
+
+
+
+Download
+Get Started
+
+
+
+
+
+
+
+
+
+
+
+
+
+{{ 
page.project_top_narative }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/_includes/users.html b/_includes/users.html
index 2befe0a..de78973 100644
--- a/_includes/users.html
+++ b/_includes/users.html
@@ -7,40 +7

[activemq-website] 36/45: fix for github pages

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 422cf32f66e47ce5f275335b7023d9766c67eedd
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 12:18:20 2018 +0100

fix for github pages
---
 _includes/features.html |  6 +++---
 _includes/footer.html   |  4 ++--
 _includes/head.html |  4 ++--
 _includes/nav.html  |  2 +-
 _includes/splash.html   |  4 ++--
 _includes/users.html| 24 
 index.html  |  4 ++--
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/_includes/features.html b/_includes/features.html
index 8c4b5e6..cc16560 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -34,7 +34,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -59,7 +59,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -84,7 +84,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/_includes/footer.html b/_includes/footer.html
index 0d050a3..eeb4273 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -6,7 +6,7 @@
   
 
   
-
+
   
 
 
@@ -14,7 +14,7 @@
 
 
   
-
+
   
 
   
diff --git a/_includes/head.html b/_includes/head.html
index ad80860..d1d7b4d 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,9 +3,9 @@
 
 
 ActiveMQ
-
+
 
-
+
 https://use.fontawesome.com/releases/v5.0.8/js/all.js&quot</a>; 
integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ"
 crossorigin="anonymous">
 https://code.jquery.com/jquery-3.2.1.slim.min.js&quot</a>; 
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
 crossorigin="anonymous">
 https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js&quot</a>; 
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
 crossorigin="anonymous">
diff --git a/_includes/nav.html b/_includes/nav.html
index 6f320f3..798d6f9 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
diff --git a/_includes/splash.html b/_includes/splash.html
index 0451c99..87001ea 100644
--- a/_includes/splash.html
+++ b/_includes/splash.html
@@ -10,7 +10,7 @@
   Read the Docs
   
   
-  
+  
   
 
   
@@ -20,7 +20,7 @@
   {{ page.project_name }}
   
   
-  
+  
   
 
 
diff --git a/_includes/users.html b/_includes/users.html

[activemq-website] 23/45: Return to green on homepage

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit cc8adaab4faa29b32bc477200d289835de9cb8ec
Author: Martyn Taylor 
AuthorDate: Mon Sep 24 17:01:55 2018 +0100

Return to green on homepage
---
 css/main.scss |  9 ++---
 index.html| 14 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/css/main.scss b/css/main.scss
index 6e56362..86b6fd2 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -263,7 +263,7 @@ h6 {
 }
 
 .users {
-  background-color: $pink;
+  background-color: $green;
   padding: 50px;
   text-align: center;
 }
@@ -338,11 +338,6 @@ h6 {
   border-bottom: 1px solid black;
 }
 
-.slider-main {
-  background-color: $dark-grey !important;
-  background-image: 
url("/assets/img/activemq_desktop_background_dark_grey.png");
-}
-
 // Projects
 .slider-artemis {
   background-color: $purple !important;
@@ -443,4 +438,4 @@ h6 {
   position: absolute;
   top: 50%;
   transform: translateY(-50%);
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index 676a2f6..f355983 100644
--- a/index.html
+++ b/index.html
@@ -15,9 +15,21 @@ layout: default
   
 
   
+  
+
+  
+  
+  
+A SUITE OF OPEN SOURCE PROJECTS FOR HIGH PERFORMANCE MESSAGING
+  
+  
+  
+
+  
+
+  
 
 
-
 
   
   

[activemq-website] 03/45: Added Readme

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 34e57f7ff530aa116f047a4e9a6fdee5f7003ddf
Author: Martyn Taylor 
AuthorDate: Wed Jul 25 11:13:38 2018 +0100

Added Readme
---
 README.md | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
new file mode 100644
index 000..ed3defb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,11 @@
+ActiveMQ Webiste
+=
+
+To run
+---
+
+1. Install ruby
+2. Install bundler: gem install bundler
+3. Install deps: cd activemq-website; bundle install
+4. Run Dev Server: jekyll serve
+

[activemq-website] 40/45: Merge pull request #2 from mtaylor/master

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 2f09188501f0e45efebade13757bc35161f5c15b
Merge: 396f560 532e1a8
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 13:35:11 2018 +0100

Merge pull request #2 from mtaylor/master

Set BaseURL In links

 _config.yml |  1 +
 projects/cms/index.html | 12 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

[activemq-website] 27/45: Updates to nav links and style

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 03306fdfca51be7e3a4ec50ec84a9a22ae885878
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 14:26:42 2018 +0100

Updates to nav links and style
---
 _includes/nav.html | 99 +++---
 css/main.scss  |  7 ++--
 2 files changed, 23 insertions(+), 83 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index f99c81d..a54094e 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -13,98 +13,38 @@
 
 
 http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Projects
-
+
 
-
+
 
-ActiveMQ 
Artemis
+Projects
 
-Overview
-Documentation
-Download
-Migration
-
-
-
-
-ActiveMQ 5
-
-Overview
-Documentation
-Download
-
-
-
-
-Other
-
-CMS
-NMS
+ActiveMQ Artemis
+ActiveMQ 5
+NMS Clients
+CMS Client
 
 
 
 
 
 
-http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Clients
-
-
-
-
-AMQP
-MQTT
-Core
-OpenWire
-
-
-
-
-STOMP
-REST
-XMPP
-
-
-
-
-
-
-
-
 
-http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Community
-
+http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Contact
+
 
-
-
-Users
-
-User Mailing List
-Support
-Used By
-Security 
Advisories
-
-
-
+
 
-Developers
+Contact
 
-Dev Mailing 
List
-Source
-Issues
-Contributing
+Mailing Lists
+IRC
+Report Issues
+Contributing
+Social Media
 
 
-
-
-Other
-
-IRC
- 

[activemq-website] 22/45: Removed Sass Cache

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 9391cfb7f0ff4e26f79854920d645330ce075ca1
Author: Martyn Taylor 
AuthorDate: Mon Sep 24 16:41:33 2018 +0100

Removed Sass Cache
---
 .../_variables.scssc   | Bin 3994 -> 0 bytes
 .../_alert.scssc   | Bin 3818 -> 0 bytes
 .../_background-variant.scssc  | Bin 5885 -> 0 bytes
 .../_badge.scssc   | Bin 3612 -> 0 bytes
 .../_border-radius.scssc   | Bin 8046 -> 0 bytes
 .../_box-shadow.scssc  | Bin 1783 -> 0 bytes
 .../_breakpoints.scssc | Bin 3 -> 0 bytes
 .../_buttons.scssc | Bin 36837 -> 0 bytes
 .../_caret.scssc   | Bin 19934 -> 0 bytes
 .../_clearfix.scssc| Bin 2163 -> 0 bytes
 .../_float.scssc   | Bin 2109 -> 0 bytes
 .../_forms.scssc   | Bin 29519 -> 0 bytes
 .../_gradients.scssc   | Bin 20757 -> 0 bytes
 .../_grid-framework.scssc  | Bin 17515 -> 0 bytes
 .../_grid.scssc| Bin 12780 -> 0 bytes
 .../_hover.scssc   | Bin 4737 -> 0 bytes
 .../_image.scssc   | Bin 6455 -> 0 bytes
 .../_list-group.scssc  | Bin 5177 -> 0 bytes
 .../_lists.scssc   | Bin 1783 -> 0 bytes
 .../_nav-divider.scssc | Bin 3265 -> 0 bytes
 .../_pagination.scssc  | Bin 5204 -> 0 bytes
 .../_reset-text.scssc  | Bin 5354 -> 0 bytes
 .../_resize.scssc  | Bin 2068 -> 0 bytes
 .../_screen-reader.scssc   | Bin 7422 -> 0 bytes
 .../_size.scssc| Bin 1764 -> 0 bytes
 .../_table-row.scssc   | Bin 5802 -> 0 bytes
 .../_text-emphasis.scssc   | Bin 3728 -> 0 bytes
 .../_text-hide.scssc   | Bin 2564 -> 0 bytes
 .../_text-truncate.scssc   | Bin 1929 -> 0 bytes
 .../_transition.scssc  | Bin 3771 -> 0 bytes
 .../_visibility.scssc  | Bin 1854 -> 0 bytes
 .../_alert.scssc   | Bin 10585 -> 0 bytes
 .../_badge.scssc   | Bin 8814 -> 0 bytes
 .../_breadcrumb.scssc  | Bin 9487 -> 0 bytes
 .../_button-group.scssc| Bin 30962 -> 0 bytes
 .../_buttons.scssc | Bin 24658 -> 0 bytes
 .../_card.scssc| Bin 50116 -> 0 bytes
 .../_carousel.scssc| Bin 43593 -> 0 bytes
 .../_close.scssc   | Bin 7581 -> 0 bytes
 .../_code.scssc| Bin 11359 -> 0 bytes
 .../_custom-forms.scssc| Bin 66349 -> 0 bytes
 .../_dropdown.scssc| Bin 28523 -> 0 bytes
 .../_forms.scssc   | Bin 65377 -> 0 bytes
 .../_functions.scssc   | Bin 25152 -> 0 bytes
 .../_grid.scssc| Bin 8851 -> 0 bytes
 .../_images.scssc  | Bin 7846 -> 0 bytes
 .../_input-group.scssc | Bin 38341 -> 0 bytes
 .../_jumbotron.scssc   | Bin 4916 -> 0 bytes
 .../_list-group.scssc  | Bin 20996 -> 0 bytes
 .../_media.scssc   | Bin 2186 -> 0 bytes
 .../_mixins.scssc  | Bin 5047 -> 0 bytes
 .../_modal.scssc   | Bin 38179 -> 0 bytes
 .../_nav.scssc | Bin 19020 -> 0 bytes
 .../_navbar.scssc  | Bin 52108 -> 0 bytes
 .../_pagination.scssc  | Bin 17299 -> 0 bytes
 .../_popover.scssc | Bin 44742 -> 0 bytes
 .../_print.scssc   | Bin 19439 -> 0 bytes
 .

[activemq-website] 24/45: Fix Reponsive Layout

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit c145ffe8449877409b0933e9df7bc2f2385c6a3b
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 12:32:04 2018 +0100

Fix Reponsive Layout
---
 _config.yml |  3 ++-
 _includes/splash.html   | 38 --
 _includes/users.html| 48 
 css/main.scss   | 16 ++--
 index.html  | 15 +++
 projects/cms/index.html |  2 +-
 projects/nms/index.html |  2 +-
 7 files changed, 85 insertions(+), 39 deletions(-)

diff --git a/_config.yml b/_config.yml
index fe13264..e6deb57 100644
--- a/_config.yml
+++ b/_config.yml
@@ -23,4 +23,5 @@ permalink: /news/:year/:month/:day/:title/
 excerpt_separator: ""
 destination: target
 exclude: [BUILD.md, Gemfile*]
-keep_files: [.git]
\ No newline at end of file
+keep_files: [.git]
+exclude: [vendor
diff --git a/_includes/splash.html b/_includes/splash.html
index 7b959fc..440b132 100644
--- a/_includes/splash.html
+++ b/_includes/splash.html
@@ -1,4 +1,4 @@
-
+
+
 
 
 
@@ -28,4 +28,38 @@
 
 
 
+ -->
+
+
+  
+
+  
+  
+  {{ page.project_name }}
+  {{ page.project_info }}
+  DOWNLOAD v{{ page.latest_version }}
+  GET STARTED
+  
+  
+  
+  
+
+  
+  
+
+  
+  {{ page.project_name }}
+  
+  
+  
+  
+
+
+  
+{{ page.project_info 
}}
+Download v{{ page.latest_version }}
+Get Started
+  
+
+  
 
diff --git a/_includes/users.html b/_includes/users.html
index 3919721..92d7b30 100644
--- a/_includes/users.html
+++ b/_includes/users.html
@@ -6,41 +6,41 @@
   USED BY
 
 
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
-  
-
+  
+
   
 
   
diff --git a/css/main.scss b/css/main.scss
index 86b6fd2..b681a85 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -13,7 +13,7 @@ ul.navbar-nav {
 
 .content {
   margin-top: 78px;
-  width: 100%;
+  //width: 100%;
 }
 
 .container {
@@ -21,7 +21,8 @@ ul.navbar-nav {
 }
 
 body {
-  width: 100%;
+   width: 100%;
+   margin: 0%;
 }
 
 .slider {
@@ -86,6 +87,17 @@ a.get-started:hover {
 font-weight: bold;
 color: white;
 text-align: center;
+padding-bottom: 20px;
+padding-top: 20px;
+}
+
+.slider-text-small {
+font-size: 20px;
+font-weight: bold;
+color: white;
+text-align: center;
+padding-bottom: 20px;
+padding-top: 20px;
 }
 
 table.slider {
diff --git a/index.html b/index.html
index f355983..cc83603 100644
--- a/index.html
+++ b/index.html
@@ -11,20 +11,19 @@ layout: default
   
   
   
-
+
   
 
   
-  
-
-  
-  
+  
+
+  
   
 A SUITE OF OPEN SOURCE PROJECTS FOR HIGH PERFORMANCE MESSAGING
   
   
-  
-
+  
+
   
 
   
@@ -32,7 +31,7 @@ layout: default
 
 
   
-  
+  
 
   
 
diff --git a/projects/cms/index.html b/projects/cms/index.html
index aa92548..f64e871 100644
--- a/projects/cms/index.html
+++ b/projects/cms/index.html
@@ -1,6 +1,6 @@
 ---
 layout: project_default
-project_name: CMS
+project_name: CMS CLIENT
 project_info: C++ CLIENT IN THE STYLE OF JMS
 project_top_narative: CMS (stands for C++ Messaging Service) is a JMS-like API 
for C++ for interfacing with Message Brokers such as Apache ActiveMQ. CMS helps 
to make your C++ client code much neater and easier to follow. To get a better 
feel for CMS try the API Reference. ActiveMQ-CPP is a client only library, a 
message broker such as Apache ActiveMQ is still needed for your clients to 
communicate.
 project_class: cms
diff --git a/projects/nms/index.html b/projects/nms/index.html
index f1c5937..d975dc6 100644
--- a/projects/nms/index.html
+++ b/projects/nms/index.html
@@ -1,6 +1,6 @@
 ---
 layout: project_default
-project_name: NMS
+project_name: NMS CLIENTS
 project_info: A SUITE OF .NET CLIENTS FOR MESSAGING WITH ACTIVEMQ
 project

[activemq-website] 08/45: update gitignore

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 990bf20812e4a9e77a315a594b10bd1c441d552f
Author: andytaylor 
AuthorDate: Fri Jul 27 16:15:48 2018 +0100

update gitignore
---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 29b636a..5d7ec25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .idea
-*.iml
\ No newline at end of file
+*.iml
+.sass-cache
+_site
\ No newline at end of file

[activemq-website] 18/45: Use bundler for dependency management

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit f50eca43aa1b63468830f2ee367ad232a6f87cd4
Author: Martyn Taylor 
AuthorDate: Mon Sep 24 11:42:26 2018 +0100

Use bundler for dependency management
---
 Gemfile | 9 +
 1 file changed, 9 insertions(+)

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 000..1a68b72
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org;
+
+git_source(:github) {|repo_name| "https://github.com/#{repo_name}; }
+
+gem 'jekyll'
+gem 'rack-jekyll'
+gem 'thin'

[activemq-website] 17/45: Add bosch logo

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 8905a2a0be722fa746893da8c46238ec26842864
Author: Michael André Pearce 
AuthorDate: Tue Aug 21 10:01:06 2018 +0100

Add bosch logo
---
 _includes/users.html   |   2 +-
 .../img/customers/bosch-938-logo-png-transparent.png   | Bin 0 -> 162811 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/users.html b/_includes/users.html
index 90bc553..3919721 100644
--- a/_includes/users.html
+++ b/_includes/users.html
@@ -31,7 +31,7 @@
 
   
   
-
+
   
   
 
diff --git a/assets/img/customers/bosch-938-logo-png-transparent.png 
b/assets/img/customers/bosch-938-logo-png-transparent.png
new file mode 100644
index 000..c515109
Binary files /dev/null and 
b/assets/img/customers/bosch-938-logo-png-transparent.png differ

[activemq-website] 45/45: try to fix ifram

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit e7ae25361735626a6b8f84429f1db4fcd84fb98e
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 14:53:54 2018 +0100

try to fix ifram
---
 projects/classic/documentation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/classic/documentation.md 
b/projects/classic/documentation.md
index 1b4cd5f..6ab7582 100644
--- a/projects/classic/documentation.md
+++ b/projects/classic/documentation.md
@@ -1,5 +1,5 @@
 ---
 layout: iframe
 title: ActiveMQ 5 Documentation
-iframe: {{site.baseurl}}/gitbook/classic/documents/index.html
+iframe: /activemq-website/gitbook/classic/documents/index.html
 ---

[activemq-website] 33/45: Add page title to docs

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit c80b86bb265add69966509016cddf4f5438a042a
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 17:57:46 2018 +0100

Add page title to docs
---
 _includes/features.html   | 2 +-
 _layouts/iframe.html  | 8 +++-
 projects/artemis/documentation.md | 2 +-
 projects/classic/documentation.md | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/_includes/features.html b/_includes/features.html
index ce3ad41..e262926 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -24,7 +24,7 @@
   
 
   
-
+
   PROTOCOL TRANSLATION
 
 
diff --git a/_layouts/iframe.html b/_layouts/iframe.html
index ca481aa..cc29018 100644
--- a/_layouts/iframe.html
+++ b/_layouts/iframe.html
@@ -17,10 +17,16 @@
 
 #documentation-content
 {
-  position:absolute; left: 0; right: 0; bottom: 0; top: 78px;
+  position:absolute; left: 0; right: 0; bottom: 0; top: 128px;
 }
   
 
+  
+
+  {{page.title}}
+
+  
+
   
 
   
diff --git a/projects/artemis/documentation.md 
b/projects/artemis/documentation.md
index 9d6deec..23c3a05 100644
--- a/projects/artemis/documentation.md
+++ b/projects/artemis/documentation.md
@@ -1,5 +1,5 @@
 ---
 layout: iframe
-title: Documentation
+title: ActiveMQ Artemis Documentation
 iframe: https://activemq.apache.org/artemis/docs/latest/index.html
 ---
diff --git a/projects/classic/documentation.md 
b/projects/classic/documentation.md
index a65bce0..870ff3b 100644
--- a/projects/classic/documentation.md
+++ b/projects/classic/documentation.md
@@ -1,5 +1,5 @@
 ---
 layout: iframe
-title: Documentation
+title: ActiveMQ 5 Documentation
 iframe: /gitbook/classic/documents/index.html
 ---

[activemq-website] 32/45: Added styling to team page

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit f7cbeef7f3aa48e1de3b9985cb93c33a72be3231
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 17:49:10 2018 +0100

Added styling to team page
---
 team/team.html | 108 +
 team/team.md   |  17 -
 2 files changed, 108 insertions(+), 17 deletions(-)

diff --git a/team/team.html b/team/team.html
new file mode 100644
index 000..385b724
--- /dev/null
+++ b/team/team.html
@@ -0,0 +1,108 @@
+---
+layout: default
+title: Team
+breadcrumb: Team
+---
+
+
+  
+TEAM
+  
+
+
+
+
+  
+
+  ActiveMQ PMC Members
+  
+Arthur Naseef
+Brian McCallister
+Bruce Snyder
+Christian Posta
+Hiram R. Chirino
+Clebert Suconic
+Christopher L. Shannon
+Dain Sundstrom
+Dejan Bosanac
+David Jencks
+Daniel Kulp
+Gert Vanthienen
+Guillaume Nodet
+Gary Tully
+Matt Richard Hogstrom
+Jeff Genender
+Jim Gomes
+John Robert Sisson
+James Strachan
+Martyn Taylor
+Roman Kalukiewicz
+Timothy A. Bish
+  
+
+
+  ActiveMQ Project Committers
+  
+Adrian T. Co
+Alan Cabrera
+Alex Dean
+Aaron Mulder
+Andy Taylor
+Arthur Naseef
+Brian McCallister
+Bruce Snyder
+Christian Posta
+Hiram R. Chirino
+Clebert Suconic
+Colin MacNaughton
+Christian Schneider
+Christopher L. Shannon
+Dain Sundstrom
+Dejan Bosanac
+Darwin G. Flores
+Dhiraj Sureshkumar Bokde
+Dennis Cook
+David Jencks
+Daniel Kulp
+Frederick G. Oconer
+Howard Gao
+Gert Vanthienen
+Guillaume Nodet
+Gregory John Wilkins
+Gary Tully
+Hadrian Zbarcea
+John Heitmann
+Matt Richard Hogstrom
+Jonathan Anstey
+Justin Graham Bertram
+Jean-Baptiste Onofré
+Joseph Dennis O. Gapuz
+Jeff Genender
+Jim Gomes
+Jonas B. Lim
+John D. Ament
+John Robert Sisson
+James Strachan
+Jason van Zyl
+Kevin Anthony Earls
+Martyn Taylor
+Matt Pavlovich
+Michael André Pearce
+Marc Schöchlin
+Francesco Nigro
+Willem Ning Jiang
+Nathan Christopher Mittler
+Nicky Sandhu
+Peter A Royal Jr.
+Patrick Edward Lapus Villacorta
+Robert Davies
+Robert Gemmell
+Roman Kalukiewicz
+Ramzi Saba
+Timothy A. Bish
+Torsten Mielke
+William Tam
+  
+
+  
+
diff --git a/team/team.md b/team/team.md
deleted file mode 100644
index bd80aae..000
--- a/team/team.md
+++ /dev/null
@@ -1,17 +0,0 @@

-layout: default_md
-title: Team
-breadcrumb: Team

-
-## Committers ##
-
-Adrian T. Co,  Alan Cabrera,  Alex Dean,  Aaron Mulder,  Andy Taylor,  
Arthur Naseef,  Brian McCallister,  Bruce Snyder,  Christian Posta,  Hiram R. 
Chirino,  Clebert Suconic,  Colin MacNaughton,  Christian Schneider,  
Christopher L. Shannon,  Dain Sundstrom,  Dejan Bosanac,  Darwin G. Flores,  
Dhiraj Sureshkumar Bokde,  Dennis Cook,  David Jencks,  Daniel Kulp,  Frederick 
G. Oconer,  Howard Gao,  Gert Vanthienen,  Guillaume Nodet,  Gregory John 
Wilkins,  Gary Tully,  Hadrian Zbarcea [...]
-
-## PMC ##
-
-Arthur Naseef,  Brian McCallister,  Bruce Snyder,  Christian Posta,  Hiram 
R. Chirino,  Clebert Suconic,  Christopher L. Shannon,  Dain Sundstrom,  Dejan 
Bosanac,  David Jencks,  Daniel Kulp,  Gert Vanthienen,  Guillaume Nodet,  Gary 
Tully,  Matt Richard Hogstrom,  Jeff Genender,  Jim Gomes,  John Robert Sisson, 
 James Strachan,  Martyn Taylor,  Roman Kalukiewicz,  Timothy A. Bish
-
-## Reports ##
-
-To be decided.

[activemq-website] 13/45: Merge pull request #2 from andytaylor/master

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 7dbd3378ac5b39bdb08030adb055ff2a66c6a8b0
Merge: 7e6a412 a9c1d1f
Author: Martyn Taylor 
AuthorDate: Mon Jul 30 09:57:59 2018 +0100

Merge pull request #2 from andytaylor/master

updated project cards

 index.html | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

[activemq-website] 28/45: team and contact

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 6ab147a36e5d137b6a2b0a86f2de8b96017b4a68
Author: Howard Gao 
AuthorDate: Tue Sep 25 22:47:12 2018 +0800

team and contact
---
 _includes/nav.html | 16 +++---
 contact/contact.md | 61 ++
 team/team.md   | 17 +++
 3 files changed, 86 insertions(+), 8 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index a54094e..6f320f3 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -37,11 +37,11 @@
 
 Contact
 
-Mailing Lists
-IRC
-Report Issues
-Contributing
-Social Media
+Mailing Lists
+IRC
+Report Issues
+Contributing
+Social Media
 
 
   
@@ -56,9 +56,9 @@
 
 Team
 
-Committers
-PMC
-Reports
+Committers
+PMC
+Reports
 
 
 
diff --git a/contact/contact.md b/contact/contact.md
new file mode 100644
index 000..106a1d1
--- /dev/null
+++ b/contact/contact.md
@@ -0,0 +1,61 @@
+---
+layout: default_md
+title: Team
+breadcrumb: Team
+---
+
+## Mailing ##
+
+This mailing list is end users to ask general questions about ActiveMQ
+
+ActiveMQ User List
+This mailing list is end users to ask general questions about ActiveMQ
+
+Subscribe users-subscr...@activemq.apache.org
+Unsubscribe users-unsubscr...@activemq.apache.org
+Apache Archive http://mail-archives.apache.org/mod_mbox/activemq-users/
+MarkMail Archive 
http://activemq.markmail.org/search/list:org.apache.activemq.users
+Nabble Forum 
http://activemq.2283324.n4.nabble.com/ActiveMQ-User-f2341805.html
+
+ActiveMQ Developer List
+This mailing list is end users to ask general questions about the development 
of ActiveMQ
+
+Subscribe dev-subscr...@activemq.apache.org
+Unsubscribe dev-unsubscr...@activemq.apache.org
+Apache Archive http://mail-archives.apache.org/mod_mbox/activemq-dev/
+MarkMail Archive 
http://activemq.markmail.org/search/list:org.apache.activemq.dev
+Nabble Forum 
http://activemq.2283324.n4.nabble.com/ActiveMQ-Dev-f2368404.html
+
+ActiveMQ Commits List
+This mailing list get automatically notified when when the project source code 
gets updated.
+
+Subscribe commits-subscr...@activemq.apache.org
+Unsubscribe commits-unsubscr...@activemq.apache.org
+Apache Archive http://mail-archives.apache.org/mod_mbox/activemq-commits/
+MarkMail Archive 
http://activemq.markmail.org/search/list:org.apache.activemq.commits
+
+ActiveMQ Issues List
+This mailing list get automatically notified when issues are created or 
modified.
+
+Subscribe issues-subscr...@activemq.apache.org
+Unsubscribe issues-unsubscr...@activemq.apache.org
+Apache Archive http://mail-archives.apache.org/mod_mbox/activemq-issues/
+MarkMail Archive 
http://activemq.markmail.org/search/list:org.apache.activemq.issues
+
+
+## IRC ##
+
+You can also catch us on IRC to chat via the #apache-activemq channel on the 
irc.freenode.net server.
+
+## Issues ##
+
+Any issues can be raised in the Apache ActiveMQ Artemis Issue Tracker 
https://issues.apache.org/jira/browse/ARTEMIS
+
+## Contributing ##
+
+We really want you to get involved in Apache ActiveMQ Artemis and welcome all 
contributions. These can be made by raising a Pull Request via Github here
+https://github.com/apache/activemq-artemis
+
+## Social ##
+
+Contents to be decided
diff --git a/team/team.md b/team/team.md
new file mode 100644
index 000..bd80aae
--- /dev/null
+++ b/team/team.md
@@ -0,0 +1,17 @@
+---
+layout: default_md
+title: Team
+breadcrumb: Team
+---
+
+## Committers ##
+
+Adrian T. Co,  Alan Cabrera,  Alex Dean,  Aaron Mulder,  Andy Taylor,  
Arthur Naseef,  Brian McCallister,  Bruce Snyder,  Christian Posta,  Hiram R. 
Chirino,  Clebert Suconic,  Colin MacNaughton,  Christian Schneider,  
Christopher L. Shannon,  Dain Sundstrom,  Dejan Bosanac,  Darwin G. Flores,  
Dhiraj Sureshkumar Bokde,  Dennis Cook,  David Jencks

[activemq-website] 12/45: updated project cards

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit a9c1d1fa13168a05d0a06b435fcae917ef11d786
Author: andytaylor 
AuthorDate: Mon Jul 30 09:49:53 2018 +0100

updated project cards
---
 index.html | 24 +---
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/index.html b/index.html
index ba970cb..332243c 100644
--- a/index.html
+++ b/index.html
@@ -43,9 +43,10 @@ layout: default
   BROKER + JMS CLIENT
   Artemis is ActiveMQ's next generation message broker
   
-Event driven core engine
+Event driven engine
 Multi protocol support
 Built in data replication
+JMS 2.0
   
   Find out more
   Download Latest
@@ -57,11 +58,12 @@ layout: default
 
   ActiveMQ 5
   BROKER + JMS CLIENT
-  Artemis is ActiveMQ's next generation message broker
+  The original highly functional message broker
   
-Event driven core engine
 Multi protocol support
-Built in data replication
+Camel Support
+Spring Support
+JMS 1.1
   
   Find out more
   Download Latest
@@ -73,11 +75,11 @@ layout: default
 
   NMS
   .NET CLIENTS
-  Artemis is ActiveMQ's next generation message broker
+  A JMS type API in written in .NET
   
-Event driven core engine
 Multi protocol support
-Built in data replication
+Support for ActiveMQ advanced features
+Simple API
   
   Find out more
   Download Latest
@@ -89,11 +91,11 @@ layout: default
 
   CMS
   C++ CLIENT
-  Artemis is ActiveMQ's next generation message broker
+  A JMS type API in written in C++
   
-Event driven core engine
-Multi protocol support
-Built in data replication
+Supports Openwire and Stomp protocols
+Failover supportl
+Simple API
   
   Find out more
   Download Latest

[activemq-website] 20/45: Merge remote-tracking branch 'origin/master' into HEAD

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit d0e1920c2f5fd30489b4c3cdb38f60a0ed5e7958
Merge: 8905a2a 21deffd
Author: Martyn Taylor 
AuthorDate: Mon Sep 24 15:41:03 2018 +0100

Merge remote-tracking branch 'origin/master' into HEAD

 Gemfile   | 9 +
 config.ru | 3 +++
 2 files changed, 12 insertions(+)

[activemq-website] 44/45: align with downdown

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit b1fef35d74222c03e7aefd457d3b98d4e6118905
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 14:30:55 2018 +0100

align with downdown
---
 _includes/nav.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index cd8c445..cbb1b10 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -15,7 +15,7 @@
 http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Projects
 
 
-
+
 
 Projects
 

[activemq-website] 41/45: Use baseurl

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 0c4105b7abf5a25062e01785916677daf91091f8
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 14:06:10 2018 +0100

Use baseurl
---
 _includes/features.html |  6 +++---
 _includes/footer.html   |  4 ++--
 _includes/head.html |  4 ++--
 _includes/nav.html  | 28 ++--
 _includes/splash.html   |  4 ++--
 _includes/users.html| 24 
 index.html  | 12 ++--
 projects/artemis/index.html | 12 ++--
 projects/classic/index.html | 12 ++--
 projects/nms/index.html | 12 ++--
 10 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/_includes/features.html b/_includes/features.html
index cc16560..21e7a92 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -34,7 +34,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -59,7 +59,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
@@ -84,7 +84,7 @@
 
   
 
-  
+  
 
 
   Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/_includes/footer.html b/_includes/footer.html
index eeb4273..694fef6 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -6,7 +6,7 @@
   
 
   
-
+
   
 
 
@@ -14,7 +14,7 @@
 
 
   
-
+
   
 
   
diff --git a/_includes/head.html b/_includes/head.html
index d1d7b4d..cd01a1f 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,9 +3,9 @@
 
 
 ActiveMQ
-
+
 
-
+
 https://use.fontawesome.com/releases/v5.0.8/js/all.js&quot</a>; 
integrity="sha384-SlE991lGASHoBfWbelyBPLsUlwY1GwNDJo3jSJO04KZ33K2bwfV9YBauFfnzvynJ"
 crossorigin="anonymous">
 https://code.jquery.com/jquery-3.2.1.slim.min.js&quot</a>; 
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
 crossorigin="anonymous">
 https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js&quot</a>; 
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
 crossorigin="anonymous">
diff --git a/_includes/nav.html b/_includes/nav.html
index 85d6a34..cd8c445 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
@@ -9,7 +9,7 @@
 
 
 
-Home
+Home
 
 
 http://example.com; data-toggle="dropdown" 
aria-haspopup="true" aria-expanded="false">Projects
@@ -19,10 +19,10 @@
 
 Projects
 
-ActiveMQ Artemis
-ActiveMQ 5
-NMS Clients
-CMS Client
+   

[activemq-website] 34/45: Use placeholder content while we decide on real content

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 058cdc416c33fc4aa95e625de75ea6acc3371439
Author: Martyn Taylor 
AuthorDate: Wed Sep 26 13:39:37 2018 +0100

Use placeholder content while we decide on real content
---
 _includes/features.html|  63 +-
 _includes/splash.html  |   4 +-
 assets/img/example-diagram.png | Bin 0 -> 40746 bytes
 index.html | 189 +
 projects/artemis/index.html| 101 ++
 projects/classic/index.html|  92 ++--
 projects/cms/index.html|  92 ++--
 projects/nms/index.html|  93 ++--
 8 files changed, 384 insertions(+), 250 deletions(-)

diff --git a/_includes/features.html b/_includes/features.html
index e262926..8c4b5e6 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -7,8 +7,9 @@
 
   
 
-  Create messaging infrastructure for any environment! 
Internet of Things, Cloud Messaging, Micro Services or Enterprise,
-we have all the bells and whistles required.  Read about some 
of our core features below.
+  
+  Narative: "Lorem ipsum dolor sit amet, consectetur 
adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna 
aliqua. Ut enim ad minim veniam,"
+  
 
   
 
@@ -25,24 +26,18 @@
 
   
 
-  PROTOCOL TRANSLATION
+  Why choose ActiveMQ over other projects.
 
 
-  SEND IN ONE PROTOCOL RECIEVE IN ANOTHER
+  Subtitle.
 
 
   
 
-  
+  
 
 
-  Applications and deployment environments are varied
-  by their very nature.  Use protocols that best suit your  
specific
-  applications and let ActiveMQ do the work of integrating the
-  specific tecnologies for you.
-
-  Produce telemetry data using MQTT for devices with limited
-  resources.  Process via AMQP or JMS in your enterprise 
application.
+  Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 
 
   
@@ -54,26 +49,20 @@
   
 
 
-  
-
-  BUILT IN REPLICATION
+  
+
+  Why choose ActiveMQ over other projects?
 
 
-  SEND IN ONE PROTOCOL RECIEVE IN ANOTHER
+  Subtitle
 
 
   
 
-  
+  
 
 
-  Applications and deployment environments are varied
-  by their very nature.  Use protocols that best suit your  
specific
-  applications and let ActiveMQ do the work of integrating the
-  specific tecnologies for you.
-
-  Produce telemetry data using MQTT for devices with limited
-  resources.  Process via AMQP or JMS in your enterprise 
application.
+  Lorem ipsum dolor sit amet, consectetur adipiscing elit, 
sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad 
minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea 
commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit 
esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat 
non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 
 
   
@@ -85,31 +74,25 @@
   
 
 
-  
-
-  BUILT IN REPLICATION
+  
+
+  Why choose ActiveMQ over other projects?
 
 
-  SEND IN ONE PROTOCOL RECIEVE IN ANOTHER
+  Subtitle.
 
 
   
 
-  
+  
 
 
-  Applications and deployment environments are varied
-  by their very nature.  Use protocols that best suit yo

[activemq-website] 05/45: add ignore

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 40a9465b4a057beb58b1493fe729583b48172dc7
Author: andytaylor 
AuthorDate: Wed Jul 25 12:42:47 2018 +0100

add ignore
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..29b636a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+*.iml
\ No newline at end of file

[activemq-website] 19/45: Enable running with Rack

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 21deffd75d887850e3fe0a40e81bd2e79d294cd4
Author: Martyn Taylor 
AuthorDate: Mon Sep 24 11:42:38 2018 +0100

Enable running with Rack
---
 config.ru | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config.ru b/config.ru
new file mode 100644
index 000..b7d8dc7
--- /dev/null
+++ b/config.ru
@@ -0,0 +1,3 @@
+require "rack/jekyll"
+
+run Rack::Jekyll.new

[activemq-website] 42/45: trygithub rebuild

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 0758e217ade48f5686916101fd299a829f001e94
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 14:17:41 2018 +0100

trygithub rebuild
---
 projects/artemis/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/artemis/index.html b/projects/artemis/index.html
index 21b3fea..09f2a52 100644
--- a/projects/artemis/index.html
+++ b/projects/artemis/index.html
@@ -105,3 +105,4 @@ latest_version: 2.6.0
 
 
 
+

[activemq-website] 43/45: sort activemq 5 docs

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 6985ca2df993137b69e05d161aa4af3488447b54
Author: Michael André Pearce 
AuthorDate: Thu Sep 27 14:26:23 2018 +0100

sort activemq 5 docs
---
 projects/classic/documentation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/classic/documentation.md 
b/projects/classic/documentation.md
index 870ff3b..1b4cd5f 100644
--- a/projects/classic/documentation.md
+++ b/projects/classic/documentation.md
@@ -1,5 +1,5 @@
 ---
 layout: iframe
 title: ActiveMQ 5 Documentation
-iframe: /gitbook/classic/documents/index.html
+iframe: {{site.baseurl}}/gitbook/classic/documents/index.html
 ---

[activemq-website] 09/45: Merge pull request #1 from andytaylor/master

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 27e988ffaa8f34896982c06e0b33861146c5c472
Merge: 4dd49c1 990bf20
Author: Martyn Taylor 
AuthorDate: Fri Jul 27 16:19:49 2018 +0100

Merge pull request #1 from andytaylor/master

some landing pages

 .gitignore |4 +
 _includes/features.html|6 +-
 _includes/nav.html |4 +-
 _includes/{nav.html => project-nav.html}   |   14 +-
 _includes/splash.html  |   49 +
 _includes/users.html   |   24 +-
 _layouts/project_default.html  |   12 +
 _site/README.md|   11 -
 _site/assets/img/apache-feather.png|  Bin 138140 -> 0 bytes
 _site/assets/img/apache-logo.png   |  Bin 25977 -> 0 bytes
 _site/assets/img/customers/igindex.png |  Bin 2268 -> 0 bytes
 _site/assets/img/features/protocol-translation.png |  Bin 10058 -> 0 bytes
 _site/assets/img/main-logo.png |  Bin 15462 -> 0 bytes
 _site/assets/img/nav-logo.png  |  Bin 3306 -> 0 bytes
 _site/css/bootstrap/bootstrap-grid.scss|   32 -
 _site/css/bootstrap/bootstrap-reboot.scss  |   12 -
 _site/css/bootstrap/bootstrap.scss |   43 -
 _site/css/main.css | 6721 
 _site/index.html   |  391 --
 _site/projects/artemis/index.html  |0
 css/main.scss  |   37 +
 index.html |8 +-
 projects/activemq/index.html   |   65 +
 projects/artemis/index.html|   74 +
 projects/cms/index.html|   65 +
 projects/nms/index.html|   65 +
 26 files changed, 395 insertions(+), 7242 deletions(-)

[activemq-website] 11/45: Added some more styling changes

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 7e6a412c02f0bfa220e3e718bbffd7ff5d90324c
Author: Martyn Taylor 
AuthorDate: Fri Jul 27 20:00:29 2018 +0100

Added some more styling changes
---
 _includes/project-nav.html   |  2 +-
 _includes/splash.html| 28 ++--
 index.html   |  2 +-
 projects/activemq/index.html |  4 ++--
 projects/artemis/index.html  |  4 ++--
 projects/cms/index.html  |  2 +-
 projects/nms/index.html  |  2 +-
 7 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/_includes/project-nav.html b/_includes/project-nav.html
index 912ca86..f150108 100644
--- a/_includes/project-nav.html
+++ b/_includes/project-nav.html
@@ -1,7 +1,7 @@
 
 
   
- {{ page.project_name }}
+
 
   
 
diff --git a/_includes/splash.html b/_includes/splash.html
index 62fa56b..6070fbf 100644
--- a/_includes/splash.html
+++ b/_includes/splash.html
@@ -1,30 +1,22 @@
 
-
+
 
 
-
+
 
   
 
-  
-
-  
-{{ page.project_info }}
-  
-
-
-  
-DOWNLOAD v{{ 
page.latest_version }}
-GET STARTED
-  
-
-  
-
+  
+  {{ 
page.project_name }}
+  {{ 
page.project_info }}
+  DOWNLOAD v{{ 
page.latest_version }}
+  GET STARTED
+
   
-  
+
   
 
-
+  
 
 
 
diff --git a/index.html b/index.html
index 06abe77..ba970cb 100644
--- a/index.html
+++ b/index.html
@@ -2,7 +2,7 @@
 layout: default
 ---
 
-
+
 
 
 
diff --git a/projects/activemq/index.html b/projects/activemq/index.html
index 26f376c..b92c1c0 100644
--- a/projects/activemq/index.html
+++ b/projects/activemq/index.html
@@ -1,7 +1,7 @@
 ---
 layout: project_default
-project_name: ActiveMQ 5
-project_info: Apache ActiveMQ ™ is the most popular and powerful open source 
messaging and Integration Patterns server.
+project_name: ACTIVEMQ 5
+project_info: THE WORLD'S MOST POPULAR OPEN SOURCE MESSAGE BROKER
 project_top_narative: Apache ActiveMQ is fast, supports many Cross Language 
Clients and Protocols, comes with easy to use Enterprise Integration Patterns 
and many advanced features while fully supporting JMS 1.1 and J2EE 1.4. Apache 
ActiveMQ is released under the Apache 2.0 License
 project_class: activemq5
 latest_version: 5.15.4
diff --git a/projects/artemis/index.html b/projects/artemis/index.html
index 809b6c7..72d0941 100644
--- a/projects/artemis/index.html
+++ b/projects/artemis/index.html
@@ -1,7 +1,7 @@
 ---
 layout: project_default
-project_name: Artemis
-project_info: Artemis is ActiveMQ's next generation message broker built to be 
both scalable and performant
+project_name: ARTEMIS
+project_info: THE NEXT GENERATATION MESSAGE BROKER BY ACTIVEMQ
 project_top_narative: Artemis is a scalable messaging broker with 
outstanding performance, see the independant article here
 project_class: artemis
 latest_version: 2.6.0
diff --git a/projects/cms/index.html b/projects/cms/index.html
index b438781..d71b6e8 100644
--- a/projects/cms/index.html
+++ b/projects/cms/index.html
@@ -1,7 +1,7 @@
 ---
 layout: project_default
 project_name: CMS
-project_info: build C++ Applications that can talk to Brokers using a JMS 
style API
+project_info: C++ CLIENT IN THE STYLE OF JMS
 project_top_narative: CMS (stands for C++ Messaging Service) is a JMS-like API 
for C++ for interfacing with Message Brokers such as Apache ActiveMQ. CMS helps 
to make your C++ client code much neater and easier to follow. To get a better 
feel for CMS try the API Reference. ActiveMQ-CPP is a client only library, a 
message broker such as Apache ActiveMQ is still needed for your clients to 
communicate.
 project_class: cms
 latest_version: 2.6.0
diff --git a/projects/nms/index.html b/projects/nms/index.html
index 693ff59..02102aa 100644
--- a/projects/nms/index.html
+++ b/projects/nms/index.html
@@ -1,7 +1,7 @@
 ---
 layout: project_default
 project_name: NMS
-project_info: build .NET Applications that can talk to Brokers using a JMS 
style API
+project_info: A SUITE OF .NET CLIENTS

[activemq-website] 16/45: Manage feature images size by css

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 1a4d3331687920246b6788238e789ce000bb5816
Author: Michael André Pearce 
AuthorDate: Sat Aug 18 00:28:23 2018 +0100

Manage feature images size by css

Add css max width and height
Add some extra images,  to check css is limiting image sizes of a selection 
of images.
---
 _includes/features.html   |   4 ++--
 assets/img/features/ha-replicated.png | Bin 0 -> 35590 bytes
 assets/img/features/protocols.png | Bin 0 -> 208929 bytes
 css/main.scss |   5 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/_includes/features.html b/_includes/features.html
index b15a99f..ce3ad41 100644
--- a/_includes/features.html
+++ b/_includes/features.html
@@ -33,7 +33,7 @@
 
   
 
-  
+  
 
 
   Applications and deployment environments are varied
@@ -95,7 +95,7 @@
 
   
 
-  
+  
 
 
   Applications and deployment environments are varied
diff --git a/assets/img/features/ha-replicated.png 
b/assets/img/features/ha-replicated.png
new file mode 100644
index 000..ef9648b
Binary files /dev/null and b/assets/img/features/ha-replicated.png differ
diff --git a/assets/img/features/protocols.png 
b/assets/img/features/protocols.png
new file mode 100644
index 000..3db8e81
Binary files /dev/null and b/assets/img/features/protocols.png differ
diff --git a/css/main.scss b/css/main.scss
index 39a497a..6e56362 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -288,6 +288,11 @@ h6 {
   padding-bottom: 30px;
 }
 
+.feature-img > img {
+  max-height: 150px;
+  max-width: 250px;
+}
+
 .features .container .card {
   background: none;
 }

[activemq-website] 35/45: Merge pull request #1 from mtaylor/master

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 1f3d918815139284a3c573d9483f15a91c645f74
Merge: 8905a2a 058cdc4
Author: Michael André Pearce 
AuthorDate: Wed Sep 26 14:25:04 2018 +0100

Merge pull request #1 from mtaylor/master

Latest Changes

 .../_variables.scssc   | Bin 3994 -> 0 bytes
 .../_alert.scssc   | Bin 3818 -> 0 bytes
 .../_background-variant.scssc  | Bin 5885 -> 0 bytes
 .../_badge.scssc   | Bin 3612 -> 0 bytes
 .../_border-radius.scssc   | Bin 8046 -> 0 bytes
 .../_box-shadow.scssc  | Bin 1783 -> 0 bytes
 .../_breakpoints.scssc | Bin 3 -> 0 bytes
 .../_buttons.scssc | Bin 36837 -> 0 bytes
 .../_caret.scssc   | Bin 19934 -> 0 bytes
 .../_clearfix.scssc| Bin 2163 -> 0 bytes
 .../_float.scssc   | Bin 2109 -> 0 bytes
 .../_forms.scssc   | Bin 29519 -> 0 bytes
 .../_gradients.scssc   | Bin 20757 -> 0 bytes
 .../_grid-framework.scssc  | Bin 17515 -> 0 bytes
 .../_grid.scssc| Bin 12780 -> 0 bytes
 .../_hover.scssc   | Bin 4737 -> 0 bytes
 .../_image.scssc   | Bin 6455 -> 0 bytes
 .../_list-group.scssc  | Bin 5177 -> 0 bytes
 .../_lists.scssc   | Bin 1783 -> 0 bytes
 .../_nav-divider.scssc | Bin 3265 -> 0 bytes
 .../_pagination.scssc  | Bin 5204 -> 0 bytes
 .../_reset-text.scssc  | Bin 5354 -> 0 bytes
 .../_resize.scssc  | Bin 2068 -> 0 bytes
 .../_screen-reader.scssc   | Bin 7422 -> 0 bytes
 .../_size.scssc| Bin 1764 -> 0 bytes
 .../_table-row.scssc   | Bin 5802 -> 0 bytes
 .../_text-emphasis.scssc   | Bin 3728 -> 0 bytes
 .../_text-hide.scssc   | Bin 2564 -> 0 bytes
 .../_text-truncate.scssc   | Bin 1929 -> 0 bytes
 .../_transition.scssc  | Bin 3771 -> 0 bytes
 .../_visibility.scssc  | Bin 1854 -> 0 bytes
 .../_alert.scssc   | Bin 10585 -> 0 bytes
 .../_badge.scssc   | Bin 8814 -> 0 bytes
 .../_breadcrumb.scssc  | Bin 9487 -> 0 bytes
 .../_button-group.scssc| Bin 30962 -> 0 bytes
 .../_buttons.scssc | Bin 24658 -> 0 bytes
 .../_card.scssc| Bin 50116 -> 0 bytes
 .../_carousel.scssc| Bin 43593 -> 0 bytes
 .../_close.scssc   | Bin 7581 -> 0 bytes
 .../_code.scssc| Bin 11359 -> 0 bytes
 .../_custom-forms.scssc| Bin 66349 -> 0 bytes
 .../_dropdown.scssc| Bin 28523 -> 0 bytes
 .../_forms.scssc   | Bin 65377 -> 0 bytes
 .../_functions.scssc   | Bin 25152 -> 0 bytes
 .../_grid.scssc| Bin 8851 -> 0 bytes
 .../_images.scssc  | Bin 7846 -> 0 bytes
 .../_input-group.scssc | Bin 38341 -> 0 bytes
 .../_jumbotron.scssc   | Bin 4916 -> 0 bytes
 .../_list-group.scssc  | Bin 20996 -> 0 bytes
 .../_media.scssc   | Bin 2186 -> 0 bytes
 .../_mixins.scssc  | Bin 5047 -> 0 bytes
 .../_modal.scssc   | Bin 38179 -> 0 bytes
 .../_nav.scssc | Bin 19020 -> 0 bytes
 .../_navbar.scssc  | Bin 52108 -> 0 bytes
 .../_pagination.scssc  | Bin 17299 -> 0 bytes
 .../_popover.scssc | Bin 44742 -> 0 bytes
 .../_print.scssc   | Bin 19439 -> 0 bytes
 .../_progress.scssc| Bin 9035 -> 0 bytes
 .../_reboot.scssc  | Bin 81489 ->

[activemq-website] 04/45: Some style and logo changes

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 4dd49c18183ca699cedfe9da0210628336f92f55
Author: Martyn Taylor 
AuthorDate: Fri Jul 27 11:52:53 2018 +0100

Some style and logo changes
---
 _includes/nav.html  |   2 ++
 _site/README.md |  11 +++
 _site/assets/img/apache-feather.png | Bin 0 -> 138140 bytes
 _site/assets/img/main-logo.png  | Bin 14583 -> 15462 bytes
 _site/assets/img/nav-logo.png   | Bin 2613 -> 3306 bytes
 _site/index.html|  10 ++
 _site/projects/artemis/index.html   |   0
 assets/img/apache-feather.png   | Bin 0 -> 138140 bytes
 assets/img/main-logo.png| Bin 14583 -> 15462 bytes
 assets/img/nav-logo.png | Bin 2613 -> 3306 bytes
 index.html  |   8 
 projects/artemis/index.html |   0
 12 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index 0d7cd23..6500188 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,6 +1,7 @@
 
 
   
+
 
 
   
@@ -28,4 +29,5 @@
 
   
 
+  
 
diff --git a/_site/README.md b/_site/README.md
new file mode 100644
index 000..ed3defb
--- /dev/null
+++ b/_site/README.md
@@ -0,0 +1,11 @@
+ActiveMQ Webiste
+=
+
+To run
+---
+
+1. Install ruby
+2. Install bundler: gem install bundler
+3. Install deps: cd activemq-website; bundle install
+4. Run Dev Server: jekyll serve
+
diff --git a/_site/assets/img/apache-feather.png 
b/_site/assets/img/apache-feather.png
new file mode 100644
index 000..744b8d7
Binary files /dev/null and b/_site/assets/img/apache-feather.png differ
diff --git a/_site/assets/img/main-logo.png b/_site/assets/img/main-logo.png
index aa20089..6f471e3 100644
Binary files a/_site/assets/img/main-logo.png and 
b/_site/assets/img/main-logo.png differ
diff --git a/_site/assets/img/nav-logo.png b/_site/assets/img/nav-logo.png
index b4a4859..7bbedd0 100644
Binary files a/_site/assets/img/nav-logo.png and 
b/_site/assets/img/nav-logo.png differ
diff --git a/_site/index.html b/_site/index.html
index ce5646b..e46d633 100644
--- a/_site/index.html
+++ b/_site/index.html
@@ -17,6 +17,7 @@
 
 
   
+
 
 
   
@@ -44,6 +45,7 @@
 
   
 
+  
 
 
 
@@ -82,7 +84,7 @@
 
   
 
-From brokers to clients ActiveMQ has everything required to 
build scalable, fault tolerant, messaging infrastructure.  Proven
+From brokers to clients Apache ActiveMQ has everything 
required to build scalable, fault tolerant, messaging infrastructure.  Proven
 resilience, standards based technologies and super fast 
performance.
 
   
@@ -101,7 +103,7 @@
 Multi protocol support
 Built in data replication
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -109,7 +111,7 @@
 
   
 
-  ActiveMQ
+  ActiveMQ 5
   BROKER + JMS CLIENT
   Artemis is ActiveMQ's next generation message broker
   
@@ -126,7 +128,7 @@
   
 
   NMS
-  DOT NET CLIENT
+  .NET CLIENTS
   Artemis is ActiveMQ's next generation message broker
   
 Event driven core engine
diff --git a/_site/projects/artemis/index.html 
b/_site/projects/artemis/index.html
new file mode 100644
index 000..e69de29
diff --git a/assets/img/apache-feather.png b/assets/img/apache-feather.png
new file mode 100644
index 000..744b8d7
Binary files /dev/null and b/assets/img/apache-feather.png differ
diff --git a/assets/img/main-logo.png b/assets/img/main-logo.png
index aa20089..6f471e3 100644
Binary files a/assets/img/main-logo.png and b/assets/img/main-logo.png differ
diff --git a/assets/img/nav-logo.png b/assets/img/nav-logo.png
index b4a4859..7bbedd0 100644
Binary files a/assets/img/nav-logo.png and b/assets/img/nav-logo.png differ
diff --git a/index.html b/index.html
index 7895ef9..4f62cf7 100644
--- a/index.html
+++ b/index.html
@@ -36,7 +36,7 @@ layout: default
 
   
 
-From brokers to clients ActiveMQ has everything required to 
build scalable, fault tolerant, messaging infrastructure.  Proven
+From brokers to clients Apache ActiveMQ has everything 
required to build scalable, fault tolerant, messaging infrastructure.  Proven
 resilience, standards based technologies and super fast 
performance.
 
   
@@ -55,7 +55,7 @@ layout: default
 Multi protocol support
 Built in data replication
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -63,7 +63,7 

[activemq-website] branch master created (now e7ae253)

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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


  at e7ae253  try to fix ifram

This branch includes the following new commits:

 new 978ddfc  Initial Commit
 new 33cde8c  Initial Import of ActiveMQ Website
 new 34e57f7  Added Readme
 new 4dd49c1  Some style and logo changes
 new 40a9465  add ignore
 new cebf833  first pass at project landing pages
 new 6c26389  removed _site
 new 990bf20  update gitignore
 new 27e988f  Merge pull request #1 from andytaylor/master
 new d761c2a  Style fixes and button alignment
 new 7e6a412  Added some more styling changes
 new a9c1d1f  updated project cards
 new 7dbd337  Merge pull request #2 from andytaylor/master
 new e2f37d6  Merge original poc site, with new
 new 9a345f6  More tidy up
 new 1a4d333  Manage feature images size by css
 new 8905a2a  Add bosch logo
 new f50eca4  Use bundler for dependency management
 new 21deffd  Enable running with Rack
 new d0e1920  Merge remote-tracking branch 'origin/master' into HEAD
 new d99975c  Add Gemfile.lock
 new 9391cfb  Removed Sass Cache
 new cc8adaa  Return to green on homepage
 new c145ffe  Fix Reponsive Layout
 new 3815982  Add example company logo
 new 6db232b  Make project page splash responsive
 new 03306fd  Updates to nav links and style
 new 6ab147a  team and contact
 new d49ab42  Merge pull request #3 from gaohoward/master
 new c1bc867  Add styling to contact page
 new fc7c212  Fix config.yml
 new f7cbeef  Added styling to team page
 new c80b86b  Add page title to docs
 new 058cdc4  Use placeholder content while we decide on real content
 new 1f3d918  Merge pull request #1 from mtaylor/master
 new 422cf32  fix for github pages
 new 396f560  further fix
 new e1eb1fe  Set Base Url for Site
 new 532e1a8  Merge remote-tracking branch 'michael/master'
 new 2f09188  Merge pull request #2 from mtaylor/master
 new 0c4105b  Use baseurl
 new 0758e21  trygithub rebuild
 new 6985ca2  sort activemq 5 docs
 new b1fef35  align with downdown
 new e7ae253  try to fix ifram

The 45 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] 26/45: Make project page splash responsive

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 6db232b1d4f0863d4b5d56d140b9c48cc170d33f
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 13:27:13 2018 +0100

Make project page splash responsive
---
 _includes/splash.html | 40 +---
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/_includes/splash.html b/_includes/splash.html
index 440b132..f3d2e4c 100644
--- a/_includes/splash.html
+++ b/_includes/splash.html
@@ -1,35 +1,3 @@
-
-
 
   
 
@@ -37,8 +5,9 @@
   
   {{ page.project_name }}
   {{ page.project_info }}
-  DOWNLOAD v{{ page.latest_version }}
-  GET STARTED
+  Download v{{ page.latest_version }}
+  Get Started
+  Read the Docs
   
   
   
@@ -57,8 +26,9 @@
 
   
 {{ page.project_info 
}}
-Download v{{ page.latest_version }}
 Get Started
+Read the Docs
+Download v{{ page.latest_version }}
   
 
   

[activemq-website] 31/45: Fix config.yml

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit fc7c212b86e9c1be5d3202339372a14a99bbef8e
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 17:33:58 2018 +0100

Fix config.yml
---
 _config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_config.yml b/_config.yml
index e6deb57..590c47e 100644
--- a/_config.yml
+++ b/_config.yml
@@ -24,4 +24,4 @@ excerpt_separator: ""
 destination: target
 exclude: [BUILD.md, Gemfile*]
 keep_files: [.git]
-exclude: [vendor
+exclude: [vendor]

[activemq-website] 21/45: Add Gemfile.lock

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit d99975cfecf9d82cc89371be648a5f74fa8df9f4
Author: Martyn Taylor 
AuthorDate: Mon Sep 24 15:46:56 2018 +0100

Add Gemfile.lock
---
 Gemfile.lock | 75 
 1 file changed, 75 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 000..92ea58b
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,75 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+addressable (2.5.2)
+  public_suffix (>= 2.0.2, < 4.0)
+colorator (1.1.0)
+concurrent-ruby (1.0.5)
+daemons (1.2.6)
+em-websocket (0.5.1)
+  eventmachine (>= 0.12.9)
+  http_parser.rb (~> 0.6.0)
+eventmachine (1.2.7)
+ffi (1.9.25)
+forwardable-extended (2.6.0)
+http_parser.rb (0.6.0)
+i18n (0.9.5)
+  concurrent-ruby (~> 1.0)
+jekyll (3.8.4)
+  addressable (~> 2.4)
+  colorator (~> 1.0)
+  em-websocket (~> 0.5)
+  i18n (~> 0.7)
+  jekyll-sass-converter (~> 1.0)
+  jekyll-watch (~> 2.0)
+  kramdown (~> 1.14)
+  liquid (~> 4.0)
+  mercenary (~> 0.3.3)
+  pathutil (~> 0.9)
+  rouge (>= 1.7, < 4)
+  safe_yaml (~> 1.0)
+jekyll-sass-converter (1.5.2)
+  sass (~> 3.4)
+jekyll-watch (2.0.0)
+  listen (~> 3.0)
+kramdown (1.17.0)
+liquid (4.0.0)
+listen (3.1.5)
+  rb-fsevent (~> 0.9, >= 0.9.4)
+  rb-inotify (~> 0.9, >= 0.9.7)
+  ruby_dep (~> 1.2)
+mercenary (0.3.6)
+pathutil (0.16.1)
+  forwardable-extended (~> 2.6)
+public_suffix (3.0.3)
+rack (1.6.10)
+rack-jekyll (0.5.0)
+  jekyll (>= 1.3)
+  listen (>= 1.3)
+  rack (~> 1.5)
+rb-fsevent (0.10.3)
+rb-inotify (0.9.10)
+  ffi (>= 0.5.0, < 2)
+rouge (3.2.1)
+ruby_dep (1.5.0)
+safe_yaml (1.0.4)
+sass (3.6.0)
+  sass-listen (~> 4.0.0)
+sass-listen (4.0.0)
+  rb-fsevent (~> 0.9, >= 0.9.4)
+  rb-inotify (~> 0.9, >= 0.9.7)
+thin (1.7.2)
+  daemons (~> 1.0, >= 1.0.9)
+  eventmachine (~> 1.0, >= 1.0.4)
+  rack (>= 1, < 3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jekyll
+  rack-jekyll
+  thin
+
+BUNDLED WITH
+   1.16.2

[activemq-website] 25/45: Add example company logo

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 38159828221f8567dfcee1b660a515749b47ace5
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 12:32:14 2018 +0100

Add example company logo
---
 assets/img/customers/company-logo.png | Bin 0 -> 21221 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/img/customers/company-logo.png 
b/assets/img/customers/company-logo.png
new file mode 100644
index 000..4024a93
Binary files /dev/null and b/assets/img/customers/company-logo.png differ

[activemq-website] 29/45: Merge pull request #3 from gaohoward/master

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit d49ab42811328debe3aa90d544b1c40e0efc72d0
Merge: 03306fd 6ab147a
Author: Martyn Taylor 
AuthorDate: Tue Sep 25 15:54:45 2018 +0100

Merge pull request #3 from gaohoward/master

team and contact

 _includes/nav.html | 16 +++---
 contact/contact.md | 61 ++
 team/team.md   | 17 +++
 3 files changed, 86 insertions(+), 8 deletions(-)

[activemq-website] 10/45: Style fixes and button alignment

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit d761c2a70d718b6cf8d1392f6a9a021a313e
Author: Martyn Taylor 
AuthorDate: Fri Jul 27 16:59:59 2018 +0100

Style fixes and button alignment
---
 _includes/splash.html| 45 ++--
 css/main.scss| 17 +
 index.html   | 14 +++---
 projects/activemq/index.html |  4 +++-
 projects/artemis/index.html  |  2 ++
 projects/cms/index.html  |  2 ++
 projects/nms/index.html  |  3 +++
 7 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/_includes/splash.html b/_includes/splash.html
index 9863669..62fa56b 100644
--- a/_includes/splash.html
+++ b/_includes/splash.html
@@ -1,34 +1,33 @@
 
-
+
 
 
-
-
-
-
-{{ 
page.project_info }}
-
-
-
-
-
-
-
-
+
+
+  
 
-Artemis 
is ActiveMQ's next generation message broker
-
+  
+
+  
+{{ page.project_info }}
+  
+
+
+  
+DOWNLOAD v{{ 
page.latest_version }}
+GET STARTED
+  
+
+  
+
+  
+  
+  
 
 
 
 
 
-
-
-Download
-Get Started
-
-
 
 
 
@@ -46,4 +45,4 @@
 
 
 
-
\ No newline at end of file
+
diff --git a/css/main.scss b/css/main.scss
index 2d441c8..8c81832 100644
--- a/css/main.scss
+++ b/css/main.scss
@@ -328,3 +328,20 @@ h6 {
 .navbar {
   border-bottom: 1px solid black;
 }
+
+// Projects
+.slider-artemis {
+  background-color: $purple !important;
+}
+
+.slider-activemq5 {
+  background-color: $pink !important;
+}
+
+.slider-cms {
+  background-color: $blue !important;
+}
+
+.slider-nms {
+  background-color: $orange !important;
+}
diff --git a/index.html b/index.html
index 96eac6d..06abe77 100644
--- a/index.html
+++ b/index.html
@@ -6,9 +6,9 @@ layout: default
 
 
 
-
-  
-
+
+  
+
   A SUITE OF OPEN 
SOURCE PROJECTS FOR HIGH PERFORMANCE MESSAGING
   
 
@@ -16,14 +16,6 @@ layout: default
 
   
 
-
-  
-
-  A SUITE 
OF OPEN SOURCE PROJECTS FOR HIGH PERFORMANCE MESSAGING
-  
-
-  
-
 
 
 
diff --git a/projects/activemq/index.html b/projects/activemq/index.html
index 20a1e66..26f376c 100644
--- a/projects/activemq/index.html
+++ b/projects/activemq/index.html
@@ -1,8 +1,10 @@
 ---
 layout: project_default
-project_name: Classic
+project_name: ActiveMQ 5
 project_info: Apache ActiveMQ ™ is the most popular and powerful open source 
messaging and Integration Patterns server.
 project_top_narative: Apache ActiveMQ is fast, supports many Cross Language 
Clients and Protocols, comes with easy to use Enterprise Integration Patterns 
and many advanced features while fully supporting JMS 1.1 and J2EE 1.4. Apache 
ActiveMQ is released under the Apache 2.0 License
+project_class: activemq5
+latest_version: 5.15.4
 ---
 
 
diff --git a/projects/artemis/index.html b/projects/artemis/index.html
index ff5e64d..809b6c7 100644
--- a/projects/artemis/index.html
+++ b/projects/artemis/index.html
@@ -3,6 +3,8 @@ layout: project_default
 project_name: Artemis
 project_info: Artemis is ActiveMQ's next generation message broker built to be 
both scalable and performant
 project_top_narative: Artemis is a scalable messaging broker with 
outstanding performance, see the independant article here
+project_class: artemis
+latest_version: 2.6.0
 ---
 
 
diff

[activemq-website] 15/45: More tidy up

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 9a345f6e94f12d39e5bea42ac103e9711d41
Author: Michael André Pearce 
AuthorDate: Sat Aug 18 00:07:01 2018 +0100

More tidy up
---
 _includes/nav.html | 10 +-
 index.html |  8 
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/_includes/nav.html b/_includes/nav.html
index d151b55..f99c81d 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -51,17 +51,17 @@
 
 
 
-Core
-OpenWire
 AMQP
 MQTT
+Core
+OpenWire
 
 
 
 
-STOMP
-REST
-XMPP
+STOMP
+REST
+XMPP
 
 
 
diff --git a/index.html b/index.html
index 4d114eb..676a2f6 100644
--- a/index.html
+++ b/index.html
@@ -44,7 +44,7 @@ layout: default
 Built in data replication
 JMS 2.0
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -61,7 +61,7 @@ layout: default
 Spring Support
 JMS 1.1
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -77,7 +77,7 @@ layout: default
 Support for ActiveMQ advanced features
 Simple API
   
-  Find out more
+  Find out more
   Download Latest
 
   
@@ -93,7 +93,7 @@ layout: default
 Failover supportl
 Simple API
   
-  Find out more
+  Find out more
   Download Latest
 
   

[activemq-website] 39/45: Merge remote-tracking branch 'michael/master'

[martyntaylor]

This is an automated email from the ASF dual-hosted git repository.

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

commit 532e1a87d41cee3b01769119a942c8d306e0ba30
Merge: e1eb1fe 396f560
Author: Martyn Taylor 
AuthorDate: Thu Sep 27 13:31:27 2018 +0100

Merge remote-tracking branch 'michael/master'

 _includes/features.html |  6 +++---
 _includes/footer.html   |  4 ++--
 _includes/head.html |  4 ++--
 _includes/nav.html  | 28 ++--
 _includes/splash.html   |  4 ++--
 _includes/users.html| 24 
 index.html  | 12 ++--
 projects/artemis/index.html | 12 ++--
 projects/classic/index.html | 12 ++--
 projects/nms/index.html | 12 ++--
 10 files changed, 59 insertions(+), 59 deletions(-)

activemq-artemis git commit: ARTEMIS-2100 address routing-type overridden on attaching AMQP sender

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x ade0003c3 -> 5b7f2d5c2


ARTEMIS-2100 address routing-type overridden on attaching AMQP sender

AMQPSender has to honor an already existing multicast routingType
of an address while attempting to create a fresh new queue on it

(cherry picked from commit b71c1448914cbd25d53ba11720966bf8c2323c07)


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

Branch: refs/heads/2.6.x
Commit: 5b7f2d5c2af97c719d0529513d8db96351176863
Parents: ade0003
Author: Francesco Nigro 
Authored: Wed Oct 24 15:45:53 2018 +0200
Committer: Martyn Taylor 
Committed: Mon Nov 5 10:52:13 2018 +

--
 .../proton/ProtonServerReceiverContext.java |  13 ++-
 .../amqp/AmqpSenderRoutingTypeTest.java | 116 +++
 2 files changed, 127 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5b7f2d5c/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
index 0758714..b0cfba0 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
@@ -19,11 +19,13 @@ package org.apache.activemq.artemis.protocol.amqp.proton;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.security.CheckType;
 import org.apache.activemq.artemis.core.security.SecurityAuth;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.core.transaction.Transaction;
 import org.apache.activemq.artemis.protocol.amqp.broker.AMQPSessionCallback;
 import 
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
@@ -229,8 +231,15 @@ public class ProtonServerReceiverContext extends 
ProtonInitializable implements
 }
  }
   }
-
-  return sessionSPI.getDefaultRoutingType(address);
+  final AddressInfo addressInfo = sessionSPI.getAddress(address);
+  if (addressInfo != null && !addressInfo.getRoutingTypes().isEmpty()) {
+ if (addressInfo.getRoutingTypes().size() == 1 && 
addressInfo.getRoutingType() == RoutingType.MULTICAST) {
+return RoutingType.MULTICAST;
+ }
+  }
+  RoutingType defaultRoutingType = 
sessionSPI.getDefaultRoutingType(address);
+  defaultRoutingType = defaultRoutingType == null ? 
ActiveMQDefaultConfiguration.getDefaultRoutingType() : defaultRoutingType;
+  return defaultRoutingType;
}
 
/*

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5b7f2d5c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
new file mode 100644
index 000..0d46798
--- /dev/null
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
@@ -0,0 +1,116 @@
+/**
+ * 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
+ * 

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 43ad18058 -> c0a40a161


This closes #2415


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

Branch: refs/heads/master
Commit: c0a40a161932f740ef91bdc019ec8fec5971cd68
Parents: 43ad180 b71c144
Author: Martyn Taylor 
Authored: Mon Nov 5 10:50:28 2018 +
Committer: Martyn Taylor 
Committed: Mon Nov 5 10:50:28 2018 +

--
 .../proton/ProtonServerReceiverContext.java |  13 ++-
 .../amqp/AmqpSenderRoutingTypeTest.java | 116 +++
 2 files changed, 127 insertions(+), 2 deletions(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-2100 address routing-type overridden on attaching AMQP sender

[martyntaylor]

ARTEMIS-2100 address routing-type overridden on attaching AMQP sender

AMQPSender has to honor an already existing multicast routingType
of an address while attempting to create a fresh new queue on it


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

Branch: refs/heads/master
Commit: b71c1448914cbd25d53ba11720966bf8c2323c07
Parents: 43ad180
Author: Francesco Nigro 
Authored: Wed Oct 24 15:45:53 2018 +0200
Committer: Martyn Taylor 
Committed: Mon Nov 5 10:50:28 2018 +

--
 .../proton/ProtonServerReceiverContext.java |  13 ++-
 .../amqp/AmqpSenderRoutingTypeTest.java | 116 +++
 2 files changed, 127 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b71c1448/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
--
diff --git 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
index 0758714..b0cfba0 100644
--- 
a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
+++ 
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonServerReceiverContext.java
@@ -19,11 +19,13 @@ package org.apache.activemq.artemis.protocol.amqp.proton;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
 import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.security.CheckType;
 import org.apache.activemq.artemis.core.security.SecurityAuth;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.core.transaction.Transaction;
 import org.apache.activemq.artemis.protocol.amqp.broker.AMQPSessionCallback;
 import 
org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
@@ -229,8 +231,15 @@ public class ProtonServerReceiverContext extends 
ProtonInitializable implements
 }
  }
   }
-
-  return sessionSPI.getDefaultRoutingType(address);
+  final AddressInfo addressInfo = sessionSPI.getAddress(address);
+  if (addressInfo != null && !addressInfo.getRoutingTypes().isEmpty()) {
+ if (addressInfo.getRoutingTypes().size() == 1 && 
addressInfo.getRoutingType() == RoutingType.MULTICAST) {
+return RoutingType.MULTICAST;
+ }
+  }
+  RoutingType defaultRoutingType = 
sessionSPI.getDefaultRoutingType(address);
+  defaultRoutingType = defaultRoutingType == null ? 
ActiveMQDefaultConfiguration.getDefaultRoutingType() : defaultRoutingType;
+  return defaultRoutingType;
}
 
/*

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b71c1448/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
new file mode 100644
index 000..0d46798
--- /dev/null
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSenderRoutingTypeTest.java
@@ -0,0 +1,116 @@
+/**
+ * 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 

[1/2] activemq-artemis git commit: ARTEMIS-1710 Allow management msgs to exceed global-max-size limit

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 27c2375ce -> 43ad18058


ARTEMIS-1710 Allow management msgs to exceed global-max-size limit


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

Branch: refs/heads/master
Commit: 270b383e80296fb47dba6a719ef1616ddcaab1ef
Parents: 27c2375
Author: Francesco Nigro 
Authored: Sat Nov 3 16:37:26 2018 +0100
Committer: Francesco Nigro 
Committed: Sat Nov 3 23:34:59 2018 +0100

--
 .../artemis/cli/commands/tools/DBOption.java|  4 +-
 .../amqp/broker/AMQPSessionCallback.java|  8 +-
 .../core/protocol/openwire/amq/AMQSession.java  | 25 --
 .../management/impl/AddressControlImpl.java | 28 --
 .../core/paging/impl/PagingManagerImpl.java | 18 +++-
 .../journal/AbstractJournalStorageManager.java  |  3 +
 .../core/postoffice/impl/BindingsImpl.java  |  6 +-
 .../core/postoffice/impl/PostOfficeImpl.java|  6 +-
 .../artemis/core/server/QueueConfig.java|  8 +-
 .../core/server/impl/ActiveMQServerImpl.java|  2 +-
 .../server/impl/PostOfficeJournalLoader.java|  2 +-
 .../core/server/impl/ScaleDownHandler.java  | 13 ++-
 .../core/server/impl/ServerSessionImpl.java |  4 +-
 .../core/server/files/FileMoveManagerTest.java  |  3 +-
 .../broker/region/policy/DestinationProxy.java  | 15 +++-
 .../integration/paging/GlobalPagingTest.java| 95 
 .../replication/ReplicationTest.java|  2 +-
 .../core/postoffice/impl/BindingsImplTest.java  |  2 +-
 18 files changed, 203 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/270b383e/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
index aa0b47a..2f2d8e9 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DBOption.java
@@ -241,11 +241,11 @@ public class DBOption extends OptionalLocking {
   
storageManager, 1000L,
   
scheduledExecutorService, executorFactory,
  
false, null);
- pagingmanager = new PagingManagerImpl(pageStoreFactory, 
addressSettingsRepository);
+ pagingmanager = new PagingManagerImpl(pageStoreFactory, 
addressSettingsRepository, configuration.getManagementAddress());
   } else {
  storageManager = new JournalStorageManager(config, 
EmptyCriticalAnalyzer.getInstance(), executorFactory, executorFactory);
  PagingStoreFactory pageStoreFactory = new 
PagingStoreFactoryNIO(storageManager, config.getPagingLocation(), 1000L, 
scheduledExecutorService, executorFactory, true, null);
- pagingmanager = new PagingManagerImpl(pageStoreFactory, 
addressSettingsRepository);
+ pagingmanager = new PagingManagerImpl(pageStoreFactory, 
addressSettingsRepository, configuration.getManagementAddress());
 
   }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/270b383e/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 3d8ae5a..61816af 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
@@ -486,7 +486,7 @@ public class AMQPSessionCallback implements SessionCallback 
{
 
   try {
  PagingStore store = 
manager.getServer().getPagingManager().getPageStore(message.getAddressSimpleString());
- if (store.isRejectingMessages()) {
+ if (store != null && store.isRejectingMessages()) {
 // We drop pre-settled messages (and abort 

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

[martyntaylor]

This closes #2414


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

Branch: refs/heads/master
Commit: 43ad18058dbbec819e1324d4dd09409a3e2d532a
Parents: 27c2375 270b383
Author: Martyn Taylor 
Authored: Mon Nov 5 09:43:51 2018 +
Committer: Martyn Taylor 
Committed: Mon Nov 5 09:43:51 2018 +

--
 .../artemis/cli/commands/tools/DBOption.java|  4 +-
 .../amqp/broker/AMQPSessionCallback.java|  8 +-
 .../core/protocol/openwire/amq/AMQSession.java  | 25 --
 .../management/impl/AddressControlImpl.java | 28 --
 .../core/paging/impl/PagingManagerImpl.java | 18 +++-
 .../journal/AbstractJournalStorageManager.java  |  3 +
 .../core/postoffice/impl/BindingsImpl.java  |  6 +-
 .../core/postoffice/impl/PostOfficeImpl.java|  6 +-
 .../artemis/core/server/QueueConfig.java|  8 +-
 .../core/server/impl/ActiveMQServerImpl.java|  2 +-
 .../server/impl/PostOfficeJournalLoader.java|  2 +-
 .../core/server/impl/ScaleDownHandler.java  | 13 ++-
 .../core/server/impl/ServerSessionImpl.java |  4 +-
 .../core/server/files/FileMoveManagerTest.java  |  3 +-
 .../broker/region/policy/DestinationProxy.java  | 15 +++-
 .../integration/paging/GlobalPagingTest.java| 95 
 .../replication/ReplicationTest.java|  2 +-
 .../core/postoffice/impl/BindingsImplTest.java  |  2 +-
 18 files changed, 203 insertions(+), 41 deletions(-)
--

activemq-artemis git commit: ARTEMIS-2139 Do not add prefix for temp queues

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x f4e294289 -> 65213ebef


ARTEMIS-2139 Do not add prefix for temp queues


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

Branch: refs/heads/2.6.x
Commit: 65213ebeffb4725c0d926d64c9a85a07af0d89e1
Parents: f4e2942
Author: Martyn Taylor 
Authored: Sun Nov 4 13:32:29 2018 +
Committer: Martyn Taylor 
Committed: Sun Nov 4 15:44:44 2018 +

--
 .../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java  | 4 
 1 file changed, 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/65213ebe/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index 83fffc0..fb0574e 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -388,10 +388,6 @@ public class ActiveMQMessage implements javax.jms.Message {
  if (!address.startsWith(TOPIC_QUALIFIED_PREFIX + 
PacketImpl.OLD_TOPIC_PREFIX.toString())) {
 address = TOPIC_QUALIFIED_PREFIX + PacketImpl.OLD_TOPIC_PREFIX + 
address.substring(TOPIC_QUALIFIED_PREFIX.length());
  }
-  } else if (address.startsWith(TEMP_QUEUE_QUALIFED_PREFIX)) {
- if (!address.startsWith(TEMP_QUEUE_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_QUEUE_PREFIX.toString())) {
-address = TEMP_QUEUE_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_QUEUE_PREFIX + 
address.substring(TEMP_QUEUE_QUALIFED_PREFIX.length());
- }
   } else if (address.startsWith(TEMP_TOPIC_QUALIFED_PREFIX)) {
  if (!address.startsWith(TEMP_TOPIC_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_TOPIC_PREFIX.toString())) {
 address = TEMP_TOPIC_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_TOPIC_PREFIX + 
address.substring(TEMP_TOPIC_QUALIFED_PREFIX.length());

activemq-artemis git commit: ARTEMIS-2139 Fix ReplyTo for TempQueue

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 13f1ca36f -> 8e8b02a4c


ARTEMIS-2139 Fix ReplyTo for TempQueue


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

Branch: refs/heads/2.6.x
Commit: 8e8b02a4ca51d13d5c3010802cf49b6687043c42
Parents: 13f1ca3
Author: Martyn Taylor 
Authored: Thu Nov 1 15:39:36 2018 +
Committer: Martyn Taylor 
Committed: Thu Nov 1 15:48:53 2018 +

--
 .../apache/activemq/artemis/jms/client/ActiveMQDestination.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8e8b02a4/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 1868812..0228e70 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -128,7 +128,7 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
   } else if 
(unprefixedName.startsWith(PacketImpl.OLD_TOPIC_PREFIX.toString())) {
  unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_TOPIC_PREFIX.length());
   } else if 
(unprefixedName.startsWith(PacketImpl.OLD_TEMP_QUEUE_PREFIX.toString())) {
- unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_QUEUE_PREFIX.length());
+ unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_TEMP_QUEUE_PREFIX.length());
   } else if 
(unprefixedName.startsWith(PacketImpl.OLD_TEMP_TOPIC_PREFIX.toString())) {
  unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_TEMP_TOPIC_PREFIX.length());
   }

activemq-artemis git commit: ARTEMIS-2139 Fix ReplyTo for TempTopic

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 8ac9f8d30 -> e4744c903


ARTEMIS-2139 Fix ReplyTo for TempTopic


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

Branch: refs/heads/2.6.x
Commit: e4744c90381d9afc6d2a5275e5e25b26cd22a647
Parents: 8ac9f8d
Author: Martyn Taylor 
Authored: Tue Oct 30 15:42:02 2018 +
Committer: Martyn Taylor 
Committed: Tue Oct 30 15:42:02 2018 +

--
 .../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e4744c90/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index 31631e3..83fffc0 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -393,7 +393,7 @@ public class ActiveMQMessage implements javax.jms.Message {
 address = TEMP_QUEUE_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_QUEUE_PREFIX + 
address.substring(TEMP_QUEUE_QUALIFED_PREFIX.length());
  }
   } else if (address.startsWith(TEMP_TOPIC_QUALIFED_PREFIX)) {
- if (!address.startsWith(TEMP_TOPIC_QUALIFED_PREFIX + 
PacketImpl.OLD_TOPIC_PREFIX.toString())) {
+ if (!address.startsWith(TEMP_TOPIC_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_TOPIC_PREFIX.toString())) {
 address = TEMP_TOPIC_QUALIFED_PREFIX + 
PacketImpl.OLD_TEMP_TOPIC_PREFIX + 
address.substring(TEMP_TOPIC_QUALIFED_PREFIX.length());
  }
   } else if (address.startsWith(PacketImpl.OLD_QUEUE_PREFIX.toString())) {

[3/3] activemq-artemis git commit: ARTEMIS-2139 Fix JMS reply to Address is correct for all versions

[martyntaylor]

ARTEMIS-2139 Fix JMS reply to Address is correct for all versions


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

Branch: refs/heads/2.6.x
Commit: 8ac9f8d3033435e1fc99deaece676c78997ae4c4
Parents: ec313ba
Author: Martyn Taylor 
Authored: Fri Oct 26 09:23:10 2018 +0100
Committer: Martyn Taylor 
Committed: Fri Oct 26 09:48:03 2018 +0100

--
 .../artemis/jms/client/ActiveMQDestination.java | 20 +++--
 .../artemis/jms/client/ActiveMQMessage.java | 82 +++-
 2 files changed, 61 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/8ac9f8d3/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 6d1b409..1868812 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -26,6 +26,7 @@ import java.util.UUID;
 import org.apache.activemq.artemis.api.core.Pair;
 import org.apache.activemq.artemis.api.core.QueueAttributes;
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 import org.apache.activemq.artemis.jndi.JNDIStorable;
 import org.apache.activemq.artemis.api.core.ParameterisedAddress;
 
@@ -94,24 +95,24 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
public static Destination fromPrefixedName(final String addr, final String 
name) {
 
   ActiveMQDestination destination;
+  String address = addr;
   if (addr.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
+ address = 
addr.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
  destination = createQueue(address);
   } else if (addr.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
+ address = 
addr.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
  destination = createTopic(address);
   } else if 
(addr.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
+ address = 
addr.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
  destination = new ActiveMQTemporaryQueue(address, null);
   } else if 
(addr.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
+ address = 
addr.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
  destination = new ActiveMQTemporaryTopic(address, null);
   } else {
  destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
   }
 
   String unprefixedName = name;
-
   if (name.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
  unprefixedName = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
   } else if (name.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
@@ -122,6 +123,15 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
  unprefixedName = 
name.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
   }
 
+  if (unprefixedName.startsWith(PacketImpl.OLD_QUEUE_PREFIX.toString())) {
+ unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_QUEUE_PREFIX.length());
+  } else if 
(unprefixedName.startsWith(PacketImpl.OLD_TOPIC_PREFIX.toString())) {
+ unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_TOPIC_PREFIX.length());
+  } else if 
(unprefixedName.startsWith(PacketImpl.OLD_TEMP_QUEUE_PREFIX.toString())) {
+ unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_QUEUE_PREFIX.length());
+  } else if 
(unprefixedName.startsWith(PacketImpl.OLD_TEMP_TOPIC_PREFIX.toString())) {
+ unprefixedName = 
unprefixedName.substring(PacketImpl.OLD_TEMP_TOPIC_PREFIX.length());
+  }
   destination.setName(unprefixedName);
 
   

[1/3] activemq-artemis git commit: Revert "ARTEMIS-2139 Ensure 1.x Client reply to address is correct"

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 5bd533a97 -> 8ac9f8d30


Revert "ARTEMIS-2139 Ensure 1.x Client reply to address is correct"

This reverts commit cad1e9a630ddfb4647d7ee59c83195d98fbf1d30.


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

Branch: refs/heads/2.6.x
Commit: 5a113ff352dde926094a23a3c5134b16349be8e3
Parents: 5bd533a
Author: Martyn Taylor 
Authored: Fri Oct 26 09:24:29 2018 +0100
Committer: Martyn Taylor 
Committed: Fri Oct 26 09:24:29 2018 +0100

--
 .../artemis/jms/client/ActiveMQDestination.java | 37 ++--
 .../artemis/jms/client/ActiveMQMessage.java | 28 +++
 2 files changed, 38 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5a113ff3/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index a349e3e..6d1b409 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -91,24 +91,39 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
   return fromPrefixedName(name, name);
}
 
-   public static Destination fromPrefixedName(final String addr, String name) {
+   public static Destination fromPrefixedName(final String addr, final String 
name) {
 
   ActiveMQDestination destination;
+  if (addr.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
+ destination = createQueue(address);
+  } else if (addr.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
+ destination = createTopic(address);
+  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryQueue(address, null);
+  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryTopic(address, null);
+  } else {
+ destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
+  }
+
+  String unprefixedName = name;
+
   if (name.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
- name = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
- destination = createQueue(addr, name);
+ unprefixedName = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
   } else if (name.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
- name = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
- destination = createTopic(addr, name);
+ unprefixedName = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
- name = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
- destination = new ActiveMQTemporaryQueue(addr, null);
+ unprefixedName = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
- name = 
name.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
- destination = new ActiveMQTemporaryTopic(addr, null);
-  } else {
- destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
+ unprefixedName = 
name.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
   }
+
+  destination.setName(unprefixedName);
+
   return destination;
}
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5a113ff3/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
--
diff --git 

[2/3] activemq-artemis git commit: Revert "NO-JIRA Fix extra imports"

[martyntaylor]

Revert "NO-JIRA Fix extra imports"

This reverts commit ad92ea2c03903c13b9241096d432565bda933879.


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

Branch: refs/heads/2.6.x
Commit: ec313ba8032b1766ad2a2a1d161a624cc293d037
Parents: 5a113ff
Author: Martyn Taylor 
Authored: Fri Oct 26 09:24:39 2018 +0100
Committer: Martyn Taylor 
Committed: Fri Oct 26 09:24:39 2018 +0100

--
 .../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec313ba8/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index ff7da00..2056fb8 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -46,8 +46,10 @@ import 
org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
 import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
 import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal;
 import org.apache.activemq.artemis.api.core.RoutingType;
+import org.apache.activemq.artemis.core.protocol.core.Packet;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 import org.apache.activemq.artemis.reader.MessageUtil;
+import org.apache.activemq.artemis.utils.PrefixUtil;
 import org.apache.activemq.artemis.utils.UUID;
 
 import static 
org.apache.activemq.artemis.jms.client.ActiveMQDestination.QUEUE_QUALIFIED_PREFIX;

activemq-artemis git commit: NO-JIRA Fix extra imports

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x d72a7acbb -> ad92ea2c0


NO-JIRA Fix extra imports


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

Branch: refs/heads/2.6.x
Commit: ad92ea2c03903c13b9241096d432565bda933879
Parents: d72a7ac
Author: Martyn Taylor 
Authored: Tue Oct 23 17:47:13 2018 +0100
Committer: Martyn Taylor 
Committed: Tue Oct 23 18:00:27 2018 +0100

--
 .../org/apache/activemq/artemis/jms/client/ActiveMQMessage.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ad92ea2c/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index bd0f7eb..ea3ccb5 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -46,10 +46,8 @@ import 
org.apache.activemq.artemis.api.jms.ActiveMQJMSConstants;
 import org.apache.activemq.artemis.core.client.ActiveMQClientMessageBundle;
 import org.apache.activemq.artemis.core.client.impl.ClientMessageInternal;
 import org.apache.activemq.artemis.api.core.RoutingType;
-import org.apache.activemq.artemis.core.protocol.core.Packet;
 import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
 import org.apache.activemq.artemis.reader.MessageUtil;
-import org.apache.activemq.artemis.utils.PrefixUtil;
 import org.apache.activemq.artemis.utils.UUID;
 
 import static 
org.apache.activemq.artemis.jms.client.ActiveMQDestination.QUEUE_QUALIFIED_PREFIX;

activemq-artemis git commit: ARTEMIS-2139 Ensure 1.x Client reply to address is correct

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 292566e39 -> cad1e9a63


ARTEMIS-2139 Ensure 1.x Client reply to address is correct


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

Branch: refs/heads/2.6.x
Commit: cad1e9a630ddfb4647d7ee59c83195d98fbf1d30
Parents: 292566e
Author: Martyn Taylor 
Authored: Fri Oct 19 12:07:44 2018 +0100
Committer: Martyn Taylor 
Committed: Tue Oct 23 15:51:24 2018 +0100

--
 .../artemis/jms/client/ActiveMQDestination.java | 37 ++--
 .../artemis/jms/client/ActiveMQMessage.java | 30 +---
 2 files changed, 29 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cad1e9a6/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 6d1b409..a349e3e 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -91,39 +91,24 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
   return fromPrefixedName(name, name);
}
 
-   public static Destination fromPrefixedName(final String addr, final String 
name) {
+   public static Destination fromPrefixedName(final String addr, String name) {
 
   ActiveMQDestination destination;
-  if (addr.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
- destination = createQueue(address);
-  } else if (addr.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
- destination = createTopic(address);
-  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
- destination = new ActiveMQTemporaryQueue(address, null);
-  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
- String address = 
addr.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
- destination = new ActiveMQTemporaryTopic(address, null);
-  } else {
- destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
-  }
-
-  String unprefixedName = name;
-
   if (name.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
- unprefixedName = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
+ name = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
+ destination = createQueue(addr, name);
   } else if (name.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
- unprefixedName = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
+ name = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
+ destination = createTopic(addr, name);
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
- unprefixedName = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
+ name = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryQueue(addr, null);
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
- unprefixedName = 
name.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
+ name = 
name.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryTopic(addr, null);
+  } else {
+ destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
   }
-
-  destination.setName(unprefixedName);
-
   return destination;
}
 

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

activemq-artemis git commit: ARTEMIS-2089 DB2 sending larger message (1MB) crashes the whole server

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 737fbbab3 -> 31c9d38e4


ARTEMIS-2089 DB2 sending larger message (1MB) crashes the whole server

It declares JDBC journal Blobs for IBM DB2 DBMS matching max-blob-size
in order to allow to store data with size > 1 MB ie the default BLOB
capacity

(cherry picked from commit ead9b007579ad83fd6c808243e4c20035d4c4b4d)


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

Branch: refs/heads/2.6.x
Commit: 31c9d38e47c691f738ab9328a57e5538d5078d3f
Parents: 737fbba
Author: Francesco Nigro 
Authored: Fri Sep 14 16:11:44 2018 +0200
Committer: Martyn Taylor 
Committed: Tue Sep 18 11:47:30 2018 +0100

--
 artemis-jdbc-store/src/main/resources/journal-sql.properties | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/31c9d38e/artemis-jdbc-store/src/main/resources/journal-sql.properties
--
diff --git a/artemis-jdbc-store/src/main/resources/journal-sql.properties 
b/artemis-jdbc-store/src/main/resources/journal-sql.properties
index 86e6a3d..eb7a5a4 100644
--- a/artemis-jdbc-store/src/main/resources/journal-sql.properties
+++ b/artemis-jdbc-store/src/main/resources/journal-sql.properties
@@ -86,6 +86,7 @@ max-blob-size.oracle=4294967296
 table-names-case.oracle=upper
 
 # DB2 SQL statements
+create-journal-table.db2=CREATE TABLE %s(id BIGINT,recordType 
SMALLINT,compactCount SMALLINT,txId BIGINT,userRecordType SMALLINT,variableSize 
INTEGER,record BLOB(2G),txDataSize INTEGER,txData BLOB(2G),txCheckNoRecords 
INTEGER,seq BIGINT NOT NULL, PRIMARY KEY(seq))
 max-blob-size.db2=2147483647
 create-file-table.db2=CREATE TABLE %s (ID BIGINT GENERATED ALWAYS AS IDENTITY 
(START WITH 1 INCREMENT BY 1), FILENAME VARCHAR(255), EXTENSION VARCHAR(10), 
DATA BLOB(2G), PRIMARY KEY(ID))
 append-to-file.db2=UPDATE %s SET DATA = (DATA || ?) WHERE ID=?
\ No newline at end of file

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 4cbc38778 -> 076c9791a


This closes #2317


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

Branch: refs/heads/master
Commit: 076c9791a44b089ac9dc67cb3c8c420e9305ebee
Parents: 4cbc387 ead9b00
Author: Martyn Taylor 
Authored: Tue Sep 18 11:46:47 2018 +0100
Committer: Martyn Taylor 
Committed: Tue Sep 18 11:46:47 2018 +0100

--
 artemis-jdbc-store/src/main/resources/journal-sql.properties | 1 +
 1 file changed, 1 insertion(+)
--

[2/2] activemq-artemis git commit: ARTEMIS-2089 DB2 sending larger message (1MB) crashes the whole server

[martyntaylor]

ARTEMIS-2089 DB2 sending larger message (1MB) crashes the whole server

It declares JDBC journal Blobs for IBM DB2 DBMS matching max-blob-size
in order to allow to store data with size > 1 MB ie the default BLOB
capacity


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

Branch: refs/heads/master
Commit: ead9b007579ad83fd6c808243e4c20035d4c4b4d
Parents: 4cbc387
Author: Francesco Nigro 
Authored: Fri Sep 14 16:11:44 2018 +0200
Committer: Martyn Taylor 
Committed: Tue Sep 18 11:46:47 2018 +0100

--
 artemis-jdbc-store/src/main/resources/journal-sql.properties | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ead9b007/artemis-jdbc-store/src/main/resources/journal-sql.properties
--
diff --git a/artemis-jdbc-store/src/main/resources/journal-sql.properties 
b/artemis-jdbc-store/src/main/resources/journal-sql.properties
index 3d76d5d..bf758b8 100644
--- a/artemis-jdbc-store/src/main/resources/journal-sql.properties
+++ b/artemis-jdbc-store/src/main/resources/journal-sql.properties
@@ -86,6 +86,7 @@ max-blob-size.oracle=4294967296
 table-names-case.oracle=upper
 
 # DB2 SQL statements
+create-journal-table.db2=CREATE TABLE %s(id BIGINT,recordType 
SMALLINT,compactCount SMALLINT,txId BIGINT,userRecordType SMALLINT,variableSize 
INTEGER,record BLOB(2G),txDataSize INTEGER,txData BLOB(2G),txCheckNoRecords 
INTEGER,seq BIGINT NOT NULL, PRIMARY KEY(seq))
 max-blob-size.db2=2147483647
 create-file-table.db2=CREATE TABLE %s (ID BIGINT GENERATED ALWAYS AS IDENTITY 
(START WITH 1 INCREMENT BY 1), FILENAME VARCHAR(255), EXTENSION VARCHAR(10), 
DATA BLOB(2G), PRIMARY KEY(ID))
 append-to-file.db2=UPDATE %s SET DATA = (DATA || ?) WHERE ID=?

activemq-artemis git commit: ARTEMIS-2046 Fixing issues with JournalStorageManager.stop in replication, JDBC and shared storage

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x 9427d0010 -> e617f322d


ARTEMIS-2046 Fixing issues with JournalStorageManager.stop in replication, JDBC 
and shared storage

(cherry picked from commit 63e6cd98f856ba8900782b7488c3ce4cf9e48257)


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

Branch: refs/heads/2.6.x
Commit: e617f322dad1d6e6b044af03d6b4977afaaf08c4
Parents: 9427d00
Author: Clebert Suconic 
Authored: Fri Aug 17 16:45:07 2018 -0400
Committer: Martyn Taylor 
Committed: Tue Aug 21 14:29:33 2018 +0100

--
 .../artemis/api/core/ActiveMQExceptionType.java |   6 +
 .../api/core/ActiveMQShutdownException.java |  31 
 .../core/client/impl/ClientSessionImpl.java |   4 +-
 .../jdbc/store/journal/JDBCJournalImpl.java |  12 +-
 .../artemis/core/journal/impl/JournalImpl.java  |  41 +++--
 .../journal/AbstractJournalStorageManager.java  |  16 +-
 .../impl/journal/JournalStorageManager.java |  63 +---
 .../core/replication/ReplicationEndpoint.java   |  14 ++
 .../core/replication/ReplicationManager.java|   9 +-
 .../failover/NettyReplicationStopTest.java  | 150 +++
 .../tests/integration/xa/BasicXaTest.java   | 100 +
 11 files changed, 407 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e617f322/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
index 9120d79..7cec2e4 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
@@ -249,6 +249,12 @@ public enum ActiveMQExceptionType {
   public ActiveMQException createException(String msg) {
  return new ActiveMQNullRefException(msg);
   }
+   },
+   SHUTDOWN_ERROR(219) {
+  @Override
+  public ActiveMQException createException(String msg) {
+ return new ActiveMQShutdownException(msg);
+  }
};
 
private static final Map TYPE_MAP;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e617f322/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
new file mode 100644
index 000..03797a8
--- /dev/null
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
@@ -0,0 +1,31 @@
+/*
+ * 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.core;
+
+/**
+ * An operation failed because an address exists on the server.
+ */
+public final class ActiveMQShutdownException extends ActiveMQException {
+
+   public ActiveMQShutdownException() {
+  super(ActiveMQExceptionType.SHUTDOWN_ERROR);
+   }
+
+   public ActiveMQShutdownException(String msg) {
+  super(ActiveMQExceptionType.SHUTDOWN_ERROR, msg);
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e617f322/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
 

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

[martyntaylor]

This closes #2255


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

Branch: refs/heads/master
Commit: 281cff3d41b7bbeee6ac3ea97995a7c2e32c845a
Parents: f1dfc72 63e6cd9
Author: Martyn Taylor 
Authored: Tue Aug 21 14:27:36 2018 +0100
Committer: Martyn Taylor 
Committed: Tue Aug 21 14:27:36 2018 +0100

--
 .../artemis/api/core/ActiveMQExceptionType.java |   6 +
 .../api/core/ActiveMQShutdownException.java |  31 
 .../core/client/impl/ClientSessionImpl.java |   4 +-
 .../jdbc/store/journal/JDBCJournalImpl.java |  12 +-
 .../artemis/core/journal/impl/JournalImpl.java  |  41 +++--
 .../journal/AbstractJournalStorageManager.java  |  16 +-
 .../impl/journal/JournalStorageManager.java |  63 +---
 .../core/replication/ReplicationEndpoint.java   |  14 ++
 .../core/replication/ReplicationManager.java|   9 +-
 .../failover/NettyReplicationStopTest.java  | 150 +++
 .../tests/integration/xa/BasicXaTest.java   | 100 +
 11 files changed, 407 insertions(+), 39 deletions(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-2046 Fixing issues with JournalStorageManager.stop in replication, JDBC and shared storage

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master f1dfc7281 -> 281cff3d4


ARTEMIS-2046 Fixing issues with JournalStorageManager.stop in replication, JDBC 
and shared storage


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

Branch: refs/heads/master
Commit: 63e6cd98f856ba8900782b7488c3ce4cf9e48257
Parents: f1dfc72
Author: Clebert Suconic 
Authored: Fri Aug 17 16:45:07 2018 -0400
Committer: Clebert Suconic 
Committed: Mon Aug 20 21:25:57 2018 -0400

--
 .../artemis/api/core/ActiveMQExceptionType.java |   6 +
 .../api/core/ActiveMQShutdownException.java |  31 
 .../core/client/impl/ClientSessionImpl.java |   4 +-
 .../jdbc/store/journal/JDBCJournalImpl.java |  12 +-
 .../artemis/core/journal/impl/JournalImpl.java  |  41 +++--
 .../journal/AbstractJournalStorageManager.java  |  16 +-
 .../impl/journal/JournalStorageManager.java |  63 +---
 .../core/replication/ReplicationEndpoint.java   |  14 ++
 .../core/replication/ReplicationManager.java|   9 +-
 .../failover/NettyReplicationStopTest.java  | 150 +++
 .../tests/integration/xa/BasicXaTest.java   | 100 +
 11 files changed, 407 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/63e6cd98/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
index 9120d79..7cec2e4 100644
--- 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
@@ -249,6 +249,12 @@ public enum ActiveMQExceptionType {
   public ActiveMQException createException(String msg) {
  return new ActiveMQNullRefException(msg);
   }
+   },
+   SHUTDOWN_ERROR(219) {
+  @Override
+  public ActiveMQException createException(String msg) {
+ return new ActiveMQShutdownException(msg);
+  }
};
 
private static final Map TYPE_MAP;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/63e6cd98/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
--
diff --git 
a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
new file mode 100644
index 000..03797a8
--- /dev/null
+++ 
b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQShutdownException.java
@@ -0,0 +1,31 @@
+/*
+ * 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.core;
+
+/**
+ * An operation failed because an address exists on the server.
+ */
+public final class ActiveMQShutdownException extends ActiveMQException {
+
+   public ActiveMQShutdownException() {
+  super(ActiveMQExceptionType.SHUTDOWN_ERROR);
+   }
+
+   public ActiveMQShutdownException(String msg) {
+  super(ActiveMQExceptionType.SHUTDOWN_ERROR, msg);
+   }
+}

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/63e6cd98/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
 

activemq-artemis git commit: ARTEMIS-2023 extend 1x naming to other ops

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/2.6.x b00eaad20 -> e6d9d30e2


ARTEMIS-2023 extend 1x naming to other ops


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

Branch: refs/heads/2.6.x
Commit: e6d9d30e2f8f834b1ffb1546b7486a86e6ebf2c8
Parents: b00eaad
Author: Justin Bertram 
Authored: Mon Aug 13 21:40:52 2018 -0500
Committer: Martyn Taylor 
Committed: Thu Aug 16 20:58:10 2018 +0100

--
 .../artemis/jms/client/ActiveMQDestination.java | 61 +++-
 .../artemis/jms/client/ActiveMQMessage.java | 54 +++--
 .../jms/client/ActiveMQMessageConsumer.java |  4 ++
 .../artemis/jms/client/ActiveMQQueue.java   |  2 +-
 .../jms/client/ActiveMQQueueBrowser.java| 11 +++-
 .../artemis/jms/client/ActiveMQSession.java |  6 +-
 .../jms/client/JMSMessageListenerWrapper.java   |  4 ++
 .../artemis/ra/ActiveMQResourceAdapter.java |  2 +
 .../artemis/ra/inflow/ActiveMQActivation.java   |  1 +
 .../integration/jms/SimpleJNDIClientTest.java   |  1 -
 10 files changed, 121 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e6d9d30e/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 81aada1..6d1b409 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -53,6 +53,10 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
   return input.replace("\\", "").replace(".", "\\.");
}
 
+   protected void setName(String name) {
+  this.name = name;
+   }
+
/**
 * Static helper method for working with destinations.
 */
@@ -84,21 +88,43 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
}
 
public static Destination fromPrefixedName(final String name) {
+  return fromPrefixedName(name, name);
+   }
+
+   public static Destination fromPrefixedName(final String addr, final String 
name) {
+
+  ActiveMQDestination destination;
+  if (addr.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
+ destination = createQueue(address);
+  } else if (addr.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
+ destination = createTopic(address);
+  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryQueue(address, null);
+  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryTopic(address, null);
+  } else {
+ destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
+  }
+
+  String unprefixedName = name;
+
   if (name.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
- return createQueue(address);
+ unprefixedName = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
   } else if (name.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
- return createTopic(address);
+ unprefixedName = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
- return new ActiveMQTemporaryQueue(address, null);
+ unprefixedName = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
- 

[2/2] activemq-artemis git commit: ARTEMIS-2023 extend 1x naming to other ops

[martyntaylor]

ARTEMIS-2023 extend 1x naming to other ops


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

Branch: refs/heads/master
Commit: a0b4c4dd1923497a03255d4a27d0ed9b7948931e
Parents: dd15aa8
Author: Justin Bertram 
Authored: Mon Aug 13 21:40:52 2018 -0500
Committer: Martyn Taylor 
Committed: Thu Aug 16 20:57:11 2018 +0100

--
 .../artemis/jms/client/ActiveMQDestination.java | 61 +++-
 .../artemis/jms/client/ActiveMQMessage.java | 54 +++--
 .../jms/client/ActiveMQMessageConsumer.java |  4 ++
 .../artemis/jms/client/ActiveMQQueue.java   |  2 +-
 .../jms/client/ActiveMQQueueBrowser.java| 11 +++-
 .../artemis/jms/client/ActiveMQSession.java |  6 +-
 .../jms/client/JMSMessageListenerWrapper.java   |  4 ++
 .../artemis/ra/ActiveMQResourceAdapter.java |  2 +
 .../artemis/ra/inflow/ActiveMQActivation.java   |  1 +
 .../integration/jms/SimpleJNDIClientTest.java   |  1 -
 10 files changed, 121 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a0b4c4dd/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
--
diff --git 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 81aada1..6d1b409 100644
--- 
a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ 
b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -53,6 +53,10 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
   return input.replace("\\", "").replace(".", "\\.");
}
 
+   protected void setName(String name) {
+  this.name = name;
+   }
+
/**
 * Static helper method for working with destinations.
 */
@@ -84,21 +88,43 @@ public class ActiveMQDestination extends JNDIStorable 
implements Destination, Se
}
 
public static Destination fromPrefixedName(final String name) {
+  return fromPrefixedName(name, name);
+   }
+
+   public static Destination fromPrefixedName(final String addr, final String 
name) {
+
+  ActiveMQDestination destination;
+  if (addr.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
+ destination = createQueue(address);
+  } else if (addr.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
+ destination = createTopic(address);
+  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryQueue(address, null);
+  } else if 
(addr.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
+ String address = 
addr.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
+ destination = new ActiveMQTemporaryTopic(address, null);
+  } else {
+ destination = new ActiveMQDestination(addr, TYPE.DESTINATION, null);
+  }
+
+  String unprefixedName = name;
+
   if (name.startsWith(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
- return createQueue(address);
+ unprefixedName = 
name.substring(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX.length());
   } else if (name.startsWith(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
- return createTopic(address);
+ unprefixedName = 
name.substring(ActiveMQDestination.TOPIC_QUALIFIED_PREFIX.length());
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
- return new ActiveMQTemporaryQueue(address, null);
+ unprefixedName = 
name.substring(ActiveMQDestination.TEMP_QUEUE_QUALIFED_PREFIX.length());
   } else if 
(name.startsWith(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX)) {
- String address = 
name.substring(ActiveMQDestination.TEMP_TOPIC_QUALIFED_PREFIX.length());
-

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master dd15aa87d -> 86b4ed5bf


This closes #2251


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

Branch: refs/heads/master
Commit: 86b4ed5bfc2ddaaa59d65e8cb7169a1575c4aa0d
Parents: dd15aa8 a0b4c4d
Author: Martyn Taylor 
Authored: Thu Aug 16 20:57:11 2018 +0100
Committer: Martyn Taylor 
Committed: Thu Aug 16 20:57:11 2018 +0100

--
 .../artemis/jms/client/ActiveMQDestination.java | 61 +++-
 .../artemis/jms/client/ActiveMQMessage.java | 54 +++--
 .../jms/client/ActiveMQMessageConsumer.java |  4 ++
 .../artemis/jms/client/ActiveMQQueue.java   |  2 +-
 .../jms/client/ActiveMQQueueBrowser.java| 11 +++-
 .../artemis/jms/client/ActiveMQSession.java |  6 +-
 .../jms/client/JMSMessageListenerWrapper.java   |  4 ++
 .../artemis/ra/ActiveMQResourceAdapter.java |  2 +
 .../artemis/ra/inflow/ActiveMQActivation.java   |  1 +
 .../integration/jms/SimpleJNDIClientTest.java   |  1 -
 10 files changed, 121 insertions(+), 25 deletions(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-1482 Enhance test to ensure len check is done before byte[] init

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master c8fc7c64f -> d2063131f


ARTEMIS-1482 Enhance test to ensure len check is done before byte[] init

Set the int to Integer.MAX_VALUE thus if the len check is not done before 
byte[] initialization the test would blow with an OOM.

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

Branch: refs/heads/master
Commit: 5d8079845ee3fe1092b84533ae63438d79ad353c
Parents: c8fc7c6
Author: Michael André Pearce 
Authored: Thu Aug 9 15:54:32 2018 +0100
Committer: Michael André Pearce 
Committed: Thu Aug 9 15:54:54 2018 +0100

--
 .../java/org/apache/activemq/artemis/utils/SimpleStringTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/5d807984/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
--
diff --git 
a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
 
b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
index 0498cab..85e5794 100644
--- 
a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
+++ 
b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleStringTest.java
@@ -28,7 +28,7 @@ public class SimpleStringTest {
@Test
public void testOutOfBoundsThrownOnMalformedString() {
   ByteBuf byteBuffer = ByteBufAllocator.DEFAULT.buffer(5);
-  byteBuffer.writeInt(100);
+  byteBuffer.writeInt(Integer.MAX_VALUE);
 
   Exception e = null;
   try {

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

[martyntaylor]

This closes #2232


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

Branch: refs/heads/master
Commit: d2063131f4e504fa5962a4aa56e6d41d7e30f30a
Parents: c8fc7c6 5d80798
Author: Martyn Taylor 
Authored: Thu Aug 9 17:03:00 2018 +0100
Committer: Martyn Taylor 
Committed: Thu Aug 9 17:03:00 2018 +0100

--
 .../java/org/apache/activemq/artemis/utils/SimpleStringTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master e775b3ee2 -> 845345313


This closes #2194


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

Branch: refs/heads/master
Commit: 845345313aa3b136ed626334a9dd180edc176dd4
Parents: e775b3e 56be281
Author: Martyn Taylor 
Authored: Wed Jul 25 15:03:57 2018 +0100
Committer: Martyn Taylor 
Committed: Wed Jul 25 15:03:57 2018 +0100

--
 .../artemis/core/io/nio/NIOSequentialFile.java  |   2 +-
 .../core/io/nio/NIOSequentialFileFactory.java   |   2 +-
 .../core/paging/impl/PagingManagerImpl.java |  13 +-
 .../core/paging/impl/PagingStoreFactoryNIO.java |  38 -
 .../core/replication/ReplicationEndpoint.java   |   9 +-
 .../artemis/core/server/ActiveMQServer.java |   2 +
 .../core/server/impl/ActiveMQServerImpl.java|   3 +-
 ...SharedNothingReplicationFlowControlTest.java | 139 ++-
 8 files changed, 193 insertions(+), 15 deletions(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-1989 Replication catch up leaking files

[martyntaylor]

ARTEMIS-1989 Replication catch up leaking files

Related commit that broke this at 
https://github.com/hornetq/hornetq/commit/837694e70573069cf78d1911975bef95925b6f29


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

Branch: refs/heads/master
Commit: 56be281aafdbfaea2059c0ed5bd1e065f7710124
Parents: e775b3e
Author: Clebert Suconic 
Authored: Tue Jul 24 21:54:18 2018 -0400
Committer: Martyn Taylor 
Committed: Wed Jul 25 15:03:57 2018 +0100

--
 .../artemis/core/io/nio/NIOSequentialFile.java  |   2 +-
 .../core/io/nio/NIOSequentialFileFactory.java   |   2 +-
 .../core/paging/impl/PagingManagerImpl.java |  13 +-
 .../core/paging/impl/PagingStoreFactoryNIO.java |  38 -
 .../core/replication/ReplicationEndpoint.java   |   9 +-
 .../artemis/core/server/ActiveMQServer.java |   2 +
 .../core/server/impl/ActiveMQServerImpl.java|   3 +-
 ...SharedNothingReplicationFlowControlTest.java | 139 ++-
 8 files changed, 193 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56be281a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
--
diff --git 
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
 
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
index 891bd5c..55654b7 100644
--- 
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
+++ 
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFile.java
@@ -37,7 +37,7 @@ import 
org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
 import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
 import org.apache.activemq.artemis.utils.Env;
 
-public final class NIOSequentialFile extends AbstractSequentialFile {
+public class NIOSequentialFile extends AbstractSequentialFile {
 
private FileChannel channel;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56be281a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFileFactory.java
--
diff --git 
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFileFactory.java
 
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFileFactory.java
index b585b24..c142377 100644
--- 
a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFileFactory.java
+++ 
b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFileFactory.java
@@ -29,7 +29,7 @@ import org.apache.activemq.artemis.core.io.SequentialFile;
 import org.apache.activemq.artemis.utils.Env;
 import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
 
-public final class NIOSequentialFileFactory extends 
AbstractSequentialFileFactory {
+public class NIOSequentialFileFactory extends AbstractSequentialFileFactory {
 
private static final int DEFAULT_CAPACITY_ALIGNMENT = Env.osPageSize();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/56be281a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
index 44e8067..bca70cf 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
@@ -62,7 +62,7 @@ public final class PagingManagerImpl implements PagingManager 
{
 
private final HierarchicalRepository 
addressSettingsRepository;
 
-   private final PagingStoreFactory pagingStoreFactory;
+   private PagingStoreFactory pagingStoreFactory;
 
private final AtomicLong globalSizeBytes = new AtomicLong(0);
 
@@ -84,6 +84,17 @@ public final class PagingManagerImpl implements 
PagingManager {
// Constructors
// 

 
+
+   // for tests.. not part of the API
+   public void replacePageStoreFactory(PagingStoreFactory factory) {
+  this.pagingStoreFactory = factory;
+   }
+
+   // for tests.. 

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

[martyntaylor]

This closes #2115


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

Branch: refs/heads/master
Commit: 545b82fbd73598a640c5a33dc885f841da2087c1
Parents: 9b7ebef 1ae2784
Author: Martyn Taylor 
Authored: Thu May 31 10:48:12 2018 +0100
Committer: Martyn Taylor 
Committed: Thu May 31 10:48:12 2018 +0100

--
 .../activemq/artemis/api/core/Message.java  |  18 ++
 .../message/impl/CoreMessageObjectPools.java|   4 +
 .../protocol/amqp/broker/AMQPMessage.java   |  44 ++-
 .../amqp/broker/AMQPSessionCallback.java|   2 +-
 .../amqp/converter/AmqpCoreConverter.java   |   3 +
 .../amqp/converter/CoreAmqpConverter.java   |   2 +-
 .../protocol/amqp/message/AMQPMessageTest.java  |   4 +-
 .../core/postoffice/impl/PostOfficeImpl.java|   4 +-
 .../ProtocolsMessageLoadBalancingTest.java  | 284 +++
 .../cluster/crossprotocol/package-info.java |  20 ++
 10 files changed, 366 insertions(+), 19 deletions(-)
--

[1/2] activemq-artemis git commit: ARTEMIS-1858 Expiry messages are not transversing clustering with AMQP

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 9b7ebef9f -> 545b82fbd


ARTEMIS-1858 Expiry messages are not transversing clustering with AMQP


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

Branch: refs/heads/master
Commit: 1ae2784dc6075875b18780fa8ba40f86cb895f7b
Parents: 9b7ebef
Author: Clebert Suconic 
Authored: Tue May 29 22:12:58 2018 -0400
Committer: Clebert Suconic 
Committed: Wed May 30 18:57:38 2018 -0400

--
 .../activemq/artemis/api/core/Message.java  |  18 ++
 .../message/impl/CoreMessageObjectPools.java|   4 +
 .../protocol/amqp/broker/AMQPMessage.java   |  44 ++-
 .../amqp/broker/AMQPSessionCallback.java|   2 +-
 .../amqp/converter/AmqpCoreConverter.java   |   3 +
 .../amqp/converter/CoreAmqpConverter.java   |   2 +-
 .../protocol/amqp/message/AMQPMessageTest.java  |   4 +-
 .../core/postoffice/impl/PostOfficeImpl.java|   4 +-
 .../ProtocolsMessageLoadBalancingTest.java  | 284 +++
 .../cluster/crossprotocol/package-info.java |  20 ++
 10 files changed, 366 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ae2784d/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 6ca37ea..667f95f 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
@@ -355,10 +355,28 @@ public interface Message {
 
String getAddress();
 
+   /**
+* Look at {@link #setAddress(SimpleString)} for the doc.
+* @param address
+* @return
+*/
Message setAddress(String address);
 
SimpleString getAddressSimpleString();
 
+   /**
+* This will set the address on CoreMessage.
+*
+* Note for AMQPMessages:
+* in AMQPMessages this will not really change the address on the message. 
Instead it will add a property
+* on extraProperties which only transverse internally at the broker.
+* Whatever you change here it won't affect anything towards the received 
message.
+*
+* If you wish to change AMQPMessages address you will have to do it 
directly at the AMQP Message, however beware
+* that AMQPMessages are not supposed to be changed at the broker, so only 
do it if you know what you are doing.
+* @param address
+* @return
+*/
Message setAddress(SimpleString address);
 
long getTimestamp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ae2784d/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessageObjectPools.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessageObjectPools.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessageObjectPools.java
index 7ee7d0a..4c56eac 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessageObjectPools.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessageObjectPools.java
@@ -54,4 +54,8 @@ public class CoreMessageObjectPools {
public TypedProperties.TypedPropertiesStringSimpleStringPools 
getPropertiesStringSimpleStringPools() {
   return propertiesStringSimpleStringPools.get();
}
+
+   public static SimpleString cachedAddressSimpleString(String address, 
CoreMessageObjectPools coreMessageObjectPools) {
+  return SimpleString.toSimpleString(address, coreMessageObjectPools == 
null ? null : coreMessageObjectPools.getAddressStringSimpleStringPool());
+   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1ae2784d/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
--
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 2775f77..27d571e 100644
--- 

activemq-artemis git commit: ARTEMIS-1840 Added Error and Doc to Import Message

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3c8c434f1 -> a6c48a37c


ARTEMIS-1840 Added Error and Doc to Import Message


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

Branch: refs/heads/master
Commit: a6c48a37c77aca8eb5b01abae0ca48ef0c186575
Parents: 3c8c434
Author: Martyn Taylor 
Authored: Thu May 3 11:13:56 2018 +0100
Committer: Martyn Taylor 
Committed: Thu May 3 11:43:50 2018 +0100

--
 .../cli/commands/messages/DestAbstract.java| 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a6c48a37/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/DestAbstract.java
--
diff --git 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/DestAbstract.java
 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/DestAbstract.java
index 63b5f17..64c6e66 100644
--- 
a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/DestAbstract.java
+++ 
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/messages/DestAbstract.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
 
 import io.airlift.airline.Option;
 import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
 import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
 import org.apache.activemq.artemis.api.core.client.ClientMessage;
 import org.apache.activemq.artemis.api.core.client.ClientRequestor;
@@ -43,7 +44,7 @@ public class DestAbstract extends ConnectionAbstract {
 
private static final String FQQN_SEPERATOR = "::";
 
-   @Option(name = "--destination", description = "Destination to be used. It 
can be prefixed with queue:// or topic:// (Default: queue://TEST)")
+   @Option(name = "--destination", description = "Destination to be used. It 
can be prefixed with queue:// or topic:// or fqqn:// (Default: queue://TEST)")
String destination = "queue://TEST";
 
@Option(name = "--message-count", description = "Number of messages to act 
on (Default: 1000)")
@@ -111,11 +112,15 @@ public class DestAbstract extends ConnectionAbstract {
}
 
public byte[] getQueueIdFromName(String queueName) throws Exception {
-  ClientMessage message = getQueueAttribute(queueName, "ID");
-  Number idObject = (Number) ManagementHelper.getResult(message);
-  ByteBuffer byteBuffer = ByteBuffer.allocate(8);
-  byteBuffer.putLong(idObject.longValue());
-  return byteBuffer.array();
+  try {
+ ClientMessage message = getQueueAttribute(queueName, "ID");
+ Number idObject = (Number) ManagementHelper.getResult(message);
+ ByteBuffer byteBuffer = ByteBuffer.allocate(8);
+ byteBuffer.putLong(idObject.longValue());
+ return byteBuffer.array();
+  } catch (Exception e) {
+ throw new ActiveMQException("Error occured when looking up FQQN.  
Please ensure the FQQN exists.", e, ActiveMQExceptionType.ILLEGAL_STATE);
+  }
}
 
protected ClientMessage getQueueAttribute(String queueName, String 
attribute) throws Exception {

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 2ddaa0aa8 -> 3c8c434f1


This closes #2061


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

Branch: refs/heads/master
Commit: 3c8c434f17b2e2db643a235357e80aab8d0eb771
Parents: 2ddaa0a 2eef0fb
Author: Martyn Taylor 
Authored: Thu May 3 10:22:09 2018 +0100
Committer: Martyn Taylor 
Committed: Thu May 3 10:22:09 2018 +0100

--
 .../core/server/cluster/qourum/SharedNothingBackupQuorum.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-1842 make sure quorum vote loops exits

[martyntaylor]

ARTEMIS-1842 make sure quorum vote loops exits

The stopped flag used to stop the quorum vote loop needs to be volatile
in order to be safely published between threads.


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

Branch: refs/heads/master
Commit: 2eef0fbb10507565d145844cb7fd83b0bea90118
Parents: 2ddaa0a
Author: Francesco Nigro 
Authored: Wed May 2 19:44:11 2018 +0200
Committer: Martyn Taylor 
Committed: Thu May 3 10:22:09 2018 +0100

--
 .../core/server/cluster/qourum/SharedNothingBackupQuorum.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2eef0fbb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
index dd1248d..035ca05 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
@@ -64,7 +64,7 @@ public class SharedNothingBackupQuorum implements Quorum, 
SessionFailureListener
 
private final NetworkHealthCheck networkHealthCheck;
 
-   private boolean stopped = false;
+   private volatile boolean stopped = false;
 
/**
 * This is a safety net in case the live sends the first {@link 
ReplicationLiveIsStoppingMessage}

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master d3b11bc43 -> 92a73e2cb


This closes #1957


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

Branch: refs/heads/master
Commit: 92a73e2cb61d973d0812b06e23cc2278d3e6b61d
Parents: d3b11bc a1c76e8
Author: Martyn Taylor 
Authored: Thu Mar 22 11:01:32 2018 +
Committer: Martyn Taylor 
Committed: Thu Mar 22 11:01:32 2018 +

--
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-1752 - avoid null pointer in BridgeImpl

[martyntaylor]

ARTEMIS-1752 - avoid null pointer in BridgeImpl

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


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

Branch: refs/heads/master
Commit: a1c76e8d61dc6ef0aed3126f529fa1403a582f85
Parents: d3b11bc
Author: andytaylor 
Authored: Mon Mar 19 08:36:38 2018 +
Committer: Martyn Taylor 
Committed: Thu Mar 22 11:01:32 2018 +

--
 .../activemq/artemis/core/server/cluster/impl/BridgeImpl.java| 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a1c76e8d/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 1c4038b..a83e91b 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -775,7 +775,9 @@ public class BridgeImpl implements Bridge, 
SessionFailureListener, SendAcknowled
protected void fail(final boolean permanently) {
   logger.debug(this + "\n\t::fail being called, permanently=" + 
permanently);
   //we need to make sure we remove the node from the topology so any 
incoming quorum requests are voted correctly
-  serverLocator.notifyNodeDown(System.currentTimeMillis(), targetNodeID);
+  if (targetNodeID != null) {
+ serverLocator.notifyNodeDown(System.currentTimeMillis(), 
targetNodeID);
+  }
   if (queue != null) {
  try {
 if (logger.isTraceEnabled()) {

activemq-artemis git commit: ARTEMIS-1682 Added back test-jar artemis-server test-jar

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 3c9e725ae -> 41a3fedb8


ARTEMIS-1682 Added back test-jar artemis-server test-jar


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

Branch: refs/heads/master
Commit: 41a3fedb8246a29dec2d0ce7a3b6853c598e100b
Parents: 3c9e725
Author: Martyn Taylor 
Authored: Fri Mar 9 16:30:16 2018 +
Committer: Martyn Taylor 
Committed: Fri Mar 9 16:30:25 2018 +

--
 artemis-server/pom.xml | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/41a3fedb/artemis-server/pom.xml
--
diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
index 6beca99..1b05c1c 100644
--- a/artemis-server/pom.xml
+++ b/artemis-server/pom.xml
@@ -223,4 +223,20 @@
  
   

+   
+  
+ 
+org.apache.maven.plugins
+maven-jar-plugin
+
+   
+  test
+  
+ test-jar
+  
+   
+
+ 
+  
+   
 

svn commit: r1026009 - in /websites/production/activemq/content/artemis: ./ docs/1.5.6/ docs/1.5.6/diagrams/ docs/1.5.6/gitbook/ docs/1.5.6/gitbook/fonts/ docs/1.5.6/gitbook/fonts/fontawesome/ docs/1.

[martyntaylor]

Author: martyntaylor
Date: Mon Feb 26 18:47:29 2018
New Revision: 1026009

Log:
Updated to incorporate 1.5.6 release


[This commit notification would consist of 219 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

svn commit: r25279 - /release/activemq/activemq-artemis/1.5.6/

[martyntaylor]

Author: martyntaylor
Date: Mon Feb 26 17:48:53 2018
New Revision: 25279

Log:
Added Release Artefacts for Artemis 1.5.6

Added:
release/activemq/activemq-artemis/1.5.6/
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz   
(with props)
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.asc 
  (with props)
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip   
(with props)
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.asc   
(with props)
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz
   (with props)

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz.asc
   (with props)

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz.md5

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz.sha512

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip 
  (with props)

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip.asc
   (with props)

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip.md5

release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip.sha512

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

Propchange: 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz
--
svn:mime-type = application/x-gzip

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

Propchange: 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5
==
--- release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5 
(added)
+++ release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5 
Mon Feb 26 17:48:53 2018
@@ -0,0 +1 @@
+125c023728db847773021725f4e4990c  apache-artemis-1.5.6-bin.tar.gz

Added: 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512
==
--- 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512 
(added)
+++ 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512 
Mon Feb 26 17:48:53 2018
@@ -0,0 +1 @@
+ad6788ffcf192bfa0c7b595cffcb49b80cb5e894b386ddae2230b1ba0533b773b54e021a7df791c857d3e30dc3c463cc2753b396617d57bbca77ba4ecfdc7d95
  apache-artemis-1.5.6-bin.tar.gz

Added: release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip
==
Binary file - no diff available.

Propchange: release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip
--
svn:mime-type = application/zip

Added: release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.asc
==
Binary file - no diff available.

Propchange: 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5
==
--- release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5 
(added)
+++ release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5 
Mon Feb 26 17:48:53 2018
@@ -0,0 +1 @@
+ec9bc5f0c13d7ab0f75473cd4f02d834  apache-artemis-1.5.6-bin.zip

Added: 
release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512
==
--- release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512 
(added)
+++ release/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512

svn commit: r25191 - /dev/activemq/activemq-artemis/1.5.6/

[martyntaylor]

Author: martyntaylor
Date: Wed Feb 21 16:50:55 2018
New Revision: 25191

Log:
Uploaded new dev dist

Added:
dev/activemq/activemq-artemis/1.5.6/
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz   (with 
props)
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.asc   
(with props)
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip   (with 
props)
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.asc   
(with props)
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz  
 (with props)

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz.asc
   (with props)

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz.md5

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.tar.gz.sha512
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip 
  (with props)

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip.asc 
  (with props)

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip.md5

dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-source-release.zip.sha512

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz
==
Binary file - no diff available.

Propchange: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.asc
==
Binary file - no diff available.

Propchange: 
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.asc
--
svn:mime-type = application/pgp-signature

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5
==
--- dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5 
(added)
+++ dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.md5 Wed 
Feb 21 16:50:55 2018
@@ -0,0 +1 @@
+125c023728db847773021725f4e4990c  apache-artemis-1.5.6-bin.tar.gz

Added: 
dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512
==
--- dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512 
(added)
+++ dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.tar.gz.sha512 
Wed Feb 21 16:50:55 2018
@@ -0,0 +1 @@
+ad6788ffcf192bfa0c7b595cffcb49b80cb5e894b386ddae2230b1ba0533b773b54e021a7df791c857d3e30dc3c463cc2753b396617d57bbca77ba4ecfdc7d95
  apache-artemis-1.5.6-bin.tar.gz

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip
==
Binary file - no diff available.

Propchange: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip
--
svn:mime-type = application/zip

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.asc
==
Binary file - no diff available.

Propchange: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.asc
--
svn:mime-type = application/pgp-signature

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5
==
--- dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5 (added)
+++ dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.md5 Wed 
Feb 21 16:50:55 2018
@@ -0,0 +1 @@
+ec9bc5f0c13d7ab0f75473cd4f02d834  apache-artemis-1.5.6-bin.zip

Added: dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512
==
--- dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512 
(added)
+++ dev/activemq/activemq-artemis/1.5.6/apache-artemis-1.5.6-bin.zip.sha512 Wed 
Feb 21 16:50:55 2018
@@ -0,0 +1 @@
+87a57bba7bd672d26baa2628bdcfd4060343686b5d100ae3fb5ef9829e3901d01eb830454fdaa34e80b5a378ac37880c4469b2839be182020b18f36dafd44c04
  apache

svn commit: r25190 - /dev/activemq/activemq-artemis/2.4.0/

[martyntaylor]

Author: martyntaylor
Date: Wed Feb 21 16:48:53 2018
New Revision: 25190

Log:
Uploaded new dev dist

Removed:
dev/activemq/activemq-artemis/2.4.0/

[activemq-artemis] Git Push Summary

[martyntaylor]

Repository: activemq-artemis
Updated Tags:  refs/tags/1.5.6 [created] 485c90896

activemq-artemis git commit: ARTEMIS-1658 Fix Typo in ActivationSpec

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 485400960 -> 9553de82b


ARTEMIS-1658 Fix Typo in ActivationSpec


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

Branch: refs/heads/master
Commit: 9553de82bb3e5bf6707b1aa13f4436d2ca519d3b
Parents: 4854009
Author: Martyn Taylor 
Authored: Mon Feb 5 18:39:19 2018 +
Committer: Martyn Taylor 
Committed: Mon Feb 5 18:39:19 2018 +

--
 .../apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9553de82/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
--
diff --git 
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
 
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index 901135d..1252486 100644
--- 
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ 
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -935,7 +935,7 @@ public class ActiveMQActivationSpec extends 
ConnectionFactoryProperties implemen
   result = 31 * result + (setupAttempts != null ? setupAttempts.hashCode() 
: 0);
   result = 31 * result + (setupInterval != null ? setupInterval.hashCode() 
: 0);
   result = 31 * result + (queuePrefix != null ? queuePrefix.hashCode() : 
0);
-  result = 31 * result + (topicPrefix != null ? queuePrefix.hashCode() : 
0);
+  result = 31 * result + (topicPrefix != null ? topicPrefix.hashCode() : 
0);
   return result;
}
 }

[2/2] activemq-artemis git commit: ARTEMIS-1576 couple more tests for good measure

[martyntaylor]

ARTEMIS-1576 couple more tests for good measure


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

Branch: refs/heads/master
Commit: 2afe08126b4aaf97920954e18ec971cd13e3abb4
Parents: 18d2d13
Author: Justin Bertram 
Authored: Fri Jan 5 15:15:33 2018 -0600
Committer: Martyn Taylor 
Committed: Thu Jan 11 10:59:11 2018 +

--
 .../integration/amqp/JMSTopicConsumerTest.java  | 86 
 1 file changed, 86 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2afe0812/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTopicConsumerTest.java
--
diff --git 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTopicConsumerTest.java
 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTopicConsumerTest.java
index 52bd247..5f7490f 100644
--- 
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTopicConsumerTest.java
+++ 
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/JMSTopicConsumerTest.java
@@ -16,12 +16,17 @@
  */
 package org.apache.activemq.artemis.tests.integration.amqp;
 
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
 import javax.jms.ExceptionListener;
+import javax.jms.JMSConsumer;
+import javax.jms.JMSContext;
 import javax.jms.JMSException;
+import javax.jms.JMSProducer;
 import javax.jms.MessageProducer;
 import javax.jms.Session;
 import javax.jms.TextMessage;
@@ -30,9 +35,11 @@ import javax.jms.TopicPublisher;
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 
+import org.apache.activemq.artemis.api.core.RoutingType;
 import org.apache.activemq.artemis.api.core.SimpleString;
 import org.apache.activemq.artemis.core.postoffice.Bindings;
 import org.apache.activemq.artemis.core.remoting.CloseListener;
+import org.apache.qpid.jms.JmsConnectionFactory;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -65,6 +72,85 @@ public class JMSTopicConsumerTest extends 
JMSClientTestSupport {
}
 
@Test(timeout = 6)
+   public void testSendAndReceiveOnAutoCreatedTopic() throws Exception {
+  Connection connection = createConnection("myClientId");
+  String topicName = UUID.randomUUID().toString();
+  SimpleString simpleTopicName = SimpleString.toSimpleString(topicName);
+
+  try {
+ TopicSession session = (TopicSession) connection.createSession(false, 
Session.AUTO_ACKNOWLEDGE);
+ Topic topic = session.createTopic(topicName);
+ TopicPublisher producer = session.createPublisher(topic);
+
+ TextMessage message = session.createTextMessage("test-message");
+ // this will auto-create the address, but not the subscription queue
+ producer.send(message);
+
+ assertNotNull(server.getAddressInfo(simpleTopicName));
+ assertEquals(RoutingType.MULTICAST, 
server.getAddressInfo(simpleTopicName).getRoutingType());
+ assertTrue(server.getAddressInfo(simpleTopicName).isAutoCreated());
+ 
assertTrue(server.getPostOffice().getBindingsForAddress(simpleTopicName).getBindings().isEmpty());
+
+ // this will auto-create the subscription queue
+ TopicSubscriber consumer = session.createSubscriber(topic);
+ 
assertFalse(server.getPostOffice().getBindingsForAddress(simpleTopicName).getBindings().isEmpty());
+ producer.send(message);
+
+ producer.close();
+ connection.start();
+
+ message = (TextMessage) consumer.receive(1000);
+
+ assertNotNull(message);
+ assertNotNull(message.getText());
+ assertEquals("test-message", message.getText());
+ consumer.close();
+ 
assertTrue(server.getPostOffice().getBindingsForAddress(simpleTopicName).getBindings().isEmpty());
+  } finally {
+ connection.close();
+  }
+   }
+
+   @Test(timeout = 6)
+   public void testSendAndReceiveOnAutoCreatedTopicJMS2() throws Exception {
+  ConnectionFactory cf = new 
JmsConnectionFactory(getBrokerQpidJMSConnectionURI());
+  JMSContext context = cf.createContext();
+  String topicName = UUID.randomUUID().toString();
+  SimpleString simpleTopicName = SimpleString.toSimpleString(topicName);
+
+  try {
+ Topic topic = 

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 18d2d13d9 -> c959d0c67


This closes #1754


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

Branch: refs/heads/master
Commit: c959d0c67d4b2c9ebb9ed8fba5c0b5026ced8eb7
Parents: 18d2d13 2afe081
Author: Martyn Taylor 
Authored: Thu Jan 11 10:59:11 2018 +
Committer: Martyn Taylor 
Committed: Thu Jan 11 10:59:11 2018 +

--
 .../integration/amqp/JMSTopicConsumerTest.java  | 86 
 1 file changed, 86 insertions(+)
--

[2/2] activemq-artemis git commit: ARTEMIS-1579 browsing messages in hawtio console

[martyntaylor]

ARTEMIS-1579 browsing messages in hawtio console


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

Branch: refs/heads/master
Commit: 21b58bfea84c984fd2065abdbd3fcb05dba23b54
Parents: e5251ce
Author: Stanislav Knot 
Authored: Thu Jan 4 16:25:46 2018 +0100
Committer: Martyn Taylor 
Committed: Thu Jan 11 10:56:46 2018 +

--
 .../api/core/management/QueueControl.java   | 10 +++--
 .../src/main/webapp/plugin/js/browse.js | 21 -
 .../core/management/impl/QueueControlImpl.java  | 46 
 .../management/QueueControlUsingCoreTest.java   | 15 +++
 4 files changed, 88 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/21b58bfe/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
index d678977..9eec8e0 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/QueueControl.java
@@ -223,6 +223,9 @@ public interface QueueControl {
@Operation(desc = "Returns the number of the messages in the queue matching 
the given filter", impact = MBeanOperationInfo.INFO)
long countMessages(@Parameter(name = "filter", desc = "A message filter 
(can be empty)") String filter) throws Exception;
 
+   @Operation(desc = "Returns the number of the messages in the queue", impact 
= MBeanOperationInfo.INFO)
+   long countMessages() throws Exception;
+
/**
 * Removes the message corresponding to the specified message ID.
 *
@@ -464,12 +467,13 @@ public interface QueueControl {
@Operation(desc = "Browse Messages", impact = MBeanOperationInfo.ACTION)
CompositeData[] browse() throws Exception;
 
-   /**
-* Resets the MessagesAdded property
-*/
@Operation(desc = "Browse Messages", impact = MBeanOperationInfo.ACTION)
CompositeData[] browse(@Parameter(name = "filter", desc = "A message filter 
(can be empty)") String filter) throws Exception;
 
+   @Operation(desc = "Browse Messages", impact = MBeanOperationInfo.ACTION)
+   CompositeData[] browse(@Parameter(name = "page", desc = "Current page") int 
page,
+  @Parameter(name = "pageSize", desc = "Page size") 
int pageSize) throws Exception;
+
/**
 * Resets the MessagesAdded property
 */

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/21b58bfe/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
--
diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js 
b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
index 7e06b17..a58d9eb 100644
--- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
+++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/browse.js
@@ -20,6 +20,12 @@
 var ARTEMIS = (function(ARTEMIS) {
 
 ARTEMIS.BrowseQueueController = function ($scope, workspace, 
ARTEMISService, jolokia, localStorage, artemisMessage, $location, $timeout) {
+$scope.pagingOptions = {
+  pageSizes: [50, 100, 200],
+  pageSize: 100,
+  currentPage: 1
+   };
+   $scope.totalServerItems = 0;
$scope.searchText = '';
$scope.allMessages = [];
$scope.messages = [];
@@ -28,6 +34,10 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.deleteDialog = false;
$scope.moveDialog = false;
$scope.gridOptions = {
+  pagingOptions: $scope.pagingOptions,
+  enablePaging: true,
+  totalServerItems: 'totalServerItems',
+  showFooter: true,
   selectedItems: [],
   data: 'messages',
   displayFooter: false,
@@ -102,6 +112,14 @@ var ARTEMIS = (function(ARTEMIS) {
$scope.$watch('gridOptions.filterOptions.filterText', function 
(filterText) {
   filterMessages(filterText);
});
+   $scope.$watch('pagingOptions', function (newVal, oldVal) {
+  if (parseInt(newVal.currentPage) && newVal !== oldVal && 
newVal.currentPage !== oldVal.currentPage) {
+ loadTable();
+  }
+  if (parseInt(newVal.pageSize) && newVal !== oldVal && 

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master e5251ce60 -> 18d2d13d9


This closes #1749


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

Branch: refs/heads/master
Commit: 18d2d13d9175183ef2f3cbe140095dc90167f9bb
Parents: e5251ce 21b58bf
Author: Martyn Taylor 
Authored: Thu Jan 11 10:56:46 2018 +
Committer: Martyn Taylor 
Committed: Thu Jan 11 10:56:46 2018 +

--
 .../api/core/management/QueueControl.java   | 10 +++--
 .../src/main/webapp/plugin/js/browse.js | 21 -
 .../core/management/impl/QueueControlImpl.java  | 46 
 .../management/QueueControlUsingCoreTest.java   | 15 +++
 4 files changed, 88 insertions(+), 4 deletions(-)
--

activemq-artemis git commit: ARTEMIS-1565 Fix server schema

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master a076c50e5 -> 3ba50574f


ARTEMIS-1565 Fix server 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/3ba50574
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/3ba50574
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/3ba50574

Branch: refs/heads/master
Commit: 3ba50574fbf4c2230dda982a41a4b1c213ed0a0b
Parents: a076c50
Author: Martyn Taylor 
Authored: Tue Dec 19 14:01:46 2017 +
Committer: Martyn Taylor 
Committed: Tue Dec 19 14:01:46 2017 +

--
 .../src/main/resources/schema/artemis-configuration.xsd  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/3ba50574/artemis-server/src/main/resources/schema/artemis-configuration.xsd
--
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd 
b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index e76478c..4360b02 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -1445,8 +1445,8 @@
  
   

-   
-   
+
+
 

   
@@ -2180,7 +2180,7 @@

 
  
- 
+ 
 

   How long to wait (in milliseconds) between each vote
@@ -2282,7 +2282,7 @@

 
  
- 
+ 
 

   How long to wait (in milliseconds) between each vote

[1/2] activemq-artemis git commit: https://issues.apache.org/jira/browse/ARTEMIS-1565

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master d1c9bc0f2 -> a076c50e5


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

ARTEMIS-1565 - replica should retry quorum vote

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


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

Branch: refs/heads/master
Commit: 6067a285bdbb7e33ad427bf7ea911cc547b1717c
Parents: d1c9bc0
Author: Andy Taylor 
Authored: Tue Dec 19 11:14:50 2017 +
Committer: Andy Taylor 
Committed: Tue Dec 19 11:30:20 2017 +

--
 .../config/ActiveMQDefaultConfiguration.java| 13 +
 .../artemis/core/config/ConfigurationUtils.java |  4 +-
 .../config/ha/ReplicaPolicyConfiguration.java   | 20 +++
 .../ha/ReplicatedPolicyConfiguration.java   | 21 +++
 .../deployers/impl/FileConfigurationParser.java |  8 +++
 .../core/server/cluster/ha/ReplicaPolicy.java   | 28 +-
 .../server/cluster/ha/ReplicatedPolicy.java | 16 +-
 .../core/server/cluster/impl/BridgeImpl.java|  3 +-
 .../server/cluster/qourum/QuorumManager.java| 16 ++
 .../qourum/SharedNothingBackupQuorum.java   | 58 
 .../impl/SharedNothingBackupActivation.java |  2 +-
 .../resources/schema/artemis-configuration.xsd  | 30 ++
 docs/user-manual/en/network-isolation.md| 17 +-
 13 files changed, 216 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6067a285/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 a409ffb..9b5d75d 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
@@ -485,6 +485,12 @@ public final class ActiveMQDefaultConfiguration {
 
public static boolean DEFAULT_VOTE_ON_REPLICATION_FAILURE = false;
 
+   //how many times we retry a vote before restarting as a backup
+   private static int DEFAULT_VOTE_RETRIES = 12;
+
+   //how long we wait between votes, 5 secs
+   private static long DEFAULT_VOTE_RETRY_WAIT = 5000;
+
public static int DEFAULT_QUORUM_SIZE = -1;
 
public static final boolean DEFAULT_ANALYZE_CRITICAL = true;
@@ -1334,4 +1340,11 @@ public final class ActiveMQDefaultConfiguration {
}
 
 
+   public static int getDefaultVoteRetries() {
+  return DEFAULT_VOTE_RETRIES;
+   }
+
+   public static long getDefaultVoteRetryWait() {
+  return DEFAULT_VOTE_RETRY_WAIT;
+   }
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6067a285/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
--
diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
index 95f524f..7ea26ae 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/ConfigurationUtils.java
@@ -72,11 +72,11 @@ public final class ConfigurationUtils {
  }
  case REPLICATED: {
 ReplicatedPolicyConfiguration pc = (ReplicatedPolicyConfiguration) 
conf;
-return new ReplicatedPolicy(pc.isCheckForLiveServer(), 
pc.getGroupName(), pc.getClusterName(), pc.getInitialReplicationSyncTimeout(), 
server.getNetworkHealthCheck(), pc.getVoteOnReplicationFailure(), 
pc.getQuorumSize());
+return new ReplicatedPolicy(pc.isCheckForLiveServer(), 
pc.getGroupName(), pc.getClusterName(), pc.getInitialReplicationSyncTimeout(), 
server.getNetworkHealthCheck(), pc.getVoteOnReplicationFailure(), 
pc.getQuorumSize(), pc.getVoteRetries(), pc.getVoteRetryWait());
  }
  case REPLICA: {
 ReplicaPolicyConfiguration pc = (ReplicaPolicyConfiguration) conf;
-return new ReplicaPolicy(pc.getClusterName(), 
pc.getMaxSavedReplicatedJournalsSize(), pc.getGroupName(), 
pc.isRestartBackup(), pc.isAllowFailBack(), 

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

[martyntaylor]

This closes #1726


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

Branch: refs/heads/master
Commit: a076c50e538e9c8a8c324126439dcf7111f2945c
Parents: d1c9bc0 6067a28
Author: Martyn Taylor 
Authored: Tue Dec 19 12:32:54 2017 +
Committer: Martyn Taylor 
Committed: Tue Dec 19 12:32:54 2017 +

--
 .../config/ActiveMQDefaultConfiguration.java| 13 +
 .../artemis/core/config/ConfigurationUtils.java |  4 +-
 .../config/ha/ReplicaPolicyConfiguration.java   | 20 +++
 .../ha/ReplicatedPolicyConfiguration.java   | 21 +++
 .../deployers/impl/FileConfigurationParser.java |  8 +++
 .../core/server/cluster/ha/ReplicaPolicy.java   | 28 +-
 .../server/cluster/ha/ReplicatedPolicy.java | 16 +-
 .../core/server/cluster/impl/BridgeImpl.java|  3 +-
 .../server/cluster/qourum/QuorumManager.java| 16 ++
 .../qourum/SharedNothingBackupQuorum.java   | 58 
 .../impl/SharedNothingBackupActivation.java |  2 +-
 .../resources/schema/artemis-configuration.xsd  | 30 ++
 docs/user-manual/en/network-isolation.md| 17 +-
 13 files changed, 216 insertions(+), 20 deletions(-)
--

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master aa3b29080 -> ac170710f


This closes #1720


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

Branch: refs/heads/master
Commit: ac170710fca2c4d688abe7c0d5a83269333131a8
Parents: aa3b290 a685bf6
Author: Martyn Taylor 
Authored: Mon Dec 18 11:34:11 2017 +
Committer: Martyn Taylor 
Committed: Mon Dec 18 11:34:11 2017 +

--
 docs/user-manual/en/examples.md |  6 +++
 docs/user-manual/en/slow-consumers.md   |  9 +++-
 examples/features/standard/pom.xml  |  1 +
 .../features/standard/slow-consumer/pom.xml | 20 +++-
 .../features/standard/slow-consumer/readme.html | 50 
 .../features/standard/slow-consumer/readme.md   | 17 +++
 .../main/resources/activemq/server0/broker.xml  | 27 ++-
 7 files changed, 52 insertions(+), 78 deletions(-)
--

[2/2] activemq-artemis git commit: ARTEMIS-1562 update docs for slow-consumer example

[martyntaylor]

ARTEMIS-1562 update docs for slow-consumer example


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

Branch: refs/heads/master
Commit: a685bf6e5c1ef241ad69dead8decb9d8b3bb2018
Parents: aa3b290
Author: Justin Bertram 
Authored: Tue Oct 24 14:20:37 2017 -0500
Committer: Martyn Taylor 
Committed: Mon Dec 18 11:34:11 2017 +

--
 docs/user-manual/en/examples.md |  6 +++
 docs/user-manual/en/slow-consumers.md   |  9 +++-
 examples/features/standard/pom.xml  |  1 +
 .../features/standard/slow-consumer/pom.xml | 20 +++-
 .../features/standard/slow-consumer/readme.html | 50 
 .../features/standard/slow-consumer/readme.md   | 17 +++
 .../main/resources/activemq/server0/broker.xml  | 27 ++-
 7 files changed, 52 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a685bf6e/docs/user-manual/en/examples.md
--
diff --git a/docs/user-manual/en/examples.md b/docs/user-manual/en/examples.md
index 36d4684..8bf8c80 100644
--- a/docs/user-manual/en/examples.md
+++ b/docs/user-manual/en/examples.md
@@ -758,6 +758,12 @@ advanced *asynchronous send acknowledgements* feature to 
obtain
 acknowledgement from the server that sends have been received and
 processed in a separate stream to the sent messages.
 
+Slow Consumer
+-
+
+The `slow-consumer` example shows you how to detect slow consumers and 
configure
+a slow consumer policy in Apache ActiveMQ Artemis's
+
 Spring Integration
 --
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a685bf6e/docs/user-manual/en/slow-consumers.md
--
diff --git a/docs/user-manual/en/slow-consumers.md 
b/docs/user-manual/en/slow-consumers.md
index 81e9f24..afca530 100644
--- a/docs/user-manual/en/slow-consumers.md
+++ b/docs/user-manual/en/slow-consumers.md
@@ -15,8 +15,8 @@ resources.
 ## Configuration required for detecting slow consumers
 
 By default the server will not detect slow consumers. If slow consumer
-detection is desired then see [queue attributes chapter](queue-attributes.md)
-for more details.
+detection is desired then see [address model chapter](address-model.md)
+for more details on the required address settings.
 
 The calculation to determine whether or not a consumer is slow only
 inspects the number of messages a particular consumer has
@@ -33,3 +33,8 @@ are a high number of queues and the 
`slow-consumer-check-period` is
 relatively low then there may be delays in executing some of the checks.
 However, this will not impact the accuracy of the calculations used by
 the detection algorithm. See [thread pooling](thread-pooling.md) for more 
details about this pool.
+
+## Example
+
+See the [examples](examples.md) chapter for an example which shows how to 
detect a slow consumer
+with Apache ActiveMQ Artemis.

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a685bf6e/examples/features/standard/pom.xml
--
diff --git a/examples/features/standard/pom.xml 
b/examples/features/standard/pom.xml
index 6a1a598..d254992 100644
--- a/examples/features/standard/pom.xml
+++ b/examples/features/standard/pom.xml
@@ -155,6 +155,7 @@ under the License.
 security
 security-ldap
 send-acknowledgements
+slow-consumer
 spring-integration
 ssl-enabled
 ssl-enabled-dual-authentication

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/a685bf6e/examples/features/standard/slow-consumer/pom.xml
--
diff --git a/examples/features/standard/slow-consumer/pom.xml 
b/examples/features/standard/slow-consumer/pom.xml
index 79904f9..239f10e 100644
--- a/examples/features/standard/slow-consumer/pom.xml
+++ b/examples/features/standard/slow-consumer/pom.xml
@@ -111,7 +111,23 @@ under the License.

 
  
+ 
+org.apache.maven.plugins
+maven-clean-plugin
+ 
   

-
-
+   
+  
+ release
+ 
+
+   
+  com.vladsch.flexmark
+  markdown-page-generator-plugin
+   
+
+ 
+  
+   
+
\ No newline at end of file

[2/2] activemq-artemis git commit: ARTEMIS-1463 Fix broker's mBean domain name

[martyntaylor]

ARTEMIS-1463 Fix broker's mBean domain name


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

Branch: refs/heads/master
Commit: 0a2e143de50ec6506b6bcce6fe9427cd2fbf9f4c
Parents: 4928269
Author: Jiri Danek 
Authored: Fri Dec 15 20:52:20 2017 +0100
Committer: Martyn Taylor 
Committed: Mon Dec 18 11:30:18 2017 +

--
 .../activemq/artemis/cli/commands/etc/management.xml  |  4 ++--
 .../core/server/management/JMXAccessControlList.java  | 10 +-
 docs/user-manual/en/management.md | 14 +++---
 .../main/resources/activemq/server0/management.xml|  4 ++--
 .../main/resources/activemq/server0/management.xml|  4 ++--
 .../main/resources/activemq/server0/management.xml|  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a2e143d/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
--
diff --git 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
index 1dd7510..6ca565d 100644
--- 
a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
+++ 
b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/management.xml
@@ -29,7 +29,7 @@
  
   
   
- 
+ 
 
 
 
@@ -37,7 +37,7 @@
 
  
  
- 
- 
- 
- 

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

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master 4928269ad -> aa3b29080


This closes #1723


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

Branch: refs/heads/master
Commit: aa3b29080c8551b6652b8d2b9a9b2043e2c9ebcb
Parents: 4928269 0a2e143
Author: Martyn Taylor 
Authored: Mon Dec 18 11:30:18 2017 +
Committer: Martyn Taylor 
Committed: Mon Dec 18 11:30:18 2017 +

--
 .../activemq/artemis/cli/commands/etc/management.xml  |  4 ++--
 .../core/server/management/JMXAccessControlList.java  | 10 +-
 docs/user-manual/en/management.md | 14 +++---
 .../main/resources/activemq/server0/management.xml|  4 ++--
 .../main/resources/activemq/server0/management.xml|  4 ++--
 .../main/resources/activemq/server0/management.xml|  4 ++--
 6 files changed, 20 insertions(+), 20 deletions(-)
--

activemq-artemis git commit: [NOJIRA] Fix checkstyle

[martyntaylor]

Repository: activemq-artemis
Updated Branches:
  refs/heads/master c902e29b2 -> 27f448f06


[NOJIRA] Fix 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/27f448f0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/27f448f0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/27f448f0

Branch: refs/heads/master
Commit: 27f448f061e633e50806934d4bfc718b4d783788
Parents: c902e29
Author: Martyn Taylor 
Authored: Fri Dec 15 15:36:09 2017 +
Committer: Martyn Taylor 
Committed: Fri Dec 15 15:36:09 2017 +

--
 .../artemis/core/remoting/impl/netty/NettyConnection.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/27f448f0/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
--
diff --git 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
index a73983d..de3a1ee 100644
--- 
a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
+++ 
b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnection.java
@@ -28,7 +28,6 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;
-import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelPromise;
 import io.netty.channel.EventLoop;
 import io.netty.handler.ssl.SslHandler;
@@ -46,8 +45,6 @@ import org.apache.activemq.artemis.utils.Env;
 import org.apache.activemq.artemis.utils.IPV6Util;
 import org.jboss.logging.Logger;
 
-import javax.net.ssl.SSLPeerUnverifiedException;
-
 public class NettyConnection implements Connection {
 
private static final Logger logger = 
Logger.getLogger(NettyConnection.class);

[04/14] activemq-artemis git commit: ARTEMIS-1562 Refactor example documentation

[martyntaylor]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/ssl-enabled-dual-authentication/pom.xml
--
diff --git a/examples/features/standard/ssl-enabled-dual-authentication/pom.xml 
b/examples/features/standard/ssl-enabled-dual-authentication/pom.xml
index d106915..9984924 100644
--- a/examples/features/standard/ssl-enabled-dual-authentication/pom.xml
+++ b/examples/features/standard/ssl-enabled-dual-authentication/pom.xml
@@ -104,7 +104,23 @@ under the License.

 
  
+ 
+org.apache.maven.plugins
+maven-clean-plugin
+ 
   

-
-
+   
+  
+ release
+ 
+
+   
+  com.vladsch.flexmark
+  markdown-page-generator-plugin
+   
+
+ 
+  
+   
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/ssl-enabled-dual-authentication/readme.html
--
diff --git 
a/examples/features/standard/ssl-enabled-dual-authentication/readme.html 
b/examples/features/standard/ssl-enabled-dual-authentication/readme.html
deleted file mode 100644
index 93d7c72..000
--- a/examples/features/standard/ssl-enabled-dual-authentication/readme.html
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-  
-ActiveMQ Artemis JMS SSL Example
-
-
-
-  
-  
- JMS SSL Dual Authentication Example
-
- To run the example, simply type mvn verify from this 
directory, or mvn -PnoServer verify if you want to start and create 
the server manually.
-
- This example shows you how to configure 2-way SSL along with 2 
different authentications mechanisms so that SSL and non-SSL clients can send 
and consume messages to/from ActiveMQ Artemis.
- The non-SSL authentication mechanism simply uses username and password. 
The SSL authentication mechanism uses the client's certificate.
-
- To configure 2-way SSL you need to configure the acceptor as 
follows:
-
- 
-
-   
-  !-- Acceptor --
-
-  acceptor 
name=netty-ssl-acceptortcp://localhost:5500?sslEnabled=true;needClientAuth=true;keyStorePath=${data.dir}/../etc/server-side-keystore.jks;keyStorePassword=secureexample;trustStorePath=${data.dir}/../etc/server-side-truststore.jks;trustStorePassword=secureexample/acceptor
-   
-
- 
-
- In the server-side URL, the server-side-keystore.jks is the key store 
file holding the server's certificate. The server-side-truststore.jks is the 
file holding the certificates which the server trusts. Notice also the 
"sslEnabled" and "needClientAuth" parameters which enable SSL and require 
clients to present their own certificate respectively. Here's the URL the 
client uses to connect over SSL:
-
- 
-
-   
-  
tcp://localhost:5500?sslEnabled=true=activemq/server0/client-side-truststore.jks=secureexample=activemq/server0/client-side-keystore.jks=secureexample
-   
-
- 
-
- In the client-side URL, the client-side-keystore.jks is the key store 
file holding the client's certificate. The client-side-truststore.jks is the 
file holding the certificates which the client trusts. The "sslEnabled" 
parameter is present here as well just as it is on the server.
-
- The various keystore files are generated using the following 
commands:
-
- 
-
-   
-keytool -genkey -keystore server-side-keystore.jks -storepass secureexample 
-keypass secureexample -dname "CN=ActiveMQ Artemis Server, OU=Artemis, 
O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA
-keytool -export -keystore server-side-keystore.jks -file server-side-cert.cer 
-storepass secureexample
-keytool -import -keystore client-side-truststore.jks -file 
server-side-cert.cer -storepass secureexample -keypass secureexample -noprompt
-keytool -genkey -keystore client-side-keystore.jks -storepass secureexample 
-keypass secureexample -dname "CN=ActiveMQ Artemis Client, OU=Artemis, 
O=ActiveMQ, L=AMQ, S=AMQ, C=AMQ" -keyalg RSA
-keytool -export -keystore client-side-keystore.jks -file client-side-cert.cer 
-storepass secureexample
-keytool -import -keystore server-side-truststore.jks -file 
client-side-cert.cer -storepass secureexample -keypass secureexample -noprompt
-   
-
- 
-
-  
-

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/ssl-enabled-dual-authentication/readme.md
--
diff --git 
a/examples/features/standard/ssl-enabled-dual-authentication/readme.md 
b/examples/features/standard/ssl-enabled-dual-authentication/readme.md
new file mode 100644
index 000..1fbe0da
--- /dev/null
+++ 

[08/14] activemq-artemis git commit: ARTEMIS-1562 Refactor example documentation

[martyntaylor]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml
--
diff --git 
a/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml
 
b/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml
index ed98e9c..94ff709 100644
--- 
a/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml
+++ 
b/examples/features/standard/jms-bridge/src/main/resources/activemq/server0/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-   
-
+-->
+http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">

 
   ./data/bindings
@@ -42,8 +40,8 @@ under the License.
 
  
   
-   
- 
+  
+ 
 
  
   

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml
--
diff --git 
a/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml
 
b/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml
index 6ee55d9..7ed1674 100644
--- 
a/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml
+++ 
b/examples/features/standard/jms-bridge/src/main/resources/activemq/server1/broker.xml
@@ -16,10 +16,8 @@ software distributed under the License is distributed on an
 KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
--->http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
-
-   
-
+-->
+http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">

 
   ./data/bindings
@@ -42,7 +40,7 @@ under the License.
 
  
   
-   
+  
  
 


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/jms-completion-listener/pom.xml
--
diff --git a/examples/features/standard/jms-completion-listener/pom.xml 
b/examples/features/standard/jms-completion-listener/pom.xml
index 4d4848b..16f9167 100644
--- a/examples/features/standard/jms-completion-listener/pom.xml
+++ b/examples/features/standard/jms-completion-listener/pom.xml
@@ -103,7 +103,23 @@ under the License.

 
  
+ 
+org.apache.maven.plugins
+maven-clean-plugin
+ 
   

-
-
+   
+  
+ release
+ 
+
+   
+  com.vladsch.flexmark
+  markdown-page-generator-plugin
+   
+
+ 
+  
+   
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/standard/jms-completion-listener/readme.html
--
diff --git a/examples/features/standard/jms-completion-listener/readme.html 
b/examples/features/standard/jms-completion-listener/readme.html
deleted file mode 100644
index 36be17a..000
--- a/examples/features/standard/jms-completion-listener/readme.html
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
-  
-ActiveMQ Artemis JMS Completion Listener Example
-
-
-
-  
-  
- JMS Completion Listener Example
-
- To run the example, simply type mvn verify from this 
directory, or mvn -PnoServer verify if you want to start and create 
the server manually.
-
- This example shows you how to send a message asynchronously to 
ActiveMQ Artemis and use a CompletionListener to be notified of
- the Broker receiving it
-
- Example step-by-step
-
- 
-First we need to get an initial context so we can look-up the JMS 
connection factory and destination objects from JNDI. This initial context will 
get it's properties from the client-jndi.properties file in the 
directory ../common/config
-
-   InitialContext initialContext = getContext();
-
-
-We look-up the JMS queue object from JNDI
-
-   Queue queue = (Queue) 
initialContext.lookup("/queue/exampleQueue");
-
-
-We look-up the JMS connection factory object from JNDI
-
-   ConnectionFactory cf = 

[12/14] activemq-artemis git commit: ARTEMIS-1562 Refactor example documentation

[martyntaylor]

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b77cdaf7/examples/features/ha/application-layer-failover/readme.html
--
diff --git a/examples/features/ha/application-layer-failover/readme.html 
b/examples/features/ha/application-layer-failover/readme.html
deleted file mode 100644
index c5248aa..000
--- a/examples/features/ha/application-layer-failover/readme.html
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-  
-ActiveMQ Artemis Application-Layer Failover Example
-
-
-
-  
-  
- Application-Layer Failover Example
-
- To run the example, simply type mvn verify from this 
directory. This example will always spawn and stop multiple servers.
-
- ActiveMQ Artemis implements fully transparent automatic 
failover of connections from a live node to a backup node which requires
- no special coding. This is described in a different example and requires 
server replication.
- However, ActiveMQ Artemis also supports Application-Layer 
failover which is useful in the case where replication is not enabled.
- With Application-Layer failover, it's up to the application to 
register a JMS ExceptionListener with ActiveMQ Artemis.
- This listener will then be called by ActiveMQ Artemis in the event 
that connection failure is detected.
- User code in the ExceptionListener can then recreate any JMS 
Connection, Session, etc on another node and the application
- can continue.
- Application-Layer failover is an alternative approach to High 
Availability (HA).
- Application-Layer failover differs from automatic failover in that 
some client side coding is required in order
- to implement this. Also, with Application-Layer failover, since the old 
Session object dies and a new is created, any uncommitted
- work in the old Session will be lost, and any unacknowledged messages 
might be redelivered.
- For more information on ActiveMQ Artemis failover and HA, and 
clustering in general, please see the clustering
- section of the user manual.
-
- Example step-by-step
- In this example, the live server is server 1, which will failover onto 
server 0.
- The connection will initially be created to server1, server 1 will 
crash, and the client will carry on
- on server 0, the new  server. With Application-Layer failover the node 
that is failed over onto, does not need to
- be specially configured as a backup server, it can be any node.
-
- 
- We create our JMS Connection, Session, MessageProducer and 
MessageConsumer on server 1
-
-   createJMSObjects(1);
-
-
-We set a JMS ExceptionListener on the connection. On failure this 
will be called and the connection,
- session, etc. will be manually recreated on the backup node.
-
-   connection.setExceptionListener(new ExampleListener());
-
-
-We send some messages to server 1, the live server.
-
-   
- final int numMessages = 10;
-
- for (int i = 0; i < numMessages; i++)
- {
-TextMessage message = session.createTextMessage("This is text 
message " + i);
-
-producer.send(message);
-
-System.out.println("Sent message: " + message.getText());
- }
-   
-
-
-We consume those messages on server 1.
-
-  
-  for (int i = 0; i < numMessages; i++)
- {
-TextMessage message0 = (TextMessage)consumer.receive(5000);
-
-System.out.println("Got message: " + message0.getText());
- }
-  
-
-
-We now cause server 1, the live server to crash. After a little 
while the connection's
-ExceptionListener will register the failure and reconnection will 
occur.
-
-   killServer(1);
-
-
-The connection's ExceptionListener gets called, and we lookup the 
JMS objects and
-recreate the connection, session, etc on the other node 0.
-
-   
-   private class ExampleListener implements ExceptionListener
-   {
-  public void onException(JMSException exception)
-  {
- try
- {
-// Close the old resources
-
-closeResources();
-
-// Create new JMS objects on the backup server
-
-createJMSObjects(0);
-
-failoverLatch.countDown();
- }
- catch (Exception e)
- {
-System.err.println("Failed to handle failover");
-
-e.printStackTrace();
- }
-  }
-   }
-   
-
-
-We are now connected to the other node. We now send some more 
messages.
-
-   
-   for (int i = numMessages; i < numMessages * 2; i++)
- {
-TextMessage message = session.createTextMessage("This is text 
message " + i);
-
-producer.send(message);
-
-