QPID-5369: Issue compile-time error if deprecated QMF Agent or Console API used by applications

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

22 files changed, 94 insertions, 0 deletions

diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
index 00554539eb..8751ed4b38 100644
--- a/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/agent.cpp
@@ -19,6 +19,8 @@
 
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
 #include <qmf/AgentSession.h>
 #include <qmf/AgentEvent.h>
 #include <qmf/Schema.h>
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
index c288aa6bdd..0b09bbf85f 100644
--- a/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/event_driven_list_agents.cpp
@@ -22,6 +22,8 @@
 
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
 #include <qmf/Agent.h>
 #include <qmf/ConsoleEvent.h>
 #include <qmf/ConsoleSession.h>
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
index 327da9661f..5fff985118 100644
--- a/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/list_agents.cpp
@@ -19,6 +19,8 @@
 
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
 #include <qmf/ConsoleSession.h>
 #include <qmf/ConsoleEvent.h>
 #include <qmf/Agent.h>
diff --git a/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
index 9883a19962..413c01bb62 100644
--- a/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
+++ b/qpid/cpp/bindings/qmf2/examples/cpp/print_events.cpp
@@ -19,6 +19,8 @@
 
 #include <qpid/messaging/Connection.h>
 #include <qpid/messaging/Duration.h>
+
+#define QMF_USE_DEPRECATED_API
 #include <qmf/ConsoleSession.h>
 #include <qmf/ConsoleEvent.h>
 #include <qmf/Data.h>
diff --git a/qpid/cpp/include/qmf/Agent.h b/qpid/cpp/include/qmf/Agent.h
index 94083be4f3..457b1495de 100644
--- a/qpid/cpp/include/qmf/Agent.h
+++ b/qpid/cpp/include/qmf/Agent.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/AgentEvent.h b/qpid/cpp/include/qmf/AgentEvent.h
index 0f93a9bb0a..b3f4bfaa9b 100644
--- a/qpid/cpp/include/qmf/AgentEvent.h
+++ b/qpid/cpp/include/qmf/AgentEvent.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/AgentSession.h b/qpid/cpp/include/qmf/AgentSession.h
index 589d364bcc..25778f0198 100644
--- a/qpid/cpp/include/qmf/AgentSession.h
+++ b/qpid/cpp/include/qmf/AgentSession.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/ConsoleEvent.h b/qpid/cpp/include/qmf/ConsoleEvent.h
index 94600f9357..1419b45de0 100644
--- a/qpid/cpp/include/qmf/ConsoleEvent.h
+++ b/qpid/cpp/include/qmf/ConsoleEvent.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/ConsoleSession.h b/qpid/cpp/include/qmf/ConsoleSession.h
index 022485cfa7..8d34032b1f 100644
--- a/qpid/cpp/include/qmf/ConsoleSession.h
+++ b/qpid/cpp/include/qmf/ConsoleSession.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/Data.h b/qpid/cpp/include/qmf/Data.h
index 487a02fe95..5067c3432a 100644
--- a/qpid/cpp/include/qmf/Data.h
+++ b/qpid/cpp/include/qmf/Data.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/DataAddr.h b/qpid/cpp/include/qmf/DataAddr.h
index 20c469081e..7964f1cd02 100644
--- a/qpid/cpp/include/qmf/DataAddr.h
+++ b/qpid/cpp/include/qmf/DataAddr.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/Handle.h b/qpid/cpp/include/qmf/Handle.h
index 50971ea626..b0715a2145 100644
--- a/qpid/cpp/include/qmf/Handle.h
+++ b/qpid/cpp/include/qmf/Handle.h
@@ -22,6 +22,11 @@
  *
  */
 
+#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 {
diff --git a/qpid/cpp/include/qmf/Query.h b/qpid/cpp/include/qmf/Query.h
index c1264f8901..dbd28c12de 100644
--- a/qpid/cpp/include/qmf/Query.h
+++ b/qpid/cpp/include/qmf/Query.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/Schema.h b/qpid/cpp/include/qmf/Schema.h
index 6cfd2e2a56..836eb271bd 100644
--- a/qpid/cpp/include/qmf/Schema.h
+++ b/qpid/cpp/include/qmf/Schema.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/SchemaId.h b/qpid/cpp/include/qmf/SchemaId.h
index 2dafc1c091..7d074c93de 100644
--- a/qpid/cpp/include/qmf/SchemaId.h
+++ b/qpid/cpp/include/qmf/SchemaId.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/SchemaMethod.h b/qpid/cpp/include/qmf/SchemaMethod.h
index b5944dc29e..66b2be2300 100644
--- a/qpid/cpp/include/qmf/SchemaMethod.h
+++ b/qpid/cpp/include/qmf/SchemaMethod.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/SchemaProperty.h b/qpid/cpp/include/qmf/SchemaProperty.h
index bbb603fa50..cb2dec8d2c 100644
--- a/qpid/cpp/include/qmf/SchemaProperty.h
+++ b/qpid/cpp/include/qmf/SchemaProperty.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/SchemaTypes.h b/qpid/cpp/include/qmf/SchemaTypes.h
index af3da612e5..b44d32a157 100644
--- a/qpid/cpp/include/qmf/SchemaTypes.h
+++ b/qpid/cpp/include/qmf/SchemaTypes.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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;
diff --git a/qpid/cpp/include/qmf/Subscription.h b/qpid/cpp/include/qmf/Subscription.h
index 398a45b922..adda2a75ab 100644
--- a/qpid/cpp/include/qmf/Subscription.h
+++ b/qpid/cpp/include/qmf/Subscription.h
@@ -21,6 +21,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/exceptions.h b/qpid/cpp/include/qmf/exceptions.h
index c7ffa68ce2..1a2e5dd2e8 100644
--- a/qpid/cpp/include/qmf/exceptions.h
+++ b/qpid/cpp/include/qmf/exceptions.h
@@ -22,6 +22,11 @@
  *
  */
 
+#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"
diff --git a/qpid/cpp/include/qmf/posix/EventNotifier.h b/qpid/cpp/include/qmf/posix/EventNotifier.h
index c8b90b6421..c95a95dddf 100644
--- a/qpid/cpp/include/qmf/posix/EventNotifier.h
+++ b/qpid/cpp/include/qmf/posix/EventNotifier.h
@@ -20,6 +20,11 @@
  * 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"
diff --git a/qpid/cpp/include/qmf/qmf2.i b/qpid/cpp/include/qmf/qmf2.i
index 0f573fe3e6..7c54197f6d 100644
--- a/qpid/cpp/include/qmf/qmf2.i
+++ b/qpid/cpp/include/qmf/qmf2.i
@@ -19,6 +19,7 @@
 
 %{
 
+#define QMF_USE_DEPRECATED_API
 #include <qmf/exceptions.h>
 #include <qmf/AgentEvent.h>
 #include <qmf/Agent.h>