You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/02/02 15:26:18 UTC

svn commit: r1239643 - in /qpid/trunk/qpid/java: broker/ broker/src/main/grammar/ broker/src/main/java/org/apache/qpid/server/exchange/ broker/src/main/java/org/apache/qpid/server/filter/ broker/src/test/java/org/apache/qpid/server/ client/ client/src/...

Author: rgodfrey
Date: Thu Feb  2 14:26:16 2012
New Revision: 1239643

URL: http://svn.apache.org/viewvc?rev=1239643&view=rev
Log:
QPID-3801 : [Java] Move JMS Selector code into common

Added:
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java   (contents, props changed)
      - copied, changed from r1239110, qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java   (contents, props changed)
      - copied, changed from r1239110, qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
    qpid/trunk/qpid/java/common/src/main/grammar/
    qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/grammar/SelectorParser.jj
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java
    qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java   (contents, props changed)
      - copied, changed from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
Removed:
    qpid/trunk/qpid/java/broker/src/main/grammar/
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XPathExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XQueryExpression.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/XalanXPathEvaluator.java
    qpid/trunk/qpid/java/client/src/main/grammar/
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/
Modified:
    qpid/trunk/qpid/java/broker/build.xml
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
    qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
    qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
    qpid/trunk/qpid/java/client/build.xml
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
    qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
    qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
    qpid/trunk/qpid/java/common/build.xml
    qpid/trunk/qpid/java/lib/javacc.jar

Modified: qpid/trunk/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/build.xml?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/build.xml (original)
+++ qpid/trunk/qpid/java/broker/build.xml Thu Feb  2 14:26:16 2012
@@ -34,14 +34,7 @@
     <property name="qmf.output.file" value="BrokerSchema.java"/>
 
 
-    <target name="precompile" depends="gen_logging,gen_qmf">
-        <mkdir dir="${output.dir}"/>
-        <!-- Compile Selcector Code -->
-        <javacc target="src/main/grammar/SelectorParser.jj"
-                outputdirectory="${output.dir}"
-                javacchome="${project.root}/lib"/>
-    </target>
-
+    <target name="precompile" depends="gen_logging,gen_qmf"/>
 
   <target name="check_qmf_deps">
     <uptodate property="gen_qmf.notRequired" targetfile="${qmf.output.dir}/${qmf.output.file}">

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java Thu Feb  2 14:26:16 2012
@@ -26,6 +26,8 @@ import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.common.AMQPFilterTypes;
 import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.filter.selector.TokenMgrError;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.server.binding.Binding;
@@ -34,6 +36,7 @@ import org.apache.qpid.server.exchange.t
 import org.apache.qpid.server.exchange.topic.TopicNormalizer;
 import org.apache.qpid.server.exchange.topic.TopicParser;
 import org.apache.qpid.server.filter.JMSSelectorFilter;
+import org.apache.qpid.filter.selector.ParseException;
 import org.apache.qpid.server.message.InboundMessage;
 import org.apache.qpid.server.queue.AMQQueue;
 import org.apache.qpid.server.queue.BaseQueue;
@@ -193,7 +196,22 @@ public class TopicExchange extends Abstr
 
         if(selectorRef == null || (selector = selectorRef.get())==null)
         {
-            selector = new JMSSelectorFilter(selectorString);
+            try
+            {
+                selector = new JMSSelectorFilter(selectorString);
+            }
+            catch (ParseException e)
+            {
+                throw new AMQInvalidArgumentException("Cannot parse JMS selector \"" + selectorString + "\"", e);
+            }
+            catch (SelectorParsingException e)
+            {
+                throw new AMQInvalidArgumentException("Cannot parse JMS selector \"" + selectorString + "\"", e);
+            }
+            catch (TokenMgrError e)
+            {
+                throw new AMQInvalidArgumentException("Cannot parse JMS selector \"" + selectorString + "\"", e);
+            }
             _selectorCache.put(selectorString, new WeakReference<JMSSelectorFilter>(selector));
         }
         return selector;

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/FilterManagerFactory.java Thu Feb  2 14:26:16 2012
@@ -23,7 +23,11 @@ package org.apache.qpid.server.filter;
 import org.apache.log4j.Logger;
 
 import org.apache.qpid.AMQException;
+import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.filter.selector.ParseException;
+import org.apache.qpid.filter.selector.TokenMgrError;
 import org.apache.qpid.framing.FieldTable;
 
 import java.util.Map;
@@ -56,7 +60,22 @@ public class FilterManagerFactory
                 if (selector != null && !selector.equals(""))
                 {
                     manager = new SimpleFilterManager();
-                    manager.add(new JMSSelectorFilter(selector));
+                    try
+                    {
+                        manager.add(new JMSSelectorFilter(selector));
+                    }
+                    catch (ParseException e)
+                    {
+                        throw new AMQInvalidArgumentException("Cannot parse JMS selector \"" + selector + "\"", e);
+                    }
+                    catch (SelectorParsingException e)
+                    {
+                        throw new AMQInvalidArgumentException("Cannot parse JMS selector \"" + selector + "\"", e);
+                    }
+                    catch (TokenMgrError e)
+                    {
+                        throw new AMQInvalidArgumentException("Cannot parse JMS selector \"" + selector + "\"", e);
+                    }
                 }
 
             }

Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java Thu Feb  2 14:26:16 2012
@@ -22,8 +22,12 @@ package org.apache.qpid.server.filter;
 
 import org.apache.log4j.Logger;
 
-import org.apache.qpid.AMQInvalidArgumentException;
-import org.apache.qpid.server.filter.jms.selector.SelectorParser;
+import org.apache.qpid.filter.BooleanExpression;
+import org.apache.qpid.filter.FilterableMessage;
+import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.filter.selector.ParseException;
+import org.apache.qpid.filter.selector.SelectorParser;
+import org.apache.qpid.filter.selector.TokenMgrError;
 import org.apache.qpid.server.queue.Filterable;
 
 
@@ -34,7 +38,7 @@ public class JMSSelectorFilter implement
     private String _selector;
     private BooleanExpression _matcher;
 
-    public JMSSelectorFilter(String selector) throws AMQInvalidArgumentException
+    public JMSSelectorFilter(String selector) throws ParseException, TokenMgrError, SelectorParsingException
     {
         _selector = selector;
         _matcher = new SelectorParser().parse(selector);
@@ -42,7 +46,8 @@ public class JMSSelectorFilter implement
 
     public boolean matches(Filterable message)
     {
-        boolean match = _matcher.matches(message);
+
+        boolean match = _matcher.matches(wrap(message));
         if(_logger.isDebugEnabled())
         {
             _logger.debug(message + " match(" + match + ") selector(" + System.identityHashCode(_selector) + "):" + _selector);
@@ -50,6 +55,62 @@ public class JMSSelectorFilter implement
         return match;
     }
 
+    private FilterableMessage wrap(final Filterable message)
+    {
+        return new FilterableMessage()
+        {
+            public boolean isPersistent()
+            {
+                return message.isPersistent();
+            }
+
+            public boolean isRedelivered()
+            {
+                return message.isRedelivered();
+            }
+
+            public Object getHeader(String name)
+            {
+                return message.getMessageHeader().getHeader(name);
+            }
+
+            public String getReplyTo()
+            {
+                return message.getMessageHeader().getReplyTo();
+            }
+
+            public String getType()
+            {
+                return message.getMessageHeader().getType();
+            }
+
+            public byte getPriority()
+            {
+                return message.getMessageHeader().getPriority();
+            }
+
+            public String getMessageId()
+            {
+                return message.getMessageHeader().getMessageId();
+            }
+
+            public long getTimestamp()
+            {
+                return message.getMessageHeader().getTimestamp();
+            }
+
+            public String getCorrelationId()
+            {
+                return message.getMessageHeader().getCorrelationId();
+            }
+
+            public long getExpiration()
+            {
+                return message.getMessageHeader().getExpiration();
+            }
+        };
+    }
+
     public String getSelector()
     {
         return _selector;

Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/SelectorParserTest.java Thu Feb  2 14:26:16 2012
@@ -23,7 +23,8 @@ package org.apache.qpid.server;
 
 import junit.framework.TestCase;
 
-import org.apache.qpid.AMQException;
+import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.filter.selector.ParseException;
 import org.apache.qpid.server.filter.JMSSelectorFilter;
 
 public class SelectorParserTest extends TestCase
@@ -109,7 +110,11 @@ public class SelectorParserTest extends 
         {
             new JMSSelectorFilter(selector);
         }
-        catch (AMQException e)
+        catch (ParseException e)
+        {
+            fail("Selector '" + selector + "' was not parsed :" + e.getMessage());
+        }
+        catch (SelectorParsingException e)
         {
             fail("Selector '" + selector + "' was not parsed :" + e.getMessage());
         }
@@ -122,7 +127,11 @@ public class SelectorParserTest extends 
             new JMSSelectorFilter(selector);
             fail("Selector '" + selector + "' was parsed ");
         }
-        catch (AMQException e)
+        catch (ParseException e)
+        {
+            //normal path
+        }
+        catch (SelectorParsingException e)
         {
             //normal path
         }

Modified: qpid/trunk/qpid/java/client/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/build.xml?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/build.xml (original)
+++ qpid/trunk/qpid/java/client/build.xml Thu Feb  2 14:26:16 2012
@@ -32,14 +32,6 @@
 
   <property name="output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/>
 
-  <target name="precompile">
-    <mkdir dir="${output.dir}"/>
-    <javacc target="src/main/grammar/SelectorParser.jj"
-            outputdirectory="${output.dir}"
-            javacchome="${project.root}/lib"/>
-  </target>
-
-
   <uptodate property="doc-release.done" targetfile="${module.release}/api/index.html">
     <srcfiles dir="${module.src}" includes="**/*.java"/>
   </uptodate>

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Thu Feb  2 14:26:16 2012
@@ -47,8 +47,8 @@ import org.apache.qpid.client.message.Un
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.client.util.FlowControllingBlockingQueue;
 import org.apache.qpid.common.AMQPFilterTypes;
+import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.filter.MessageFilter;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.MethodRegistry;

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java Thu Feb  2 14:26:16 2012
@@ -27,6 +27,7 @@ import org.apache.qpid.client.AMQDestina
 import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.client.failover.FailoverNoopSupport;
 import org.apache.qpid.client.failover.FailoverProtectedOperation;
+import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.client.message.AMQMessageDelegateFactory;
 import org.apache.qpid.client.message.FieldTableSupport;
 import org.apache.qpid.client.message.MessageFactoryRegistry;
@@ -37,7 +38,6 @@ import org.apache.qpid.client.messaging.
 import org.apache.qpid.client.messaging.address.Node.QueueNode;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.filter.MessageFilter;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.protocol.AMQConstant;

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java Thu Feb  2 14:26:16 2012
@@ -38,7 +38,7 @@ import org.apache.qpid.client.protocol.A
 import org.apache.qpid.client.state.AMQState;
 import org.apache.qpid.client.state.AMQStateManager;
 import org.apache.qpid.client.state.listener.SpecificMethodFrameListener;
-import org.apache.qpid.filter.MessageFilter;
+import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.framing.*;
 import org.apache.qpid.framing.amqp_0_9.MethodRegistry_0_9;
 import org.apache.qpid.framing.amqp_0_91.MethodRegistry_0_91;

Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java Thu Feb  2 14:26:16 2012
@@ -26,14 +26,14 @@ import org.slf4j.LoggerFactory;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.failover.FailoverException;
+import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.client.message.AMQMessageDelegateFactory;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 import org.apache.qpid.client.message.CloseConsumerMessage;
 import org.apache.qpid.client.message.MessageFactoryRegistry;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.filter.JMSSelectorFilter;
-import org.apache.qpid.filter.MessageFilter;
+import org.apache.qpid.client.filter.JMSSelectorFilter;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.framing.FieldTableFactory;

Copied: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java (from r1239110, qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java?p2=qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java&p1=qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java&r1=1239110&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java Thu Feb  2 14:26:16 2012
@@ -15,14 +15,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.client.filter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.apache.qpid.filter.FilterableMessage;
+import org.apache.qpid.filter.SelectorParsingException;
+import org.apache.qpid.filter.selector.ParseException;
 import org.apache.qpid.filter.selector.SelectorParser;
+import org.apache.qpid.filter.BooleanExpression;
+import org.apache.qpid.filter.selector.TokenMgrError;
+
+import javax.jms.DeliveryMode;
+import javax.jms.JMSException;
 
 
 public class JMSSelectorFilter implements MessageFilter
@@ -43,27 +51,161 @@ public class JMSSelectorFilter implement
         {
             _logger.debug("Created JMSSelectorFilter with selector:" + _selector);
         }
-        _matcher = new SelectorParser().parse(selector);
+        try
+        {
+            _matcher = new SelectorParser().parse(selector);
+        }
+        catch (ParseException e)
+        {
+            throw new AMQInternalException("Unable to parse selector \""+selector+"\"", e);
+        }
+        catch (SelectorParsingException e)
+        {
+            throw new AMQInternalException("Unable to parse selector \""+selector+"\"", e);
+        }
+        catch (TokenMgrError e)
+        {
+            throw new AMQInternalException("Unable to parse selector \""+selector+"\"", e);
+        }
     }
 
     public boolean matches(AbstractJMSMessage message)
     {
         try
         {
-            boolean match = _matcher.matches(message);
+            boolean match = _matcher.matches(wrap(message));
             if (_logger.isDebugEnabled())
             {
                 _logger.debug(message + " match(" + match + ") selector(" + _selector + "): " + _selector);
             }
             return match;
         }
-        catch (AMQInternalException e)
+        catch (SelectorParsingException e)
         {
             _logger.warn("Caught exception when evaluating message selector for message  " + message, e);
         }
         return false;
     }
 
+    private FilterableMessage wrap(final AbstractJMSMessage message)
+    {
+        return new FilterableMessage()
+        {
+            public boolean isPersistent()
+            {
+                try
+                {
+                    return message.getJMSDeliveryMode() == DeliveryMode.PERSISTENT;
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public boolean isRedelivered()
+            {
+                try
+                {
+                    return message.getJMSRedelivered();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public Object getHeader(String name)
+            {
+                try
+                {
+                    return message.getObjectProperty(name);
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public String getReplyTo()
+            {
+                return message.getReplyToString();
+            }
+
+            public String getType()
+            {
+                try
+                {
+                    return message.getJMSType();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public byte getPriority()
+            {
+                try
+                {
+                    return (byte) message.getJMSPriority();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public String getMessageId()
+            {
+                try
+                {
+                    return message.getJMSMessageID();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public long getTimestamp()
+            {
+                try
+                {
+                    return message.getJMSTimestamp();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public String getCorrelationId()
+            {
+                try
+                {
+                    return message.getJMSCorrelationID();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+
+            public long getExpiration()
+            {
+                try
+                {
+                    return message.getJMSExpiration();
+                }
+                catch (JMSException e)
+                {
+                    throw new SelectorParsingException(e);
+                }
+            }
+        };
+    }
+
     public String getSelector()
     {
         return _selector;

Propchange: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/JMSSelectorFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java (from r1239110, qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java?p2=qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java&p1=qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java&r1=1239110&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java Thu Feb  2 14:26:16 2012
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.filter;
+package org.apache.qpid.client.filter;
 
 import org.apache.qpid.client.message.AbstractJMSMessage;
 

Propchange: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/filter/MessageFilter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/filter/JMSSelectorFilterTest.java Thu Feb  2 14:26:16 2012
@@ -23,6 +23,8 @@ package org.apache.qpid.filter;
 import junit.framework.TestCase;
 
 import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.filter.JMSSelectorFilter;
+import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.client.message.JMSTextMessage;
 import org.apache.qpid.client.message.TestMessageHelper;
 

Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java Thu Feb  2 14:26:16 2012
@@ -29,7 +29,7 @@ import org.apache.qpid.client.BasicMessa
 import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.client.message.AMQMessageDelegateFactory;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
-import org.apache.qpid.filter.MessageFilter;
+import org.apache.qpid.client.filter.MessageFilter;
 import org.apache.qpid.framing.AMQShortString;
 import org.apache.qpid.framing.FieldTable;
 

Modified: qpid/trunk/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Thu Feb  2 14:26:16 2012
@@ -32,6 +32,7 @@
   <property name="xml.spec.list" value='"${xml.spec.dir}/amqp.0-8.xml" "${xml.spec.dir}/amqp.0-9.xml" "${xml.spec.dir}/amqp0-9-1.stripped.xml"' />
   <property name="gentools.timestamp" location="${framing.generated.dir}/gentools.timestamp" />
   <property name="jython.timestamp" location="${framing.generated.dir}/jython.timestamp" />
+  <property name="selector.output.dir" value="${module.precompiled}/org/apache/qpid/filter/selector"/>
 
   <target name="check_jython_deps">
     <uptodate property="jython.notRequired" targetfile="${jython.timestamp}">
@@ -96,7 +97,14 @@ public class QpidBuildVersion
 
   </target>
 
-  <target name="precompile" depends="gentools,jython,create-version,build-version"/>
+  <target name="jms-selector">
+    <mkdir dir="${selector.output.dir}"/>
+    <javacc target="src/main/grammar/SelectorParser.jj"
+            outputdirectory="${selector.output.dir}"
+            javacchome="${project.root}/lib"/>
+  </target>
+
+  <target name="precompile" depends="gentools,jython,create-version,build-version,jms-selector"/>
 
   <target name="bundle" depends="bundle-tasks"/>
 </project>

Copied: qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj (from r1239514, qpid/trunk/qpid/java/broker/src/main/grammar/SelectorParser.jj)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj?p2=qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj&p1=qpid/trunk/qpid/java/broker/src/main/grammar/SelectorParser.jj&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/grammar/SelectorParser.jj (original)
+++ qpid/trunk/qpid/java/common/src/main/grammar/SelectorParser.jj Thu Feb  2 14:26:16 2012
@@ -31,7 +31,6 @@ options {
   UNICODE_INPUT = true;
 
   // some performance optimizations
-  OPTIMIZE_TOKEN_MANAGER = true;
   ERROR_REPORTING = false;
 }
 
@@ -61,49 +60,49 @@ PARSER_BEGIN(SelectorParser)
  *
  */
 
-package org.apache.qpid.server.filter.jms.selector;
+package org.apache.qpid.filter.selector;
 
 import java.io.StringReader;
 import java.util.ArrayList;
 
-import org.apache.qpid.AMQInvalidArgumentException;
-import org.apache.qpid.server.filter.ArithmeticExpression;
-import org.apache.qpid.server.filter.BooleanExpression;
-import org.apache.qpid.server.filter.ComparisonExpression;
-import org.apache.qpid.server.filter.ConstantExpression;
-import org.apache.qpid.server.filter.Expression;
-import org.apache.qpid.server.filter.LogicExpression;
-import org.apache.qpid.server.filter.PropertyExpression;
-import org.apache.qpid.server.filter.UnaryExpression;
+import org.apache.qpid.filter.ArithmeticExpression;
+import org.apache.qpid.filter.BooleanExpression;
+import org.apache.qpid.filter.ComparisonExpression;
+import org.apache.qpid.filter.ConstantExpression;
+import org.apache.qpid.filter.Expression;
+import org.apache.qpid.filter.LogicExpression;
+import org.apache.qpid.filter.PropertyExpression;
+import org.apache.qpid.filter.UnaryExpression;
 
 /**
  * JMS Selector Parser generated by JavaCC
  *
  * Do not edit this .java file directly - it is autogenerated from SelectorParser.jj
  */
-public class SelectorParser {
+public class SelectorParser
+{
 
-    public SelectorParser() {
+    public SelectorParser()
+    {
         this(new StringReader(""));
     }
 
-    public BooleanExpression parse(String sql) throws AMQInvalidArgumentException {
+    public BooleanExpression parse(String sql) throws ParseException
+    {
         this.ReInit(new StringReader(sql));
 
-        try {
-            return this.JmsSelector();
-        }
-        catch (Throwable e) {
-	        throw (AMQInvalidArgumentException)new AMQInvalidArgumentException(sql,e);
-        }
+        return this.JmsSelector();
 
     }
 
-    private BooleanExpression asBooleanExpression(Expression value) throws ParseException  {
-        if (value instanceof BooleanExpression) {
+    private BooleanExpression asBooleanExpression(Expression value) throws ParseException
+    {
+        if (value instanceof BooleanExpression)
+        {
             return (BooleanExpression) value;
         }
-        if (value instanceof PropertyExpression) {
+        if (value instanceof PropertyExpression)
+        {
             return UnaryExpression.createBooleanCast( value );
         }
         throw new ParseException("Expression will not result in a boolean value: " + value);
@@ -149,8 +148,6 @@ TOKEN [IGNORE_CASE] :
   | <  TRUE    : "TRUE" >
   | <  FALSE   : "FALSE" >
   | <  NULL    : "NULL" >
-  | <  XPATH   : "XPATH" >
-  | <  XQUERY  : "XQUERY" >
 }
 
 /* Literals */
@@ -309,8 +306,8 @@ Expression comparisonExpression() :
 				{
 					u=null;
 				}
-		        <LIKE> t = stringLitteral()
-		        	[ <ESCAPE> u = stringLitteral() ]
+		        <LIKE> t = stringLiteral()
+		        	[ <ESCAPE> u = stringLiteral() ]
 		        {
                     left = ComparisonExpression.createLike(left, t, u);
 		        }
@@ -319,7 +316,7 @@ Expression comparisonExpression() :
 				{
 					u=null;
 				}
-		        <NOT> <LIKE> t = stringLitteral() [ <ESCAPE> u = stringLitteral() ]
+		        <NOT> <LIKE> t = stringLiteral() [ <ESCAPE> u = stringLiteral() ]
 		        {
                     left = ComparisonExpression.createNotLike(left, t, u);
 		        }
@@ -337,14 +334,14 @@ Expression comparisonExpression() :
             |
 				<IN>
 		        "("
-		            t = stringLitteral()
+		            t = stringLiteral()
 		            {
 			            list = new ArrayList();
 			            list.add( t );
 		            }
 			        (
 			        	","
-			            t = stringLitteral()
+			            t = stringLiteral()
 			            {
 				            list.add( t );
 			            }
@@ -358,14 +355,14 @@ Expression comparisonExpression() :
 	        	LOOKAHEAD(2)
 	            <NOT> <IN>
 		        "("
-		            t = stringLitteral()
+		            t = stringLiteral()
 		            {
 			            list = new ArrayList();
 			            list.add( t );
 		            }
 			        (
 			        	","
-			            t = stringLitteral()
+			            t = stringLiteral()
 			            {
 				            list.add( t );
 			            }
@@ -460,16 +457,6 @@ Expression unaryExpr() :
 		    left = UnaryExpression.createNOT( asBooleanExpression(left) );
 	    }
 	    |
-	    <XPATH> s=stringLitteral()
-	    {
-		    left = UnaryExpression.createXPath( s );
-	    }
-	    |
-	    <XQUERY> s=stringLitteral()
-	    {
-		    left = UnaryExpression.createXQuery( s );
-	    }
-	    |
 	    left = primaryExpr()
     )
     {
@@ -506,7 +493,7 @@ ConstantExpression literal() :
 {
     (
         (
-            s = stringLitteral()
+            s = stringLiteral()
             {
                 left = new ConstantExpression(s);
             }
@@ -566,7 +553,7 @@ ConstantExpression literal() :
     }
 }
 
-String stringLitteral() :
+String stringLiteral() :
 {
     Token t;
     StringBuffer rc = new StringBuffer();

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java Thu Feb  2 14:26:16 2012
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 /**
  * An expression which performs an operation on two expression values
  */
@@ -59,7 +57,7 @@ public abstract class ArithmeticExpressi
                         return plus((Number) lvalue, asNumber(rvalue));
                     }
 
-                    throw new RuntimeException("Cannot call plus operation on: " + lvalue + " and: " + rvalue);
+                    throw new SelectorParsingException("Cannot call plus operation on: " + lvalue + " and: " + rvalue);
                 }
 
                 public String getExpressionSymbol()
@@ -80,7 +78,7 @@ public abstract class ArithmeticExpressi
                         return minus((Number) lvalue, asNumber(rvalue));
                     }
 
-                    throw new RuntimeException("Cannot call minus operation on: " + lvalue + " and: " + rvalue);
+                    throw new SelectorParsingException("Cannot call minus operation on: " + lvalue + " and: " + rvalue);
                 }
 
                 public String getExpressionSymbol()
@@ -102,7 +100,7 @@ public abstract class ArithmeticExpressi
                         return multiply((Number) lvalue, asNumber(rvalue));
                     }
 
-                    throw new RuntimeException("Cannot call multiply operation on: " + lvalue + " and: " + rvalue);
+                    throw new SelectorParsingException("Cannot call multiply operation on: " + lvalue + " and: " + rvalue);
                 }
 
                 public String getExpressionSymbol()
@@ -124,7 +122,7 @@ public abstract class ArithmeticExpressi
                         return divide((Number) lvalue, asNumber(rvalue));
                     }
 
-                    throw new RuntimeException("Cannot call divide operation on: " + lvalue + " and: " + rvalue);
+                    throw new SelectorParsingException("Cannot call divide operation on: " + lvalue + " and: " + rvalue);
                 }
 
                 public String getExpressionSymbol()
@@ -146,7 +144,7 @@ public abstract class ArithmeticExpressi
                         return mod((Number) lvalue, asNumber(rvalue));
                     }
 
-                    throw new RuntimeException("Cannot call mod operation on: " + lvalue + " and: " + rvalue);
+                    throw new SelectorParsingException("Cannot call mod operation on: " + lvalue + " and: " + rvalue);
                 }
 
                 public String getExpressionSymbol()
@@ -243,11 +241,11 @@ public abstract class ArithmeticExpressi
         }
         else
         {
-            throw new RuntimeException("Cannot convert value: " + value + " into a number");
+            throw new SelectorParsingException("Cannot convert value: " + value + " into a number");
         }
     }
 
-    public Object evaluate(Filterable message)
+    public Object evaluate(FilterableMessage message)
     {
         Object lvalue = getLeft().evaluate(message);
         if (lvalue == null)

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java Thu Feb  2 14:26:16 2012
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BinaryExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/BooleanExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java Thu Feb  2 14:26:16 2012
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 /**
  * A BooleanExpression is an expression that always
  * produces a Boolean result.
@@ -33,6 +31,6 @@ public interface BooleanExpression exten
      * @param message
      * @return true if the expression evaluates to Boolean.TRUE.
      */
-    public boolean matches(Filterable message);
+    public boolean matches(FilterableMessage message);
 
 }

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/BooleanExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java Thu Feb  2 14:26:16 2012
@@ -18,13 +18,11 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -136,7 +134,7 @@ public abstract class ComparisonExpressi
         /**
          *  org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
          */
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
             Object rv = this.getRight().evaluate(message);
@@ -155,7 +153,7 @@ public abstract class ComparisonExpressi
             return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
         }
 
-        public boolean matches(Filterable message)
+        public boolean matches(FilterableMessage message)
         {
             Object object = evaluate(message);
 
@@ -167,8 +165,8 @@ public abstract class ComparisonExpressi
     {
         if ((escape != null) && (escape.length() != 1))
         {
-            throw new RuntimeException(
-                "The ESCAPE string litteral is invalid.  It can only be one character.  Litteral used: " + escape);
+            throw new SelectorParsingException(
+                "The ESCAPE string literal is invalid.  It can only be one character.  Litteral used: " + escape);
         }
 
         int c = -1;
@@ -190,7 +188,7 @@ public abstract class ComparisonExpressi
 
         if (!(left instanceof PropertyExpression))
         {
-            throw new RuntimeException("Expected a property for In expression, got: " + left);
+            throw new SelectorParsingException("Expected a property for In expression, got: " + left);
         }
 
         return UnaryExpression.createInExpression((PropertyExpression) left, elements, false);
@@ -202,7 +200,7 @@ public abstract class ComparisonExpressi
 
         if (!(left instanceof PropertyExpression))
         {
-            throw new RuntimeException("Expected a property for In expression, got: " + left);
+            throw new SelectorParsingException("Expected a property for In expression, got: " + left);
         }
 
         return UnaryExpression.createInExpression((PropertyExpression) left, elements, true);
@@ -333,18 +331,18 @@ public abstract class ComparisonExpressi
             }
 
             // Else it's boolean or a String..
-            throw new RuntimeException("Value '" + expr + "' cannot be compared.");
+            throw new SelectorParsingException("Value '" + expr + "' cannot be compared.");
         }
 
         if (expr instanceof BooleanExpression)
         {
-            throw new RuntimeException("Value '" + expr + "' cannot be compared.");
+            throw new SelectorParsingException("Value '" + expr + "' cannot be compared.");
         }
     }
 
     /**
      * Validates that the expression can be used in == or <> expression.
-     * Cannot not be NULL TRUE or FALSE litterals.
+     * Cannot not be NULL TRUE or FALSE literals.
      *
      * @param expr
      */
@@ -355,7 +353,7 @@ public abstract class ComparisonExpressi
             Object value = ((ConstantExpression) expr).getValue();
             if (value == null)
             {
-                throw new RuntimeException("'" + expr + "' cannot be compared.");
+                throw new SelectorParsingException("'" + expr + "' cannot be compared.");
             }
         }
     }
@@ -371,7 +369,7 @@ public abstract class ComparisonExpressi
         {
             if ((left instanceof BooleanExpression) && !(right instanceof BooleanExpression))
             {
-                throw new RuntimeException("'" + left + "' cannot be compared with '" + right + "'");
+                throw new SelectorParsingException("'" + left + "' cannot be compared with '" + right + "'");
             }
         }
     }
@@ -385,7 +383,7 @@ public abstract class ComparisonExpressi
         super(left, right);
     }
 
-    public Object evaluate(Filterable message)
+    public Object evaluate(FilterableMessage message)
     {
         Comparable lv = (Comparable) getLeft().evaluate(message);
         if (lv == null)
@@ -547,7 +545,7 @@ public abstract class ComparisonExpressi
 
     protected abstract boolean asBoolean(int answer);
 
-    public boolean matches(Filterable message)
+    public boolean matches(FilterableMessage message)
     {
         Object object = evaluate(message);
 
@@ -561,7 +559,7 @@ public abstract class ComparisonExpressi
             super(left, right);
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
             Object lv = getLeft().evaluate(message);
             Object rv = getRight().evaluate(message);

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/ConstantExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java Thu Feb  2 14:26:16 2012
@@ -18,13 +18,11 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 import java.math.BigDecimal;
 
 /**
@@ -40,7 +38,7 @@ public class ConstantExpression implemen
             super(value);
         }
 
-        public boolean matches(Filterable message)
+        public boolean matches(FilterableMessage message)
         {
             Object object = evaluate(message);
 
@@ -119,7 +117,7 @@ public class ConstantExpression implemen
         this.value = value;
     }
 
-    public Object evaluate(Filterable message)
+    public Object evaluate(FilterableMessage message)
     {
         return value;
     }

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/ConstantExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/Expression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java Thu Feb  2 14:26:16 2012
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 /**
  * Represents an expression
  */
@@ -31,6 +29,6 @@ public interface Expression
     /**
      * @return the value of this expression
      */
-    public Object evaluate(Filterable message);
+    public Object evaluate(FilterableMessage message);
 
 }

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/Expression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java?rev=1239643&view=auto
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java (added)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/FilterableMessage.java Thu Feb  2 14:26:16 2012
@@ -0,0 +1,41 @@
+package org.apache.qpid.filter;
+
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+public interface FilterableMessage
+{
+
+    boolean isPersistent();
+
+    boolean isRedelivered();
+
+    Object getHeader(String name);
+
+    String getReplyTo();
+
+    String getType();
+
+    byte getPriority();
+
+    String getMessageId();
+
+    long getTimestamp();
+
+    String getCorrelationId();
+
+    long getExpiration();
+}

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/LogicExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java Thu Feb  2 14:26:16 2012
@@ -15,13 +15,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 /**
  * A filter performing a comparison of two objects
  */
@@ -47,9 +45,9 @@ public abstract class LogicExpression ex
         super(left, right);
     }
 
-    public abstract Object evaluate(Filterable message);
+    public abstract Object evaluate(FilterableMessage message);
 
-    public boolean matches(Filterable message)
+    public boolean matches(FilterableMessage message)
     {
         Object object = evaluate(message);
 
@@ -63,7 +61,7 @@ public abstract class LogicExpression ex
             super(lvalue, rvalue);
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
             Boolean lv = (Boolean) getLeft().evaluate(message);
@@ -91,7 +89,7 @@ public abstract class LogicExpression ex
             super(lvalue, rvalue);
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
             Boolean lv = (Boolean) getLeft().evaluate(message);

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/LogicExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java Thu Feb  2 14:26:16 2012
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.log4j.Logger;
 
-import org.apache.qpid.server.queue.Filterable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 
@@ -39,14 +39,14 @@ public class PropertyExpression implemen
 
     private static final int DEFAULT_PRIORITY = 4;
 
-    private static final Logger _logger = org.apache.log4j.Logger.getLogger(PropertyExpression.class);
+    private static final Logger _logger = LoggerFactory.getLogger(PropertyExpression.class);
 
     private static final HashMap<String, Expression> JMS_PROPERTY_EXPRESSIONS = new HashMap<String, Expression>();
 
     {
         JMS_PROPERTY_EXPRESSIONS.put("JMSDestination", new Expression()
                                      {
-                                         public Object evaluate(Filterable message)
+                                         public Object evaluate(FilterableMessage message)
                                          {
                                              //TODO
                                              return null;
@@ -72,7 +72,7 @@ public class PropertyExpression implemen
 
         JMS_PROPERTY_EXPRESSIONS.put("JMSRedelivered", new Expression()
                                      {
-                                         public Object evaluate(Filterable message)
+                                         public Object evaluate(FilterableMessage message)
                                          {
                                              return message.isRedelivered();
                                          }
@@ -93,10 +93,10 @@ public class PropertyExpression implemen
 
         
 
-        jmsPropertyExpression = (Expression) JMS_PROPERTY_EXPRESSIONS.get(name);
+        jmsPropertyExpression = JMS_PROPERTY_EXPRESSIONS.get(name);
     }
 
-    public Object evaluate(Filterable message)
+    public Object evaluate(FilterableMessage message)
     {
 
         if (jmsPropertyExpression != null)
@@ -105,7 +105,7 @@ public class PropertyExpression implemen
         }
         else
         {
-            return message.getMessageHeader().getHeader(name);
+            return message.getHeader(name);
         }
     }
 
@@ -147,9 +147,9 @@ public class PropertyExpression implemen
 
     private static class ReplyToExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
-            String replyTo = message.getMessageHeader().getReplyTo();
+            String replyTo = message.getReplyTo();
             return replyTo;
         }
 
@@ -157,10 +157,10 @@ public class PropertyExpression implemen
 
     private static class TypeExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
-                String type = message.getMessageHeader().getType();
+                String type = message.getType();
                 return type;
 
         }
@@ -168,7 +168,7 @@ public class PropertyExpression implemen
 
     private static class DeliveryModeExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
                 JMSDeliveryMode mode = message.isPersistent() ? JMSDeliveryMode.PERSISTENT :
                                                                 JMSDeliveryMode.NON_PERSISTENT;
@@ -183,19 +183,19 @@ public class PropertyExpression implemen
 
     private static class PriorityExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
-            byte priority = message.getMessageHeader().getPriority();
+            byte priority = message.getPriority();
             return (int) priority;
         }
     }
 
     private static class MessageIDExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
-            String messageId = message.getMessageHeader().getMessageId();
+            String messageId = message.getMessageId();
 
             return messageId;
 
@@ -204,19 +204,19 @@ public class PropertyExpression implemen
 
     private static class TimestampExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
-            long timestamp = message.getMessageHeader().getTimestamp();
+            long timestamp = message.getTimestamp();
             return timestamp;
         }
     }
 
     private static class CorrelationIdExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
-            String correlationId = message.getMessageHeader().getCorrelationId();
+            String correlationId = message.getCorrelationId();
 
             return correlationId;
         }
@@ -224,9 +224,9 @@ public class PropertyExpression implemen
 
     private static class ExpirationExpression implements Expression
     {
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
-            long expiration = message.getMessageHeader().getExpiration();
+            long expiration = message.getExpiration();
             return expiration;
 
         }

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/PropertyExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java?rev=1239643&view=auto
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java (added)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/SelectorParsingException.java Thu Feb  2 14:26:16 2012
@@ -0,0 +1,40 @@
+package org.apache.qpid.filter;
+
+/**
+ * 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
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * 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.
+ */
+public class SelectorParsingException extends RuntimeException
+{
+    public SelectorParsingException(String s)
+    {
+        super(s);
+    }
+
+    public SelectorParsingException(String message, Throwable cause)
+    {
+        super(message, cause);
+    }
+
+    public SelectorParsingException(Throwable cause)
+    {
+        super(cause);
+    }
+
+    public SelectorParsingException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace)
+    {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
+}

Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java (from r1239514, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java&r1=1239514&r2=1239643&rev=1239643&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/UnaryExpression.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java Thu Feb  2 14:26:16 2012
@@ -18,17 +18,14 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.filter;
+package org.apache.qpid.filter;
 //
 // Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
 //
 
-import org.apache.qpid.server.queue.Filterable;
-
 import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -75,31 +72,20 @@ public abstract class UnaryExpression im
             super(left);
         }
 
-        public boolean matches(Filterable message)
+        public boolean matches(FilterableMessage message)
         {
             Object object = evaluate(message);
 
             return (object != null) && (object == Boolean.TRUE);
         }
     }
-    ;
 
-    public static<E extends Exception> BooleanExpression createNOT(BooleanExpression left)
+    public static BooleanExpression createNOT(BooleanExpression left)
     {
         return new NotExpression(left);
     }
 
-    public static BooleanExpression createXPath(final String xpath)
-    {
-        return new XPathExpression(xpath);
-    }
-
-    public static BooleanExpression createXQuery(final String xpath)
-    {
-        return new XQueryExpression(xpath);
-    }
-
-    public static<E extends Exception> BooleanExpression createBooleanCast(Expression left)
+    public static BooleanExpression createBooleanCast(Expression left)
     {
         return new BooleanCastExpression(left);
     }
@@ -141,7 +127,7 @@ public abstract class UnaryExpression im
         }
         else
         {
-            throw new RuntimeException("Don't know how to negate: " + left);
+            throw new SelectorParsingException("Don't know how to negate: " + left);
         }
     }
 
@@ -155,11 +141,6 @@ public abstract class UnaryExpression im
         return right;
     }
 
-    public void setRight(Expression expression)
-    {
-        right = expression;
-    }
-
     /**
      * @see java.lang.Object#toString()
      */
@@ -192,7 +173,7 @@ public abstract class UnaryExpression im
      * Returns the symbol that represents this binary expression.  For example, addition is
      * represented by "+"
      *
-     * @return
+     * @return symbol
      */
     public abstract String getExpressionSymbol();
 
@@ -203,7 +184,7 @@ public abstract class UnaryExpression im
             super(left);
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
             Object rvalue = getRight().evaluate(message);
             if (rvalue == null)
@@ -237,7 +218,7 @@ public abstract class UnaryExpression im
             _not = not;
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
 
             Object rvalue = getRight().evaluate(message);
@@ -264,16 +245,14 @@ public abstract class UnaryExpression im
 
         public String toString()
         {
-            StringBuffer answer = new StringBuffer();
-            answer.append(getRight());
+            StringBuilder answer = new StringBuilder(String.valueOf(getRight()));
             answer.append(" ");
             answer.append(getExpressionSymbol());
             answer.append(" ( ");
 
             int count = 0;
-            for (Iterator i = _inList.iterator(); i.hasNext();)
+            for (Object o : _inList)
             {
-                Object o = (Object) i.next();
                 if (count != 0)
                 {
                     answer.append(", ");
@@ -308,7 +287,7 @@ public abstract class UnaryExpression im
             super(left);
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
             Boolean lvalue = (Boolean) getRight().evaluate(message);
             if (lvalue == null)
@@ -316,7 +295,7 @@ public abstract class UnaryExpression im
                 return null;
             }
 
-            return lvalue.booleanValue() ? Boolean.FALSE : Boolean.TRUE;
+            return lvalue ? Boolean.FALSE : Boolean.TRUE;
         }
 
         public String getExpressionSymbol()
@@ -332,7 +311,7 @@ public abstract class UnaryExpression im
             super(left);
         }
 
-        public Object evaluate(Filterable message)
+        public Object evaluate(FilterableMessage message)
         {
             Object rvalue = getRight().evaluate(message);
             if (rvalue == null)
@@ -345,7 +324,7 @@ public abstract class UnaryExpression im
                 return Boolean.FALSE;
             }
 
-            return ((Boolean) rvalue).booleanValue() ? Boolean.TRUE : Boolean.FALSE;
+            return ((Boolean) rvalue) ? Boolean.TRUE : Boolean.FALSE;
         }
 
         public String toString()

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/filter/UnaryExpression.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: qpid/trunk/qpid/java/lib/javacc.jar
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/javacc.jar?rev=1239643&r1=1239642&r2=1239643&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org