QPID-2675: Remove obsolete QpidException

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@979294 13f79535-47bb-0310-9956-ffa450edef68

21 files changed, 68 insertions, 336 deletions

diff --git a/java/client/src/main/grammar/SelectorParser.jj b/java/client/src/main/grammar/SelectorParser.jj
index b45cf1a487..4bf9a968d7 100644
--- a/java/client/src/main/grammar/SelectorParser.jj
+++ b/java/client/src/main/grammar/SelectorParser.jj
@@ -66,7 +66,7 @@ package org.apache.qpid.filter.selector;
 import java.io.StringReader;

 import java.util.ArrayList;

 

-import org.apache.qpid.QpidException;

+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.filter.ArithmeticExpression;

 import org.apache.qpid.filter.BooleanExpression;

 import org.apache.qpid.filter.ComparisonExpression;

@@ -87,14 +87,14 @@ public class SelectorParser {
         this(new StringReader(""));

     }

 

-    public BooleanExpression parse(String sql) throws QpidException {

+    public BooleanExpression parse(String sql) throws AMQInternalException {

         this.ReInit(new StringReader(sql));

 

         try {

             return this.JmsSelector();

         }

         catch (Throwable e) {

-	        throw new QpidException(sql,null,e);

+	        throw new AMQInternalException(sql,e);

         }

 

     }

diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index c275905a67..a942d808a9 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -24,9 +24,9 @@ import org.apache.qpid.client.message.*;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
 import org.apache.qpid.framing.FieldTable;
 import org.apache.qpid.AMQException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.protocol.AMQConstant;
 import org.apache.qpid.transport.*;
-import org.apache.qpid.QpidException;
 import org.apache.qpid.filter.MessageFilter;
 import org.apache.qpid.filter.JMSSelectorFilter;
 
@@ -93,7 +93,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<UnprocessedM
             {
                 _filter = new JMSSelectorFilter(messageSelector);
             }
-            catch (QpidException e)
+            catch (AMQInternalException e)
             {
                 throw new InvalidSelectorException("cannot create consumer because of selector issue");
             }
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
index 308f04f082..cdbf57769d 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
@@ -25,7 +25,7 @@ import javax.jms.JMSException;
 import javax.jms.Message;
 
 import org.apache.qpid.AMQException;
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.failover.FailoverException;
 import org.apache.qpid.client.message.*;
 import org.apache.qpid.client.protocol.AMQProtocolHandler;
@@ -54,7 +54,7 @@ public class BasicMessageConsumer_0_8 extends BasicMessageConsumer<UnprocessedMe
                 JMSSelectorFilter _filter = new JMSSelectorFilter(messageSelector);
             }
         }
-        catch (QpidException e)
+        catch (AMQInternalException e)
         {
             throw new InvalidSelectorException("cannot create consumer because of selector issue");
         }
diff --git a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
index 4f4fc3ddd3..8a75082202 100644
--- a/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
+++ b/java/client/src/main/java/org/apache/qpid/client/XAResourceImpl.java
@@ -21,7 +21,7 @@ import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInvalidArgumentException;
 import org.apache.qpid.dtx.XidImpl;
 import org.apache.qpid.transport.*;
 
@@ -350,19 +350,8 @@ public class XAResourceImpl implements XAResource
     
     private void setDtxTimeout(int timeout) throws XAException
     {
-        try
-        {
-            _xaSession.getQpidSession()
+        _xaSession.getQpidSession()
                     .dtxSetTimeout(XidImpl.convert(_xid), timeout);
-        }
-        catch (QpidException e)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Cannot convert Xid into String format ", e);
-            }
-            throw new XAException(XAException.XAER_PROTO);
-        }
     }
 
     /**
@@ -518,7 +507,7 @@ public class XAResourceImpl implements XAResource
      * convert a generic xid into qpid format
      * @param xid xid to be converted
      * @return the qpid formated xid
-     * @throws XAException when xid is null or when it cannot be converted. 
+     * @throws XAException when xid is null 
      */
     private org.apache.qpid.transport.Xid convertXid(Xid xid) throws XAException
     {
@@ -527,19 +516,7 @@ public class XAResourceImpl implements XAResource
             // Invalid arguments were given.
             throw new XAException(XAException.XAER_INVAL);
         }
-        try
-        {
-            return XidImpl.convert(xid);
-        }
-        catch (QpidException e)
-        {
-            if (_logger.isDebugEnabled())
-            {
-                _logger.debug("Cannot convert Xid into String format ", e);
-            }
-            //A resource manager error has occured in the transaction branch.
-            throw new XAException(XAException.XAER_RMERR);
-        }
+        return XidImpl.convert(xid);
     }
 
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
index 56d1bdcdc5..a86613f10c 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ArithmeticExpression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -241,7 +241,7 @@ public abstract class ArithmeticExpression extends BinaryExpression
         }
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         Object lvalue = left.evaluate(message);
         if (lvalue == null)
diff --git a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
index cc24c81729..14a5c7ea87 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/BooleanExpression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -28,6 +28,6 @@ import org.apache.qpid.client.message.AbstractJMSMessage;
 public interface BooleanExpression extends Expression
 {
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException;
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException;
 
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
index adf360698b..55fca853ef 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ComparisonExpression.java
@@ -17,13 +17,13 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.util.HashSet;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+
 /**
  * A filter performing a comparison of two objects
  */
@@ -131,7 +131,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         /**
          *  org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
          */
-        public Object evaluate(AbstractJMSMessage message) throws QpidException
+        public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
         {
 
             Object rv = this.getRight().evaluate(message);
@@ -151,7 +151,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
             return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -234,7 +234,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         return new ComparisonExpression(left, right)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
                     Object lv = left.evaluate(message);
                     Object rv = right.evaluate(message);
@@ -417,7 +417,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
         super(left, right);
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         Comparable lv = (Comparable) left.evaluate(message);
         if (lv == null)
@@ -579,7 +579,7 @@ public abstract class ComparisonExpression extends BinaryExpression implements B
 
     protected abstract boolean asBoolean(int answer);
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException
     {
         Object object = evaluate(message);
 
diff --git a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
index 447de914a4..3874d13431 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/ConstantExpression.java
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.math.BigDecimal;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+
 /**
  * Represents a constant expression
  */
@@ -35,7 +35,7 @@ public class ConstantExpression implements Expression
             super(value);
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -114,7 +114,7 @@ public class ConstantExpression implements Expression
         this.value = value;
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
         return value;
     }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/Expression.java b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
index e578775a77..8208f49688 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/Expression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/Expression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -29,6 +29,7 @@ public interface Expression
     /**
      * @param message The message to evaluate
      * @return the value of this expression
+     * @throws AMQInternalException 
      */
-    public Object evaluate(AbstractJMSMessage message) throws QpidException;
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException;
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
index dcfb9a9940..4159986090 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/JMSSelectorFilter.java
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.apache.qpid.filter.selector.SelectorParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.filter.selector.SelectorParser;
-import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
 public class JMSSelectorFilter implements MessageFilter
@@ -34,7 +34,7 @@ public class JMSSelectorFilter implements MessageFilter
     private String _selector;
     private BooleanExpression _matcher;
 
-    public JMSSelectorFilter(String selector) throws QpidException
+    public JMSSelectorFilter(String selector) throws AMQInternalException
     {
         _selector = selector;
         if (JMSSelectorFilter._logger.isDebugEnabled())
@@ -56,7 +56,7 @@ public class JMSSelectorFilter implements MessageFilter
             }
             return match;
         }
-        catch (QpidException e)
+        catch (AMQInternalException e)
         {
             JMSSelectorFilter._logger.warn("Caght exception when evaluating message selector for message  " + message, e);
         }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
index d7aabd5a46..7ef85cbacb 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/LogicExpression.java
@@ -17,7 +17,7 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
@@ -32,7 +32,7 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
         return new LogicExpression(lvalue, rvalue)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
 
                     Boolean lv = (Boolean) left.evaluate(message);
@@ -59,7 +59,7 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
         return new LogicExpression(lvalue, rvalue)
             {
 
-                public Object evaluate(AbstractJMSMessage message) throws QpidException
+                public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
                 {
 
                     Boolean lv = (Boolean) left.evaluate(message);
@@ -96,9 +96,9 @@ public abstract class LogicExpression extends BinaryExpression implements Boolea
         super(left, right);
     }
 
-    public abstract Object evaluate(AbstractJMSMessage message) throws QpidException;
+    public abstract Object evaluate(AbstractJMSMessage message) throws AMQInternalException;
 
-    public boolean matches(AbstractJMSMessage message) throws QpidException
+    public boolean matches(AbstractJMSMessage message) throws AMQInternalException
     {
         Object object = evaluate(message);
 
diff --git a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
index a775080d81..62e4a28c1e 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/MessageFilter.java
@@ -17,11 +17,11 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInternalException;
 import org.apache.qpid.client.message.AbstractJMSMessage;
 
 
 public interface MessageFilter
 {
-    boolean matches(AbstractJMSMessage message) throws QpidException;
+    boolean matches(AbstractJMSMessage message) throws AMQInternalException;
 }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
index 09152f7f1b..b7b6bd57bc 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/PropertyExpression.java
@@ -17,14 +17,14 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.client.message.AbstractJMSMessage;
-import org.apache.qpid.QpidException;
-import org.apache.qpid.ErrorCode;
-import org.slf4j.LoggerFactory;
-import org.slf4j.Logger;
+import java.util.HashMap;
 
 import javax.jms.JMSException;
-import java.util.HashMap;
+
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a property  expression
@@ -234,7 +234,7 @@ public class PropertyExpression implements Expression
         jmsPropertyExpression = JMS_PROPERTY_EXPRESSIONS.get(name);
     }
 
-    public Object evaluate(AbstractJMSMessage message) throws QpidException
+    public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
     {
 
         if (jmsPropertyExpression != null)
@@ -256,7 +256,7 @@ public class PropertyExpression implements Expression
             }
             catch(JMSException e)
             {
-                throw new QpidException("Exception evaluating properties for filter", ErrorCode.INTERNAL_ERROR, e);
+                throw new AMQInternalException("Exception evaluating properties for filter", e);
             }
         }
     }
diff --git a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
index b620b107c4..0fc3382b7e 100644
--- a/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
+++ b/java/client/src/main/java/org/apache/qpid/filter/UnaryExpression.java
@@ -17,14 +17,14 @@
  */
 package org.apache.qpid.filter;
 
-import org.apache.qpid.QpidException;
-import org.apache.qpid.client.message.AbstractJMSMessage;
-
 import java.math.BigDecimal;
-import java.util.List;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
+
+import org.apache.qpid.AMQInternalException;
+import org.apache.qpid.client.message.AbstractJMSMessage;
 
 /**
  * An expression which performs an operation on two expression values
@@ -39,7 +39,7 @@ public abstract class UnaryExpression implements Expression
     {
         return new UnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Object rvalue = right.evaluate(message);
                 if (rvalue == null)
@@ -84,7 +84,7 @@ public abstract class UnaryExpression implements Expression
 
         return new BooleanUnaryExpression(right)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
 
                 Object rvalue = right.evaluate(message);
@@ -156,7 +156,7 @@ public abstract class UnaryExpression implements Expression
             super(left);
         }
 
-        public boolean matches(AbstractJMSMessage message) throws QpidException
+        public boolean matches(AbstractJMSMessage message) throws AMQInternalException
         {
             Object object = evaluate(message);
 
@@ -170,7 +170,7 @@ public abstract class UnaryExpression implements Expression
     {
         return new BooleanUnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Boolean lvalue = (Boolean) right.evaluate(message);
                 if (lvalue == null)
@@ -191,7 +191,7 @@ public abstract class UnaryExpression implements Expression
     {
         return new BooleanUnaryExpression(left)
         {
-            public Object evaluate(AbstractJMSMessage message) throws QpidException
+            public Object evaluate(AbstractJMSMessage message) throws AMQInternalException
             {
                 Object rvalue = right.evaluate(message);
                 if (rvalue == null)
diff --git a/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java b/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
deleted file mode 100644
index ce790a3b24..0000000000
--- a/java/client/src/main/java/org/apache/qpid/njms/ExceptionHelper.java
+++ /dev/null
@@ -1,60 +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.njms;
-
-import org.apache.qpid.QpidException;
-
-import javax.jms.JMSException;
-import javax.transaction.xa.XAException;
-
-/**
- * Helper class for handling exceptions
- */
-public class ExceptionHelper
-{
-    static public JMSException convertQpidExceptionToJMSException(Exception exception)
-    {
-        JMSException jmsException = null;
-        if (!(exception instanceof JMSException))
-        {
-            if (exception instanceof QpidException)
-            {
-                jmsException = new JMSException(exception.getMessage(), String.valueOf(((QpidException) exception).getErrorCode()));
-            }
-            else
-            {
-                jmsException = new JMSException(exception.getMessage());
-            }
-            jmsException.setLinkedException(exception);
-            jmsException.initCause(exception);
-        }
-        else
-        {
-            jmsException = (JMSException) exception;
-        }
-        return jmsException;
-    }
-
-    static public XAException convertQpidExceptionToXAException(QpidException exception)
-    {
-        String qpidErrorCode = String.valueOf(exception.getErrorCode());
-        // todo map this error to an XA code
-        int xaCode = XAException.XAER_PROTO;
-        return new XAException(xaCode);
-    }
-}
diff --git a/java/common/src/main/java/org/apache/qpid/ErrorCode.java b/java/common/src/main/java/org/apache/qpid/ErrorCode.java
deleted file mode 100644
index 0549869e71..0000000000
--- a/java/common/src/main/java/org/apache/qpid/ErrorCode.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.apache.qpid;
-/*
- * 
- * 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.
- * 
- */
-
-
-public enum ErrorCode
-{
-    //Qpid specific - for the time being
-    UNDEFINED(1,"undefined",true),
-    MESSAGE_REJECTED(2,"message_rejected",true),
-    CONNECTION_ERROR(3,"connection was closed",true),
-    UNSUPPORTED_PROTOCOL(4, "protocol version is unsupported", true),
-
-    //This might change in the spec, the error class is not applicable
-    NO_ERROR(200,"reply-success",true),
-
-    //From the spec
-    CONTENT_TOO_LARGE(311,"content-too-large",false),
-    NO_ROUTE(312,"no-route",false),
-    NO_CONSUMERS(313,"content-consumers",false),
-    CONNECTION_FORCED(320,"connection-forced",true),
-    INVALID_PATH(402,"invalid-path",true),
-    ACCESS_REFUSED(403,"access-refused",false),
-    NOT_FOUND(404,"not-found",false),
-    RESOURCE_LOCKED(405,"resource-locked",false),
-    PRE_CONDITION_FAILED(406,"precondition-failed",false),
-
-    FRAME_ERROR(501,"frame_error",true),
-    SYNTAX_ERROR(502,"syntax_error",true),
-    COMMAND_INVALID(503,"command_invalid",true),
-    SESSION_ERROR(504,"sesion_error",true),
-    NOT_ALLOWED(530,"not_allowed",true),
-    NOT_IMPLEMENTED(540,"not_implemented",true),
-    INTERNAL_ERROR(541,"internal_error",true),
-    INVALID_ARGUMENT(542,"invalid_argument",true);
-
-    private int _code;
-    private String _desc;
-    private boolean _hardError;
-
-    private ErrorCode(int code,String desc,boolean hardError)
-    {
-        _code = code;
-        _desc= desc;
-        _hardError = hardError;
-    }
-
-    public int getCode()
-    {
-        return _code;
-    }
-
-    public String getDesc()
-    {
-        return _desc;
-    }
-
-    private boolean isHardError()
-    {
-        return _hardError;
-    }
-
-    public static ErrorCode get(int code)
-    {
-        switch(code)
-        {
-            case 200 : return NO_ERROR;
-            case 311 : return CONTENT_TOO_LARGE;
-            case 312 : return NO_ROUTE;
-            case 313 : return NO_CONSUMERS;
-            case 320 : return CONNECTION_FORCED;
-            case 402 : return INVALID_PATH;
-            case 403 : return ACCESS_REFUSED;
-            case 404 : return NOT_FOUND;
-            case 405 : return RESOURCE_LOCKED;
-            case 406 : return PRE_CONDITION_FAILED;
-            case 501 : return FRAME_ERROR;
-            case 502 : return SYNTAX_ERROR;
-            case 503 : return COMMAND_INVALID;
-            case 504 : return SESSION_ERROR;
-            case 530 : return NOT_ALLOWED;
-            case 540 : return NOT_IMPLEMENTED;
-            case 541 : return INTERNAL_ERROR;
-            case 542 : return INVALID_ARGUMENT;
-
-            default : return UNDEFINED;
-        }
-    }
- }
-
-/*
-
-<constant name="internal-error" value="541" class="hard-error">
-<doc>
-  The server could not complete the method because of an internal error. The server may require
-  intervention by an operator in order to resume normal operations.
-</doc>
-</constant>
-
-<constant name="invalid-argument" value="542" class="hard-error">
-<doc>
-  An invalid or illegal argument was passed to a method, and the operation could not proceed.
-</doc>
-</constant>
-*/
diff --git a/java/common/src/main/java/org/apache/qpid/QpidException.java b/java/common/src/main/java/org/apache/qpid/QpidException.java
deleted file mode 100644
index 8503adaef8..0000000000
--- a/java/common/src/main/java/org/apache/qpid/QpidException.java
+++ /dev/null
@@ -1,58 +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;
-
-public class QpidException extends Exception
-{
-    /**
-     * AMQP error code
-     */
-    private ErrorCode _errorCode;
-
-    /**
-     * Constructor for a Qpid Exception.
-     * <p> This is the only provided constructor and the parameters have to be set to null when
-     * they are unknown.
-     * @param message    A description of the reason of this exception .
-     * @param errorCode  A string specifyin the error code of this exception.
-     * @param cause      The linked Execption.    * 
-     * 
-     */
-    public QpidException(String message, ErrorCode errorCode, Throwable cause)
-    {
-        super(message, cause);
-        _errorCode = errorCode;
-    }
-    
-    /*hack to get rid of a compile error from a  generated class
-    public QpidException(String message, String errorCode, Throwable cause)
-    {
-        
-    }*/
-
-    /**
-     * Get this execption error code.
-     *
-     * @return This exception error code.
-     */
-    public ErrorCode getErrorCode()
-    {
-        return _errorCode;
-    }
-}
-
diff --git a/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java b/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
index 49effc2dae..69ccef7c29 100644
--- a/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
+++ b/java/common/src/main/java/org/apache/qpid/dtx/XidImpl.java
@@ -19,7 +19,7 @@ package org.apache.qpid.dtx;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.apache.qpid.QpidException;
+import org.apache.qpid.AMQInvalidArgumentException;
 
 import javax.transaction.xa.Xid;
 
@@ -107,9 +107,9 @@ public class XidImpl implements Xid
      * Note - The sum of the two lengths must equal the length of the data field.
      *
      * @param xid an XID STring Form
-     * @throws QpidException If the string does not represent a valid Xid
+     * @throws AMQInvalidArgumentException If the string does not represent a valid Xid
      */
-    public XidImpl(String xid) throws QpidException
+    public XidImpl(String xid) throws AMQInvalidArgumentException
     {
         if (_logger.isDebugEnabled())
         {
@@ -125,16 +125,16 @@ public class XidImpl implements Xid
             _branchQualifier = new byte[b];
             if (input.read(_globalTransactionID, 0, g) != g)
             {
-                throw new QpidException("Cannot convert the string " + xid + " into an Xid", null, null);
+                throw new AMQInvalidArgumentException("Cannot convert the string " + xid + " into an Xid", null);
             }
             if (input.read(_branchQualifier, 0, b) != b)
             {
-                throw new QpidException("Cannot convert the string " + xid + " into an Xid", null, null);
+                throw new AMQInvalidArgumentException("Cannot convert the string " + xid + " into an Xid", null);
             }
         }
         catch (IOException e)
         {
-            throw new QpidException("cannot convert the string " + xid + " into an Xid", null, e);
+            throw new AMQInvalidArgumentException("cannot convert the string " + xid + " into an Xid", e);
         }
     }
 
@@ -239,9 +239,8 @@ public class XidImpl implements Xid
      *
      * @param xid an Xid to convert.
      * @return The String representation of this Xid
-     * @throws QpidException In case of problem when converting this Xid into a string.
      */
-    public static org.apache.qpid.transport.Xid convert(Xid xid) throws QpidException
+    public static org.apache.qpid.transport.Xid convert(Xid xid)
     {
         return new org.apache.qpid.transport.Xid(xid.getFormatId(),
                                                     xid.getGlobalTransactionId(),
diff --git a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java b/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
index 9c56d36ade..5af2d4d1b3 100644
--- a/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
+++ b/java/common/src/main/java/org/apache/qpid/transport/ServerDelegate.java
@@ -26,8 +26,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.qpid.QpidException;
-
 import javax.security.sasl.Sasl;
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
index ee610b1713..a6f5ab90cc 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/ManagementClient.java
@@ -22,7 +22,6 @@ package org.apache.qpid.management.domain.services;
 
 import java.util.UUID;
 
-import org.apache.qpid.QpidException;
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.Names;
 import org.apache.qpid.management.configuration.BrokerConnectionData;
@@ -152,7 +151,7 @@ public final class ManagementClient
     /**
      * Registers a consumer (listener) on the management queue.
      */
-    private void registerConsumerOnManagementQueue () throws QpidException
+    private void registerConsumerOnManagementQueue ()
     {  
         BrokerMessageListener managementChannelListener = new BrokerMessageListener(_domainModel);
         managementChannelListener.setHandlers(Configuration.getInstance().getManagementQueueHandlers());        
diff --git a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
index ee41beaf50..bd7d305184 100644
--- a/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
+++ b/java/management/client/src/main/java/org/apache/qpid/management/domain/services/QpidService.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.qpid.QpidException;
 import org.apache.qpid.api.Message;
 import org.apache.qpid.management.Messages;
 import org.apache.qpid.management.Names;