Commit Graph

150 Commits

Author SHA1 Message Date
Andy Taylor 0818587597 revert fix that was ported by accident 2015-01-16 10:08:37 +00:00
Clebert Suconic 475f2322e2 This closes #63 on configuration changes 2015-01-15 12:18:19 -05:00
Andy Taylor 4b63891aaa ACTIVEMQ6-67 - cleaned up configuration
https://issues.apache.org/jira/browse/ACTIVEMQ6-67

fixed distribution so that file based security works and hot deployers as broken and no longer needed with new bootstrap.

Also combined the jms and core configuration files.
2015-01-15 15:48:22 +00:00
Martyn Taylor 260f579c18 Merge branch #62 2015-01-14 12:08:22 +00:00
Andy Taylor 2c61399b11 example fixes 2015-01-14 09:11:22 +00:00
Andy Taylor 5595e0a9fc fix maven plugin to wait until stop thread has been called by making thread non deamon 2015-01-14 09:09:58 +00:00
Andy Taylor 41fed219c0 added data dir exclude for Rat plugin 2015-01-14 09:09:58 +00:00
Clebert Suconic c98937c089 This closes #60 on auto-create queues 2015-01-13 16:40:29 -05:00
jbertram e293d80f08 ACTIVEMQ6-13 auto-create/auto-delete jms queues
Implements a new feature for the broker whereby it may automatically
create and delete JMS queues which are not explicitly defined through
the management API or file-based configuration. A JMS queue is created
in response to a sent message or connected consumer. The queue may
subsequently be deleted when it no longer has any messages and
consumers. Auto-creation and auto-deletion can both be turned on/off
via address-setting.
2015-01-13 15:29:17 -06:00
Andy Taylor b388bf2397 merge #61 - Improving ScaleDown and allowing snapshots on builds 2015-01-13 09:21:33 +00:00
Clebert Suconic ec9ff4f55e ACTIVEMQ6-68 Improving Scale down routine and fixing test
https://issues.apache.org/jira/browse/ACTIVEMQ6-68

The logic on transferring method is a bit complex, where
I found a better way to calculate the targetIDs.

This will also fix a few ScaleDownTests

I also added some extra tests using ScaleDownDirect
2015-01-12 21:46:55 -05:00
jbertram b4e2884f14 Allow snapshots to fix the build after removing parent root 2015-01-12 14:51:48 -05:00
Clebert Suconic ff7dbff842 Merging #59
This closes #59
2015-01-12 14:49:59 -05:00
Martyn Taylor 86cdc589d8 ActiveMQ6-65 Removes XA with JTA example
This example requires a Transaction Manager implementation to run.  As
we are not shipping with an appropriate Transaction Manager this is
being removed.
2015-01-12 16:19:42 +00:00
Martyn Taylor 82f1e7a503 ActiveMQ6-65 Examples updated: 3rd party CatX deps
Removes any occurances of CatX deps from examples and removes a couple
of other references to Cat X 3rd party deps.
2015-01-12 15:52:38 +00:00
Andy Taylor 0028efbdc5 merge #58 - removing apache parent for now 2015-01-10 10:38:50 +00:00
Andy Taylor 5e780438f4 merge #57 - Updates distro licences and fix Rat exclusion 2015-01-09 10:56:08 +00:00
Clebert Suconic 99024d4bf9 removing apache parent for now
For some reason this is not playing well with Idea. When I import the project nothing is being able to be executed.
2015-01-08 10:42:05 -05:00
Martyn Taylor 0be3a3e984 Updates distro licences and fix Rat exclusion 2015-01-08 15:33:44 +00:00
Andy Taylor ecf535adb7 merge #56 - Remove jboss jms from examples 2015-01-08 12:55:32 +00:00
Andy Taylor f6ec72fe09 merge #55 - Apache Rat- Exclude target dirs and intellij files 2015-01-08 12:54:19 +00:00
Martyn Taylor f6811d3c43 Apache Rat- Exclude target dirs and intellij files 2015-01-07 19:57:49 +00:00
Martyn Taylor 56d6a47a83 ActiveMQ6-65 JBoss JMS1.1 -> Geronimo 2.0 spec jar
Replaces usage of the JBoss 1.1 API jar with the Geronimo JMS 2.0 jar.
The API is backwards compatibile.
2015-01-07 19:54:42 +00:00
Martyn Taylor 63769aab91 ActiveMQ6-65 JBoss JMS 2.0 spec jar -> Geronimo
Swaps out all usages of the JBoss JMS 2.0 spec jar and replaces with the
Geronimo spec jar, in examples, docs and distribution.
2015-01-07 19:54:42 +00:00
Andy Taylor 3059c6f65b merge #54 - Fix failing RA OutgoingConnectionTests 2015-01-07 09:29:58 +00:00
Martyn Taylor e58f2362cc Fix failing RA OutgoingConnectionTests
Some of the outgoing connection tests require a dummy transaction
manager to setup a fake transaction.  The default transaction manager is
set to the JBoss TX manager and so the tests were failing.  This patch
split the OutgoingConnectionTest into ones that require a real TM
manager vs Dummy TM Manager.
.
2015-01-06 17:06:56 +00:00
Martyn Taylor c9de5c763f Merge branch #53 2015-01-06 16:57:18 +00:00
Clebert Suconic e0b0b6bf89 ACTIVEMQ6-64 Messages duplicated during ScaleDown or queue.totalIterator
https://issues.apache.org/jira/browse/ACTIVEMQ6-64

The redelivery list was not isolated on the PageIterator. This is moving the
redelivery list to the Iterator so we would have proper isolation of the functionality.

The previous version was assuming a single instance of PageIterator, QueueImpl and PageSubscription.
When we started using more than one instance of the Iterator we created this bug.
2015-01-05 20:34:05 -05:00
Clebert Suconic 887743f09d This closes #52 2015-01-05 13:14:41 -05:00
Howard Gao 1d022fe474 ACTIVEMQ6-43(reopened) : Replace License Headers on codebase
- added missing license headers found by maven rat plugin.
  most of them added automatically via apache-rat
  a few manually added

- added apache-rat maven plugin to the build cycle
2015-01-05 13:14:25 -05:00
Martyn Taylor 3d784f41cc Merge branch #51 Use Geronimo JMS 2.0 spec jar 2015-01-05 13:39:16 +00:00
Howard Gao 28fc98ffd0 ACTIVEMQ6-43(reopened) : Replace License Headers on codebase
- added missing license headers found by maven rat plugin.
  most of them added automatically via apache-rat
  a few manually added

- added apache-rat maven plugin to the build cycle
2015-01-05 20:45:36 +08:00
John D. Ament 96dc7e40ea ACTIVEMQ6-40 Update to the geronimo jms 2 spec JAR. 2015-01-02 12:51:37 -05:00
Andy Taylor df873e6909 merge #49 - couple of fixes 2015-01-02 08:24:04 +00:00
jbertram 1a5ea5a029 ACTIVEMQ6-63 add example links to site 2014-12-31 11:07:19 -06:00
jbertram edd5adda7d ACTIVEMQ6-11 Fix the distribution build 2014-12-31 11:07:19 -06:00
jbertram f0d1881667 ACTIVEMQ6-62 Remove unneeded dependency on jackson 2014-12-31 11:07:18 -06:00
jbertram 16d74b2bec Merge #50 ttl fix from Howard 2014-12-31 11:05:07 -06:00
jbertram 1b791ef9e6 Merge #48 more JNDI removal 2014-12-31 09:43:24 -06:00
Howard Gao 1d159e6da0 Bug 1174886 - HornetQ TTL / check-period not being respected
on the replication channel

The connection-ttl and client-failure-check-period are not passed
to the server locator used to create replication connection. So the
fix sets the two parameters in SharedNothingBackupActivation.
2014-12-23 20:38:35 +08:00
Andy Taylor 2514611285 ACTIVEMQ6-14 - more JNDI removal
https://issues.apache.org/jira/browse/ACTIVEMQ6-14

cleaned up more remaining server JNDI code and fixed some abstraction and naming around JNDI and bindings
2014-12-19 08:07:06 +00:00
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