1 files changed, 0 insertions, 235 deletions
diff --git a/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java b/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
deleted file mode 100644
index 11fdeae2b1..0000000000
--- a/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/PropertyExpression.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- *
- * 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
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.
- *
- */
-package org.apache.qpid.server.filter;
-//
-// Based on like named file from r450141 of the Apache ActiveMQ project <http://www.activemq.org/site/home.html>
-//
-
-import java.util.HashMap;
-
-import org.apache.log4j.Logger;
-
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.CommonContentHeaderProperties;
-import org.apache.qpid.server.queue.Filterable;
-
-/**
- * Represents a property  expression
- */
-public class PropertyExpression implements Expression
-{
-    // Constants - defined the same as JMS
-    private static final int NON_PERSISTENT = 1;
-    private static final int PERSISTENT = 2;
-    private static final int DEFAULT_PRIORITY = 4;
-
-    private static final Logger _logger = org.apache.log4j.Logger.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)
-                                         {
-                                             //TODO
-                                             return null;
-                                         }
-                                     });
-        JMS_PROPERTY_EXPRESSIONS.put("JMSReplyTo", new ReplyToExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSType", new TypeExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSDeliveryMode", new DeliveryModeExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSPriority", new PriorityExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSMessageID", new MessageIDExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("AMQMessageID", new MessageIDExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSTimestamp", new TimestampExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSCorrelationID", new CorrelationIdExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSExpiration", new ExpirationExpression());
-
-        JMS_PROPERTY_EXPRESSIONS.put("JMSRedelivered", new Expression()
-                                     {
-                                         public Object evaluate(Filterable message)
-                                         {
-                                             return message.isRedelivered();
-                                         }
-                                     });
-    }
-
-    private final String name;
-    private final Expression jmsPropertyExpression;
-
-    public boolean outerTest()
-    {
-        return false;
-    }
-
-    public PropertyExpression(String name)
-    {
-        this.name = name;
-
-        
-
-        jmsPropertyExpression = (Expression) JMS_PROPERTY_EXPRESSIONS.get(name);
-    }
-
-    public Object evaluate(Filterable message)
-    {
-
-        if (jmsPropertyExpression != null)
-        {
-            return jmsPropertyExpression.evaluate(message);
-        }
-        else
-        {
-            return message.getMessageHeader().getHeader(name);
-        }
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-
-    /**
-     * @see java.lang.Object#toString()
-     */
-    public String toString()
-    {
-        return name;
-    }
-
-    /**
-     * @see java.lang.Object#hashCode()
-     */
-    public int hashCode()
-    {
-        return name.hashCode();
-    }
-
-    /**
-     * @see java.lang.Object#equals(java.lang.Object)
-     */
-    public boolean equals(Object o)
-    {
-
-        if ((o == null) || !this.getClass().equals(o.getClass()))
-        {
-            return false;
-        }
-
-        return name.equals(((PropertyExpression) o).name);
-
-    }
-
-    private static class ReplyToExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-            String replyTo = message.getMessageHeader().getReplyTo();
-            return replyTo;
-        }
-
-    }
-
-    private static class TypeExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-
-                String type = message.getMessageHeader().getType();
-                return type;
-
-        }
-    }
-
-    private static class DeliveryModeExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-                int mode = message.isPersistent() ? PERSISTENT : NON_PERSISTENT;
-                if (_logger.isDebugEnabled())
-                {
-                    _logger.debug("JMSDeliveryMode is :" + mode);
-                }
-
-                return mode;
-        }
-    }
-
-    private static class PriorityExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-            byte priority = message.getMessageHeader().getPriority();
-            return (int) priority;
-        }
-    }
-
-    private static class MessageIDExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-
-            String messageId = message.getMessageHeader().getMessageId();
-
-            return messageId;
-
-        }
-    }
-
-    private static class TimestampExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-            long timestamp = message.getMessageHeader().getTimestamp();
-            return timestamp;
-        }
-    }
-
-    private static class CorrelationIdExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-
-            String correlationId = message.getMessageHeader().getCorrelationId();
-
-            return correlationId;
-        }
-    }
-
-    private static class ExpirationExpression implements Expression
-    {
-        public Object evaluate(Filterable message)
-        {
-            long expiration = message.getMessageHeader().getExpiration();
-            return expiration;
-
-        }
-    }
-}