Author: rajith
Date: Mon Jun 18 14:50:09 2012
New Revision: 1351370
URL: http://svn.apache.org/viewvc?rev=1351370&view=rev
Log:
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".
Added:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java
- copied, changed from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java
- copied, changed from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java
- copied, changed from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java
- copied, changed from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java
- copied, changed from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java
- copied, changed from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java
Removed:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java?rev=1351370&r1=1351369&r2=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/cpp/CppSender.java
Mon Jun 18 14:50:09 2012
@@ -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
{
Copied:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java
(from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java?p2=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java&p1=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java&r1=1351025&r2=1351370&rev=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionExt.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionInternal.java
Mon Jun 18 14:50:09 2012
@@ -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);
Copied:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java
(from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java?p2=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java&p1=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java&r1=1351025&r2=1351370&rev=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ConnectionStateListener.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ConnectionStateListener.java
Mon Jun 18 14:50:09 2012
@@ -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;
Copied:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java
(from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java?p2=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java&p1=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java&r1=1351025&r2=1351370&rev=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/MessageInternal.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/MessageInternal.java
Mon Jun 18 14:50:09 2012
@@ -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;
Copied:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java
(from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java?p2=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java&p1=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java&r1=1351025&r2=1351370&rev=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/ReceiverExt.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/ReceiverInternal.java
Mon Jun 18 14:50:09 2012
@@ -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;
}
Copied:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java
(from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java?p2=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java&p1=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java&r1=1351025&r2=1351370&rev=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SenderExt.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SenderInternal.java
Mon Jun 18 14:50:09 2012
@@ -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;
}
Copied:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java
(from r1351025,
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java?p2=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java&p1=qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java&r1=1351025&r2=1351370&rev=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ext/SessionExt.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/internal/SessionInternal.java
Mon Jun 18 14:50:09 2012
@@ -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);
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java?rev=1351370&r1=1351369&r2=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ConnectionManagementDecorator.java
Mon Jun 18 14:50:09 2012
@@ -29,9 +29,9 @@ import org.apache.qpid.messaging.Message
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 ConnectionManagementDecorat
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 ConnectionManagementDecorat
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 ConnectionManagementDecorat
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 ConnectionManagementDecorat
}
@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.
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java?rev=1351370&r1=1351369&r2=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/GenericMessageAdapter.java
Mon Jun 18 14:50:09 2012
@@ -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
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java?rev=1351370&r1=1351369&r2=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/ReceiverManagementDecorator.java
Mon Jun 18 14:50:09 2012
@@ -24,9 +24,8 @@ import org.apache.qpid.messaging.Receive
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
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
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java?rev=1351370&r1=1351369&r2=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SenderManagementDecorator.java
Mon Jun 18 14:50:09 2012
@@ -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 i
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
Modified:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java?rev=1351370&r1=1351369&r2=1351370&view=diff
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
(original)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/util/SessionManagementDecorator.java
Mon Jun 18 14:50:09 2012
@@ -29,10 +29,10 @@ import org.apache.qpid.messaging.Receive
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
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
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
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
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
}
@Override
- public ConnectionExt getConnectionExt()
+ public ConnectionInternal getConnectionInternal()
{
return _conn;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
