moved the QpidException to common from client

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

2 files changed, 4 insertions, 61 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/nclient/api/Session.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/api/Session.java
index 2a68297df4..dbe9c739a9 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/nclient/api/Session.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/nclient/api/Session.java
@@ -45,7 +45,7 @@ public interface Session
      * @throws QpidException If the communication layer fails to close this session or if an internal error happens
      *                       when closing this session resources. .
      */
-    public void close()
+    public void sessionClose()
             throws
             QpidException;
 
@@ -55,7 +55,7 @@ public interface Session
      *
      * @throws QpidException If the communication layer fails to suspend this session
      */
-    public void suspend()
+    public void sessionSuspend()
             throws
             QpidException;
 
@@ -66,7 +66,8 @@ public interface Session
      *
      * @throws QpidException If the communication layer fails to unsuspend this session
      */
-    public void unsuspend()
+    public void sessionUnsuspend()
+    
             throws
             QpidException;
 
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/nclient/exception/QpidException.java b/qpid/java/client/src/main/java/org/apache/qpid/nclient/exception/QpidException.java
deleted file mode 100644
index c2a70f705f..0000000000
--- a/qpid/java/client/src/main/java/org/apache/qpid/nclient/exception/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.nclient.exception;
-
-/**
- * Created by Arnaud Simon
- * Date: 20-Jul-2007
- * Time: 10:56:55
- */
-public class QpidException extends Exception
-{
-    /**
-     * This exception error code.
-     * <p> This error code is used for internationalisation purpose.
-     * <p> This error code is set from the AMQP ones.
-     * <TODO> So we may want to use the AMQP error code directly.
-     */
-    private String _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, String errorCode, Throwable cause)
-    {
-        super(message, cause);
-        _errorCode = errorCode;
-    }
-
-    /**
-     * Get this execption error code.
-     *
-     * @return This exception error code.
-     */
-    public String getErrorCode()
-    {
-        return _errorCode;
-    }
-}