From e417ce5b5894d370aed8746091b12f11cd2768e7 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 3 Jun 2008 07:38:38 +0000 Subject: Move ConnectionOptions into qpid::client. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@662675 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/Makefile.am | 1 + cpp/src/qpid/client/ConnectionOptions.h | 57 +++++++++++++++++++++++++++++++++ cpp/src/tests/ConnectionOptions.h | 53 ------------------------------ cpp/src/tests/Makefile.am | 3 +- cpp/src/tests/TestOptions.h | 4 +-- 5 files changed, 61 insertions(+), 57 deletions(-) create mode 100644 cpp/src/qpid/client/ConnectionOptions.h delete mode 100644 cpp/src/tests/ConnectionOptions.h (limited to 'cpp/src') diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am index 53b828a709..bb0df2aa2d 100644 --- a/cpp/src/Makefile.am +++ b/cpp/src/Makefile.am @@ -443,6 +443,7 @@ nobase_include_HEADERS = \ 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 \ diff --git a/cpp/src/qpid/client/ConnectionOptions.h b/cpp/src/qpid/client/ConnectionOptions.h new file mode 100644 index 0000000000..b997b21494 --- /dev/null +++ b/cpp/src/qpid/client/ConnectionOptions.h @@ -0,0 +1,57 @@ +#ifndef QPID_CLIENT_CONNECTIONOPTIONS_H +#define QPID_CLIENT_CONNECTIONOPTIONS_H + +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#include "qpid/Options.h" +#include "qpid/client/ConnectionSettings.h" + +namespace qpid { +namespace client { +/** + * Options parser for ConnectionOptions. + */ +struct ConnectionOptions : public qpid::Options, + public qpid::client::ConnectionSettings +{ + ConnectionOptions() : qpid::Options("Connection Settings") + { + using namespace qpid; + addOptions() + ("broker,b", optValue(host, "HOST"), "Broker host to connect to") + ("port,p", optValue(port, "PORT"), "Broker port to connect to") + ("virtualhost,v", optValue(virtualhost, "VHOST"), "virtual host") + ("clientname,n", optValue(clientid, "ID"), "unique client identifier") + ("username", optValue(username, "USER"), "user name for broker log in.") + ("password", optValue(password, "PASSWORD"), "password for broker log in.") + ("mechanism", optValue(mechanism, "MECH"), "SASL mechanism to use when authenticating.") + ("locale", optValue(locale, "LOCALE"), "locale to use.") + ("max-channels", optValue(maxChannels, "N"), "the maximum number of channels the client requires.") + ("max-frame-size", optValue(maxFrameSize, "N"), "the maximum frame size to request.") + ("bounds-multiplier", optValue(bounds, "N"), + "bound size of write queue (as a multiple of the max frame size)."); + } +}; + +}} + +#endif /*!QPID_CLIENT_CONNECTIONOPTIONS_H*/ diff --git a/cpp/src/tests/ConnectionOptions.h b/cpp/src/tests/ConnectionOptions.h deleted file mode 100644 index 3be0528612..0000000000 --- a/cpp/src/tests/ConnectionOptions.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef QPID_CLIENT_CONNECTIONOPTIONS_H -#define QPID_CLIENT_CONNECTIONOPTIONS_H - -/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -#include "ConnectionOptions.h" -#include "qpid/Options.h" - -/** - * Options parser for ConnectionOptions. - */ -struct ConnectionOptions : public qpid::Options, - public qpid::client::ConnectionSettings -{ - ConnectionOptions() : qpid::Options("Connection Settings") - { - using namespace qpid; - addOptions() - ("broker,b", optValue(host, "HOST"), "Broker host to connect to") - ("port,p", optValue(port, "PORT"), "Broker port to connect to") - ("virtualhost,v", optValue(virtualhost, "VHOST"), "virtual host") - ("clientname,n", optValue(clientid, "ID"), "unique client identifier") - ("username", optValue(username, "USER"), "user name for broker log in.") - ("password", optValue(password, "PASSWORD"), "password for broker log in.") - ("mechanism", optValue(mechanism, "MECH"), "SASL mechanism to use when authenticating.") - ("locale", optValue(locale, "LOCALE"), "locale to use.") - ("max-channels", optValue(maxChannels, "N"), "the maximum number of channels the client requires.") - ("max-frame-size", optValue(maxFrameSize, "N"), "the maximum frame size to request.") - ("bounds-multiplier", optValue(bounds, "N"), - "bound size of write queue (as a multiple of the max frame size)."); - } -}; - -#endif /*!QPID_CLIENT_CONNECTIONOPTIONS_H*/ diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am index 1751d26808..41e7c525cf 100644 --- a/cpp/src/tests/Makefile.am +++ b/cpp/src/tests/Makefile.am @@ -63,8 +63,7 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \ TxAckTest.cpp \ TxBufferTest.cpp \ TxPublishTest.cpp \ - MessageBuilderTest.cpp \ - ConnectionOptions.h + MessageBuilderTest.cpp if HAVE_XML unit_test_SOURCES+= XmlClientSessionTest.cpp diff --git a/cpp/src/tests/TestOptions.h b/cpp/src/tests/TestOptions.h index a400fe5ecb..365db59637 100644 --- a/cpp/src/tests/TestOptions.h +++ b/cpp/src/tests/TestOptions.h @@ -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 #include @@ -69,7 +69,7 @@ struct TestOptions : public qpid::Options bool help; - ConnectionOptions con; + qpid::client::ConnectionOptions con; qpid::log::Options log; std::string helpText; }; -- cgit v1.2.1