QPID-4027 Renamed the extension interfaces as Internal. These not really

extensions but a set of interfaces used by the internal implementations
classes. The packages was also renamed from "ext" to "internal".

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/address-refactor2@1351370 13f79535-47bb-0310-9956-ffa450edef68

12 files changed, 51 insertions, 56 deletions

diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
index 1b2604a3c0..d9acce0ccd 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
@@ -24,7 +24,7 @@ import org.apache.qpid.messaging.Session;
 import org.apache.qpid.messaging.cpp.CppMessageFactory.CppMessageDelegate;
 import org.apache.qpid.messaging.cpp.jni.NativeMessage;
 import org.apache.qpid.messaging.cpp.jni.NativeSender;
-import org.apache.qpid.messaging.ext.MessageInternal;
+import org.apache.qpid.messaging.internal.MessageInternal;
 
 public class CppSender implements Sender
 {
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java
index 674a35cd6b..2e964b3ad7 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.messaging.ext;
+package org.apache.qpid.messaging.internal;
 
 import java.util.List;
 
@@ -27,13 +27,13 @@ import org.apache.qpid.messaging.Session;
 /**
  * An extended interface meant for API implementors.
  */
-public interface ConnectionExt extends Connection
+public interface ConnectionInternal extends Connection
 {
     public void addConnectionStateListener(ConnectionStateListener l) throws ConnectionException;
 
     public void removeConnectionStateListener(ConnectionStateListener l) throws ConnectionException;
 
-    public List<SessionExt> getSessions() throws ConnectionException;
+    public List<SessionInternal> getSessions() throws ConnectionException;
 
     public void exception(ConnectionException e);
 
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java
index e1af2479c5..4055c1e904 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.messaging.ext;
+package org.apache.qpid.messaging.internal;
 
 import org.apache.qpid.messaging.ConnectionException;
 
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java
index 30fefd6835..9ee0b5a032 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java
@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.messaging.ext;
+package org.apache.qpid.messaging.internal;
 
 import org.apache.qpid.messaging.Message;
 import org.apache.qpid.messaging.MessageFactory;
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java
index 2ff574f07d..d81e815112 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.messaging.ext;
+package org.apache.qpid.messaging.internal;
 
 import org.apache.qpid.messaging.MessagingException;
 import org.apache.qpid.messaging.Receiver;
 
-public interface ReceiverExt extends Receiver
+public interface ReceiverInternal extends Receiver
 {
     public void recreate() throws MessagingException;
 }
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java
index c05fbc52c0..586cfccffd 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java
@@ -15,12 +15,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.messaging.ext;
+package org.apache.qpid.messaging.internal;
 
 import org.apache.qpid.messaging.MessagingException;
 import org.apache.qpid.messaging.Sender;
 
-public interface SenderExt extends Sender
+public interface SenderInternal extends Sender
 {
     public void recreate() throws MessagingException;
 }
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java
index 626ef5770b..cee3a31c0e 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java
@@ -15,14 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.qpid.messaging.ext;
+package org.apache.qpid.messaging.internal;
 
 import org.apache.qpid.messaging.MessagingException;
 import org.apache.qpid.messaging.Session;
 
-public interface SessionExt extends Session
+public interface SessionInternal extends Session
 {
-    public ConnectionExt getConnectionExt();
+    public ConnectionInternal getConnectionInternal();
 
     public void exception(MessagingException e);
 
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
index 5b2276eb04..6e7d4bed31 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
@@ -29,9 +29,9 @@ import org.apache.qpid.messaging.MessageFactory;
 import org.apache.qpid.messaging.MessagingException;
 import org.apache.qpid.messaging.Session;
 import org.apache.qpid.messaging.SessionException;
-import org.apache.qpid.messaging.ext.ConnectionExt;
-import org.apache.qpid.messaging.ext.ConnectionStateListener;
-import org.apache.qpid.messaging.ext.SessionExt;
+import org.apache.qpid.messaging.internal.ConnectionInternal;
+import org.apache.qpid.messaging.internal.ConnectionStateListener;
+import org.apache.qpid.messaging.internal.SessionInternal;
 import org.apache.qpid.util.UUIDGen;
 import org.apache.qpid.util.UUIDs;
 import org.slf4j.Logger;
@@ -61,17 +61,17 @@ import org.slf4j.LoggerFactory;
  *  If failover is handled at a layer below (or no failover at all) then an exception means the connection is no longer usable.
  *  Therefore this class will attempt to close the connection if the parent is null.
  */
-public class ConnectionManagementDecorator implements ConnectionExt
+public class ConnectionManagementDecorator implements ConnectionInternal
 {
     private static Logger _logger = LoggerFactory.getLogger(ConnectionManagementDecorator.class);
 
     public enum ConnectionState { UNDEFINED, OPENED, CLOSED, ERROR}
 
-    private ConnectionExt _parent;
+    private ConnectionInternal _parent;
     private Connection _delegate;
     private ConnectionState _state = ConnectionState.UNDEFINED;
     private UUIDGen _ssnNameGenerator = UUIDs.newGenerator();
-    private Map<String, SessionExt> _sessions = new ConcurrentHashMap<String,SessionExt>();
+    private Map<String, SessionInternal> _sessions = new ConcurrentHashMap<String,SessionInternal>();
     private ConnectionException _lastException;
     private List<ConnectionStateListener> _stateListeners = new ArrayList<ConnectionStateListener>();
 
@@ -82,7 +82,7 @@ public class ConnectionManagementDecorator implements ConnectionExt
         this(null,delegate);
     }
 
-    public ConnectionManagementDecorator(ConnectionExt parent, Connection delegate)
+    public ConnectionManagementDecorator(ConnectionInternal parent, Connection delegate)
     {
         _delegate = delegate;
         _parent = parent;
@@ -138,7 +138,7 @@ public class ConnectionManagementDecorator implements ConnectionExt
         try
         {
             if (name == null || name.isEmpty()) { name = generateSessionName(); }
-            SessionExt ssn =  new SessionManagementDecorator(this,_delegate.createSession(name));
+            SessionInternal ssn =  new SessionManagementDecorator(this,_delegate.createSession(name));
             _sessions.put(name, ssn);
             return ssn;
         }
@@ -159,7 +159,7 @@ public class ConnectionManagementDecorator implements ConnectionExt
         try
         {
             if (name == null || name.isEmpty()) { name = generateSessionName(); }
-            SessionExt ssn = new SessionManagementDecorator(this,_delegate.createTransactionalSession(name));
+            SessionInternal ssn = new SessionManagementDecorator(this,_delegate.createTransactionalSession(name));
             _sessions.put(name, ssn);
             return ssn;
         }
@@ -207,10 +207,10 @@ public class ConnectionManagementDecorator implements ConnectionExt
     }
 
     @Override
-    public List<SessionExt> getSessions() throws ConnectionException
+    public List<SessionInternal> getSessions() throws ConnectionException
     {
         checkClosedAndThrowException();
-        return new ArrayList<SessionExt>(_sessions.values());
+        return new ArrayList<SessionInternal>(_sessions.values());
     }
 
     @Override // Called by the delegate or a a session created by this connection.
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
index 6bd19a44c2..056dd404e1 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
@@ -18,14 +18,12 @@
 package org.apache.qpid.messaging.util;
 
 import java.nio.ByteBuffer;
-import java.util.Collections;
 import java.util.Map;
 
 import org.apache.qpid.messaging.Message;
 import org.apache.qpid.messaging.MessageFactory;
-import org.apache.qpid.messaging.MessageNotWritableException;
 import org.apache.qpid.messaging.MessagingException;
-import org.apache.qpid.messaging.ext.MessageInternal;
+import org.apache.qpid.messaging.internal.MessageInternal;
 
 /**
  *  A generic message adapter that simply delegates
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
index ef7a0ca354..6d75f06c15 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
@@ -24,9 +24,8 @@ import org.apache.qpid.messaging.Receiver;
 import org.apache.qpid.messaging.ReceiverException;
 import org.apache.qpid.messaging.Session;
 import org.apache.qpid.messaging.SessionException;
-import org.apache.qpid.messaging.ext.ReceiverExt;
-import org.apache.qpid.messaging.ext.SessionExt;
-import org.apache.qpid.messaging.util.SessionManagementDecorator.SessionState;
+import org.apache.qpid.messaging.internal.ReceiverInternal;
+import org.apache.qpid.messaging.internal.SessionInternal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +36,7 @@ import org.slf4j.LoggerFactory;
  * 2. Exception handling.
  *
  */
-public class ReceiverManagementDecorator implements ReceiverExt
+public class ReceiverManagementDecorator implements ReceiverInternal
 {
     private static Logger _logger = LoggerFactory.getLogger(ReceiverManagementDecorator.class);
 
@@ -45,14 +44,14 @@ public class ReceiverManagementDecorator implements ReceiverExt
 
     private Receiver _delegate;
     private ReceiverState _state = ReceiverState.OPENED;
-    private SessionExt _ssn;
+    private SessionInternal _ssn;
     private final Object _connectionLock;  // global per connection lock
 
-    public ReceiverManagementDecorator(SessionExt ssn, Receiver delegate)
+    public ReceiverManagementDecorator(SessionInternal ssn, Receiver delegate)
     {
         _ssn = ssn;
         _delegate = delegate;
-        _connectionLock = ssn.getConnectionExt().getConnectionLock();
+        _connectionLock = ssn.getConnectionInternal().getConnectionLock();
     }
 
     @Override
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
index 2c28116da1..8bb1c9d6e3 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
@@ -3,15 +3,13 @@ package org.apache.qpid.messaging.util;
 import org.apache.qpid.messaging.ConnectionException;
 import org.apache.qpid.messaging.Message;
 import org.apache.qpid.messaging.MessagingException;
-import org.apache.qpid.messaging.Receiver;
 import org.apache.qpid.messaging.ReceiverException;
 import org.apache.qpid.messaging.Sender;
 import org.apache.qpid.messaging.SenderException;
 import org.apache.qpid.messaging.Session;
 import org.apache.qpid.messaging.SessionException;
-import org.apache.qpid.messaging.ext.SenderExt;
-import org.apache.qpid.messaging.ext.SessionExt;
-import org.apache.qpid.messaging.util.ReceiverManagementDecorator.ReceiverState;
+import org.apache.qpid.messaging.internal.SenderInternal;
+import org.apache.qpid.messaging.internal.SessionInternal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -22,7 +20,7 @@ import org.slf4j.LoggerFactory;
  * 2. Exception handling.
  *
  */
-public class SenderManagementDecorator implements SenderExt
+public class SenderManagementDecorator implements SenderInternal
 {
     private static Logger _logger = LoggerFactory.getLogger(SenderManagementDecorator.class);
 
@@ -30,14 +28,14 @@ public class SenderManagementDecorator implements SenderExt
 
     private Sender _delegate;
     private SenderState _state = SenderState.OPENED;
-    private SessionExt _ssn;
+    private SessionInternal _ssn;
     private final Object _connectionLock;  // global per connection lock
 
-    public SenderManagementDecorator(SessionExt ssn, Sender delegate)
+    public SenderManagementDecorator(SessionInternal ssn, Sender delegate)
     {
         _ssn = ssn;
         _delegate = delegate;
-        _connectionLock = ssn.getConnectionExt().getConnectionLock();
+        _connectionLock = ssn.getConnectionInternal().getConnectionLock();
     }
 
     @Override
diff --git a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
index 4f84d865df..f35589901b 100644
--- a/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
+++ b/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
@@ -29,10 +29,10 @@ import org.apache.qpid.messaging.Receiver;
 import org.apache.qpid.messaging.Sender;
 import org.apache.qpid.messaging.Session;
 import org.apache.qpid.messaging.SessionException;
-import org.apache.qpid.messaging.ext.ConnectionExt;
-import org.apache.qpid.messaging.ext.ReceiverExt;
-import org.apache.qpid.messaging.ext.SenderExt;
-import org.apache.qpid.messaging.ext.SessionExt;
+import org.apache.qpid.messaging.internal.ConnectionInternal;
+import org.apache.qpid.messaging.internal.ReceiverInternal;
+import org.apache.qpid.messaging.internal.SenderInternal;
+import org.apache.qpid.messaging.internal.SessionInternal;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -75,20 +75,20 @@ import org.slf4j.LoggerFactory;
  * For the time being, anytime a session exception is received, the session will be marked CLOSED.
  * We need to revisit this.
  */
-public class SessionManagementDecorator implements SessionExt
+public class SessionManagementDecorator implements SessionInternal
 {
     private static Logger _logger = LoggerFactory.getLogger(SessionManagementDecorator.class);
 
     public enum SessionState {OPENED, CLOSED, ERROR}
 
-    private ConnectionExt _conn;
+    private ConnectionInternal _conn;
     private Session _delegate;
     SessionState _state = SessionState.OPENED;
-    private List<ReceiverExt> _receivers = new ArrayList<ReceiverExt>();
-    private List<SenderExt> _senders = new ArrayList<SenderExt>();
+    private List<ReceiverInternal> _receivers = new ArrayList<ReceiverInternal>();
+    private List<SenderInternal> _senders = new ArrayList<SenderInternal>();
     private final Object _connectionLock;  // global per connection lock
 
-    public SessionManagementDecorator(ConnectionExt conn, Session delegate)
+    public SessionManagementDecorator(ConnectionInternal conn, Session delegate)
     {
         _conn = conn;
         _delegate = delegate;
@@ -310,7 +310,7 @@ public class SessionManagementDecorator implements SessionExt
         checkClosedAndThrowException();
         try
         {
-            SenderExt sender = new SenderManagementDecorator(this,_delegate.createSender(address));
+            SenderInternal sender = new SenderManagementDecorator(this,_delegate.createSender(address));
             _senders.add(sender);
             return sender;
         }
@@ -330,7 +330,7 @@ public class SessionManagementDecorator implements SessionExt
         checkClosedAndThrowException();
         try
         {
-            SenderExt sender = new SenderManagementDecorator(this,_delegate.createSender(address));
+            SenderInternal sender = new SenderManagementDecorator(this,_delegate.createSender(address));
             _senders.add(sender);
             return sender;
         }
@@ -350,7 +350,7 @@ public class SessionManagementDecorator implements SessionExt
         checkClosedAndThrowException();
         try
         {
-            ReceiverExt receiver = new ReceiverManagementDecorator(this,_delegate.createReceiver(address));
+            ReceiverInternal receiver = new ReceiverManagementDecorator(this,_delegate.createReceiver(address));
             _receivers.add(receiver);
             return receiver;
         }
@@ -370,7 +370,7 @@ public class SessionManagementDecorator implements SessionExt
         checkClosedAndThrowException();
         try
         {
-            ReceiverExt receiver = new ReceiverManagementDecorator(this,_delegate.createReceiver(address));
+            ReceiverInternal receiver = new ReceiverManagementDecorator(this,_delegate.createReceiver(address));
             _receivers.add(receiver);
             return receiver;
         }
@@ -437,7 +437,7 @@ public class SessionManagementDecorator implements SessionExt
     }
 
     @Override
-    public ConnectionExt getConnectionExt()
+    public ConnectionInternal getConnectionInternal()
     {
         return _conn;
     }