Author: aconway
Date: Fri May 23 14:23:07 2008
New Revision: 659663
URL: http://svn.apache.org/viewvc?rev=659663&view=rev
Log:
Delete obsolete Channel class.
Removed:
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Channel.h
incubator/qpid/trunk/qpid/cpp/src/tests/ClientChannelTest.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/echo_service.cpp
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=659663&r1=659662&r2=659663&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Fri May 23 14:23:07 2008
@@ -308,7 +308,6 @@
libqpidclient_la_SOURCES = \
$(rgen_client_srcs) \
qpid/client/Bounds.cpp \
- qpid/client/Channel.cpp \
qpid/client/ConnectionImpl.cpp \
qpid/client/Connector.cpp \
qpid/client/Connection.cpp \
@@ -434,7 +433,6 @@
qpid/client/ConnectionSettings.h \
qpid/client/Connector.h \
qpid/client/ChainableFrameHandler.h \
- qpid/client/Channel.h \
qpid/client/Demux.h \
qpid/client/Dispatcher.h \
qpid/client/Exchange.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=659663&r1=659662&r2=659663&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Fri May 23
14:23:07 2008
@@ -20,7 +20,6 @@
*/
#include "Connection.h"
#include "ConnectionSettings.h"
-#include "Channel.h"
#include "Message.h"
#include "SessionImpl.h"
#include "qpid/log/Logger.h"
@@ -73,13 +72,6 @@
max_frame_size = impl->getNegotiatedSettings().maxFrameSize;
}
-void Connection::openChannel(Channel& channel)
-{
- if (!impl)
- throw Exception(QPID_MSG("Connection has not yet been opened"));
- channel.open(newSession(ASYNC));
-}
-
Session Connection::newSession(SynchronousMode sync,
uint32_t detachedLifetime)
{
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?rev=659663&r1=659662&r2=659663&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Fri May 23
14:23:07 2008
@@ -23,7 +23,6 @@
*/
#include <map>
#include <string>
-#include "Channel.h"
#include "ConnectionImpl.h"
#include "qpid/client/Session.h"
#include "qpid/framing/AMQP_HighestVersion.h"
@@ -108,18 +107,6 @@
void close();
/**
- * Associate a Channel with this connection and open it for use.
- *
- * In AMQP, channels are like multiplexed 'sessions' of work over
- * a connection. Almost all the interaction with AMQP is done over
- * a channel.
- *
- * @param connection the connection object to be associated with
- * the channel. Call Channel::close() to close the channel.
- */
- void openChannel(Channel&);
-
- /**
* Create a new session on this connection. Sessions allow
* multiple streams of work to be multiplexed over the same
* connection.
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=659663&r1=659662&r2=659663&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Fri May 23 14:23:07 2008
@@ -102,9 +102,6 @@
TxPublishTest \
MessageBuilderTest
-#client_unit_tests = \
-# ClientChannelTest
-
framing_unit_tests = \
FramingTest \
HeaderTest \
@@ -121,10 +118,9 @@
testprogs= \
client_test \
topic_listener \
- topic_publisher
-# echo_service
+ topic_publisher
-check_PROGRAMS += $(testprogs) interop_runner publish consume
+check_PROGRAMS += $(testprogs) publish consume
TESTS_ENVIRONMENT = VALGRIND=$(VALGRIND) srcdir=$(srcdir) QPID_DATA_DIR=
$(srcdir)/run_test
@@ -172,17 +168,22 @@
CLEANFILES+=valgrind.out *.log *.vglog dummy_test $(unit_wrappers)
MAINTAINERCLEANFILES=gen.mk
-interop_runner_SOURCES = \
- interop_runner.cpp \
- SimpleTestCaseBase.cpp \
- BasicP2PTest.cpp \
- BasicPubSubTest.cpp \
- SimpleTestCaseBase.h \
- BasicP2PTest.h \
- BasicPubSubTest.h \
- TestCase.h \
- TestOptions.h
-interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs)
+# FIXME aconway 2008-05-23: Disabled interop_runner because it uses
+# the obsolete Channel class. Convert to Session and re-enable.
+#
+# check_PROGRAMS += interop_runner
+
+# interop_runner_SOURCES = \
+# interop_runner.cpp \
+# SimpleTestCaseBase.cpp \
+# BasicP2PTest.cpp \
+# BasicPubSubTest.cpp \
+# SimpleTestCaseBase.h \
+# BasicP2PTest.h \
+# BasicPubSubTest.h \
+# TestCase.h \
+# TestOptions.h
+# interop_runner_LDADD = $(lib_client) $(lib_common) $(extra_libs)
publish_SOURCES = publish.cpp
publish_LDADD = $(lib_client) $(lib_common) $(extra_libs)
