QPID-4942: Only install include files that are used by the supported API

- Since we removed a whole lot of old API code we can drastically cut
  down on the header files that we export.

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

77 files changed, 2 insertions, 11 deletions

diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 6869d6aeee..3b242d627f 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -1205,23 +1205,14 @@ add_msvc_version (qpidmessaging library dll)
 
 add_library (qpidmessaging SHARED ${qpidmessaging_SOURCES})
 target_link_libraries (qpidmessaging qpidclient)
-set_target_properties (qpidmessaging PROPERTIES 
-                       VERSION ${qpidmessaging_version} 
+set_target_properties (qpidmessaging PROPERTIES
+                       VERSION ${qpidmessaging_version}
                        SOVERSION ${qpidmessaging_version_major})
 install (TARGETS qpidmessaging
          DESTINATION ${QPID_INSTALL_LIBDIR}
          COMPONENT ${QPID_COMPONENT_CLIENT})
 install_pdb (qpidmessaging ${QPID_COMPONENT_CLIENT})
 
-# Released source artifacts from Apache have the generated headers included in
-# the source tree, not the binary tree. So don't attempt to grab them when
-# they're not supposed to be there.
-if (NOT QPID_GENERATED_HEADERS_IN_SOURCE)
-  install (DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../include/qpid
-           DESTINATION ${QPID_INSTALL_INCLUDEDIR}
-           COMPONENT ${QPID_COMPONENT_CLIENT_INCLUDE})
-endif (NOT QPID_GENERATED_HEADERS_IN_SOURCE)
-
 
 if (MSVC)
     # Install the DtcPlugin project and call it qpidxarm.
diff --git a/cpp/include/qpid/Address.h b/cpp/src/qpid/Address.h
index edb405db92..edb405db92 100755
--- a/cpp/include/qpid/Address.h
+++ b/cpp/src/qpid/Address.h
diff --git a/cpp/include/qpid/CommonImportExport.h b/cpp/src/qpid/CommonImportExport.h
index dd2b900b73..dd2b900b73 100644
--- a/cpp/include/qpid/CommonImportExport.h
+++ b/cpp/src/qpid/CommonImportExport.h
diff --git a/cpp/include/qpid/InlineAllocator.h b/cpp/src/qpid/InlineAllocator.h
index 2502545dcb..2502545dcb 100644
--- a/cpp/include/qpid/InlineAllocator.h
+++ b/cpp/src/qpid/InlineAllocator.h
diff --git a/cpp/include/qpid/InlineVector.h b/cpp/src/qpid/InlineVector.h
index c55db295f3..c55db295f3 100644
--- a/cpp/include/qpid/InlineVector.h
+++ b/cpp/src/qpid/InlineVector.h
diff --git a/cpp/include/qpid/Msg.h b/cpp/src/qpid/Msg.h
index 5f0b11bc60..5f0b11bc60 100644
--- a/cpp/include/qpid/Msg.h
+++ b/cpp/src/qpid/Msg.h
diff --git a/cpp/include/qpid/Options.h b/cpp/src/qpid/Options.h
index 6c908518b8..6c908518b8 100644
--- a/cpp/include/qpid/Options.h
+++ b/cpp/src/qpid/Options.h
diff --git a/cpp/include/qpid/RangeSet.h b/cpp/src/qpid/RangeSet.h
index ef0ad032da..ef0ad032da 100644
--- a/cpp/include/qpid/RangeSet.h
+++ b/cpp/src/qpid/RangeSet.h
diff --git a/cpp/include/qpid/SessionId.h b/cpp/src/qpid/SessionId.h
index e18b360999..e18b360999 100644
--- a/cpp/include/qpid/SessionId.h
+++ b/cpp/src/qpid/SessionId.h
diff --git a/cpp/include/qpid/Url.h b/cpp/src/qpid/Url.h
index f9ed87c24b..f9ed87c24b 100644
--- a/cpp/include/qpid/Url.h
+++ b/cpp/src/qpid/Url.h
diff --git a/cpp/include/qpid/amqp_0_10/Codecs.h b/cpp/src/qpid/amqp_0_10/Codecs.h
index 408307eb7a..408307eb7a 100644
--- a/cpp/include/qpid/amqp_0_10/Codecs.h
+++ b/cpp/src/qpid/amqp_0_10/Codecs.h
diff --git a/cpp/include/qpid/client/AsyncSession.h b/cpp/src/qpid/client/AsyncSession.h
index d91efeb4f1..d91efeb4f1 100644
--- a/cpp/include/qpid/client/AsyncSession.h
+++ b/cpp/src/qpid/client/AsyncSession.h
diff --git a/cpp/include/qpid/client/ClientImportExport.h b/cpp/src/qpid/client/ClientImportExport.h
index 2a3a5a52e9..2a3a5a52e9 100644
--- a/cpp/include/qpid/client/ClientImportExport.h
+++ b/cpp/src/qpid/client/ClientImportExport.h
diff --git a/cpp/include/qpid/client/Completion.h b/cpp/src/qpid/client/Completion.h
index 9546db9258..9546db9258 100644
--- a/cpp/include/qpid/client/Completion.h
+++ b/cpp/src/qpid/client/Completion.h
diff --git a/cpp/include/qpid/client/Connection.h b/cpp/src/qpid/client/Connection.h
index c0db0f301d..c0db0f301d 100644
--- a/cpp/include/qpid/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
diff --git a/cpp/include/qpid/client/ConnectionSettings.h b/cpp/src/qpid/client/ConnectionSettings.h
index a0c209badf..a0c209badf 100644
--- a/cpp/include/qpid/client/ConnectionSettings.h
+++ b/cpp/src/qpid/client/ConnectionSettings.h
diff --git a/cpp/include/qpid/client/FailoverListener.h b/cpp/src/qpid/client/FailoverListener.h
index 53c7c26211..53c7c26211 100644
--- a/cpp/include/qpid/client/FailoverListener.h
+++ b/cpp/src/qpid/client/FailoverListener.h
diff --git a/cpp/include/qpid/client/FailoverManager.h b/cpp/src/qpid/client/FailoverManager.h
index bc739fd0f5..bc739fd0f5 100644
--- a/cpp/include/qpid/client/FailoverManager.h
+++ b/cpp/src/qpid/client/FailoverManager.h
diff --git a/cpp/include/qpid/client/FlowControl.h b/cpp/src/qpid/client/FlowControl.h
index bff7071b3b..bff7071b3b 100644
--- a/cpp/include/qpid/client/FlowControl.h
+++ b/cpp/src/qpid/client/FlowControl.h
diff --git a/cpp/include/qpid/client/Future.h b/cpp/src/qpid/client/Future.h
index 630a7e03c0..630a7e03c0 100644
--- a/cpp/include/qpid/client/Future.h
+++ b/cpp/src/qpid/client/Future.h
diff --git a/cpp/include/qpid/client/FutureCompletion.h b/cpp/src/qpid/client/FutureCompletion.h
index 0970f494b7..0970f494b7 100644
--- a/cpp/include/qpid/client/FutureCompletion.h
+++ b/cpp/src/qpid/client/FutureCompletion.h
diff --git a/cpp/include/qpid/client/FutureResult.h b/cpp/src/qpid/client/FutureResult.h
index ead4929571..ead4929571 100644
--- a/cpp/include/qpid/client/FutureResult.h
+++ b/cpp/src/qpid/client/FutureResult.h
diff --git a/cpp/include/qpid/client/Handle.h b/cpp/src/qpid/client/Handle.h
index b8315481a9..b8315481a9 100644
--- a/cpp/include/qpid/client/Handle.h
+++ b/cpp/src/qpid/client/Handle.h
diff --git a/cpp/include/qpid/client/LocalQueue.h b/cpp/src/qpid/client/LocalQueue.h
index 1a19a8499d..1a19a8499d 100644
--- a/cpp/include/qpid/client/LocalQueue.h
+++ b/cpp/src/qpid/client/LocalQueue.h
diff --git a/cpp/include/qpid/client/Message.h b/cpp/src/qpid/client/Message.h
index ba50dda9ba..ba50dda9ba 100644
--- a/cpp/include/qpid/client/Message.h
+++ b/cpp/src/qpid/client/Message.h
diff --git a/cpp/include/qpid/client/MessageListener.h b/cpp/src/qpid/client/MessageListener.h
index 3ca2fa964a..3ca2fa964a 100644
--- a/cpp/include/qpid/client/MessageListener.h
+++ b/cpp/src/qpid/client/MessageListener.h
diff --git a/cpp/include/qpid/client/MessageReplayTracker.h b/cpp/src/qpid/client/MessageReplayTracker.h
index 06a3f29c7d..06a3f29c7d 100644
--- a/cpp/include/qpid/client/MessageReplayTracker.h
+++ b/cpp/src/qpid/client/MessageReplayTracker.h
diff --git a/cpp/include/qpid/client/QueueOptions.h b/cpp/src/qpid/client/QueueOptions.h
index 3984b63fdd..3984b63fdd 100644
--- a/cpp/include/qpid/client/QueueOptions.h
+++ b/cpp/src/qpid/client/QueueOptions.h
diff --git a/cpp/include/qpid/client/Session.h b/cpp/src/qpid/client/Session.h
index c40549bbc5..c40549bbc5 100644
--- a/cpp/include/qpid/client/Session.h
+++ b/cpp/src/qpid/client/Session.h
diff --git a/cpp/include/qpid/client/SessionBase_0_10.h b/cpp/src/qpid/client/SessionBase_0_10.h
index 630987c11d..630987c11d 100644
--- a/cpp/include/qpid/client/SessionBase_0_10.h
+++ b/cpp/src/qpid/client/SessionBase_0_10.h
diff --git a/cpp/include/qpid/client/Subscription.h b/cpp/src/qpid/client/Subscription.h
index bb9b98e8ff..bb9b98e8ff 100644
--- a/cpp/include/qpid/client/Subscription.h
+++ b/cpp/src/qpid/client/Subscription.h
diff --git a/cpp/include/qpid/client/SubscriptionManager.h b/cpp/src/qpid/client/SubscriptionManager.h
index 404a9c6eb9..404a9c6eb9 100644
--- a/cpp/include/qpid/client/SubscriptionManager.h
+++ b/cpp/src/qpid/client/SubscriptionManager.h
diff --git a/cpp/include/qpid/client/SubscriptionSettings.h b/cpp/src/qpid/client/SubscriptionSettings.h
index bee39f6816..bee39f6816 100644
--- a/cpp/include/qpid/client/SubscriptionSettings.h
+++ b/cpp/src/qpid/client/SubscriptionSettings.h
diff --git a/cpp/include/qpid/client/TypedResult.h b/cpp/src/qpid/client/TypedResult.h
index 8e1a16580c..8e1a16580c 100644
--- a/cpp/include/qpid/client/TypedResult.h
+++ b/cpp/src/qpid/client/TypedResult.h
diff --git a/cpp/include/qpid/framing/Array.h b/cpp/src/qpid/framing/Array.h
index 6254f6271a..6254f6271a 100644
--- a/cpp/include/qpid/framing/Array.h
+++ b/cpp/src/qpid/framing/Array.h
diff --git a/cpp/include/qpid/framing/Buffer.h b/cpp/src/qpid/framing/Buffer.h
index 166b524e3c..166b524e3c 100644
--- a/cpp/include/qpid/framing/Buffer.h
+++ b/cpp/src/qpid/framing/Buffer.h
diff --git a/cpp/include/qpid/framing/FieldTable.h b/cpp/src/qpid/framing/FieldTable.h
index 1986a72d10..1986a72d10 100644
--- a/cpp/include/qpid/framing/FieldTable.h
+++ b/cpp/src/qpid/framing/FieldTable.h
diff --git a/cpp/include/qpid/framing/FieldValue.h b/cpp/src/qpid/framing/FieldValue.h
index 1adcb2fa07..1adcb2fa07 100644
--- a/cpp/include/qpid/framing/FieldValue.h
+++ b/cpp/src/qpid/framing/FieldValue.h
diff --git a/cpp/include/qpid/framing/List.h b/cpp/src/qpid/framing/List.h
index 681445947c..681445947c 100644
--- a/cpp/include/qpid/framing/List.h
+++ b/cpp/src/qpid/framing/List.h
diff --git a/cpp/include/qpid/framing/ProtocolVersion.h b/cpp/src/qpid/framing/ProtocolVersion.h
index 309e543516..309e543516 100644
--- a/cpp/include/qpid/framing/ProtocolVersion.h
+++ b/cpp/src/qpid/framing/ProtocolVersion.h
diff --git a/cpp/include/qpid/framing/SequenceNumber.h b/cpp/src/qpid/framing/SequenceNumber.h
index 00fa2469c8..00fa2469c8 100644
--- a/cpp/include/qpid/framing/SequenceNumber.h
+++ b/cpp/src/qpid/framing/SequenceNumber.h
diff --git a/cpp/include/qpid/framing/SequenceSet.h b/cpp/src/qpid/framing/SequenceSet.h
index 827c8999b3..827c8999b3 100644
--- a/cpp/include/qpid/framing/SequenceSet.h
+++ b/cpp/src/qpid/framing/SequenceSet.h
diff --git a/cpp/include/qpid/framing/StructHelper.h b/cpp/src/qpid/framing/StructHelper.h
index fe2fa64ce7..fe2fa64ce7 100644
--- a/cpp/include/qpid/framing/StructHelper.h
+++ b/cpp/src/qpid/framing/StructHelper.h
diff --git a/cpp/include/qpid/framing/Uuid.h b/cpp/src/qpid/framing/Uuid.h
index e9e56ed7c9..e9e56ed7c9 100644
--- a/cpp/include/qpid/framing/Uuid.h
+++ b/cpp/src/qpid/framing/Uuid.h
diff --git a/cpp/include/qpid/framing/amqp_types.h b/cpp/src/qpid/framing/amqp_types.h
index 2072a83904..2072a83904 100644
--- a/cpp/include/qpid/framing/amqp_types.h
+++ b/cpp/src/qpid/framing/amqp_types.h
diff --git a/cpp/include/qpid/framing/amqp_types_full.h b/cpp/src/qpid/framing/amqp_types_full.h
index c5d84dedea..c5d84dedea 100644
--- a/cpp/include/qpid/framing/amqp_types_full.h
+++ b/cpp/src/qpid/framing/amqp_types_full.h
diff --git a/cpp/include/qpid/log/Logger.h b/cpp/src/qpid/log/Logger.h
index 8c4beb0785..8c4beb0785 100644
--- a/cpp/include/qpid/log/Logger.h
+++ b/cpp/src/qpid/log/Logger.h
diff --git a/cpp/include/qpid/log/Options.h b/cpp/src/qpid/log/Options.h
index 42a8fb40fe..42a8fb40fe 100644
--- a/cpp/include/qpid/log/Options.h
+++ b/cpp/src/qpid/log/Options.h
diff --git a/cpp/include/qpid/log/Selector.h b/cpp/src/qpid/log/Selector.h
index 1d025e9646..1d025e9646 100644
--- a/cpp/include/qpid/log/Selector.h
+++ b/cpp/src/qpid/log/Selector.h
diff --git a/cpp/include/qpid/log/SinkOptions.h b/cpp/src/qpid/log/SinkOptions.h
index 7ec2cfbc17..7ec2cfbc17 100644
--- a/cpp/include/qpid/log/SinkOptions.h
+++ b/cpp/src/qpid/log/SinkOptions.h
diff --git a/cpp/include/qpid/log/Statement.h b/cpp/src/qpid/log/Statement.h
index e928e19f22..e928e19f22 100644
--- a/cpp/include/qpid/log/Statement.h
+++ b/cpp/src/qpid/log/Statement.h
diff --git a/cpp/include/qpid/management/Args.h b/cpp/src/qpid/management/Args.h
index 5d1cb7e01d..5d1cb7e01d 100644
--- a/cpp/include/qpid/management/Args.h
+++ b/cpp/src/qpid/management/Args.h
diff --git a/cpp/include/qpid/management/Buffer.h b/cpp/src/qpid/management/Buffer.h
index 1ac52bf276..1ac52bf276 100644
--- a/cpp/include/qpid/management/Buffer.h
+++ b/cpp/src/qpid/management/Buffer.h
diff --git a/cpp/include/qpid/management/ConnectionSettings.h b/cpp/src/qpid/management/ConnectionSettings.h
index b631ffa658..b631ffa658 100644
--- a/cpp/include/qpid/management/ConnectionSettings.h
+++ b/cpp/src/qpid/management/ConnectionSettings.h
diff --git a/cpp/include/qpid/management/Manageable.h b/cpp/src/qpid/management/Manageable.h
index ede5c29e43..ede5c29e43 100644
--- a/cpp/include/qpid/management/Manageable.h
+++ b/cpp/src/qpid/management/Manageable.h
diff --git a/cpp/include/qpid/management/ManagementEvent.h b/cpp/src/qpid/management/ManagementEvent.h
index e80175096f..e80175096f 100644
--- a/cpp/include/qpid/management/ManagementEvent.h
+++ b/cpp/src/qpid/management/ManagementEvent.h
diff --git a/cpp/include/qpid/management/ManagementObject.h b/cpp/src/qpid/management/ManagementObject.h
index 93fbec7bc7..93fbec7bc7 100644
--- a/cpp/include/qpid/management/ManagementObject.h
+++ b/cpp/src/qpid/management/ManagementObject.h
diff --git a/cpp/include/qpid/management/Mutex.h b/cpp/src/qpid/management/Mutex.h
index 67ae04bae9..67ae04bae9 100644
--- a/cpp/include/qpid/management/Mutex.h
+++ b/cpp/src/qpid/management/Mutex.h
diff --git a/cpp/include/qpid/sys/Condition.h b/cpp/src/qpid/sys/Condition.h
index 9be4b357fe..9be4b357fe 100644
--- a/cpp/include/qpid/sys/Condition.h
+++ b/cpp/src/qpid/sys/Condition.h
diff --git a/cpp/include/qpid/sys/ExceptionHolder.h b/cpp/src/qpid/sys/ExceptionHolder.h
index 4bc934cf75..4bc934cf75 100644
--- a/cpp/include/qpid/sys/ExceptionHolder.h
+++ b/cpp/src/qpid/sys/ExceptionHolder.h
diff --git a/cpp/include/qpid/sys/IOHandle.h b/cpp/src/qpid/sys/IOHandle.h
index 06ae65f879..06ae65f879 100644
--- a/cpp/include/qpid/sys/IOHandle.h
+++ b/cpp/src/qpid/sys/IOHandle.h
diff --git a/cpp/include/qpid/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h
index 123bf92dcb..123bf92dcb 100644
--- a/cpp/include/qpid/sys/Monitor.h
+++ b/cpp/src/qpid/sys/Monitor.h
diff --git a/cpp/include/qpid/sys/Mutex.h b/cpp/src/qpid/sys/Mutex.h
index e718586a39..e718586a39 100644
--- a/cpp/include/qpid/sys/Mutex.h
+++ b/cpp/src/qpid/sys/Mutex.h
diff --git a/cpp/include/qpid/sys/Runnable.h b/cpp/src/qpid/sys/Runnable.h
index fed7663cb6..fed7663cb6 100644
--- a/cpp/include/qpid/sys/Runnable.h
+++ b/cpp/src/qpid/sys/Runnable.h
diff --git a/cpp/include/qpid/sys/StrError.h b/cpp/src/qpid/sys/StrError.h
index 36489dd0fc..36489dd0fc 100644
--- a/cpp/include/qpid/sys/StrError.h
+++ b/cpp/src/qpid/sys/StrError.h
diff --git a/cpp/include/qpid/sys/SystemInfo.h b/cpp/src/qpid/sys/SystemInfo.h
index 1b5720a5f0..1b5720a5f0 100644
--- a/cpp/include/qpid/sys/SystemInfo.h
+++ b/cpp/src/qpid/sys/SystemInfo.h
diff --git a/cpp/include/qpid/sys/Thread.h b/cpp/src/qpid/sys/Thread.h
index f556612908..f556612908 100644
--- a/cpp/include/qpid/sys/Thread.h
+++ b/cpp/src/qpid/sys/Thread.h
diff --git a/cpp/include/qpid/sys/Time.h b/cpp/src/qpid/sys/Time.h
index 2ccff92e7c..2ccff92e7c 100644
--- a/cpp/include/qpid/sys/Time.h
+++ b/cpp/src/qpid/sys/Time.h
diff --git a/cpp/include/qpid/sys/posix/Condition.h b/cpp/src/qpid/sys/posix/Condition.h
index 36e7557ffd..36e7557ffd 100644
--- a/cpp/include/qpid/sys/posix/Condition.h
+++ b/cpp/src/qpid/sys/posix/Condition.h
diff --git a/cpp/include/qpid/sys/posix/Mutex.h b/cpp/src/qpid/sys/posix/Mutex.h
index e2b21b5a56..e2b21b5a56 100644
--- a/cpp/include/qpid/sys/posix/Mutex.h
+++ b/cpp/src/qpid/sys/posix/Mutex.h
diff --git a/cpp/include/qpid/sys/posix/PrivatePosix.h b/cpp/src/qpid/sys/posix/PrivatePosix.h
index 0f59fe3176..0f59fe3176 100644
--- a/cpp/include/qpid/sys/posix/PrivatePosix.h
+++ b/cpp/src/qpid/sys/posix/PrivatePosix.h
diff --git a/cpp/include/qpid/sys/posix/Time.h b/cpp/src/qpid/sys/posix/Time.h
index 62d734c816..62d734c816 100755
--- a/cpp/include/qpid/sys/posix/Time.h
+++ b/cpp/src/qpid/sys/posix/Time.h
diff --git a/cpp/include/qpid/sys/posix/check.h b/cpp/src/qpid/sys/posix/check.h
index 1bfe5d6d78..1bfe5d6d78 100644
--- a/cpp/include/qpid/sys/posix/check.h
+++ b/cpp/src/qpid/sys/posix/check.h
diff --git a/cpp/include/qpid/sys/windows/Condition.h b/cpp/src/qpid/sys/windows/Condition.h
index cd5aebbf09..cd5aebbf09 100755
--- a/cpp/include/qpid/sys/windows/Condition.h
+++ b/cpp/src/qpid/sys/windows/Condition.h
diff --git a/cpp/include/qpid/sys/windows/Mutex.h b/cpp/src/qpid/sys/windows/Mutex.h
index 5dcc69e836..5dcc69e836 100755
--- a/cpp/include/qpid/sys/windows/Mutex.h
+++ b/cpp/src/qpid/sys/windows/Mutex.h
diff --git a/cpp/include/qpid/sys/windows/Time.h b/cpp/src/qpid/sys/windows/Time.h
index 2987b1c8b2..2987b1c8b2 100644
--- a/cpp/include/qpid/sys/windows/Time.h
+++ b/cpp/src/qpid/sys/windows/Time.h
diff --git a/cpp/include/qpid/sys/windows/check.h b/cpp/src/qpid/sys/windows/check.h
index 2a8e439bed..2a8e439bed 100755
--- a/cpp/include/qpid/sys/windows/check.h
+++ b/cpp/src/qpid/sys/windows/check.h