Author: gsim
Date: Tue Jun 3 00:54:09 2008
New Revision: 662681
URL: http://svn.apache.org/viewvc?rev=662681&view=rev
Log:
Reverted move of ConnectionOptions (without the parse functionality they aren't
off much use).
Corrected include in ConnectionOptions.h
Added:
incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h
- copied, changed from r662674,
incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h
Removed:
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionOptions.h
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/tests/TestOptions.h
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=662681&r1=662680&r2=662681&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Jun 3 00:54:09 2008
@@ -443,7 +443,6 @@
qpid/client/ConnectionHandler.h \
qpid/client/ConnectionImpl.h \
qpid/client/ConnectionSettings.h \
- qpid/client/ConnectionOptions.h \
qpid/client/Connector.h \
qpid/client/ChainableFrameHandler.h \
qpid/client/Demux.h \
Copied: incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h (from
r662674, incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h?p2=incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h&p1=incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h&r1=662674&r2=662681&rev=662681&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h Tue Jun 3
00:54:09 2008
@@ -22,7 +22,7 @@
*
*/
-#include "ConnectionOptions.h"
+#include "qpid/client/ConnectionSettings.h"
#include "qpid/Options.h"
/**
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=662681&r1=662680&r2=662681&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Tue Jun 3 00:54:09 2008
@@ -63,7 +63,8 @@
TxAckTest.cpp \
TxBufferTest.cpp \
TxPublishTest.cpp \
- MessageBuilderTest.cpp
+ MessageBuilderTest.cpp \
+ ConnectionOptions.h
if HAVE_XML
unit_test_SOURCES+= XmlClientSessionTest.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/TestOptions.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/TestOptions.h?rev=662681&r1=662680&r2=662681&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/TestOptions.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/TestOptions.h Tue Jun 3 00:54:09
2008
@@ -26,7 +26,7 @@
#include "qpid/Url.h"
#include "qpid/log/Logger.h"
#include "qpid/client/Connection.h"
-#include "qpid/client/ConnectionOptions.h"
+#include "ConnectionOptions.h"
#include <iostream>
#include <exception>
@@ -69,7 +69,7 @@
bool help;
- qpid::client::ConnectionOptions con;
+ ConnectionOptions con;
qpid::log::Options log;
std::string helpText;
};
