QPID-7207: remove cpp and python subdirs from svn trunk, they have migrated to their own git repositories

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

20 files changed, 0 insertions, 1672 deletions

diff --git a/qpid/cpp/include/qmf/Agent.h b/qpid/cpp/include/qmf/Agent.h
deleted file mode 100644
index 457b1495de..0000000000
--- a/qpid/cpp/include/qmf/Agent.h
+++ /dev/null
@@ -1,138 +0,0 @@
-#ifndef QMF_AGENT_H
-#define QMF_AGENT_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-//#include "qmf/Subscription.h"
-#include "qmf/exceptions.h"
-#include "qpid/messaging/Duration.h"
-#include "qpid/types/Variant.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class AgentImpl;
-    class ConsoleEvent;
-    class Query;
-    class DataAddr;
-    class SchemaId;
-    class Schema;
-
-    class QMF_CLASS_EXTERN Agent : public qmf::Handle<AgentImpl> {
-    public:
-        QMF_EXTERN Agent(AgentImpl* impl = 0);
-        QMF_EXTERN Agent(const Agent&);
-        QMF_EXTERN Agent& operator=(const Agent&);
-        QMF_EXTERN ~Agent();
-
-        QMF_EXTERN std::string getName() const;
-        QMF_EXTERN uint32_t getEpoch() const;
-        QMF_EXTERN std::string getVendor() const;
-        QMF_EXTERN std::string getProduct() const;
-        QMF_EXTERN std::string getInstance() const;
-        QMF_EXTERN const qpid::types::Variant& getAttribute(const std::string&) const;
-        QMF_EXTERN const qpid::types::Variant::Map& getAttributes() const;
-
-        QMF_EXTERN ConsoleEvent query(const Query&, qpid::messaging::Duration timeout=qpid::messaging::Duration::MINUTE);
-        QMF_EXTERN ConsoleEvent query(const std::string&, qpid::messaging::Duration timeout=qpid::messaging::Duration::MINUTE);
-        QMF_EXTERN uint32_t queryAsync(const Query&);
-        QMF_EXTERN uint32_t queryAsync(const std::string&);
-
-        /**
-         * Create a subscription to this agent
-         */
-        //QMF_EXTERN Subscription subscribe(const Query&, const std::string& options = "");
-        //QMF_EXTERN Subscription subscribe(const std::string&, const std::string& options = "");
-
-        QMF_EXTERN ConsoleEvent callMethod(const std::string&, const qpid::types::Variant::Map&, const DataAddr&,
-                                           qpid::messaging::Duration timeout=qpid::messaging::Duration::MINUTE);
-        QMF_EXTERN uint32_t callMethodAsync(const std::string&, const qpid::types::Variant::Map&, const DataAddr&);
-
-        /**
-         * Query the agent for a list of schema classes that it exposes.  This operation comes in both
-         * synchronous (blocking) and asynchronous flavors.
-         *
-         * This method will typically be used after receiving an AGENT_SCHEMA_UPDATE event from the console session.
-         * It may also be used on a newly discovered agent to learn what schemata are exposed.
-         *
-         * querySchema returns a ConsoleEvent that contains a list of SchemaId objects exposed by the agent.
-         * This list is cached locally and can be locally queried using getPackage[Count] and getSchemaId[Count].
-         */
-        QMF_EXTERN ConsoleEvent querySchema(qpid::messaging::Duration timeout=qpid::messaging::Duration::MINUTE);
-        QMF_EXTERN uint32_t querySchemaAsync();
-
-        /**
-         * Get the list of schema packages exposed by the agent.
-         *
-         *   getPackageCount returns the number of packages exposed.
-         *   getPackage returns the name of the package by index (0..package-count)
-         *
-         * Note that both of these calls are synchronous and non-blocking.  They only return locally cached data
-         * and will not send any messages to the remote agent.  Use querySchema[Async] to get the latest schema
-         * information from the remote agent.
-         */
-        QMF_EXTERN uint32_t getPackageCount() const;
-        QMF_EXTERN const std::string& getPackage(uint32_t) const;
-
-        /**
-         * Get the list of schema identifiers for a particular package.
-         *
-         *   getSchemaIdCount returns the number of IDs in the indicates package.
-         *   getSchemaId returns the SchemaId by index (0..schema-id-count)
-         *
-         * Note that both of these calls are synchronous and non-blocking.  They only return locally cached data
-         * and will not send any messages to the remote agent.  Use querySchema[Async] to get the latest schema
-         * information from the remote agent.
-         */
-        QMF_EXTERN uint32_t getSchemaIdCount(const std::string&) const;
-        QMF_EXTERN SchemaId getSchemaId(const std::string&, uint32_t) const;
-
-        /**
-         * Get detailed schema information for a specified schema ID.
-         *
-         * This call will return cached information if it is available.  If not, it will send a query message to the
-         * remote agent and block waiting for a response.  The timeout argument specifies the maximum time to wait
-         * for a response from the agent.
-         */
-        QMF_EXTERN Schema getSchema(const SchemaId&, qpid::messaging::Duration timeout=qpid::messaging::Duration::MINUTE);
-
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<Agent>;
-        friend struct AgentImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/AgentEvent.h b/qpid/cpp/include/qmf/AgentEvent.h
deleted file mode 100644
index b3f4bfaa9b..0000000000
--- a/qpid/cpp/include/qmf/AgentEvent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef QMF_AGENT_EVENT_H
-#define QMF_AGENT_EVENT_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/types/Variant.h"
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class AgentEventImpl;
-    class Query;
-    class DataAddr;
-
-    enum AgentEventCode {
-    AGENT_AUTH_QUERY      = 1,
-    AGENT_AUTH_SUBSCRIBE  = 2,
-    AGENT_QUERY           = 3,
-    AGENT_METHOD          = 4,
-    AGENT_SUBSCRIBE_BEGIN = 5,
-    AGENT_SUBSCRIBE_TOUCH = 6,
-    AGENT_SUBSCRIBE_END   = 7,
-    AGENT_THREAD_FAILED   = 8
-    };
-
-    class QMF_CLASS_EXTERN AgentEvent : public qmf::Handle<AgentEventImpl> {
-    public:
-        QMF_EXTERN AgentEvent(AgentEventImpl* impl = 0);
-        QMF_EXTERN AgentEvent(const AgentEvent&);
-        QMF_EXTERN AgentEvent& operator=(const AgentEvent&);
-        QMF_EXTERN ~AgentEvent();
-
-        QMF_EXTERN AgentEventCode getType() const;
-        QMF_EXTERN const std::string& getUserId() const;
-        QMF_EXTERN Query getQuery() const;
-        QMF_EXTERN bool hasDataAddr() const;
-        QMF_EXTERN DataAddr getDataAddr() const;
-        QMF_EXTERN const std::string& getMethodName() const;
-        QMF_EXTERN qpid::types::Variant::Map& getArguments();
-        QMF_EXTERN qpid::types::Variant::Map& getArgumentSubtypes();
-        QMF_EXTERN void addReturnArgument(const std::string&, const qpid::types::Variant&, const std::string& st="");
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<AgentEvent>;
-        friend struct AgentEventImplAccess;
-#endif
-    };
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/AgentSession.h b/qpid/cpp/include/qmf/AgentSession.h
deleted file mode 100644
index 25778f0198..0000000000
--- a/qpid/cpp/include/qmf/AgentSession.h
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef QMF_AGENT_SESSION_H
-#define QMF_AGENT_SESSION_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/messaging/Duration.h"
-#include "qpid/messaging/Connection.h"
-#include "qpid/types/Variant.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class AgentSessionImpl;
-    class AgentEvent;
-    class Schema;
-    class Data;
-    class DataAddr;
-
-    class QMF_CLASS_EXTERN AgentSession : public qmf::Handle<AgentSessionImpl> {
-    public:
-        QMF_EXTERN AgentSession(AgentSessionImpl* impl = 0);
-        QMF_EXTERN AgentSession(const AgentSession&);
-        QMF_EXTERN AgentSession& operator=(const AgentSession&);
-        QMF_EXTERN ~AgentSession();
-
-        /**
-         * AgentSession
-         *   A session that runs over an AMQP connection for QMF agent operation.
-         *
-         * @param connection - An opened qpid::messaging::Connection
-         * @param options - An optional string containing options
-         *
-         * The options string is of the form "{key:value,key:value}".  The following keys are supported:
-         *
-         *    interval:N                 - Heartbeat interval in seconds [default: 60]
-         *    external:{True,False}      - Use external data storage (queries and subscriptions are pass-through) [default: False]
-         *    allow-queries:{True,False} - If True:  automatically allow all queries [default]
-         *                                 If False: generate an AUTH_QUERY event to allow per-query authorization
-         *    allow-methods:{True,False} - If True:  automatically allow all methods [default]
-         *                                 If False: generate an AUTH_METHOD event to allow per-method authorization
-         *    max-subscriptions:N        - Maximum number of concurrent subscription queries permitted [default: 64]
-         *    min-sub-interval:N         - Minimum publish interval (in milliseconds) permitted for a subscription [default: 3000]
-         *    sub-lifetime:N             - Lifetime (in seconds with no keepalive) for a subscription [default: 300]
-         *    public-events:{True,False} - If True:  QMF events are sent to the topic exchange [default]
-         *                                 If False: QMF events are only sent to authorized subscribers
-         *    listen-on-direct:{True,False} - If True:  Listen on legacy direct-exchange address for backward compatibility [default]
-         *                                    If False: Listen only on the routable direct address
-         *    strict-security:{True,False}  - If True:  Cooperate with the broker to enforce strict access control to the network
-         *                                  - If False: Operate more flexibly with regard to use of messaging facilities [default]
-         *    max-thread-wait-time:N     - Time (in seconds) the session thread will wait for messages from the network between
-         *                                 periodic background processing passes. [default: 5]
-         *                                 Must not be greater than 'interval'.  Larger numbers will cause fewer wake-ups but will
-         *                                 increase the time it takes to shut down the process.  This setting will not affect the
-         *                                 agent's response time for queries or method invocation.
-         */
-        QMF_EXTERN AgentSession(qpid::messaging::Connection& conn, const std::string& options="");
-
-        /**
-         * setDomain - Change the QMF domain that this agent will operate in.  If this is not called,
-         * the domain will be "default".  Agents in a domain can be seen only by consoles in the same domain.
-         * This must be called prior to opening the agent session.
-         */
-        QMF_EXTERN void setDomain(const std::string& domain);
-
-        /**
-         * Set identifying attributes of this agent.
-         * setVendor   - Set the vendor string
-         * setProduct  - Set the product name string
-         * setInstance - Set the unique instance name (if not set, a UUID will be assigned)
-         * These must be called prior to opening the agent session.
-         */
-        QMF_EXTERN void setVendor(const std::string& vendor);
-        QMF_EXTERN void setProduct(const std::string& product);
-        QMF_EXTERN void setInstance(const std::string& instance);
-
-        /**
-         * setAttribute - Set an arbitrary attribute for this agent.  The attributes are not used
-         * to uniquely identify the agent but can be used as a search criteria when looking for agents.
-         * This must be called prior to opening the agent session.
-         */
-        QMF_EXTERN void setAttribute(const std::string& key, const qpid::types::Variant& value);
-
-        /**
-         * Get the identifying name of the agent.
-         */
-        QMF_EXTERN const std::string& getName() const;
-
-        /**
-         * Open the agent session.  After opening the session, the domain, identifying strings, and attributes cannot
-         * be changed.
-         */
-        QMF_EXTERN void open();
-
-        /**
-         * Close the session.  Once closed, the session no longer communicates on the messaging network.
-         */
-        QMF_EXTERN void close();
-
-        /**
-         * Get the next event from the agent session.  Events represent actions that must be acted upon by the
-         * agent application.  This method blocks for up to the timeout if there are no events to be handled.
-         * This method will typically be the focus of the agent application's main execution loop.
-         * If the timeout is set to Duration::IMMEDIATE, the call will not block.
-         */
-        QMF_EXTERN bool nextEvent(AgentEvent& outEvent, qpid::messaging::Duration timeout=qpid::messaging::Duration::FOREVER);
-
-        /**
-         * Return the number of events pending for nextEvent.  This method will never block.
-         */
-        QMF_EXTERN int pendingEvents() const;
-
-        /**
-         * Register a schema to be exposed by this agent.
-         */
-        QMF_EXTERN void registerSchema(Schema& schema);
-
-        /**
-         * Add data to be managed internally by the agent.  If the option external:True is selected, this call
-         * should not be used.
-         *
-         * @param data - The data object being managed by the agent.
-         * @param name - A name unique to this object to be used to address the object.
-         *               If left default, a unique name will be assigned by the agent.
-         * @param persistent - Set this to true if the data object is to be considered persistent
-         *                     across different sessions.  If persistent, it is the agent application's
-         *                     responsibility to ensure the name is the same each time it is added.
-         */
-        QMF_EXTERN DataAddr addData(Data& data, const std::string& name="", bool persistent=false);
-
-        /**
-         * Delete data from internal agent management.
-         */
-        QMF_EXTERN void delData(const DataAddr& dataAddr);
-
-        /**
-         * The following methods are used to respond to events received in nextEvent.
-         *
-         * authAccept - Accept an authorization request.
-         * authReject - Reject/forbid an authorization request.
-         * raiseException - indicate failure of an operation (i.e. query or method call).
-         * response - Provide data in response to a query (only for option:  external:True)
-         * complete - Indicate that the response to a query is complete (external:True only)
-         * methodSuccess - Indicate the successful completion of a method call.
-         */
-        QMF_EXTERN void authAccept(AgentEvent& event);
-        QMF_EXTERN void authReject(AgentEvent& event, const std::string& diag="");
-        QMF_EXTERN void raiseException(AgentEvent& event, const std::string& errorText);
-        QMF_EXTERN void raiseException(AgentEvent& event, const Data& errorData);
-        QMF_EXTERN void response(AgentEvent& event, const Data& responseData);
-        QMF_EXTERN void complete(AgentEvent& event);
-        QMF_EXTERN void methodSuccess(AgentEvent& event);
-
-        /**
-         * Raise an event to be sent into the QMF network.
-         *
-         * @param data - A data object that contains the event contents.
-         * @param severity - Explicit severity (from qmf/SchemaTypes.h).  If omitted, the severity is set to
-         *        the default severity for the data's schema.  If the data has no schema, the severity defaults
-         *        to SEV_NOTICE.
-         */
-        QMF_EXTERN void raiseEvent(const Data& data);
-        QMF_EXTERN void raiseEvent(const Data& data, int severity);
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<AgentSession>;
-        friend struct AgentSessionImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/BrokerImportExport.h b/qpid/cpp/include/qmf/BrokerImportExport.h
deleted file mode 100644
index ee05788063..0000000000
--- a/qpid/cpp/include/qmf/BrokerImportExport.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef QPID_BROKER_IMPORT_EXPORT_H
-#define QPID_BROKER_IMPORT_EXPORT_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.
- */
-
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#  if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
-#    define QPID_BROKER_EXTERN __declspec(dllexport)
-#  else
-#    define QPID_BROKER_EXTERN __declspec(dllimport)
-#  endif
-#  ifdef _MSC_VER
-#    define QPID_BROKER_CLASS_EXTERN
-#    define QPID_BROKER_INLINE_EXTERN QPID_BROKER_EXTERN
-#  else
-#    define QPID_BROKER_CLASS_EXTERN QPID_BROKER_EXTERN
-#    define QPID_BROKER_INLINE_EXTERN
-#  endif
-#else
-#  define QPID_BROKER_EXTERN
-#  define QPID_BROKER_CLASS_EXTERN
-#  define QPID_BROKER_INLINE_EXTERN
-#endif
-
-#endif
diff --git a/qpid/cpp/include/qmf/ConsoleEvent.h b/qpid/cpp/include/qmf/ConsoleEvent.h
deleted file mode 100644
index 1419b45de0..0000000000
--- a/qpid/cpp/include/qmf/ConsoleEvent.h
+++ /dev/null
@@ -1,94 +0,0 @@
-#ifndef QMF_CONSOLE_EVENT_H
-#define QMF_CONSOLE_EVENT_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qmf/Agent.h"
-#include "qmf/Data.h"
-#include "qmf/SchemaId.h"
-#include "qpid/types/Variant.h"
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class ConsoleEventImpl;
-
-    enum ConsoleEventCode {
-    CONSOLE_AGENT_ADD             = 1,
-    CONSOLE_AGENT_DEL             = 2,
-    CONSOLE_AGENT_RESTART         = 3,
-    CONSOLE_AGENT_SCHEMA_UPDATE   = 4,
-    CONSOLE_AGENT_SCHEMA_RESPONSE = 5,
-    CONSOLE_EVENT                 = 6,
-    CONSOLE_QUERY_RESPONSE        = 7,
-    CONSOLE_METHOD_RESPONSE       = 8,
-    CONSOLE_EXCEPTION             = 9,
-    CONSOLE_SUBSCRIBE_ADD         = 10,
-    CONSOLE_SUBSCRIBE_UPDATE      = 11,
-    CONSOLE_SUBSCRIBE_DEL         = 12,
-    CONSOLE_THREAD_FAILED         = 13
-    };
-
-    enum AgentDelReason {
-    AGENT_DEL_AGED   = 1,
-    AGENT_DEL_FILTER = 2 
-    };
-
-    class QMF_CLASS_EXTERN ConsoleEvent : public qmf::Handle<ConsoleEventImpl> {
-    public:
-        QMF_EXTERN ConsoleEvent(ConsoleEventImpl* impl = 0);
-        QMF_EXTERN ConsoleEvent(const ConsoleEvent&);
-        QMF_EXTERN ConsoleEvent& operator=(const ConsoleEvent&);
-        QMF_EXTERN ~ConsoleEvent();
-
-        QMF_EXTERN ConsoleEventCode getType() const;
-        QMF_EXTERN uint32_t getCorrelator() const;
-        QMF_EXTERN Agent getAgent() const;
-        QMF_EXTERN AgentDelReason getAgentDelReason() const;
-        QMF_EXTERN uint32_t getSchemaIdCount() const;
-        QMF_EXTERN SchemaId getSchemaId(uint32_t) const;
-        QMF_EXTERN uint32_t getDataCount() const;
-        QMF_EXTERN Data getData(uint32_t) const;
-        QMF_EXTERN bool isFinal() const;
-        QMF_EXTERN const qpid::types::Variant::Map& getArguments() const;
-        QMF_EXTERN int getSeverity() const;
-        QMF_EXTERN uint64_t getTimestamp() const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<ConsoleEvent>;
-        friend struct ConsoleEventImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/ConsoleSession.h b/qpid/cpp/include/qmf/ConsoleSession.h
deleted file mode 100644
index 8d34032b1f..0000000000
--- a/qpid/cpp/include/qmf/ConsoleSession.h
+++ /dev/null
@@ -1,137 +0,0 @@
-#ifndef QMF_CONSOLE_SESSION_H
-#define QMF_CONSOLE_SESSION_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qmf/Agent.h"
-#include "qmf/Subscription.h"
-#include "qpid/messaging/Duration.h"
-#include "qpid/messaging/Connection.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class ConsoleSessionImpl;
-    class ConsoleEvent;
-
-    class QMF_CLASS_EXTERN ConsoleSession : public qmf::Handle<ConsoleSessionImpl> {
-    public:
-        QMF_EXTERN ConsoleSession(ConsoleSessionImpl* impl = 0);
-        QMF_EXTERN ConsoleSession(const ConsoleSession&);
-        QMF_EXTERN ConsoleSession& operator=(const ConsoleSession&);
-        QMF_EXTERN ~ConsoleSession();
-
-        /**
-         * ConsoleSession
-         *   A session that runs over an AMQP connection for QMF console operation.
-         *
-         * @param connection - An opened qpid::messaging::Connection
-         * @param options - An optional string containing options
-         *
-         * The options string is of the form "{key:value,key:value}".  The following keys are supported:
-         *
-         *    domain:NAME                - QMF Domain to join [default: "default"]
-         *    max-agent-age:N            - Maximum time, in minutes, that we will tolerate not hearing from
-         *                                 an agent before deleting it [default: 5]
-         *    listen-on-direct:{True,False} - If True:  Listen on legacy direct-exchange address for backward compatibility [default]
-         *                                    If False: Listen only on the routable direct address
-         *    strict-security:{True,False}  - If True:  Cooperate with the broker to enforce strict access control to the network
-         *                                  - If False: Operate more flexibly with regard to use of messaging facilities [default]
-         *    max-thread-wait-time:N     - Time (in seconds) the session thread will wait for messages from the network between
-         *                                 periodic background processing passes.
-         *                                 Must not be greater than 60.  Larger numbers will cause fewer wake-ups but will
-         *                                 increase the time it takes to shut down the process. [default: 5]
-         */
-        QMF_EXTERN ConsoleSession(qpid::messaging::Connection& conn, const std::string& options="");
-
-        /**
-         * setDomain - Change the QMF domain that this console will operate in.  If this is not called,
-         * the domain will be "default".  Agents in a domain can be seen only by consoles in the same domain.
-         * This must be called prior to opening the console session.
-         */
-        QMF_EXTERN void setDomain(const std::string& domain);
-        QMF_EXTERN void setAgentFilter(const std::string& filter);
-
-        /**
-         * Open the console session.  After opening the session, the domain cannot be changed.
-         */
-        QMF_EXTERN void open();
-
-        /**
-         * Close the session.  Once closed, the session no longer communicates on the messaging network.
-         */
-        QMF_EXTERN void close();
-
-        /**
-         * Get the next event from the console session.  Events represent actions that must be acted upon by the
-         * console application.  This method blocks for up to the timeout if there are no events to be handled.
-         * This method will typically be the focus of the console application's main execution loop.
-         * If the timeout is set to Duration::IMMEDIATE, the call will not block.
-         */
-        QMF_EXTERN bool nextEvent(ConsoleEvent& outEvent, qpid::messaging::Duration timeout=qpid::messaging::Duration::FOREVER);
-
-        /**
-         * Return the number of events pending for nextEvent.  This method will never block.
-         */
-        QMF_EXTERN int pendingEvents() const;
-
-        /**
-         * getAgentCount, getAgent - Retrieve the set of agents that match the console session's agent filter.
-         */
-        QMF_EXTERN uint32_t getAgentCount() const;
-        QMF_EXTERN Agent getAgent(uint32_t agentIndex) const;
-
-        /**
-         * Get the agent for the connected broker (i.e. the agent embedded in the broker to which we have a connection).
-         */
-        QMF_EXTERN Agent getConnectedBrokerAgent() const;
-
-        /**
-         * Create a subscription that involves a subset of the known agents.  The set of known agents is defined by
-         * the session's agent-filter (see setAgentFilter).  The agentFilter argument to the subscribe method is used
-         * to further refine the set of agents.  If agentFilter is the empty string (i.e. match-all) the subscription
-         * will involve all known agents.  If agentFilter is non-empty, it will be applied only to the set of known
-         * agents.  A subscription cannot be created that involves an agent not known by the session.
-         */
-        QMF_EXTERN Subscription subscribe(const Query& query,       const std::string& agentFilter = "", const std::string& options = "");
-        QMF_EXTERN Subscription subscribe(const std::string& query, const std::string& agentFilter = "", const std::string& options = "");
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<ConsoleSession>;
-        friend struct ConsoleSessionImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/Data.h b/qpid/cpp/include/qmf/Data.h
deleted file mode 100644
index 5067c3432a..0000000000
--- a/qpid/cpp/include/qmf/Data.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef QMF_DATA_H
-#define QMF_DATA_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qmf/exceptions.h"
-#include "qpid/types/Variant.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class DataImpl;
-    class Schema;
-    class SchemaId;
-    class DataAddr;
-    class Agent;
-
-    class QMF_CLASS_EXTERN Data : public qmf::Handle<DataImpl> {
-    public:
-        QMF_EXTERN Data(DataImpl* impl = 0);
-        QMF_EXTERN Data(const Data&);
-        QMF_EXTERN Data& operator=(const Data&);
-        QMF_EXTERN ~Data();
-
-        QMF_EXTERN Data(const Schema&);
-        QMF_EXTERN void setAddr(const DataAddr&);
-        QMF_EXTERN void setProperty(const std::string&, const qpid::types::Variant&);
-        QMF_EXTERN void overwriteProperties(const qpid::types::Variant::Map&);
-        QMF_EXTERN bool hasSchema() const;
-        QMF_EXTERN bool hasAddr() const;
-        QMF_EXTERN const SchemaId& getSchemaId() const;
-        QMF_EXTERN const DataAddr& getAddr() const;
-        QMF_EXTERN const qpid::types::Variant& getProperty(const std::string&) const;
-        QMF_EXTERN const qpid::types::Variant::Map& getProperties() const;
-        QMF_EXTERN bool hasAgent() const;
-        QMF_EXTERN const Agent& getAgent() const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<Data>;
-        friend struct DataImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/DataAddr.h b/qpid/cpp/include/qmf/DataAddr.h
deleted file mode 100644
index 7964f1cd02..0000000000
--- a/qpid/cpp/include/qmf/DataAddr.h
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef QMF_DATA_ADDR_H
-#define QMF_DATA_ADDR_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/types/Variant.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class DataAddrImpl;
-
-    class QMF_CLASS_EXTERN DataAddr : public qmf::Handle<DataAddrImpl> {
-    public:
-        QMF_EXTERN DataAddr(DataAddrImpl* impl = 0);
-        QMF_EXTERN DataAddr(const DataAddr&);
-        QMF_EXTERN DataAddr& operator=(const DataAddr&);
-        QMF_EXTERN ~DataAddr();
-
-        QMF_EXTERN bool operator==(const DataAddr&);
-        QMF_EXTERN bool operator<(const DataAddr&);
-
-        QMF_EXTERN DataAddr(const qpid::types::Variant::Map&);
-        QMF_EXTERN DataAddr(const std::string& name, const std::string& agentName, uint32_t agentEpoch=0);
-        QMF_EXTERN const std::string& getName() const;
-        QMF_EXTERN const std::string& getAgentName() const;
-        QMF_EXTERN uint32_t getAgentEpoch() const;
-        QMF_EXTERN qpid::types::Variant::Map asMap() const;
-
-        QMF_EXTERN bool operator==(const DataAddr&) const;
-        QMF_EXTERN bool operator<(const DataAddr&) const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<DataAddr>;
-        friend struct DataAddrImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/Handle.h b/qpid/cpp/include/qmf/Handle.h
deleted file mode 100644
index b0715a2145..0000000000
--- a/qpid/cpp/include/qmf/Handle.h
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef QMF_HANDLE_H
-#define QMF_HANDLE_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include "qmf/ImportExport.h"
-
-namespace qmf {
-
-template <class> class PrivateImplRef;
-
-/** \ingroup qmf
- * A handle is like a pointer: refers to an underlying implementation object.
- * Copying the handle does not copy the object.
- *
- * Handles can be null,  like a 0 pointer. Use isValid(), isNull() or the
- * conversion to bool to test for a null handle.
- */
-template <class T> class Handle {
-  public:
-
-    /**@return true if handle is valid,  i.e. not null. */
-    QMF_INLINE_EXTERN bool isValid() const { return impl; }
-
-    /**@return true if handle is null. It is an error to call any function on a null handle. */
-    QMF_INLINE_EXTERN bool isNull() const { return !impl; }
-
-    /** Conversion to bool supports idiom if (handle) { handle->... } */
-    QMF_INLINE_EXTERN operator bool() const { return impl; }
-
-    /** Operator ! supports idiom if (!handle) { do_if_handle_is_null(); } */
-    QMF_INLINE_EXTERN bool operator !() const { return !impl; }
-
-    void swap(Handle<T>& h) { T* t = h.impl; h.impl = impl; impl = t; }
-
-  protected:
-    typedef T Impl;
-    QMF_INLINE_EXTERN Handle() :impl() {}
-
-    // Not implemented,subclasses must implement.
-    QMF_EXTERN Handle(const Handle&);
-    QMF_EXTERN Handle& operator=(const Handle&);
-
-    Impl* impl;
-
-  friend class PrivateImplRef<T>;
-};
-
-} // namespace qmf
-
-#endif  /*!QMF_HANDLE_H*/
diff --git a/qpid/cpp/include/qmf/ImportExport.h b/qpid/cpp/include/qmf/ImportExport.h
deleted file mode 100644
index 7405c15259..0000000000
--- a/qpid/cpp/include/qmf/ImportExport.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef QMF_IMPORT_EXPORT_H
-#define QMF_IMPORT_EXPORT_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/ImportExport.h"
-
-#if defined(QMF_EXPORT) || defined (qmf2_EXPORTS)
-#  define QMF_EXTERN QPID_EXPORT
-#  define QMF_CLASS_EXTERN QPID_CLASS_EXPORT
-#  define QMF_INLINE_EXTERN QPID_INLINE_EXPORT
-#else
-#  define QMF_EXTERN QPID_IMPORT
-#  define QMF_CLASS_EXTERN QPID_CLASS_IMPORT
-#  define QMF_INLINE_EXTERN QPID_INLINE_IMPORT
-#endif
-
-#endif
diff --git a/qpid/cpp/include/qmf/Query.h b/qpid/cpp/include/qmf/Query.h
deleted file mode 100644
index dbd28c12de..0000000000
--- a/qpid/cpp/include/qmf/Query.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef QMF_QUERY_H
-#define QMF_QUERY_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/types/Variant.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class QueryImpl;
-    class SchemaId;
-    class DataAddr;
-
-    enum QueryTarget {
-    QUERY_OBJECT    = 1,
-    QUERY_OBJECT_ID = 2,
-    QUERY_SCHEMA    = 3,
-    QUERY_SCHEMA_ID = 4
-    };
-
-    class QMF_CLASS_EXTERN Query : public qmf::Handle<QueryImpl> {
-    public:
-        QMF_EXTERN Query(QueryImpl* impl = 0);
-        QMF_EXTERN Query(const Query&);
-        QMF_EXTERN Query& operator=(const Query&);
-        QMF_EXTERN ~Query();
-
-        QMF_EXTERN Query(QueryTarget, const std::string& predicate="");
-        QMF_EXTERN Query(QueryTarget, const std::string& className, const std::string& package, const std::string& predicate="");
-        QMF_EXTERN Query(QueryTarget, const SchemaId&, const std::string& predicate="");
-        QMF_EXTERN Query(const DataAddr&);
-
-        QMF_EXTERN QueryTarget getTarget() const;
-        QMF_EXTERN const DataAddr& getDataAddr() const;
-        QMF_EXTERN const SchemaId& getSchemaId() const;
-        QMF_EXTERN void setPredicate(const qpid::types::Variant::List&);
-        QMF_EXTERN const qpid::types::Variant::List& getPredicate() const;
-        QMF_EXTERN bool matchesPredicate(const qpid::types::Variant::Map& map) const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<Query>;
-        friend struct QueryImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/Schema.h b/qpid/cpp/include/qmf/Schema.h
deleted file mode 100644
index 836eb271bd..0000000000
--- a/qpid/cpp/include/qmf/Schema.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#ifndef QMF_SCHEMA_H
-#define QMF_SCHEMA_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qpid/sys/IntegerTypes.h"
-#include "qmf/Handle.h"
-#include "qmf/SchemaTypes.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class SchemaImpl;
-    class SchemaId;
-    class SchemaProperty;
-    class SchemaMethod;
-
-    class QMF_CLASS_EXTERN Schema : public qmf::Handle<SchemaImpl> {
-    public:
-        QMF_EXTERN Schema(SchemaImpl* impl = 0);
-        QMF_EXTERN Schema(const Schema&);
-        QMF_EXTERN Schema& operator=(const Schema&);
-        QMF_EXTERN ~Schema();
-
-        QMF_EXTERN Schema(int, const std::string&, const std::string&);
-        QMF_EXTERN const SchemaId& getSchemaId() const;
-
-        QMF_EXTERN void finalize();
-        QMF_EXTERN bool isFinalized() const;
-        QMF_EXTERN void addProperty(const SchemaProperty&);
-        QMF_EXTERN void addMethod(const SchemaMethod&);
-        QMF_EXTERN void setDesc(const std::string&);
-        QMF_EXTERN const std::string& getDesc() const;
-
-        QMF_EXTERN void setDefaultSeverity(int);
-        QMF_EXTERN int getDefaultSeverity() const;
-
-        QMF_EXTERN uint32_t getPropertyCount() const;
-        QMF_EXTERN SchemaProperty getProperty(uint32_t) const;
-
-        QMF_EXTERN uint32_t getMethodCount() const;
-        QMF_EXTERN SchemaMethod getMethod(uint32_t) const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<Schema>;
-        friend struct SchemaImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/SchemaId.h b/qpid/cpp/include/qmf/SchemaId.h
deleted file mode 100644
index 7d074c93de..0000000000
--- a/qpid/cpp/include/qmf/SchemaId.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef QMF_SCHEMA_ID_H
-#define QMF_SCHEMA_ID_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/types/Uuid.h"
-#include "qmf/SchemaTypes.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class SchemaIdImpl;
-
-    class QMF_CLASS_EXTERN SchemaId : public qmf::Handle<SchemaIdImpl> {
-    public:
-        QMF_EXTERN SchemaId(SchemaIdImpl* impl = 0);
-        QMF_EXTERN SchemaId(const SchemaId&);
-        QMF_EXTERN SchemaId& operator=(const SchemaId&);
-        QMF_EXTERN ~SchemaId();
-
-        QMF_EXTERN SchemaId(int, const std::string&, const std::string&);
-        QMF_EXTERN void setHash(const qpid::types::Uuid&);
-        QMF_EXTERN int getType() const;
-        QMF_EXTERN const std::string& getPackageName() const;
-        QMF_EXTERN const std::string& getName() const;
-        QMF_EXTERN const qpid::types::Uuid& getHash() const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<SchemaId>;
-        friend struct SchemaIdImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/SchemaMethod.h b/qpid/cpp/include/qmf/SchemaMethod.h
deleted file mode 100644
index 66b2be2300..0000000000
--- a/qpid/cpp/include/qmf/SchemaMethod.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#ifndef QMF_SCHEMA_METHOD_H
-#define QMF_SCHEMA_METHOD_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include "qmf/ImportExport.h"
-#include "qpid/sys/IntegerTypes.h"
-#include "qmf/Handle.h"
-#include "qmf/SchemaTypes.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class SchemaMethodImpl;
-    class SchemaProperty;
-
-    class QMF_CLASS_EXTERN SchemaMethod : public qmf::Handle<SchemaMethodImpl> {
-    public:
-        QMF_EXTERN SchemaMethod(SchemaMethodImpl* impl = 0);
-        QMF_EXTERN SchemaMethod(const SchemaMethod&);
-        QMF_EXTERN SchemaMethod& operator=(const SchemaMethod&);
-        QMF_EXTERN ~SchemaMethod();
-
-        QMF_EXTERN SchemaMethod(const std::string&, const std::string& o="");
-
-        QMF_EXTERN void setDesc(const std::string&);
-        QMF_EXTERN void addArgument(const SchemaProperty&);
-
-        QMF_EXTERN const std::string& getName() const;
-        QMF_EXTERN const std::string& getDesc() const;
-        QMF_EXTERN uint32_t getArgumentCount() const;
-        QMF_EXTERN SchemaProperty getArgument(uint32_t) const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<SchemaMethod>;
-        friend struct SchemaMethodImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/SchemaProperty.h b/qpid/cpp/include/qmf/SchemaProperty.h
deleted file mode 100644
index cb2dec8d2c..0000000000
--- a/qpid/cpp/include/qmf/SchemaProperty.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef QMF_SCHEMA_PROPERTY_H
-#define QMF_SCHEMA_PROPERTY_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/types/Uuid.h"
-#include "qpid/types/Variant.h"
-#include "qmf/SchemaTypes.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class SchemaPropertyImpl;
-
-    class QMF_CLASS_EXTERN SchemaProperty : public Handle<SchemaPropertyImpl> {
-    public:
-        QMF_EXTERN SchemaProperty(SchemaPropertyImpl* impl = 0);
-        QMF_EXTERN SchemaProperty(const SchemaProperty&);
-        QMF_EXTERN SchemaProperty& operator=(const SchemaProperty&);
-        QMF_EXTERN ~SchemaProperty();
-
-        QMF_EXTERN SchemaProperty(const std::string&, int, const std::string& o="");
-
-        QMF_EXTERN void setAccess(int);
-        QMF_EXTERN void setIndex(bool);
-        QMF_EXTERN void setOptional(bool);
-        QMF_EXTERN void setUnit(const std::string&);
-        QMF_EXTERN void setDesc(const std::string&);
-        QMF_EXTERN void setSubtype(const std::string&);
-        QMF_EXTERN void setDirection(int);
-
-        QMF_EXTERN const std::string& getName() const;
-        QMF_EXTERN int getType() const;
-        QMF_EXTERN int getAccess() const;
-        QMF_EXTERN bool isIndex() const;
-        QMF_EXTERN bool isOptional() const;
-        QMF_EXTERN const std::string& getUnit() const;
-        QMF_EXTERN const std::string& getDesc() const;
-        QMF_EXTERN const std::string& getSubtype() const;
-        QMF_EXTERN int getDirection() const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<SchemaProperty>;
-        friend struct SchemaPropertyImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/SchemaTypes.h b/qpid/cpp/include/qmf/SchemaTypes.h
deleted file mode 100644
index b44d32a157..0000000000
--- a/qpid/cpp/include/qmf/SchemaTypes.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef QMF_SCHEMA_TYPES_H
-#define QMF_SCHEMA_TYPES_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-namespace qmf {
-
-    const int SCHEMA_TYPE_DATA = 1;
-    const int SCHEMA_TYPE_EVENT = 2;
-
-    const int SCHEMA_DATA_VOID = 1;
-    const int SCHEMA_DATA_BOOL = 2;
-    const int SCHEMA_DATA_INT = 3;
-    const int SCHEMA_DATA_FLOAT = 4;
-    const int SCHEMA_DATA_STRING = 5;
-    const int SCHEMA_DATA_MAP = 6;
-    const int SCHEMA_DATA_LIST = 7;
-    const int SCHEMA_DATA_UUID = 8;
-
-    const int ACCESS_READ_CREATE = 1;
-    const int ACCESS_READ_WRITE = 2;
-    const int ACCESS_READ_ONLY = 3;
-
-    const int DIR_IN = 1;
-    const int DIR_OUT = 2;
-    const int DIR_IN_OUT = 3;
-
-    const int SEV_EMERG = 0;
-    const int SEV_ALERT = 1;
-    const int SEV_CRIT = 2;
-    const int SEV_ERROR = 3;
-    const int SEV_WARN = 4;
-    const int SEV_NOTICE = 5;
-    const int SEV_INFORM = 6;
-    const int SEV_DEBUG = 7;
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h
deleted file mode 100644
index adda2a75ab..0000000000
--- a/qpid/cpp/include/qmf/Subscription.h
+++ /dev/null
@@ -1,87 +0,0 @@
-#ifndef QMF_SUBSCRIPTION_H
-#define QMF_SUBSCRIPTION_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qpid/types/Variant.h"
-#include <string>
-
-namespace qmf {
-
-#ifndef SWIG
-    template <class> class PrivateImplRef;
-#endif
-
-    class SubscriptionImpl;
-    class Data;
-
-    class QMF_CLASS_EXTERN Subscription : public qmf::Handle<SubscriptionImpl> {
-    public:
-        QMF_EXTERN Subscription(SubscriptionImpl* impl = 0);
-        QMF_EXTERN Subscription(const Subscription&);
-        QMF_EXTERN Subscription& operator=(const Subscription&);
-        QMF_EXTERN ~Subscription();
-
-        /**
-         * Construction:  A subscription is created by calling ConsoleSession::subscribe.
-         */
-
-        /**
-         * Cancel subscriptions to all subscribed agents.  After this is called, the subscription
-         * shall be inactive.
-         */
-        QMF_EXTERN void cancel();
-
-        /**
-         * Check to see if this subscription is active.  It is active if it has a live subscription
-         * on at least one agent.  If it is not active, there is nothing that can be done to make it
-         * active, it can only be deleted.
-         */
-        QMF_EXTERN bool isActive() const;
-
-        /**
-         * lock and unlock should be used to bracket a traversal of the data set.  After lock is called,
-         * the subscription will not change its set of available data objects.  Between calls to getDataCount
-         * and getData, no data objects will be added or removed.  After unlock is called, the set of data
-         * will catch up to any activity that occurred while the lock was in effect.
-         */
-        QMF_EXTERN void lock();
-        QMF_EXTERN void unlock();
-        QMF_EXTERN uint32_t getDataCount() const;
-        QMF_EXTERN Data getData(uint32_t) const;
-
-#ifndef SWIG
-    private:
-        friend class qmf::PrivateImplRef<Subscription>;
-        friend struct SubscriptionImplAccess;
-#endif
-    };
-
-}
-
-#endif
diff --git a/qpid/cpp/include/qmf/exceptions.h b/qpid/cpp/include/qmf/exceptions.h
deleted file mode 100644
index 1a2e5dd2e8..0000000000
--- a/qpid/cpp/include/qmf/exceptions.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef QMF_EXCEPTIONS_H
-#define QMF_EXCEPTIONS_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.
- *
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include "qmf/ImportExport.h"
-#include "qpid/types/Exception.h"
-#include "qpid/types/Variant.h"
-
-namespace qmf {
-
-/** \ingroup qmf
- */
-
-    struct QMF_CLASS_EXTERN QmfException : public qpid::types::Exception {
-        QMF_EXTERN QmfException(const std::string& msg);
-        QMF_EXTERN virtual ~QmfException() throw();
-
-        qpid::types::Variant::Map detail;
-    };
-
-    struct QMF_CLASS_EXTERN KeyNotFound : public QmfException {
-        QMF_EXTERN KeyNotFound(const std::string& msg);
-        QMF_EXTERN virtual ~KeyNotFound() throw();
-    };
-
-    struct QMF_CLASS_EXTERN IndexOutOfRange : public QmfException {
-        QMF_EXTERN IndexOutOfRange();
-        QMF_EXTERN virtual ~IndexOutOfRange() throw();
-    };
-
-    struct QMF_CLASS_EXTERN OperationTimedOut : public QmfException {
-        QMF_EXTERN OperationTimedOut();
-        QMF_EXTERN virtual ~OperationTimedOut() throw();
-    };
-
-}
-
-#endif
-
diff --git a/qpid/cpp/include/qmf/posix/EventNotifier.h b/qpid/cpp/include/qmf/posix/EventNotifier.h
deleted file mode 100644
index c95a95dddf..0000000000
--- a/qpid/cpp/include/qmf/posix/EventNotifier.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef __QMF_POSIX_EVENT_NOTIFIER_H
-#define __QMF_POSIX_EVENT_NOTIFIER_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.
- */
-
-#if !defined(QMF_USE_DEPRECATED_API) && !defined(qmf2_EXPORTS) && !defined(SWIG)
-#  error "The API defined in this file has been DEPRECATED and will be removed in the future."
-#  error "Define 'QMF_USE_DEPRECATED_API' to enable continued use of the API."
-#endif
-
-#include <qmf/ImportExport.h>
-#include "qmf/Handle.h"
-#include "qmf/AgentSession.h"
-#include "qmf/ConsoleSession.h"
-
-namespace qmf {
-
-    class PosixEventNotifierImpl;
-    struct PosixEventNotifierImplAccess;
-
-namespace posix {
-
-#ifndef SWIG
-  template <class> class PrivateImplRef;
-#endif
-
-  class QMF_CLASS_EXTERN EventNotifier : public qmf::Handle<qmf::PosixEventNotifierImpl> {
-  public:
-      QMF_EXTERN EventNotifier(PosixEventNotifierImpl* impl = 0);
-      QMF_EXTERN EventNotifier(::qmf::AgentSession& agentSession);
-      QMF_EXTERN EventNotifier(::qmf::ConsoleSession& consoleSession);
-      QMF_EXTERN EventNotifier(const EventNotifier& that);
-
-      QMF_EXTERN ~EventNotifier();
-
-      QMF_EXTERN EventNotifier& operator=(const EventNotifier& that);
-
-      QMF_EXTERN int getHandle() const;
-
-#ifndef SWIG
-  private:
-      friend class qmf::PrivateImplRef<EventNotifier>;
-      friend struct qmf::PosixEventNotifierImplAccess;
-#endif
-
-  };
-
-}}
-
-#endif
-
diff --git a/qpid/cpp/include/qmf/qmf2.i b/qpid/cpp/include/qmf/qmf2.i
deleted file mode 100644
index 7c54197f6d..0000000000
--- a/qpid/cpp/include/qmf/qmf2.i
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * 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.
- */
-
-%{
-
-#define QMF_USE_DEPRECATED_API
-#include <qmf/exceptions.h>
-#include <qmf/AgentEvent.h>
-#include <qmf/Agent.h>
-#include <qmf/AgentSession.h>
-#include <qmf/ConsoleEvent.h>
-#include <qmf/ConsoleSession.h>
-#include <qmf/DataAddr.h>
-#include <qmf/Data.h>
-#include <qmf/Query.h>
-#include <qmf/Schema.h>
-#include <qmf/SchemaId.h>
-#include <qmf/SchemaMethod.h>
-#include <qmf/SchemaProperty.h>
-#include <qmf/SchemaTypes.h>
-#include <qmf/Subscription.h>
-
-%}
-
-%include <qpid/ImportExport.h>
-%include <qpid/messaging/ImportExport.h>
-%include <qpid/messaging/Duration.h>
-
-%include <qmf/ImportExport.h>
-%include <qmf/exceptions.h>
-%include <qmf/AgentEvent.h>
-%include <qmf/Agent.h>
-%include <qmf/AgentSession.h>
-%include <qmf/ConsoleEvent.h>
-%include <qmf/ConsoleSession.h>
-%include <qmf/DataAddr.h>
-%include <qmf/Data.h>
-%include <qmf/Query.h>
-%include <qmf/Schema.h>
-%include <qmf/SchemaId.h>
-%include <qmf/SchemaMethod.h>
-%include <qmf/SchemaProperty.h>
-%include <qmf/SchemaTypes.h>
-%include <qmf/Subscription.h>
-
-%{
-
-using namespace qmf;
-
-%};
-