Author: orudyy
Date: Thu Aug 6 14:27:01 2015
New Revision: 1694510
URL: http://svn.apache.org/r1694510
Log:
QPID-3521: Move AMQProtocolHandler into parent package to get access to package
protected methods on AMQConnection
Added:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
- copied, changed from r1694509,
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Removed:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnection.java
Thu Aug 6 14:27:01 2015
@@ -70,7 +70,6 @@ import org.apache.qpid.AMQUnresolvedAddr
import org.apache.qpid.client.failover.ConnectionRedirectException;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.failover.FailoverProtectedOperation;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.security.CallbackHandlerRegistry;
import org.apache.qpid.client.state.AMQStateManager;
import org.apache.qpid.client.util.JMSExceptionHelper;
@@ -1818,7 +1817,7 @@ public class AMQConnection extends Close
return _messageCompressionThresholdSize;
}
- public void doWithAllLocks(Runnable r)
+ void doWithAllLocks(Runnable r)
{
doWithAllLocks(r, _sessions.values());
Copied:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
(from r1694509,
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java)
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java?p2=qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java&p1=qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java&r1=1694509&r2=1694510&rev=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQProtocolHandler.java
Thu Aug 6 14:27:01 2015
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.client.protocol;
+package org.apache.qpid.client;
import java.io.IOException;
import java.net.SocketAddress;
@@ -30,6 +30,8 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.qpid.client.protocol.AMQProtocolSession;
+import org.apache.qpid.client.protocol.BlockingMethodFrameListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,9 +40,6 @@ import org.apache.qpid.AMQDisconnectedEx
import org.apache.qpid.QpidException;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQTimeoutException;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.client.HeartbeatListener;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.failover.FailoverHandler;
import org.apache.qpid.client.failover.FailoverState;
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
Thu Aug 6 14:27:01 2015
@@ -55,7 +55,6 @@ import org.apache.qpid.client.message.Un
import org.apache.qpid.client.messaging.address.AddressHelper;
import org.apache.qpid.client.messaging.address.Link;
import org.apache.qpid.client.messaging.address.Node;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.state.AMQState;
import org.apache.qpid.client.state.AMQStateManager;
import org.apache.qpid.client.state.listener.SpecificMethodFrameListener;
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
Thu Aug 6 14:27:01 2015
@@ -44,7 +44,6 @@ import org.apache.qpid.client.message.Ab
import org.apache.qpid.client.message.Encrypted091MessageFactory;
import org.apache.qpid.client.message.MessageEncryptionHelper;
import org.apache.qpid.client.message.QpidMessageProperties;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.protocol.BlockingMethodFrameListener;
import org.apache.qpid.client.util.JMSExceptionHelper;
import org.apache.qpid.configuration.ClientProperties;
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/failover/FailoverHandler.java
Thu Aug 6 14:27:01 2015
@@ -25,7 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.qpid.AMQDisconnectedException;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.AMQProtocolHandler;
import org.apache.qpid.client.state.AMQState;
import org.apache.qpid.client.state.AMQStateManager;
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolSession.java
Thu Aug 6 14:27:01 2015
@@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentMa
import javax.jms.JMSException;
import javax.security.sasl.SaslClient;
+import org.apache.qpid.client.AMQProtocolHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/state/AMQStateManager.java
Thu Aug 6 14:27:01 2015
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.qpid.client.AMQProtocolHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,9 +38,9 @@ import org.apache.qpid.protocol.AMQMetho
/**
* The state manager is responsible for managing the state of the protocol
session.
* <p>
- * For each {@link org.apache.qpid.client.protocol.AMQProtocolHandler} there
is a separate state manager.
+ * For each {@link AMQProtocolHandler} there is a separate state manager.
* <p>
- * The AMQStateManager is now attached to the {@link
org.apache.qpid.client.protocol.AMQProtocolHandler} and that is the sole point
of reference so that
+ * The AMQStateManager is now attached to the {@link AMQProtocolHandler} and
that is the sole point of reference so that
* As the {@link AMQProtocolSession} changes due to failover the
AMQStateManager need not be copied around.
* <p>
* The StateManager works by any component can wait for a state change to
occur by using the following sequence.
Modified:
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
(original)
+++
qpid/java/trunk/client/src/test/java/org/apache/qpid/client/protocol/AMQProtocolHandlerTest.java
Thu Aug 6 14:27:01 2015
@@ -28,6 +28,7 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeUnit;
import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQProtocolHandler;
import org.apache.qpid.test.utils.QpidTestCase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java?rev=1694510&r1=1694509&r2=1694510&view=diff
==============================================================================
---
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
(original)
+++
qpid/java/trunk/client/src/test/java/org/apache/qpid/test/unit/message/TestAMQSession.java
Thu Aug 6 14:27:01 2015
@@ -28,7 +28,7 @@ import org.apache.qpid.client.BasicMessa
import org.apache.qpid.client.BasicMessageProducer_0_8;
import org.apache.qpid.client.failover.FailoverException;
import org.apache.qpid.client.message.AMQMessageDelegateFactory;
-import org.apache.qpid.client.protocol.AMQProtocolHandler;
+import org.apache.qpid.client.AMQProtocolHandler;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.framing.FieldTable;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
