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
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.
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.
When compiled by JDK 8 targeting Java 6 and then run on JDK 6 or 7 the
ConcurrentHashMap#keyset() method can fail because the return types
changed in Java 8. Using ConcurrentMap interface to resolve the issue.
https://issues.apache.org/jira/browse/ACTIVEMQ6-3
We are renaming packages from activemq6 to activemq as that's more generic and version independent
The previous commit renamed the directories. On this commit now I'm changing the code.
If we changed the code and the directories on the same commit git would remove and add a lot of files
without recognizing the renames.
https://issues.apache.org/jira/browse/ACTIVEMQ6-3
We are renaming packages from activemq6 to activemq as that's more generic and version independent
On this first commit I'm just renaming the directories otherwise the history would be lost. The next commit will rename the text on the directories.
If I squash these two commits git will make us delete / add again.
Andy Taylor
Howard Gao
Clebert Suconic
Martyn Taylor
jbertram