Commit Graph

8859 Commits

Author SHA1 Message Date
Martyn Taylor 2e14352055 Merge branch #47 2014-12-17 10:57:44 +00:00
Howard Gao 7ffa23799b ACTIVEMQ6-61 SelectorParser package conflict with openwire tests
The SelectorParser class in amq6 source code conflicts
with the same class in activemq 5 client jar. The activemq 5
client jar is needed to run openwire tests where the activemq5
client interacts with amq6 broker. In tests they are usually
in the same VM, so depending on the classpath order, whichever
class is loaded it will be used by both client and broker.
Unfortunately the method parse() in the class has different
return types in the client jar and broker side jar.
That will cause NoSuchMethod exception.

The fix moves the broker side class into a different package, i.e.
from
org.apache.activemq.selector.SelectorParser
to
org.apache.activemq.selector.impl.SelectorParser
2014-12-17 10:02:33 +08:00
Clebert Suconic f282c29661 Merging #45 on doc changes (review fixes from Andy) 2014-12-16 12:19:29 -05:00
Clebert Suconic b1d6c0b449 Merging #46 on TM Fixes 2014-12-16 12:18:10 -05:00
Martyn Taylor fe1ae2b698 Set TM as loaded only after a TM is located.
Previously the ServiceUtils component responsible for loading the
transaction manager would attempt to load a TM only once.  If it was not
found it would not try again.  This patch updates the ServiceUtils to
iterate over any TransactionManagerLocator implementations on the class
path and check each one util a TM is located.
2014-12-16 17:03:05 +00:00
Martyn Taylor f28c9be8af Only Set TM on Bridge in QoS modes that require it
The bridge currently tries to assign a TM even when the quality of
service level is set to Duplicates OK.  This QoS does not use or require
a TM.  This patch stops the bridge from attempting to assign a TM for
this QoS and also checks that a TM is set of the other QoS.  If TM is
not set for a QoS that requires one, a error is logged and RunTime
exception thrown.
2014-12-16 16:33:58 +00:00
Martyn Taylor 739c0f368b Allow tests to set TM in TMLocatorImpl
Some tests require a proper TM to be returned by the TMLocator
implementation whilst others require a DummyTM to be returned.  This
patch makes allows TM returned by the locator class to be changed by the
test.
2014-12-16 16:33:58 +00:00
Martyn Taylor 39c61014ac Add TM Locator impl to JMSBridge tests 2014-12-16 16:33:58 +00:00
Andy Taylor c7b6b66f96 documentation review fixes 2014-12-16 10:27:08 +00:00
Clebert Suconic 64cc435ea7 Merging #44 on fixing tests 2014-12-12 11:38:23 -05:00
Martyn Taylor 891e3ef1cb Add TM Locator impl to JMSBridge tests 2014-12-12 16:35:13 +00:00
Clebert Suconic 4045e89748 Merge #43 on doc changes 2014-12-12 11:32:30 -05:00
Andy Taylor b4144013d9 documentation review fixes 2014-12-12 14:46:30 +00:00
jbertram 1491f4a123 Merge #42 - paging fix from Clebert 2014-12-11 12:27:39 -06:00
Clebert Suconic 09490cdba3 ACTIVEMQ6-54 Fixing tests broken after Paging fix
https://issues.apache.org/jira/browse/ACTIVEMQ6-54

Changing the order of depaging introduced an extra check that needs to be checked now.
This will probably take care of the issue by checking if the page is complete before depage.
2014-12-10 22:06:35 -05:00
jbertram 0eb6ebda22 Merge #41 2014-12-10 10:10:08 -06:00
jbertram a102983d7a ACTIVEMQ6-51 Example server bootstrapping 2014-12-10 09:49:13 -06:00
jbertram 4f925c5a44 ACTIVEMQ6-14 NPE during init 2014-12-10 09:49:12 -06:00
jbertram 77bdb9d502 ACTIVEMQ6-14 Remove naming from bootstrap 2014-12-10 09:49:12 -06:00
jbertram 76d0cee5f5 ACTIVEMQ6-41 Drop Java EE examples 2014-12-10 09:49:12 -06:00
Clebert Suconic fecd376448 Fixing build after XA Test
The JMS Testsuite still need the TM for some tests, not having a TM would break compilation on the JMS Test
2014-12-10 10:39:08 -05:00
Clebert Suconic 60576a7c51 Merging #39 on Transaction Manager dependencies 2014-12-10 10:00:03 -05:00
Martyn Taylor 2982f37512 ActiveMQ6-6 Remove last of JBoss Transactions SPI 2014-12-10 14:00:34 +00:00
Andy Taylor 2d69d9dc7c merge #32 - wildfly recovery 2014-12-10 12:50:26 +00:00
Andy Taylor 09a6fee020 merge #27 - revert any new protocol headers to keep backward compatibility 2014-12-10 12:01:50 +00:00
gaohoward ff42c217f5 ACTIVEMQ6-50 revert any new protocol headers to keep backward compatibility
- revert the FORCED_DELIVERY_MESSAGE
   back to "_hornetq"
 - revert handshake header back to 'HORNETQ'
2014-12-10 11:15:53 +08:00
Clebert Suconic d5359535e7 Merge #38 on HTML site generation from MD 2014-12-09 11:56:47 -05:00
Martyn Taylor 8f91af1b5c ActiveMQ6-6 Factor out WildFly XA Recovery
Pulls out WildFly XA Recovery specifics into a different project.  Some
XA recovery code is still present and is used as integration points for
integrating TM XA recovery processes.
2014-12-09 16:08:34 +00:00
Andy Taylor 395b90e066 ACTIVEMQ6-9 - create html user manual for site
https://issues.apache.org/jira/browse/ACTIVEMQ6-9

The release profile now builds a static html version of the user manual for the web site using gitbook.

Also added a new profile 'distro' that builds the distribution but without the docs.

Updated read me with build process.
2014-12-09 08:35:33 +00:00
Clebert Suconic d7c7d86d55 Merging #36 on SPI and TX integration 2014-12-08 12:25:18 -05:00
Clebert Suconic 6309dd042c Merging #37 on changing docs to MD 2014-12-08 10:49:04 -05:00
Andy Taylor 4245a6b4fe ACTIVEMQ6-9 - port to markdown
https://issues.apache.org/jira/browse/ACTIVEMQ6-9

remove the jboss jdocbook build and style and replace using plane markdown
2014-12-08 13:23:24 +00:00
Andy Taylor d42481db5c merge #35 - Fixing issues with paging (browsing & depaging) 2014-12-08 11:28:02 +00:00
Andy Taylor e34fd09ce3 ACTIVEMQ6-6 - remove SPI usage
https://issues.apache.org/jira/browse/ACTIVEMQ6-6

Removed the jboss security implementations and also implemented the location of Transaction Managers using Service Loader and removed the jboss implementation.
2014-12-08 11:06:24 +00:00
Clebert Suconic 933d90a4f3 ACTIVEMQ6-54 Depaging is not kicking in on some scenarios, and Browsing is not looking towards paging
https://issues.apache.org/jira/browse/ACTIVEMQ6-54

This is fixing a few issues around paging:
- Browsing it not looking towards Paging. I'm using the queue.totalIterator which is a read-only iterator that goes towards the pages messages.
- Depage is not kicking correctly in some scenarios. I have improved the logic on scheduling depage for that.
2014-12-05 14:48:14 -05:00
Clebert Suconic aec50cf250 small fix on pom (version 6.0 instead of 2.5) 2014-12-05 10:38:42 -05:00
Clebert Suconic 46182e4155 Merge #34 on JNDI changes 2014-12-05 10:37:50 -05:00
jbertram 7cfd76d321 Handful of test fixes 2014-12-05 09:27:53 -06:00
jbertram e6a3d3a0c5 ACTIVEMQ6-14 Replace JNDI server with client impl 2014-12-05 09:27:52 -06:00
Clebert Suconic e419feb882 Merge #33 on porting HornetQ fix, based on https://issues.apache.org/jira/browse/ACTIVEMQ6-53 2014-12-05 10:25:15 -05:00
Ivo Studensky ff9052b83b HORNETQ-1381 create new threads under AccessControlContext of the creator of ActiveMQThreadFactory 2014-12-05 12:23:48 +01:00
Clebert Suconic 28ca327b85 Merge #31 on pom changes 2014-12-04 08:18:08 -05:00
Andy Taylor 8fc35ad371 ACTIVEMQ6-11 - fix distribution build for Apache
https://issues.apache.org/jira/browse/ACTIVEMQ6-11

Fixed the build so that the correct snapshot and release repositories are used for the releases.

Also corrected the scm and issue management in the pom.
2014-12-03 11:43:56 +00:00
Andy Taylor b61747de09 merged #30 - Removing twitter integration 2014-12-03 07:57:43 +00:00
Clebert Suconic a3afd62575 ACTIVEMQ6-20 removing twitter integration
https://issues.apache.org/jira/browse/ACTIVEMQ6-20

this has been identified as a dead feature.
It was only useful for presentations...
it had its time and we have better examples we can use...
It's time for this feature to go!
2014-12-02 12:33:16 -05:00
Clebert Suconic cb7774cfea ACTIVEMQ6-49 removing chinese quickstart doc
https://issues.apache.org/jira/browse/ACTIVEMQ6-49

Some left over from the chinese docs
2014-12-02 12:32:52 -05:00
Clebert Suconic 4e8edab4f6 Merge #29 on WebServer integration 2014-12-02 11:56:20 -05:00
Andy Taylor 79a970bc7a ACTIVEMQ6-15 - expose Jolokia in web server
https://issues.apache.org/jira/browse/ACTIVEMQ6-15

The Jolokia War Agent is now bootstrapped with the server so mBeans are accessible via Rest API's
2014-12-02 16:52:23 +00:00
Andy Taylor eb4f835477 ACTIVEMQ6-35 - expose web server configuration
https://issues.apache.org/jira/browse/ACTIVEMQ6-35

Added configuration to allow a web server (or any external component) to be deployed. Added a default Jetty configuration and implementation.
2014-12-02 16:52:08 +00:00
Martyn Taylor 592e47f287 Merge PR #28 2014-12-02 10:01:04 +00:00