I will be moving the public header files into a separate qpid/include directory tomorrow or the next day, I'm just ironing out glitches now. The idea is to make it clear when we might be breaking source or binary compatibility - if it's in include/ then there's a risk, if not there's not.

I did quite a bit of refactoring to reduce the files in the public API, but there are still a few files there that probably shouldn't be. I think it's better to get the structure in place and then everyone can improve it than to hold off till its perfect.

I identified the public headers using the attached public_headers script, basically it's everything recursively included by the examples and some selected tests (listed in attached api_testsprogs). The result is the attached allincludes file.

If there's no objection I'll commit this tomorrow or Thursday.
perftest.cpp
txtest.cpp
latencytest.cpp
echotest.cpp
client_test.cpp
topic_listener.cpp
topic_publisher.cpp
publish.cpp
consume.cpp
header_test.cpp
declare_queues.cpp
replaying_sender.cpp
resuming_receiver.cpp
txshift.cpp
txjob.cpp
receiver.cpp
sender.cpp
#!/bin/sh
# Run in cpp dir, generates list of public headers based on examples and tests.

SRC=~/qpid/qpid/cpp
BLD=~/qpid/qpid/cpp

EXAMPLES=`find $SRC/examples -name \*.cpp`
TESTS=`cat api_testprogs | sed s-^-$SRC/src/tests/-`
QMF=`findsrc $SRC/src/qpid/console $SRC/src/qpid/agent $SRC/src/qpid/management`
SOURCES="$EXAMPLES $TESTS"

rm -rf preproc
mkdir -p preproc

for s in $SOURCES; do
    echo preprocess $s
    OUT=`echo $s | sed 's./.=.g'`
    DIR=`dirname $s`
    g++ -DHAVE_CONFIG_H  -I$SRC/src -I$BLD/src/gen -I$SRC/src/gen -I$DIR 
-I$DIR/gen -E $s > preproc/$OUT
done
echo "collect allincludes"
cat preproc/* | grep -v '/usr/\|"<\|examples\|tests' | awk '/# [0-9]/{print 
$3}' | sort | uniq > allincludes
echo "done"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/client/arg.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/client/AsyncSession_0_10.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/client/no_keyword/AsyncSession_0_10.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/client/no_keyword/Session_0_10.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/client/Session_0_10.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/amqp_structs.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/constants.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/DeliveryProperties.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/DtxGetTimeoutResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/DtxRecoverResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/enum.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/ExchangeBoundResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/ExchangeQueryResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/FileProperties.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/FragmentProperties.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/Header.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/MessageAcquireResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/MessageProperties.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/MessageResumeResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/QueueQueryResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/ReplyTo.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/StreamProperties.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/TypeCode.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/XaResult.h"
"/home/aconway/qpid/qpid/cpp/src/gen/qpid/framing/Xid.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/Address.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/agent/ManagementAgent.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/AsyncSession.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/ClientImportExport.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/Completion.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/Connection.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/ConnectionSettings.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/FailoverManager.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/FlowControl.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/Handle.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/LocalQueue.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/Message.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/MessageListener.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/MessageReplayTracker.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/QueueOptions.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/SessionBase_0_10.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/Session.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/Subscription.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/SubscriptionManager.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/SubscriptionSettings.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/client/TypedResult.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/CommonImportExport.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Agent.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Broker.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/ClassKey.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/ConsoleImportExport.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/ConsoleListener.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Event.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Object.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/ObjectId.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Package.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Schema.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/SequenceManager.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/SessionManager.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/console/Value.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/Exception.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/amqp_types_full.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/amqp_types.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/Array.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/Buffer.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/FieldTable.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/FieldValue.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/ProtocolVersion.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/SequenceNumber.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/SequenceSet.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/StructHelper.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/framing/Uuid.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/InlineAllocator.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/InlineVector.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/log/Logger.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/log/Options.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/log/Selector.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/log/SinkOptions.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/log/Statement.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/management/Args.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/management/Manageable.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/management/ManagementEvent.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/management/ManagementObject.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/Msg.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/Options.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/RangeSet.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/SessionId.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/Condition.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/IntegerTypes.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/IOHandle.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/Monitor.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/Mutex.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/posix/check.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/posix/Condition.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/posix/IntegerTypes.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/posix/Mutex.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/posix/PrivatePosix.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/posix/Time.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/Runnable.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/StrError.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/SystemInfo.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/Thread.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/Time.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/sys/uuid.h"
"/home/aconway/qpid/qpid/cpp/src/qpid/Url.h"

---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to