Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch #47

This commit is contained in:
Martyn Taylor 2014-12-17 10:57:44 +00:00
parent f282c29661 7ffa23799b
commit 2e14352055
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQSession.java
View File

@ -52,7 +52,7 @@ import javax.transaction.xa.XAResource;
import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.ActiveMQQueueExistsException; import org.apache.activemq.api.core.ActiveMQQueueExistsException;
import org.apache.activemq.selector.filter.FilterException; import org.apache.activemq.selector.filter.FilterException;
import org.apache.activemq.selector.SelectorParser; import org.apache.activemq.selector.impl.SelectorParser;
import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientProducer; import org.apache.activemq.api.core.client.ClientProducer;

2
activemq-selector/src/main/java/org/apache/activemq/selector/LRUCache.java → activemq-selector/src/main/java/org/apache/activemq/selector/impl/LRUCache.java Executable file → Normal file
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.activemq.selector; package org.apache.activemq.selector.impl;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;

2
activemq-selector/src/main/java/org/apache/activemq/selector/SelectorParser.java → activemq-selector/src/main/java/org/apache/activemq/selector/impl/SelectorParser.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.apache.activemq.selector; package org.apache.activemq.selector.impl;
import java.io.StringReader; import java.io.StringReader;

1
activemq-selector/src/test/java/org/apache/activemq/selector/SelectorParserTest.java
View File

@ -22,6 +22,7 @@ import org.apache.activemq.selector.filter.Expression;
import org.apache.activemq.selector.filter.LogicExpression; import org.apache.activemq.selector.filter.LogicExpression;
import org.apache.activemq.selector.filter.PropertyExpression; import org.apache.activemq.selector.filter.PropertyExpression;
import org.apache.activemq.selector.filter.XPathExpression; import org.apache.activemq.selector.filter.XPathExpression;
import org.apache.activemq.selector.impl.SelectorParser;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;

1
activemq-selector/src/test/java/org/apache/activemq/selector/SelectorTest.java
View File

@ -21,6 +21,7 @@ import java.util.HashMap;
import org.apache.activemq.selector.filter.BooleanExpression; import org.apache.activemq.selector.filter.BooleanExpression;
import org.apache.activemq.selector.filter.FilterException; import org.apache.activemq.selector.filter.FilterException;
import org.apache.activemq.selector.filter.Filterable; import org.apache.activemq.selector.filter.Filterable;
import org.apache.activemq.selector.impl.SelectorParser;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;

2
activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java
View File

@ -21,7 +21,7 @@ import org.apache.activemq.core.server.ActiveMQServerLogger;
import org.apache.activemq.selector.filter.BooleanExpression; import org.apache.activemq.selector.filter.BooleanExpression;
import org.apache.activemq.selector.filter.FilterException; import org.apache.activemq.selector.filter.FilterException;
import org.apache.activemq.selector.filter.Filterable; import org.apache.activemq.selector.filter.Filterable;
import org.apache.activemq.selector.SelectorParser; import org.apache.activemq.selector.impl.SelectorParser;
import org.apache.activemq.api.core.FilterConstants; import org.apache.activemq.api.core.FilterConstants;
import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.core.filter.Filter; import org.apache.activemq.core.filter.Filter;