* Summary:

	 - Improved plugin framework and HandlerUpdater interface.
	 - Cluster handlers for traffic to/from cluster.
	 - Cluster HandlerUpdater configures channel chains for cluster.
	 - Cluster PluginProvider registers cluster objects with broker.

	* src/qpid/framing/AMQFrame.h: Made data members public. Handlers
	need to be able to modify frame data, getters/setters are just a
	nuisance here.

	* src/tests/Cluster.cpp: Updated for cluster changes, using
	handlers instead of friendship to hook test into Cluster code.

	* src/qpid/framing/amqp_types.h: Added CHANNEL_MAX and
	CHANNEL_HIGH_BIT constants.

	* src/qpid/framing/HandlerUpdater.h: Renamed ChannelInitializer,
	broke dependency on broker channel types.

	* src/qpid/framing/Handler.h: Added constructors and nextHandler()

	* src/qpid/framing/AMQFrame.h (class AMQFrame): Inlined getChannel()

	* src/qpid/cluster/ClusterPluginProvider.cpp: Provider for cluster
	plugins.

	* src/qpid/cluster/Cluster.cpp: Use ChannelManager. Factor out
	plugin details to ClusterPluginProvider.

	* src/qpid/cluster/ChannelManager.h: Insert cluster handlers
	into channel chains, route frames between cluster and channels.
	
	* src/qpid/broker/BrokerAdapter.cpp (startOk): use CHANNEL_MAX
	constant.

	* src/qpid/broker/Broker.cpp:
	 - Refactored for new plugin framework.
	 - Added getUrl().

	* src/qpid/Url.h: Added constructor from Address.

	* src/qpid/Plugin.h: Generalized plugin framework, broke
	dependency on Broker interfaces. We may want to use plug-ins for
	clients also at some point.

	* src/tests/run_test: Fix bug when VALGRIND is not set.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551981 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 6 deletions

diff --git a/cpp/src/qpid/Url.h b/cpp/src/qpid/Url.h
index 93a53afde6..0cf54c493e 100644
--- a/cpp/src/qpid/Url.h
+++ b/cpp/src/qpid/Url.h
@@ -31,7 +31,7 @@ namespace qpid {
 /** TCP address of a broker - host:port */
 struct TcpAddress {
     static const uint16_t DEFAULT_PORT=5672;
-    TcpAddress(const std::string& host_=std::string(),
+    explicit TcpAddress(const std::string& host_=std::string(),
                uint16_t port_=DEFAULT_PORT)
         : host(host_), port(port_) {}
     std::string host;
@@ -62,17 +62,26 @@ struct Url : public std::vector<Address> {
     /** Empty URL. */
     Url() {}
     
-    /** Parse an amqp URL string as defined in
+    /** URL containing a single address */
+    explicit Url(const Address& addr) { push_back(addr); }
+
+    /** Parse url, throw InvalidUrl if invalid. */
+    explicit Url(const std::string& url) { parse(url.c_str()); }
+
+    /** Parse url, throw InvalidUrl if invalid. */
+    explicit Url(const char* url) { parse(url); }
+
+    /** Replace contents with parsed URL as defined in
      * https://wiki.108.redhat.com/jira/browse/AMQP-95
      *@exception InvalidUrl if the url is invalid.
      */
-    Url(const std::string& url);
+    void parse(const char* url);
 
-    /** Parse an amqp URL string as defined in
+    /** Replace contesnts with parsed URL as defined in
      * https://wiki.108.redhat.com/jira/browse/AMQP-95
-     * Results in empty URL if url is invalid.
+     * url.empty() will be true if url is invalid.
      */
-    Url(const std::string& url, const std::nothrow_t&);
+    void parseNoThrow(const char* url);
 };
 
 std::ostream& operator<<(std::ostream& os, const Url& url);