Author: gsim
Date: Tue Jun 3 00:38:38 2008
New Revision: 662675
URL: http://svn.apache.org/viewvc?rev=662675&view=rev
Log:
Move ConnectionOptions into qpid::client.
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionOptions.h
- copied, changed from r662663,
incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h
Removed:
incubator/qpid/trunk/qpid/cpp/src/tests/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=662675&r1=662674&r2=662675&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Tue Jun 3 00:38:38 2008
@@ -443,6 +443,7 @@
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/qpid/client/ConnectionOptions.h (from
r662663, incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h)
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionOptions.h?p2=incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionOptions.h&p1=incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h&r1=662663&r2=662675&rev=662675&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/ConnectionOptions.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/client/ConnectionOptions.h Tue Jun
3 00:38:38 2008
@@ -22,9 +22,11 @@
*
*/
-#include "ConnectionOptions.h"
#include "qpid/Options.h"
+#include "qpid/client/ConnectionSettings.h"
+namespace qpid {
+namespace client {
/**
* Options parser for ConnectionOptions.
*/
@@ -50,4 +52,6 @@
}
};
+}}
+
#endif /*!QPID_CLIENT_CONNECTIONOPTIONS_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=662675&r1=662674&r2=662675&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:38:38 2008
@@ -63,8 +63,7 @@
TxAckTest.cpp \
TxBufferTest.cpp \
TxPublishTest.cpp \
- MessageBuilderTest.cpp \
- ConnectionOptions.h
+ MessageBuilderTest.cpp
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=662675&r1=662674&r2=662675&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:38:38
2008
@@ -26,7 +26,7 @@
#include "qpid/Url.h"
#include "qpid/log/Logger.h"
#include "qpid/client/Connection.h"
-#include "ConnectionOptions.h"
+#include "qpid/client/ConnectionOptions.h"
#include <iostream>
#include <exception>
@@ -69,7 +69,7 @@
bool help;
- ConnectionOptions con;
+ qpid::client::ConnectionOptions con;
qpid::log::Options log;
std::string helpText;
};
