summaryrefslogtreecommitdiff
path: root/qpid/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src')
-rw-r--r--qpid/cpp/src/Makefile.am1121
-rw-r--r--qpid/cpp/src/ha.mk72
-rw-r--r--qpid/cpp/src/legacystore.mk110
-rwxr-xr-xqpid/cpp/src/prof4
-rw-r--r--qpid/cpp/src/qmf.mk177
-rw-r--r--qpid/cpp/src/qmfc.mk57
-rw-r--r--qpid/cpp/src/ssl.mk47
-rw-r--r--qpid/cpp/src/tests/Makefile.am411
-rw-r--r--qpid/cpp/src/tests/Shlib.cpp10
-rw-r--r--qpid/cpp/src/tests/brokermgmt.mk44
-rwxr-xr-xqpid/cpp/src/tests/run-unit-tests48
-rwxr-xr-xqpid/cpp/src/tests/run_cli_tests4
-rwxr-xr-xqpid/cpp/src/tests/run_federation_tests2
-rw-r--r--qpid/cpp/src/tests/sasl.mk44
-rw-r--r--qpid/cpp/src/tests/ssl.mk22
-rw-r--r--qpid/cpp/src/tests/testagent.mk51
-rw-r--r--qpid/cpp/src/xml.mk29
17 files changed, 5 insertions, 2248 deletions
diff --git a/qpid/cpp/src/Makefile.am b/qpid/cpp/src/Makefile.am
deleted file mode 100644
index 3a6740f140..0000000000
--- a/qpid/cpp/src/Makefile.am
+++ /dev/null
@@ -1,1121 +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.
-#
-
-SUBDIRS = . tests
-
-# The Windows-only sources are not compiled using this Makefile, but
-# are listed here to ensure they're included in releases. They are built
-# using Visual Studio solutions/projects.
-windows_dist = \
- qpid/client/windows/SaslFactory.cpp \
- qpid/client/windows/SslConnector.cpp \
- qpid/client/windows/ClientDllMain.cpp \
- qpid/log/windows/SinkOptions.cpp \
- qpid/log/windows/SinkOptions.h \
- ../include/qpid/sys/windows/check.h \
- qpid/sys/MemStat.cpp \
- qpid/sys/windows/AsynchIO.cpp \
- qpid/sys/windows/AsynchIoResult.h \
- ../include/qpid/sys/windows/Condition.h \
- qpid/sys/windows/FileSysDir.cpp \
- ../include/qpid/sys/windows/IntegerTypes.h \
- qpid/sys/windows/IocpPoller.cpp \
- qpid/sys/windows/IOHandle.cpp \
- qpid/sys/windows/IoHandlePrivate.h \
- qpid/sys/windows/LockFile.cpp \
- qpid/sys/windows/MemoryMappedFile.cpp \
- qpid/sys/windows/mingw32_compat.h \
- qpid/sys/windows/PollableCondition.cpp \
- qpid/sys/windows/PipeHandle.cpp \
- ../include/qpid/sys/windows/Mutex.h \
- qpid/sys/windows/QpidDllMain.h \
- qpid/sys/windows/Shlib.cpp \
- qpid/sys/windows/SocketAddress.cpp \
- qpid/sys/windows/SslAsynchIO.cpp \
- qpid/sys/windows/SslAsynchIO.h \
- qpid/sys/windows/StrError.cpp \
- qpid/sys/windows/SystemInfo.cpp \
- qpid/sys/windows/Thread.cpp \
- qpid/sys/windows/Time.cpp \
- ../include/qpid/sys/windows/Time.h \
- qpid/sys/windows/uuid.cpp \
- qpid/sys/windows/uuid.h \
- qpid/sys/windows/WinSocket.cpp \
- qpid/sys/windows/WinSocket.h \
- windows/QpiddBroker.cpp \
- windows/SCM.h \
- windows/SCM.cpp \
- qpid/broker/windows/BrokerDefaults.cpp \
- qpid/broker/windows/SaslAuthenticator.cpp \
- qpid/broker/windows/SslProtocolFactory.cpp \
- qpid/messaging/HandleInstantiator.cpp \
- windows/resources/template-resource.rc \
- windows/resources/version-resource.h \
- windows/resources/qpid-icon.ico
-
-EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)
-
-# Define variables that are be appended to by this file and included .mk files.
-nobase_include_HEADERS =
-libqpidcommon_la_SOURCES =
-pkgconfig_DATA =
-
-## Generated code
-
-# Note: generated soure and makefiles included in distribution so a
-# distribution can be built without code generation tools and XML
-# sources.
-
-# This phony target is needed by generated makefile fragments:
-force:
-
-if GENERATE
-
-# AMQP_FINAL_XML is defined in ../configure.ac
-amqp_0_10_xml=@AMQP_FINAL_XML@
-specs=$(amqp_0_10_xml)
-
-# Ruby generator.
-rgen_dir=$(top_srcdir)/rubygen
-rgen_cmd=ruby -I $(rgen_dir) $(rgen_dir)/generate . ../include $(specs) all
-
-$(rgen_srcs) $(srcdir)/rubygen.mk: rgen.timestamp
-rgen.timestamp: $(rgen_generator) $(specs)
- $(rgen_cmd) $(srcdir)/rubygen.mk && touch $@
-$(rgen_generator):
-
-# The CMake version is needed for dist
-$(srcdir)/rubygen.cmake: $(rgen_generator) $(specs)
- $(rgen_cmd) $(srcdir)/rubygen.cmake
-
-# Management generator.
-mgen_dir=$(top_srcdir)/managementgen
-mgen_xml=$(top_srcdir)/../specs/management-schema.xml \
- $(srcdir)/qpid/acl/management-schema.xml \
- $(srcdir)/qpid/ha/management-schema.xml \
- $(srcdir)/qpid/legacystore/management-schema.xml
-mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
- -c $(srcdir)/managementgen.cmake -q -b -l -o qmf \
- $(mgen_xml)
-
-$(srcdir)/managementgen.mk $(mgen_broker_cpp) $(dist_qpid_management_HEADERS): mgen.timestamp
-mgen.timestamp: $(mgen_generator) $(mgen_xml)
- $(mgen_cmd); touch $@
-$(mgen_generator):
-
-endif # GENERATE
-
-include $(srcdir)/rubygen.mk
-include $(srcdir)/managementgen.mk
-
-## Compiler flags
-AM_CXXFLAGS = $(WARNING_CFLAGS)
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(srcdir) -I=$(builddir)
-
-#
-# Destination for intalled programs and tests defined here
-#
-qpidexecdir = $(libexecdir)/qpid
-qpidexec_PROGRAMS =
-qpidexec_SCRIPTS =
-qpidtestdir = $(qpidexecdir)/tests
-qpidtest_PROGRAMS =
-qpidtest_SCRIPTS =
-tmoduleexecdir = $(libdir)/qpid/tests
-tmoduleexec_LTLIBRARIES=
-
-BROKER_CXXFLAGS = -D_IN_QPID_BROKER
-
-## Automake macros to build libraries and executables.
-qpidd_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS) -DQPIDD_MODULE_DIR=\"$(dmoduleexecdir)\" -DQPIDD_CONF_FILE=\"$(sysconfdir)/qpidd.conf\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
-libqpidcommon_la_CXXFLAGS = $(AM_CXXFLAGS)
-libqpidbroker_la_CXXFLAGS = $(AM_CXXFLAGS) $(BROKER_CXXFLAGS)
-libqpidclient_la_CXXFLAGS = $(AM_CXXFLAGS) -DQPIDC_MODULE_DIR=\"$(cmoduleexecdir)\" -DQPIDC_CONF_FILE=\"$(confdir)/qpidc.conf\"
-
-qpidd_LDADD = \
- libqpidbroker.la \
- libqpidcommon.la \
- -lboost_program_options
-
-posix_qpidd_src = posix/QpiddBroker.cpp
-
-sbin_PROGRAMS = qpidd
-qpidd_SOURCES = qpidd.cpp qpidd.h $(posix_qpidd_src)
-
-## Platform specific code.
-
-# Posix-specific code
-libqpidcommon_la_SOURCES += \
- qpid/log/posix/SinkOptions.cpp \
- qpid/sys/posix/IOHandle.cpp \
- qpid/sys/posix/BSDSocket.cpp \
- qpid/sys/posix/BSDSocket.h \
- qpid/sys/posix/SocketAddress.cpp \
- qpid/sys/posix/AsynchIO.cpp \
- qpid/sys/posix/FileSysDir.cpp \
- qpid/sys/posix/LockFile.cpp \
- qpid/sys/posix/MemoryMappedFile.cpp \
- qpid/sys/posix/Time.cpp \
- qpid/sys/posix/Thread.cpp \
- qpid/sys/posix/Shlib.cpp \
- qpid/sys/posix/MemStat.cpp \
- qpid/sys/posix/Mutex.cpp \
- qpid/sys/posix/Fork.cpp \
- qpid/sys/posix/StrError.cpp \
- qpid/sys/posix/PollableCondition.cpp \
- qpid/sys/posix/PidFile.h \
- qpid/sys/posix/PipeHandle.cpp \
- qpid/log/posix/SinkOptions.h \
- qpid/sys/posix/Fork.h
-
-nobase_include_HEADERS += \
- ../include/qpid/sys/posix/Condition.h \
- ../include/qpid/sys/posix/IntegerTypes.h \
- ../include/qpid/sys/posix/Mutex.h \
- ../include/qpid/sys/posix/PrivatePosix.h \
- ../include/qpid/sys/posix/Time.h \
- ../include/qpid/sys/posix/check.h
-
-if USE_EPOLL
- poller = qpid/sys/epoll/EpollPoller.cpp
-endif
-
-if USE_POLL
- poller = qpid/sys/posix/PosixPoller.cpp
-endif
-
-if USE_ECF
- poller = qpid/sys/solaris/ECFPoller.cpp
-endif
-
-if SUNOS
- systeminfo = qpid/sys/solaris/SystemInfo.cpp
-else
- systeminfo = qpid/sys/posix/SystemInfo.cpp
-endif
-
-libqpidcommon_la_SOURCES += $(poller) $(systeminfo)
-
-posix_broker_src = \
- qpid/broker/posix/BrokerDefaults.cpp \
- qpid/broker/posix/SocketFDPlugin.cpp
-
-
-lib_LTLIBRARIES = libqpidtypes.la libqpidcommon.la libqpidbroker.la libqpidclient.la libqpidmessaging.la
-
-
-# Definitions for client and daemon plugins
-PLUGINLDFLAGS=-no-undefined -module -avoid-version
-confdir=$(sysconfdir)/qpid
-dmoduleexecdir=$(libdir)/qpid/daemon
-cmoduleexecdir=$(libdir)/qpid/client
-dmoduleexec_LTLIBRARIES =
-cmoduleexec_LTLIBRARIES =
-
-include ha.mk
-include qmf.mk
-include qmfc.mk
-if HAVE_XML
-include xml.mk
-endif
-include legacystore.mk
-
-if RDMA
-
-# RDMA (Infiniband) protocol code
-librdmawrap_la_SOURCES = \
- qpid/sys/rdma/rdma_exception.h \
- qpid/sys/rdma/rdma_factories.cpp \
- qpid/sys/rdma/rdma_factories.h \
- qpid/sys/rdma/RdmaIO.cpp \
- qpid/sys/rdma/RdmaIO.h \
- qpid/sys/rdma/rdma_wrap.cpp \
- qpid/sys/rdma/rdma_wrap.h
-librdmawrap_la_LIBADD = \
- libqpidcommon.la \
- -lrdmacm \
- -libverbs
-librdmawrap_la_CXXFLAGS = \
- $(AM_CXXFLAGS) -Wno-missing-field-initializers
-lib_LTLIBRARIES += \
- librdmawrap.la
-RDMAWRAP_VERSION_INFO = 2:0:0
-librdmawrap_la_LDFLAGS = -version-info $(RDMAWRAP_VERSION_INFO) -no-undefined
-
-rdma_la_SOURCES = \
- qpid/sys/RdmaIOPlugin.cpp
-rdma_la_LIBADD = \
- libqpidbroker.la \
- librdmawrap.la \
- -libverbs
-rdma_la_LDFLAGS = $(PLUGINLDFLAGS)
-rdma_la_CXXFLAGS = \
- $(AM_CXXFLAGS) -Wno-missing-field-initializers -D_IN_QPID_BROKER
-dmoduleexec_LTLIBRARIES += \
- rdma.la
-
-rdmaconnector_la_SOURCES = \
- qpid/client/RdmaConnector.cpp
-rdmaconnector_la_LIBADD = \
- libqpidclient.la \
- librdmawrap.la \
- -libverbs
-rdmaconnector_la_LDFLAGS = $(PLUGINLDFLAGS)
-rdmaconnector_la_CXXFLAGS = \
- $(AM_CXXFLAGS) -Wno-missing-field-initializers
-cmoduleexec_LTLIBRARIES += \
- rdmaconnector.la
-
-# RDMA test/sample programs
-noinst_PROGRAMS = RdmaServer RdmaClient
-RdmaServer_SOURCES = qpid/sys/rdma/RdmaServer.cpp
-RdmaServer_LDADD = \
- librdmawrap.la libqpidcommon.la
-RdmaClient_SOURCES = qpid/sys/rdma/RdmaClient.cpp
-RdmaClient_CXXFLAGS = \
- $(AM_CXXFLAGS) -Wno-missing-field-initializers
-RdmaClient_LDADD = \
- librdmawrap.la libqpidcommon.la
-
-endif
-
-EXTRA_DIST +=\
- CMakeLists.txt \
- config.h.cmake \
- amqp.cmake \
- rdma.cmake \
- legacystore.cmake \
- managementgen.cmake \
- rubygen.cmake \
- versions.cmake \
- finddb.cmake \
- $(rgen_amqp_0_10_srcs) \
- qpid/amqp_0_10/apply.h \
- qpid/amqp_0_10/built_in_types.h \
- qpid/amqp_0_10/complex_types.cpp \
- qpid/amqp_0_10/Array.h \
- qpid/amqp_0_10/Array.cpp \
- qpid/amqp_0_10/Body.h \
- qpid/amqp_0_10/Command.h \
- qpid/amqp_0_10/CommmandPacker.h \
- qpid/amqp_0_10/Control.h \
- qpid/amqp_0_10/Header.h \
- qpid/amqp_0_10/Header.cpp \
- qpid/amqp_0_10/FrameHeader.h \
- qpid/amqp_0_10/FrameHeader.cpp \
- qpid/amqp_0_10/Holder.h \
- qpid/amqp_0_10/Codec.h \
- qpid/amqp_0_10/Packer.h \
- qpid/amqp_0_10/Decimal.h \
- qpid/amqp_0_10/SerializableString.h \
- qpid/amqp_0_10/Map.h \
- qpid/amqp_0_10/Map.cpp \
- qpid/amqp_0_10/Struct.h \
- qpid/amqp_0_10/Struct32.h \
- qpid/amqp_0_10/Struct32.cpp \
- qpid/amqp_0_10/Unit.h \
- qpid/amqp_0_10/Unit.cpp \
- qpid/amqp_0_10/UnitHandler.h \
- qpid/amqp_0_10/UnknownType.h \
- qpid/amqp_0_10/UnknownType.cpp \
- qpid/amqp_0_10/UnknownStruct.h \
- qpid/amqp_0_10/UnknownStruct.cpp \
- qpid/store
-
-libqpidcommon_la_LIBADD = \
- libqpidtypes.la \
- -lboost_program_options \
- -luuid \
- -lpthread \
- $(LIB_DLOPEN) \
- $(LIB_CLOCK_GETTIME)
-
-libqpidcommon_la_SOURCES += \
- $(rgen_framing_srcs) \
- $(platform_src) \
- qpid/Address.cpp \
- qpid/DataDir.cpp \
- qpid/DataDir.h \
- qpid/DisableExceptionLogging.h \
- qpid/Exception.cpp \
- qpid/Modules.cpp \
- qpid/Modules.h \
- qpid/Options.cpp \
- qpid/Plugin.cpp \
- qpid/Plugin.h \
- qpid/RefCounted.h \
- qpid/RefCountedBuffer.cpp \
- qpid/RefCountedBuffer.h \
- qpid/BufferRef.h \
- qpid/Sasl.h \
- qpid/SaslFactory.cpp \
- qpid/SaslFactory.h \
- qpid/SaslServer.h \
- qpid/NullSaslServer.h \
- qpid/NullSaslServer.cpp \
- qpid/Serializer.h \
- qpid/SessionId.cpp \
- qpid/SessionState.cpp \
- qpid/SessionState.h \
- qpid/SessionState.h \
- qpid/SharedObject.h \
- qpid/StringUtils.cpp \
- qpid/StringUtils.h \
- qpid/Url.cpp \
- qpid/UrlArray.cpp \
- qpid/UrlArray.h \
- qpid/Version.h \
- qpid/amqp_0_10/Exception.h \
- qpid/amqp_0_10/SessionHandler.cpp \
- qpid/amqp_0_10/SessionHandler.h \
- qpid/amqp_0_10/apply.h \
- qpid/assert.cpp qpid/assert.h \
- qpid/assert.h \
- qpid/framing/AMQBody.cpp \
- qpid/framing/AMQBody.h \
- qpid/framing/AMQContentBody.cpp \
- qpid/framing/AMQContentBody.h \
- qpid/framing/AMQDataBlock.h \
- qpid/framing/AMQFrame.cpp \
- qpid/framing/AMQFrame.h \
- qpid/framing/AMQHeaderBody.cpp \
- qpid/framing/AMQHeaderBody.h \
- qpid/framing/AMQHeartbeatBody.cpp \
- qpid/framing/AMQHeartbeatBody.h \
- qpid/framing/AMQMethodBody.cpp \
- qpid/framing/AMQMethodBody.h \
- qpid/framing/AMQP_HighestVersion.h \
- qpid/framing/AMQP_HighestVersion.h \
- qpid/framing/AccumulatedAck.cpp \
- qpid/framing/AccumulatedAck.h \
- qpid/framing/Array.cpp \
- qpid/framing/BodyFactory.h \
- qpid/framing/Buffer.cpp \
- qpid/framing/ResizableBuffer.h \
- qpid/framing/ChannelHandler.h \
- qpid/framing/Endian.cpp \
- qpid/framing/Endian.h \
- qpid/framing/FieldTable.cpp \
- qpid/framing/FieldValue.cpp \
- qpid/framing/FrameDecoder.cpp \
- qpid/framing/FrameDecoder.h \
- qpid/framing/FrameDefaultVisitor.h \
- qpid/framing/FrameHandler.h \
- qpid/framing/FrameSet.cpp \
- qpid/framing/FrameSet.h \
- qpid/framing/Handler.h \
- qpid/framing/HeaderProperties.h \
- qpid/framing/InitiationHandler.h \
- qpid/framing/InputHandler.h \
- qpid/framing/Invoker.h \
- qpid/framing/IsInSequenceSet.h \
- qpid/framing/List.cpp \
- qpid/framing/MethodBodyFactory.h \
- qpid/framing/MethodContent.h \
- qpid/framing/ModelMethod.h \
- qpid/framing/ProtocolInitiation.cpp \
- qpid/framing/ProtocolInitiation.h \
- qpid/framing/ProtocolVersion.cpp \
- qpid/framing/Proxy.cpp \
- qpid/framing/Proxy.h \
- qpid/framing/SendContent.cpp \
- qpid/framing/SendContent.h \
- qpid/framing/SequenceNumber.cpp \
- qpid/framing/SequenceNumberSet.cpp \
- qpid/framing/SequenceNumberSet.h \
- qpid/framing/SequenceSet.cpp \
- qpid/framing/TransferContent.cpp \
- qpid/framing/TransferContent.h \
- qpid/framing/TypeFilter.h \
- qpid/framing/Uuid.cpp \
- qpid/framing/Visitor.h \
- qpid/framing/amqp_framing.h \
- qpid/framing/frame_functors.h \
- qpid/framing/variant.h \
- qpid/log/Helpers.h \
- qpid/log/Logger.cpp \
- qpid/log/Options.cpp \
- qpid/log/OstreamOutput.cpp \
- qpid/log/OstreamOutput.h \
- qpid/log/Selector.cpp \
- qpid/log/Statement.cpp \
- qpid/management/Buffer.cpp \
- qpid/management/ConnectionSettings.cpp \
- qpid/management/Manageable.cpp \
- qpid/management/ManagementObject.cpp \
- qpid/management/Mutex.cpp \
- qpid/memory.h \
- qpid/pointer_to_other.h \
- qpid/ptr_map.h \
- qpid/sys/AggregateOutput.cpp \
- qpid/sys/AggregateOutput.h \
- qpid/sys/AsynchIO.h \
- qpid/sys/AsynchIOHandler.cpp \
- qpid/sys/AsynchIOHandler.h \
- qpid/sys/AtomicCount.h \
- qpid/sys/AtomicValue.h \
- qpid/sys/AtomicValue_gcc.h \
- qpid/sys/AtomicValue_mutex.h \
- qpid/sys/BlockingQueue.h \
- qpid/sys/Codec.h \
- qpid/sys/ConnectionCodec.h \
- qpid/sys/ConnectionInputHandler.h \
- qpid/sys/ConnectionInputHandlerFactory.h \
- qpid/sys/ConnectionOutputHandler.h \
- qpid/sys/CopyOnWriteArray.h \
- qpid/sys/DeletionManager.h \
- qpid/sys/DispatchHandle.cpp \
- qpid/sys/DispatchHandle.h \
- qpid/sys/Dispatcher.cpp \
- qpid/sys/Dispatcher.h \
- qpid/sys/FileSysDir.h \
- qpid/sys/Fork.h \
- qpid/sys/LockFile.h \
- qpid/sys/LockPtr.h \
- qpid/sys/MemoryMappedFile.h \
- qpid/sys/MemStat.h \
- qpid/sys/OutputControl.h \
- qpid/sys/OutputTask.h \
- qpid/sys/PipeHandle.h \
- qpid/sys/PollableCondition.h \
- qpid/sys/PollableQueue.h \
- qpid/sys/Poller.h \
- qpid/sys/Probes.h \
- qpid/sys/regex.h \
- qpid/sys/Runnable.cpp \
- qpid/sys/ScopedIncrement.h \
- qpid/sys/SecurityLayer.h \
- qpid/sys/SecuritySettings.h \
- qpid/sys/Semaphore.h \
- qpid/sys/Shlib.cpp \
- qpid/sys/Shlib.h \
- qpid/sys/ShutdownHandler.h \
- qpid/sys/Socket.h \
- qpid/sys/SocketAddress.h \
- qpid/sys/StateMonitor.h \
- qpid/sys/Timer.cpp \
- qpid/sys/Timer.h \
- qpid/sys/TimerWarnings.cpp \
- qpid/sys/TimerWarnings.h \
- qpid/sys/Waitable.h \
- qpid/sys/uuid.h \
- qpid/sys/unordered_map.h \
- qpid/amqp_0_10/CodecsInternal.h \
- qpid/amqp_0_10/Codecs.cpp \
- qpid/amqp/CharSequence.h \
- qpid/amqp/CharSequence.cpp \
- qpid/amqp/Codec.h \
- qpid/amqp/Constructor.h \
- qpid/amqp/Decoder.h \
- qpid/amqp/Decoder.cpp \
- qpid/amqp/Descriptor.h \
- qpid/amqp/Descriptor.cpp \
- qpid/amqp/descriptors.h \
- qpid/amqp/Encoder.h \
- qpid/amqp/Encoder.cpp \
- qpid/amqp/ListReader.h \
- qpid/amqp/LoggingReader.h \
- qpid/amqp/MapHandler.h \
- qpid/amqp/MapEncoder.h \
- qpid/amqp/MapEncoder.cpp \
- qpid/amqp/MapSizeCalculator.h \
- qpid/amqp/MapSizeCalculator.cpp \
- qpid/amqp/MapBuilder.h \
- qpid/amqp/MapBuilder.cpp \
- qpid/amqp/MapReader.h \
- qpid/amqp/MapReader.cpp \
- qpid/amqp/MessageEncoder.h \
- qpid/amqp/MessageEncoder.cpp \
- qpid/amqp/MessageId.h \
- qpid/amqp/MessageId.cpp \
- qpid/amqp/MessageReader.h \
- qpid/amqp/MessageReader.cpp \
- qpid/amqp/Reader.h \
- qpid/amqp/Sasl.h \
- qpid/amqp/Sasl.cpp \
- qpid/amqp/SaslClient.h \
- qpid/amqp/SaslClient.cpp \
- qpid/amqp/SaslServer.h \
- qpid/amqp/SaslServer.cpp \
- qpid/amqp/typecodes.h
-
-#libqpidcommon is not really the 'right' place for the Transport
-#interface, which is only used in 1.0 impl of messaging API, but this
-#lets the 1.0 SSL support be included in the existing sslconnector lib
-#which in turn addresses common ssl needs in qpidclient and
-#qpidmessaging:
-libqpidcommon_la_SOURCES += \
- qpid/messaging/amqp/Transport.h \
- qpid/messaging/amqp/Transport.cpp \
- qpid/messaging/amqp/TransportContext.h
-
-if HAVE_SASL
-libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.h
-libqpidcommon_la_SOURCES += qpid/sys/cyrus/CyrusSecurityLayer.cpp
-libqpidcommon_la_LIBADD += -lsasl2
-endif
-
-QPIDCOMMON_VERSION_INFO = 2:0:0
-libqpidcommon_la_LDFLAGS=-version-info $(QPIDCOMMON_VERSION_INFO)
-
-libqpidbroker_la_LIBADD = libqpidcommon.la
-libqpidbroker_la_SOURCES = \
- $(mgen_broker_cpp) \
- $(posix_broker_src) \
- qpid/acl/Acl.cpp \
- qpid/acl/Acl.h \
- qpid/acl/AclConnectionCounter.cpp \
- qpid/acl/AclConnectionCounter.h \
- qpid/acl/AclData.cpp \
- qpid/acl/AclData.h \
- qpid/acl/AclPlugin.cpp \
- qpid/acl/AclReader.cpp \
- qpid/acl/AclReader.h \
- qpid/acl/AclResourceCounter.cpp \
- qpid/acl/AclResourceCounter.h \
- qpid/acl/AclTopicMatch.h \
- qpid/acl/AclValidator.cpp \
- qpid/acl/AclValidator.h \
- qpid/amqp_0_10/Connection.cpp \
- qpid/amqp_0_10/Connection.h \
- qpid/broker/AclModule.h \
- qpid/broker/Bridge.cpp \
- qpid/broker/Bridge.h \
- qpid/broker/Broker.cpp \
- qpid/broker/Broker.h \
- qpid/broker/BrokerImportExport.h \
- qpid/broker/amqp_0_10/Connection.cpp \
- qpid/broker/amqp_0_10/Connection.h \
- qpid/broker/ConnectionHandler.cpp \
- qpid/broker/ConnectionHandler.h \
- qpid/broker/Consumer.h \
- qpid/broker/Credit.h \
- qpid/broker/Credit.cpp \
- qpid/broker/ConsumerFactory.h \
- qpid/broker/Connection.h \
- qpid/broker/ConnectionObserver.h \
- qpid/broker/ConnectionObservers.h \
- qpid/broker/ConfigurationObserver.h \
- qpid/broker/ConfigurationObservers.h \
- qpid/broker/Daemon.cpp \
- qpid/broker/Daemon.h \
- qpid/broker/Deliverable.h \
- qpid/broker/DeliverableMessage.cpp \
- qpid/broker/DeliverableMessage.h \
- qpid/broker/DeliveryId.h \
- qpid/broker/DeliveryRecord.cpp \
- qpid/broker/DeliveryRecord.h \
- qpid/broker/DirectExchange.cpp \
- qpid/broker/DirectExchange.h \
- qpid/broker/DtxAck.cpp \
- qpid/broker/DtxAck.h \
- qpid/broker/DtxBuffer.cpp \
- qpid/broker/DtxBuffer.h \
- qpid/broker/DtxManager.cpp \
- qpid/broker/DtxManager.h \
- qpid/broker/DtxTimeout.cpp \
- qpid/broker/DtxTimeout.h \
- qpid/broker/DtxWorkRecord.cpp \
- qpid/broker/DtxWorkRecord.h \
- qpid/broker/Exchange.cpp \
- qpid/broker/Exchange.h \
- qpid/broker/ExchangeRegistry.cpp \
- qpid/broker/ExchangeRegistry.h \
- qpid/broker/ExpiryPolicy.cpp \
- qpid/broker/ExpiryPolicy.h \
- qpid/broker/Fairshare.h \
- qpid/broker/Fairshare.cpp \
- qpid/broker/FanOutExchange.cpp \
- qpid/broker/FanOutExchange.h \
- qpid/broker/FedOps.h \
- qpid/broker/HandlerImpl.h \
- qpid/broker/HeadersExchange.cpp \
- qpid/broker/HeadersExchange.h \
- qpid/broker/AsyncCompletion.h \
- qpid/broker/IngressCompletion.h \
- qpid/broker/IngressCompletion.cpp \
- qpid/broker/IndexedDeque.h \
- qpid/broker/Link.cpp \
- qpid/broker/Link.h \
- qpid/broker/LinkRegistry.cpp \
- qpid/broker/LinkRegistry.h \
- qpid/broker/Lvq.h \
- qpid/broker/Lvq.cpp \
- qpid/broker/Message.cpp \
- qpid/broker/Message.h \
- qpid/broker/MessageAdapter.cpp \
- qpid/broker/MessageAdapter.h \
- qpid/broker/MessageBuilder.cpp \
- qpid/broker/MessageBuilder.h \
- qpid/broker/MessageDeque.h \
- qpid/broker/MessageDeque.cpp \
- qpid/broker/MessageInterceptor.h \
- qpid/broker/MessageMap.h \
- qpid/broker/MessageMap.cpp \
- qpid/broker/Messages.h \
- qpid/broker/MessageStore.h \
- qpid/broker/MessageStoreModule.cpp \
- qpid/broker/MessageStoreModule.h \
- qpid/broker/PagedQueue.h \
- qpid/broker/PagedQueue.cpp \
- qpid/broker/PriorityQueue.h \
- qpid/broker/PriorityQueue.cpp \
- qpid/broker/Protocol.h \
- qpid/broker/Protocol.cpp \
- qpid/broker/NameGenerator.cpp \
- qpid/broker/NameGenerator.h \
- qpid/broker/NullMessageStore.cpp \
- qpid/broker/NullMessageStore.h \
- qpid/broker/ObjectFactory.h \
- qpid/broker/ObjectFactory.cpp \
- qpid/broker/Observers.h \
- qpid/broker/OwnershipToken.h \
- qpid/broker/Persistable.h \
- qpid/broker/PersistableConfig.h \
- qpid/broker/PersistableExchange.h \
- qpid/broker/PersistableMessage.cpp \
- qpid/broker/PersistableMessage.h \
- qpid/broker/PersistableObject.h \
- qpid/broker/PersistableObject.cpp \
- qpid/broker/PersistableQueue.h \
- qpid/broker/Queue.cpp \
- qpid/broker/Queue.h \
- qpid/broker/QueueBindings.cpp \
- qpid/broker/QueueBindings.h \
- qpid/broker/QueueCleaner.cpp \
- qpid/broker/QueueCleaner.h \
- qpid/broker/QueueCursor.h \
- qpid/broker/QueueCursor.cpp \
- qpid/broker/QueueDepth.h \
- qpid/broker/QueueDepth.cpp \
- qpid/broker/QueueFactory.h \
- qpid/broker/QueueFactory.cpp \
- qpid/broker/QueueSettings.h \
- qpid/broker/QueueSettings.cpp \
- qpid/broker/QueueListeners.cpp \
- qpid/broker/QueueListeners.h \
- qpid/broker/QueueObserver.h \
- qpid/broker/QueueRegistry.cpp \
- qpid/broker/QueueRegistry.h \
- qpid/broker/QueuedMessage.cpp \
- qpid/broker/QueuedMessage.h \
- qpid/broker/QueueFlowLimit.h \
- qpid/broker/QueueFlowLimit.cpp \
- qpid/broker/LossyQueue.h \
- qpid/broker/LossyQueue.cpp \
- qpid/broker/RecoverableConfig.h \
- qpid/broker/RecoverableExchange.h \
- qpid/broker/RecoverableMessage.h \
- qpid/broker/RecoverableQueue.h \
- qpid/broker/RecoverableTransaction.h \
- qpid/broker/RecoveredDequeue.cpp \
- qpid/broker/RecoveredDequeue.h \
- qpid/broker/RecoveredEnqueue.cpp \
- qpid/broker/RecoveredEnqueue.h \
- qpid/broker/RecoveryManager.h \
- qpid/broker/RecoveryManagerImpl.cpp \
- qpid/broker/RecoveryManagerImpl.h \
- qpid/broker/RecoverableMessageImpl.h \
- qpid/broker/RetryList.cpp \
- qpid/broker/RetryList.h \
- qpid/broker/SaslAuthenticator.cpp \
- qpid/broker/SaslAuthenticator.h \
- qpid/broker/SecureConnection.cpp \
- qpid/broker/SecureConnection.h \
- qpid/broker/SecureConnectionFactory.cpp \
- qpid/broker/SecureConnectionFactory.h \
- qpid/broker/Selector.cpp \
- qpid/broker/Selector.h \
- qpid/broker/SelectorExpression.cpp \
- qpid/broker/SelectorExpression.h \
- qpid/broker/SelectorToken.cpp \
- qpid/broker/SelectorToken.h \
- qpid/broker/SelectorValue.cpp \
- qpid/broker/SelectorValue.h \
- qpid/broker/SelfDestructQueue.h \
- qpid/broker/SelfDestructQueue.cpp \
- qpid/broker/SemanticState.cpp \
- qpid/broker/SemanticState.h \
- qpid/broker/SessionAdapter.cpp \
- qpid/broker/SessionAdapter.h \
- qpid/broker/SessionAdapter.h \
- qpid/broker/SessionContext.h \
- qpid/broker/SessionHandler.cpp \
- qpid/broker/SessionHandler.h \
- qpid/broker/SessionManager.cpp \
- qpid/broker/SessionManager.h \
- qpid/broker/SessionManager.h \
- qpid/broker/SessionOutputException.h \
- qpid/broker/SessionState.cpp \
- qpid/broker/SessionState.h \
- qpid/broker/SignalHandler.cpp \
- qpid/broker/SignalHandler.h \
- qpid/broker/System.cpp \
- qpid/broker/System.h \
- qpid/broker/ThresholdAlerts.cpp \
- qpid/broker/ThresholdAlerts.h \
- qpid/broker/TopicExchange.cpp \
- qpid/broker/TopicExchange.h \
- qpid/broker/TopicKeyNode.h \
- qpid/broker/TransactionalStore.h \
- qpid/broker/TxAccept.cpp \
- qpid/broker/TxAccept.h \
- qpid/broker/TxBuffer.cpp \
- qpid/broker/TxBuffer.h \
- qpid/broker/TxOp.h \
- qpid/broker/Vhost.cpp \
- qpid/broker/Vhost.h \
- qpid/broker/MessageDistributor.h \
- qpid/broker/FifoDistributor.h \
- qpid/broker/FifoDistributor.cpp \
- qpid/broker/MessageGroupManager.cpp \
- qpid/broker/MessageGroupManager.h \
- qpid/broker/amqp_0_10/MessageTransfer.h \
- qpid/broker/amqp_0_10/MessageTransfer.cpp \
- qpid/management/ManagementAgent.cpp \
- qpid/management/ManagementAgent.h \
- qpid/management/ManagementDirectExchange.cpp \
- qpid/management/ManagementDirectExchange.h \
- qpid/management/ManagementTopicExchange.cpp \
- qpid/management/ManagementTopicExchange.h \
- qpid/sys/TCPIOPlugin.cpp \
- qpid/sys/SocketTransport.cpp \
- qpid/sys/SocketTransport.h \
- qpid/sys/TransportFactory.h
-
-QPIDBROKER_VERSION_INFO = 2:0:0
-libqpidbroker_la_LDFLAGS = -version-info $(QPIDBROKER_VERSION_INFO)
-
-if HAVE_PROTON
-
-dmoduleexec_LTLIBRARIES += amqp.la
-amqp_la_LIBADD = libqpidcommon.la
-amqp_la_SOURCES = \
- qpid/broker/amqp/Authorise.h \
- qpid/broker/amqp/Authorise.cpp \
- qpid/broker/amqp/BrokerContext.h \
- qpid/broker/amqp/BrokerContext.cpp \
- qpid/broker/amqp/Connection.h \
- qpid/broker/amqp/Connection.cpp \
- qpid/broker/amqp/DataReader.h \
- qpid/broker/amqp/DataReader.cpp \
- qpid/broker/amqp/Domain.h \
- qpid/broker/amqp/Domain.cpp \
- qpid/broker/amqp/Exception.h \
- qpid/broker/amqp/Exception.cpp \
- qpid/broker/amqp/Filter.h \
- qpid/broker/amqp/Filter.cpp \
- qpid/broker/amqp/Header.h \
- qpid/broker/amqp/Header.cpp \
- qpid/broker/amqp/Incoming.h \
- qpid/broker/amqp/Incoming.cpp \
- qpid/broker/amqp/Interconnect.h \
- qpid/broker/amqp/Interconnect.cpp \
- qpid/broker/amqp/Interconnects.h \
- qpid/broker/amqp/Interconnects.cpp \
- qpid/broker/amqp/ManagedConnection.h \
- qpid/broker/amqp/ManagedConnection.cpp \
- qpid/broker/amqp/ManagedSession.h \
- qpid/broker/amqp/ManagedSession.cpp \
- qpid/broker/amqp/ManagedIncomingLink.h \
- qpid/broker/amqp/ManagedIncomingLink.cpp \
- qpid/broker/amqp/ManagedOutgoingLink.h \
- qpid/broker/amqp/ManagedOutgoingLink.cpp \
- qpid/broker/amqp/Message.h \
- qpid/broker/amqp/Message.cpp \
- qpid/broker/amqp/NodeProperties.h \
- qpid/broker/amqp/NodeProperties.cpp \
- qpid/broker/amqp/Outgoing.h \
- qpid/broker/amqp/Outgoing.cpp \
- qpid/broker/amqp/ProtocolPlugin.cpp \
- qpid/broker/amqp/Relay.h \
- qpid/broker/amqp/Relay.cpp \
- qpid/broker/amqp/Sasl.h \
- qpid/broker/amqp/Sasl.cpp \
- qpid/broker/amqp/SaslClient.h \
- qpid/broker/amqp/SaslClient.cpp \
- qpid/broker/amqp/Session.h \
- qpid/broker/amqp/Session.cpp \
- qpid/broker/amqp/Topic.h \
- qpid/broker/amqp/Topic.cpp \
- qpid/broker/amqp/Translation.h \
- qpid/broker/amqp/Translation.cpp
-
-amqp_la_CXXFLAGS=$(AM_CXXFLAGS) $(BROKER_CXXFLAGS) $(PROTON_CFLAGS)
-amqp_la_LDFLAGS = $(PLUGINLDFLAGS) $(PROTON_LIBS)
-
-cmoduleexec_LTLIBRARIES += amqpc.la
-amqpc_la_LIBADD = libqpidcommon.la libqpidclient.la libqpidmessaging.la libqpidtypes.la
-amqpc_la_SOURCES = \
- qpid/messaging/amqp/AddressHelper.h \
- qpid/messaging/amqp/AddressHelper.cpp \
- qpid/messaging/amqp/ConnectionContext.h \
- qpid/messaging/amqp/ConnectionContext.cpp \
- qpid/messaging/amqp/ConnectionHandle.h \
- qpid/messaging/amqp/ConnectionHandle.cpp \
- qpid/messaging/amqp/DriverImpl.h \
- qpid/messaging/amqp/DriverImpl.cpp \
- qpid/messaging/amqp/ReceiverContext.h \
- qpid/messaging/amqp/ReceiverContext.cpp \
- qpid/messaging/amqp/ReceiverHandle.h \
- qpid/messaging/amqp/ReceiverHandle.cpp \
- qpid/messaging/amqp/Sasl.h \
- qpid/messaging/amqp/Sasl.cpp \
- qpid/messaging/amqp/SenderContext.h \
- qpid/messaging/amqp/SenderContext.cpp \
- qpid/messaging/amqp/SenderHandle.h \
- qpid/messaging/amqp/SenderHandle.cpp \
- qpid/messaging/amqp/SessionContext.h \
- qpid/messaging/amqp/SessionContext.cpp \
- qpid/messaging/amqp/SessionHandle.h \
- qpid/messaging/amqp/SessionHandle.cpp \
- qpid/messaging/amqp/TcpTransport.h \
- qpid/messaging/amqp/TcpTransport.cpp
-
-amqpc_la_CXXFLAGS=$(AM_CXXFLAGS) $(PROTON_CFLAGS)
-amqpc_la_LDFLAGS = $(PLUGINLDFLAGS) $(PROTON_LIBS)
-
-endif #HAVE_PROTON
-
-libqpidclient_la_LIBADD = libqpidcommon.la -luuid
-
-libqpidclient_la_SOURCES = \
- $(rgen_client_srcs) \
- qpid/client/Bounds.cpp \
- qpid/client/Bounds.h \
- qpid/client/ChainableFrameHandler.h \
- qpid/client/Completion.cpp \
- qpid/client/CompletionImpl.h \
- qpid/client/Connection.cpp \
- qpid/client/ConnectionAccess.h \
- qpid/client/ConnectionHandler.cpp \
- qpid/client/ConnectionHandler.h \
- qpid/client/ConnectionImpl.cpp \
- qpid/client/ConnectionImpl.h \
- qpid/client/ConnectionSettings.cpp \
- qpid/client/Connector.cpp \
- qpid/client/Connector.h \
- qpid/client/Demux.cpp \
- qpid/client/Demux.h \
- qpid/client/Dispatcher.cpp \
- qpid/client/Dispatcher.h \
- qpid/client/Execution.h \
- qpid/client/FailoverListener.cpp \
- qpid/client/FailoverManager.cpp \
- qpid/client/Future.cpp \
- qpid/client/FutureCompletion.cpp \
- qpid/client/FutureResult.cpp \
- qpid/client/LoadPlugins.h \
- qpid/client/LoadPlugins.cpp \
- qpid/client/LocalQueue.cpp \
- qpid/client/LocalQueueImpl.cpp \
- qpid/client/LocalQueueImpl.h \
- qpid/client/Message.cpp \
- qpid/client/MessageImpl.cpp \
- qpid/client/MessageImpl.h \
- qpid/client/MessageListener.cpp \
- qpid/client/MessageReplayTracker.cpp \
- qpid/client/PrivateImplRef.h \
- qpid/client/QueueOptions.cpp \
- qpid/client/Results.cpp \
- qpid/client/Results.h \
- qpid/client/SessionBase_0_10.cpp \
- qpid/client/SessionBase_0_10Access.h \
- qpid/client/SessionImpl.cpp \
- qpid/client/SessionImpl.h \
- qpid/client/StateManager.cpp \
- qpid/client/StateManager.h \
- qpid/client/Subscription.cpp \
- qpid/client/SubscriptionImpl.cpp \
- qpid/client/SubscriptionImpl.h \
- qpid/client/SubscriptionManager.cpp \
- qpid/client/SubscriptionManagerImpl.cpp \
- qpid/client/SubscriptionManagerImpl.h \
- qpid/client/TCPConnector.cpp \
- qpid/client/TCPConnector.h
-
-QPIDCLIENT_VERSION_INFO = 2:0:0
-libqpidclient_la_LDFLAGS = -version-info $(QPIDCLIENT_VERSION_INFO)
-
-if SSL
-include ssl.mk
-endif
-
-libqpidtypes_la_LIBADD= -luuid
-libqpidtypes_la_SOURCES= \
- qpid/types/Exception.cpp \
- qpid/types/Uuid.cpp \
- qpid/types/Variant.cpp \
- ../include/qpid/types/ImportExport.h
-
-QPIDTYPES_VERSION_INFO = 1:0:0
-libqpidtypes_la_LDFLAGS = -version-info $(QPIDTYPES_VERSION_INFO)
-
-libqpidmessaging_la_LIBADD = libqpidclient.la libqpidtypes.la
-libqpidmessaging_la_SOURCES = \
- qpid/messaging/Address.cpp \
- qpid/messaging/AddressImpl.h \
- qpid/messaging/AddressParser.h \
- qpid/messaging/AddressParser.cpp \
- qpid/messaging/Connection.cpp \
- qpid/messaging/ConnectionOptions.h \
- qpid/messaging/ConnectionOptions.cpp \
- qpid/messaging/Duration.cpp \
- qpid/messaging/exceptions.cpp \
- qpid/messaging/Message.cpp \
- qpid/messaging/MessageImpl.h \
- qpid/messaging/MessageImpl.cpp \
- qpid/messaging/PrivateImplRef.h \
- qpid/messaging/ProtocolRegistry.h \
- qpid/messaging/ProtocolRegistry.cpp \
- qpid/messaging/Sender.cpp \
- qpid/messaging/Receiver.cpp \
- qpid/messaging/Session.cpp \
- qpid/messaging/ConnectionImpl.h \
- qpid/messaging/SenderImpl.h \
- qpid/messaging/ReceiverImpl.h \
- qpid/messaging/SessionImpl.h \
- qpid/messaging/FailoverUpdates.cpp \
- qpid/messaging/amqp/EncodedMessage.h \
- qpid/messaging/amqp/EncodedMessage.cpp \
- qpid/client/amqp0_10/AcceptTracker.h \
- qpid/client/amqp0_10/AcceptTracker.cpp \
- qpid/client/amqp0_10/AddressResolution.h \
- qpid/client/amqp0_10/AddressResolution.cpp \
- qpid/client/amqp0_10/ConnectionImpl.h \
- qpid/client/amqp0_10/ConnectionImpl.cpp \
- qpid/client/amqp0_10/IncomingMessages.h \
- qpid/client/amqp0_10/IncomingMessages.cpp \
- qpid/client/amqp0_10/MessageSink.h \
- qpid/client/amqp0_10/MessageSource.h \
- qpid/client/amqp0_10/OutgoingMessage.h \
- qpid/client/amqp0_10/OutgoingMessage.cpp \
- qpid/client/amqp0_10/ReceiverImpl.h \
- qpid/client/amqp0_10/ReceiverImpl.cpp \
- qpid/client/amqp0_10/SessionImpl.h \
- qpid/client/amqp0_10/SessionImpl.cpp \
- qpid/client/amqp0_10/SenderImpl.h \
- qpid/client/amqp0_10/SenderImpl.cpp
-
-QPIDMESSAGING_VERSION_INFO = 2:0:0
-libqpidmessaging_la_LDFLAGS = -version-info $(QPIDMESSAGING_VERSION_INFO)
-
-# NOTE: only public header files (which should be in ../include)
-# should go in this list. Private headers should go in the SOURCES
-# list for one of the libraries or executables that includes it.
-# Also included are the swig descriptor files.
-
-nobase_include_HEADERS += \
- ../include/qpid/Address.h \
- ../include/qpid/CommonImportExport.h \
- ../include/qpid/Exception.h \
- ../include/qpid/ImportExport.h \
- ../include/qpid/InlineAllocator.h \
- ../include/qpid/InlineVector.h \
- ../include/qpid/Msg.h \
- ../include/qpid/Options.h \
- ../include/qpid/RangeSet.h \
- ../include/qpid/SessionId.h \
- ../include/qpid/Url.h \
- ../include/qpid/amqp_0_10/Codecs.h \
- ../include/qpid/client/AsyncSession.h \
- ../include/qpid/client/ClientImportExport.h \
- ../include/qpid/client/Completion.h \
- ../include/qpid/client/Connection.h \
- ../include/qpid/client/ConnectionSettings.h \
- ../include/qpid/client/FailoverListener.h \
- ../include/qpid/client/FailoverManager.h \
- ../include/qpid/client/FlowControl.h \
- ../include/qpid/client/Future.h \
- ../include/qpid/client/FutureCompletion.h \
- ../include/qpid/client/FutureResult.h \
- ../include/qpid/client/Handle.h \
- ../include/qpid/client/LocalQueue.h \
- ../include/qpid/client/Message.h \
- ../include/qpid/client/MessageListener.h \
- ../include/qpid/client/MessageReplayTracker.h \
- ../include/qpid/client/QueueOptions.h \
- ../include/qpid/client/Session.h \
- ../include/qpid/client/SessionBase_0_10.h \
- ../include/qpid/client/Subscription.h \
- ../include/qpid/client/SubscriptionManager.h \
- ../include/qpid/client/SubscriptionSettings.h \
- ../include/qpid/client/TypedResult.h \
- ../include/qpid/framing/Array.h \
- ../include/qpid/framing/Buffer.h \
- ../include/qpid/framing/FieldTable.h \
- ../include/qpid/framing/FieldValue.h \
- ../include/qpid/framing/List.h \
- ../include/qpid/framing/ProtocolVersion.h \
- ../include/qpid/framing/SequenceNumber.h \
- ../include/qpid/framing/SequenceSet.h \
- ../include/qpid/framing/StructHelper.h \
- ../include/qpid/framing/Uuid.h \
- ../include/qpid/framing/amqp_types.h \
- ../include/qpid/framing/amqp_types_full.h \
- ../include/qpid/log/Logger.h \
- ../include/qpid/log/Options.h \
- ../include/qpid/log/Selector.h \
- ../include/qpid/log/SinkOptions.h \
- ../include/qpid/log/Statement.h \
- ../include/qpid/management/Args.h \
- ../include/qpid/management/Buffer.h \
- ../include/qpid/management/ConnectionSettings.h \
- ../include/qpid/management/Manageable.h \
- ../include/qpid/management/ManagementEvent.h \
- ../include/qpid/management/ManagementObject.h \
- ../include/qpid/management/Mutex.h \
- ../include/qpid/sys/Condition.h \
- ../include/qpid/sys/ExceptionHolder.h \
- ../include/qpid/sys/IOHandle.h \
- ../include/qpid/sys/IntegerTypes.h \
- ../include/qpid/sys/Monitor.h \
- ../include/qpid/sys/Mutex.h \
- ../include/qpid/sys/Runnable.h \
- ../include/qpid/sys/StrError.h \
- ../include/qpid/sys/SystemInfo.h \
- ../include/qpid/sys/Thread.h \
- ../include/qpid/sys/Time.h \
- ../include/qpid/messaging/Address.h \
- ../include/qpid/messaging/Connection.h \
- ../include/qpid/messaging/Duration.h \
- ../include/qpid/messaging/exceptions.h \
- ../include/qpid/messaging/Handle.h \
- ../include/qpid/messaging/ImportExport.h \
- ../include/qpid/messaging/Message.h \
- ../include/qpid/messaging/Receiver.h \
- ../include/qpid/messaging/Sender.h \
- ../include/qpid/messaging/Session.h \
- ../include/qpid/messaging/FailoverUpdates.h \
- ../include/qpid/types/Exception.h \
- ../include/qpid/types/Uuid.h \
- ../include/qpid/types/Variant.h \
- ../include/qpid/types/ImportExport.h \
- ../include/qpid/qpid.i \
- ../include/qmf/qmfengine.i \
- ../include/qmf/qmf2.i
-
-# Create the default data directory
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)/$(localstatedir)/lib/qpidd
-
-# Support for pkg-config
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA += qpid.pc
-
diff --git a/qpid/cpp/src/ha.mk b/qpid/cpp/src/ha.mk
deleted file mode 100644
index aa3a572286..0000000000
--- a/qpid/cpp/src/ha.mk
+++ /dev/null
@@ -1,72 +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.
-#
-#
-# HA plugin makefile fragment, to be included in Makefile.am
-#
-
-dmoduleexec_LTLIBRARIES += ha.la
-
-ha_la_SOURCES = \
- qpid/ha/AlternateExchangeSetter.h \
- qpid/ha/Backup.cpp \
- qpid/ha/Backup.h \
- qpid/ha/BackupConnectionExcluder.h \
- qpid/ha/BrokerInfo.cpp \
- qpid/ha/BrokerInfo.h \
- qpid/ha/BrokerReplicator.cpp \
- qpid/ha/BrokerReplicator.h \
- qpid/ha/ConnectionObserver.cpp \
- qpid/ha/ConnectionObserver.h \
- qpid/ha/FailoverExchange.cpp \
- qpid/ha/FailoverExchange.h \
- qpid/ha/HaBroker.cpp \
- qpid/ha/HaBroker.h \
- qpid/ha/HaPlugin.cpp \
- qpid/ha/hash.h \
- qpid/ha/IdSetter.h \
- qpid/ha/QueueSnapshot.h \
- qpid/ha/makeMessage.cpp \
- qpid/ha/makeMessage.h \
- qpid/ha/Membership.cpp \
- qpid/ha/Membership.h \
- qpid/ha/Primary.cpp \
- qpid/ha/Primary.h \
- qpid/ha/QueueGuard.cpp \
- qpid/ha/QueueGuard.h \
- qpid/ha/QueueReplicator.cpp \
- qpid/ha/QueueReplicator.h \
- qpid/ha/QueueSnapshot.h \
- qpid/ha/QueueSnapshots.h \
- qpid/ha/RemoteBackup.cpp \
- qpid/ha/RemoteBackup.h \
- qpid/ha/ReplicatingSubscription.cpp \
- qpid/ha/ReplicatingSubscription.h \
- qpid/ha/ReplicationTest.cpp \
- qpid/ha/ReplicationTest.h \
- qpid/ha/Role.h \
- qpid/ha/Settings.h \
- qpid/ha/StandAlone.h \
- qpid/ha/StatusCheck.cpp \
- qpid/ha/StatusCheck.h \
- qpid/ha/types.cpp \
- qpid/ha/types.h
-
-ha_la_LIBADD = libqpidbroker.la libqpidmessaging.la
-ha_la_LDFLAGS = $(PLUGINLDFLAGS)
-ha_la_CXXFLAGS = $(AM_CXXFLAGS) -D_IN_QPID_BROKER
diff --git a/qpid/cpp/src/legacystore.mk b/qpid/cpp/src/legacystore.mk
deleted file mode 100644
index 7dbfac8a28..0000000000
--- a/qpid/cpp/src/legacystore.mk
+++ /dev/null
@@ -1,110 +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.
-#
-#
-# Legacy store plugin makefile fragment, to be included in Makefile.am
-# NOTE: this fragment only includes legacystore sources in
-# the distribution, it does not build the store.
-#
-# To build the store use the cmake build system, see ../INSTALL
-#
-
-EXTRA_DIST += \
- qpid/legacystore/BindingDbt.cpp \
- qpid/legacystore/BindingDbt.h \
- qpid/legacystore/BufferValue.cpp \
- qpid/legacystore/BufferValue.h \
- qpid/legacystore/Cursor.h \
- qpid/legacystore/DataTokenImpl.cpp \
- qpid/legacystore/DataTokenImpl.h \
- qpid/legacystore/IdDbt.cpp \
- qpid/legacystore/IdDbt.h \
- qpid/legacystore/IdSequence.cpp \
- qpid/legacystore/IdSequence.h \
- qpid/legacystore/JournalImpl.cpp \
- qpid/legacystore/JournalImpl.h \
- qpid/legacystore/MessageStoreImpl.cpp \
- qpid/legacystore/MessageStoreImpl.h \
- qpid/legacystore/PreparedTransaction.cpp \
- qpid/legacystore/PreparedTransaction.h \
- qpid/legacystore/StoreException.h \
- qpid/legacystore/StorePlugin.cpp \
- qpid/legacystore/TxnCtxt.cpp \
- qpid/legacystore/TxnCtxt.h \
- qpid/legacystore/jrnl/aio.cpp \
- qpid/legacystore/jrnl/aio.h \
- qpid/legacystore/jrnl/aio_callback.h \
- qpid/legacystore/jrnl/cvar.cpp \
- qpid/legacystore/jrnl/cvar.h \
- qpid/legacystore/jrnl/data_tok.cpp \
- qpid/legacystore/jrnl/data_tok.h \
- qpid/legacystore/jrnl/deq_hdr.h \
- qpid/legacystore/jrnl/deq_rec.cpp \
- qpid/legacystore/jrnl/deq_rec.h \
- qpid/legacystore/jrnl/enq_hdr.h \
- qpid/legacystore/jrnl/enq_map.cpp \
- qpid/legacystore/jrnl/enq_map.h \
- qpid/legacystore/jrnl/enq_rec.cpp \
- qpid/legacystore/jrnl/enq_rec.h \
- qpid/legacystore/jrnl/enums.h \
- qpid/legacystore/jrnl/fcntl.cpp \
- qpid/legacystore/jrnl/fcntl.h \
- qpid/legacystore/jrnl/file_hdr.h \
- qpid/legacystore/jrnl/jcfg.h \
- qpid/legacystore/jrnl/jcntl.cpp \
- qpid/legacystore/jrnl/jcntl.h \
- qpid/legacystore/jrnl/jdir.cpp \
- qpid/legacystore/jrnl/jdir.h \
- qpid/legacystore/jrnl/jerrno.cpp \
- qpid/legacystore/jrnl/jerrno.h \
- qpid/legacystore/jrnl/jexception.cpp \
- qpid/legacystore/jrnl/jexception.h \
- qpid/legacystore/jrnl/jinf.cpp \
- qpid/legacystore/jrnl/jinf.h \
- qpid/legacystore/jrnl/jrec.cpp \
- qpid/legacystore/jrnl/jrec.h \
- qpid/legacystore/jrnl/lp_map.cpp \
- qpid/legacystore/jrnl/lp_map.h \
- qpid/legacystore/jrnl/lpmgr.cpp \
- qpid/legacystore/jrnl/lpmgr.h \
- qpid/legacystore/jrnl/pmgr.cpp \
- qpid/legacystore/jrnl/pmgr.h \
- qpid/legacystore/jrnl/rcvdat.h \
- qpid/legacystore/jrnl/rec_hdr.h \
- qpid/legacystore/jrnl/rec_tail.h \
- qpid/legacystore/jrnl/rfc.cpp \
- qpid/legacystore/jrnl/rfc.h \
- qpid/legacystore/jrnl/rmgr.cpp \
- qpid/legacystore/jrnl/rmgr.h \
- qpid/legacystore/jrnl/rrfc.cpp \
- qpid/legacystore/jrnl/rrfc.h \
- qpid/legacystore/jrnl/slock.cpp \
- qpid/legacystore/jrnl/slock.h \
- qpid/legacystore/jrnl/smutex.cpp \
- qpid/legacystore/jrnl/smutex.h \
- qpid/legacystore/jrnl/time_ns.cpp \
- qpid/legacystore/jrnl/time_ns.h \
- qpid/legacystore/jrnl/txn_hdr.h \
- qpid/legacystore/jrnl/txn_map.cpp \
- qpid/legacystore/jrnl/txn_map.h \
- qpid/legacystore/jrnl/txn_rec.cpp \
- qpid/legacystore/jrnl/txn_rec.h \
- qpid/legacystore/jrnl/wmgr.cpp \
- qpid/legacystore/jrnl/wmgr.h \
- qpid/legacystore/jrnl/wrfc.cpp \
- qpid/legacystore/jrnl/wrfc.h
diff --git a/qpid/cpp/src/prof b/qpid/cpp/src/prof
index acfbaff2d4..6276ff620a 100755
--- a/qpid/cpp/src/prof
+++ b/qpid/cpp/src/prof
@@ -32,8 +32,8 @@ opcontrol --start
opcontrol --stop
opcontrol --dump
opcontrol --shutdown
-opreport -l ./.libs/lt-qpidd > stats.txt
-opannotate --source --output-dir=qpidd-prof ./.libs/lt-qpidd
+opreport -l ./qpidd > stats.txt
+opannotate --source --output-dir=qpidd-prof ./qpidd
# clear the relusts
#opcontrol --reset
diff --git a/qpid/cpp/src/qmf.mk b/qpid/cpp/src/qmf.mk
deleted file mode 100644
index 6a4bce4087..0000000000
--- a/qpid/cpp/src/qmf.mk
+++ /dev/null
@@ -1,177 +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.
-#
-
-#
-# qmf library makefile fragment, to be included in Makefile.am
-#
-lib_LTLIBRARIES += \
- libqmf.la \
- libqmfengine.la \
- libqmf2.la
-
-#
-# Public headers for the QMF API
-#
-QMF_API = \
- ../include/qpid/agent/ManagementAgent.h \
- ../include/qpid/agent/QmfAgentImportExport.h \
- ../include/qmf/BrokerImportExport.h
-
-#
-# Public headers for the QMF2 API
-#
-QMF2_API = \
- ../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/posix/EventNotifier.h \
- ../include/qmf/exceptions.h \
- ../include/qmf/Handle.h \
- ../include/qmf/ImportExport.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
-
-
-#
-# Public headers for the QMF Engine API
-#
-QMF_ENGINE_API = \
- ../include/qmf/engine/Agent.h \
- ../include/qmf/engine/ConnectionSettings.h \
- ../include/qmf/engine/Console.h \
- ../include/qmf/engine/Event.h \
- ../include/qmf/engine/Message.h \
- ../include/qmf/engine/Object.h \
- ../include/qmf/engine/ObjectId.h \
- ../include/qmf/engine/QmfEngineImportExport.h \
- ../include/qmf/engine/Query.h \
- ../include/qmf/engine/ResilientConnection.h \
- ../include/qmf/engine/Schema.h \
- ../include/qmf/engine/Typecode.h \
- ../include/qmf/engine/Value.h
-
-# Public header files
-nobase_include_HEADERS += \
- $(QMF_API) \
- $(QMF_ENGINE_API) \
- $(QMF2_API)
-
-libqmf_la_SOURCES = \
- $(QMF_API) \
- qpid/agent/ManagementAgentImpl.cpp \
- qpid/agent/ManagementAgentImpl.h
-
-libqmf2_la_SOURCES = \
- $(QMF2_API) \
- qmf/agentCapability.h \
- qmf/Agent.cpp \
- qmf/AgentEvent.cpp \
- qmf/AgentEventImpl.h \
- qmf/AgentImpl.h \
- qmf/AgentSession.cpp \
- qmf/AgentSessionImpl.h \
- qmf/AgentSubscription.cpp \
- qmf/AgentSubscription.h \
- qmf/ConsoleEvent.cpp \
- qmf/ConsoleEventImpl.h \
- qmf/ConsoleSession.cpp \
- qmf/ConsoleSessionImpl.h \
- qmf/constants.cpp \
- qmf/constants.h \
- qmf/DataAddr.cpp \
- qmf/DataAddrImpl.h \
- qmf/Data.cpp \
- qmf/DataImpl.h \
- qmf/EventNotifierImpl.cpp \
- qmf/EventNotifierImpl.h \
- qmf/exceptions.cpp \
- qmf/Expression.cpp \
- qmf/Expression.h \
- qmf/Hash.cpp \
- qmf/Hash.h \
- qmf/PosixEventNotifier.cpp \
- qmf/PosixEventNotifierImpl.cpp \
- qmf/PosixEventNotifierImpl.h \
- qmf/PrivateImplRef.h \
- qmf/Query.cpp \
- qmf/QueryImpl.h \
- qmf/SchemaCache.cpp \
- qmf/SchemaCache.h \
- qmf/Schema.cpp \
- qmf/SchemaId.cpp \
- qmf/SchemaIdImpl.h \
- qmf/SchemaImpl.h \
- qmf/SchemaMethod.cpp \
- qmf/SchemaMethodImpl.h \
- qmf/SchemaProperty.cpp \
- qmf/SchemaPropertyImpl.h \
- qmf/Subscription.cpp \
- qmf/SubscriptionImpl.h
-
-libqmfengine_la_SOURCES = \
- $(QMF_ENGINE_API) \
- qmf/engine/Agent.cpp \
- qmf/engine/BrokerProxyImpl.cpp \
- qmf/engine/BrokerProxyImpl.h \
- qmf/engine/ConnectionSettingsImpl.cpp \
- qmf/engine/ConnectionSettingsImpl.h \
- qmf/engine/ConsoleImpl.cpp \
- qmf/engine/ConsoleImpl.h \
- qmf/engine/EventImpl.cpp \
- qmf/engine/EventImpl.h \
- qmf/engine/MessageImpl.cpp \
- qmf/engine/MessageImpl.h \
- qmf/engine/ObjectIdImpl.cpp \
- qmf/engine/ObjectIdImpl.h \
- qmf/engine/ObjectImpl.cpp \
- qmf/engine/ObjectImpl.h \
- qmf/engine/Protocol.cpp \
- qmf/engine/Protocol.h \
- qmf/engine/QueryImpl.cpp \
- qmf/engine/QueryImpl.h \
- qmf/engine/ResilientConnection.cpp \
- qmf/engine/SequenceManager.cpp \
- qmf/engine/SequenceManager.h \
- qmf/engine/SchemaImpl.cpp \
- qmf/engine/SchemaImpl.h \
- qmf/engine/ValueImpl.cpp \
- qmf/engine/ValueImpl.h
-
-libqmf_la_LIBADD = libqmfengine.la
-libqmf2_la_LIBADD = libqpidmessaging.la libqpidtypes.la
-libqmfengine_la_LIBADD = libqpidclient.la
-
-QMF_VERSION_INFO = 1:0:0
-QMF2_VERSION_INFO = 1:0:0
-QMFENGINE_VERSION_INFO = 1:1:0
-
-libqmf_la_LDFLAGS = -version-info $(QMF_VERSION_INFO)
-libqmf2_la_LDFLAGS = -version-info $(QMF2_VERSION_INFO)
-libqmfengine_la_LDFLAGS = -version-info $(QMFENGINE_VERSION_INFO)
-
-pkgconfig_DATA += qmf2.pc
diff --git a/qpid/cpp/src/qmfc.mk b/qpid/cpp/src/qmfc.mk
deleted file mode 100644
index e445a538a1..0000000000
--- a/qpid/cpp/src/qmfc.mk
+++ /dev/null
@@ -1,57 +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.
-#
-
-#
-# qmf console library makefile fragment, to be included in Makefile.am
-#
-lib_LTLIBRARIES += libqmfconsole.la
-
-# Public header files.
-nobase_include_HEADERS += \
- ../include/qpid/console/Agent.h \
- ../include/qpid/console/Broker.h \
- ../include/qpid/console/ClassKey.h \
- ../include/qpid/console/ConsoleImportExport.h \
- ../include/qpid/console/ConsoleListener.h \
- ../include/qpid/console/Event.h \
- ../include/qpid/console/Object.h \
- ../include/qpid/console/ObjectId.h \
- ../include/qpid/console/Package.h \
- ../include/qpid/console/Schema.h \
- ../include/qpid/console/SequenceManager.h \
- ../include/qpid/console/SessionManager.h \
- ../include/qpid/console/Value.h
-
-libqmfconsole_la_SOURCES = \
- qpid/console/Agent.cpp \
- qpid/console/Broker.cpp \
- qpid/console/ClassKey.cpp \
- qpid/console/Event.cpp \
- qpid/console/Object.cpp \
- qpid/console/ObjectId.cpp \
- qpid/console/Package.cpp \
- qpid/console/Schema.cpp \
- qpid/console/SequenceManager.cpp \
- qpid/console/SessionManager.cpp \
- qpid/console/Value.cpp
-
-libqmfconsole_la_LIBADD = libqpidclient.la
-
-QMFCONSOLE_VERSION_INFO = 2:0:0
-libqmfconsole_la_LDFLAGS = -version-info $(QMFCONSOLE_VERSION_INFO)
diff --git a/qpid/cpp/src/ssl.mk b/qpid/cpp/src/ssl.mk
deleted file mode 100644
index 9a92c7abc7..0000000000
--- a/qpid/cpp/src/ssl.mk
+++ /dev/null
@@ -1,47 +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.
-#
-#
-# Makefile fragment, conditionally included in Makefile.am
-#
-libqpidcommon_la_SOURCES += \
- qpid/sys/ssl/check.h \
- qpid/sys/ssl/check.cpp \
- qpid/sys/ssl/util.h \
- qpid/sys/ssl/util.cpp \
- qpid/sys/ssl/SslSocket.h \
- qpid/sys/ssl/SslSocket.cpp
-
-libqpidcommon_la_LIBADD += -lnss3 -lssl3 -lnspr4
-libqpidcommon_la_CXXFLAGS += $(SSL_CFLAGS)
-
-libqpidbroker_la_SOURCES += \
- qpid/sys/SslPlugin.cpp
-
-libqpidbroker_la_CXXFLAGS += $(SSL_CFLAGS)
-
-libqpidclient_la_SOURCES += \
- qpid/client/SslConnector.cpp
-
-libqpidclient_la_CXXFLAGS += $(SSL_CFLAGS)
-
-if HAVE_PROTON
-libqpidclient_la_SOURCES += \
- qpid/messaging/amqp/SslTransport.cpp \
- qpid/messaging/amqp/SslTransport.h
-endif #HAVE_PROTON
diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
deleted file mode 100644
index 16883363a2..0000000000
--- a/qpid/cpp/src/tests/Makefile.am
+++ /dev/null
@@ -1,411 +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.
-#
-
-AM_CXXFLAGS = $(WARNING_CFLAGS) -DBOOST_TEST_DYN_LINK -D_IN_QPID_BROKER
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/src -I$(top_builddir)/src
-PUBLIC_INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include # Use public API only
-QMF_GEN=$(top_srcdir)/managementgen/qmf-gen
-
-abs_builddir=@abs_builddir@
-abs_srcdir=@abs_srcdir@
-
-extra_libs =
-lib_client = $(abs_builddir)/../libqpidclient.la
-lib_messaging = $(abs_builddir)/../libqpidmessaging.la
-lib_types = $(abs_builddir)/../libqpidtypes.la
-lib_common = $(abs_builddir)/../libqpidcommon.la
-lib_broker = $(abs_builddir)/../libqpidbroker.la
-lib_console = $(abs_builddir)/../libqmfconsole.la
-lib_qmf2 = $(abs_builddir)/../libqmf2.la
-# lib_amqp_0_10 = $(abs_builddir)/../libqpidamqp_0_10.la
-
-#
-# Initialize variables that are incremented with +=
-#
-check_PROGRAMS=
-check_LTLIBRARIES=
-TESTS=
-EXTRA_DIST=
-CLEANFILES=
-LONG_TESTS=
-CLEAN_LOCAL=
-
-#
-# Destination for intalled programs and tests defined here
-#
-qpidexecdir = $(libexecdir)/qpid
-qpidexec_PROGRAMS =
-qpidexec_SCRIPTS =
-qpidexectestdir = $(qpidexecdir)/tests
-qpidexectest_PROGRAMS =
-qpidexectest_SCRIPTS =
-tmoduledir = $(libdir)/qpid/tests
-tmodule_LTLIBRARIES=
-
-#
-# Unit test program
-#
-# Unit tests are built as a single program to reduce valgrind overhead
-# when running the tests. If you want to build a subset of the tests do
-# rm -f unit_test; make unit_test unit_test_OBJECTS="unit_test.o SelectedTest.o"
-#
-
-TESTS+=unit_test
-check_PROGRAMS+=unit_test
-unit_test_LDADD=-lboost_unit_test_framework -lpthread \
- $(lib_messaging) $(lib_broker) $(lib_console) $(lib_qmf2)
-
-unit_test_SOURCES= unit_test.cpp unit_test.h \
- MessagingSessionTests.cpp \
- MessagingThreadTests.cpp \
- MessagingFixture.h \
- ClientSessionTest.cpp \
- BrokerFixture.h \
- exception_test.cpp \
- RefCounted.cpp \
- SessionState.cpp logging.cpp \
- AsyncCompletion.cpp \
- Url.cpp Uuid.cpp \
- Shlib.cpp FieldValue.cpp FieldTable.cpp Array.cpp \
- QueueOptionsTest.cpp \
- InlineAllocator.cpp \
- InlineVector.cpp \
- SequenceSet.cpp \
- StringUtils.cpp \
- RangeSet.cpp \
- AtomicValue.cpp \
- QueueTest.cpp \
- AccumulatedAckTest.cpp \
- DtxWorkRecordTest.cpp \
- DeliveryRecordTest.cpp \
- ExchangeTest.cpp \
- HeadersExchangeTest.cpp \
- MessageTest.cpp \
- QueueDepth.cpp \
- QueueRegistryTest.cpp \
- QueuePolicyTest.cpp \
- QueueFlowLimitTest.cpp \
- FramingTest.cpp \
- HeaderTest.cpp \
- SequenceNumberTest.cpp \
- TimerTest.cpp \
- TopicExchangeTest.cpp \
- TxBufferTest.cpp \
- ConnectionOptions.h \
- ManagementTest.cpp \
- MessageReplayTracker.cpp \
- ConsoleTest.cpp \
- ProxyTest.cpp \
- RetryList.cpp \
- FrameDecoder.cpp \
- ClientMessageTest.cpp \
- PollableCondition.cpp \
- Variant.cpp \
- Address.cpp \
- ClientMessage.cpp \
- Qmf2.cpp \
- BrokerOptions.cpp \
- Selector.cpp \
- SystemInfo.cpp
-
-if HAVE_XML
-unit_test_SOURCES+= XmlClientSessionTest.cpp
-endif
-
-TESTLIBFLAGS = -module -rpath $(abs_builddir)
-
-check_LTLIBRARIES += libshlibtest.la
-libshlibtest_la_LDFLAGS = $(TESTLIBFLAGS)
-libshlibtest_la_SOURCES = shlibtest.cpp
-
-tmodule_LTLIBRARIES += test_store.la
-test_store_la_SOURCES = test_store.cpp
-test_store_la_LIBADD = $(lib_broker)
-test_store_la_LDFLAGS = -module
-
-include sasl.mk
-if SSL
-include ssl.mk
-endif
-
-# Test programs that are installed and therefore built as part of make, not make check
-
-qpidexectest_SCRIPTS += qpid-cpp-benchmark qpid-cluster-benchmark install_env.sh qpidt
-EXTRA_DIST += qpid-cpp-benchmark qpid-cluster-benchmark install_env.sh qpidt
-
-qpidexectest_PROGRAMS += receiver
-receiver_SOURCES = \
- receiver.cpp \
- TestOptions.h \
- ConnectionOptions.h
-receiver_LDADD = $(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS += sender
-sender_SOURCES = \
- sender.cpp \
- TestOptions.h \
- ConnectionOptions.h \
- Statistics.cpp
-sender_LDADD = $(lib_messaging) -lboost_program_options $(lib_common) $(lib_types) $(lib_client)
-
-qpidexectest_PROGRAMS += qpid-receive
-qpid_receive_SOURCES = \
- qpid-receive.cpp \
- TestOptions.h \
- ConnectionOptions.h \
- Statistics.h \
- Statistics.cpp
-qpid_receive_LDADD = $(lib_messaging) -lboost_program_options $(lib_common) $(lib_types)
-
-qpidexectest_PROGRAMS += qpid-send
-qpid_send_SOURCES = \
- qpid-send.cpp \
- TestOptions.h \
- ConnectionOptions.h \
- Statistics.h \
- Statistics.cpp
-qpid_send_LDADD = $(lib_messaging) -lboost_program_options $(lib_common) $(lib_types)
-
-qpidexectest_PROGRAMS+=qpid-perftest
-qpid_perftest_SOURCES=qpid-perftest.cpp test_tools.h TestOptions.h ConnectionOptions.h
-qpid_perftest_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_perftest_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS+=qpid-txtest
-qpid_txtest_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_txtest_SOURCES=qpid-txtest.cpp TestOptions.h ConnectionOptions.h
-qpid_txtest_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS+=qpid-latency-test
-qpid_latency_test_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_latency_test_SOURCES=qpid-latency-test.cpp TestOptions.h ConnectionOptions.h
-qpid_latency_test_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS+=qpid-client-test
-qpid_client_test_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_client_test_SOURCES=qpid-client-test.cpp TestOptions.h ConnectionOptions.h
-qpid_client_test_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS+=qpid-topic-listener
-qpid_topic_listener_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_topic_listener_SOURCES=qpid-topic-listener.cpp TestOptions.h ConnectionOptions.h
-qpid_topic_listener_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS+=qpid-topic-publisher
-qpid_topic_publisher_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_topic_publisher_SOURCES=qpid-topic-publisher.cpp TestOptions.h ConnectionOptions.h
-qpid_topic_publisher_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-qpidexectest_PROGRAMS+=qpid-ping
-qpid_ping_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_ping_SOURCES=qpid-ping.cpp test_tools.h TestOptions.h ConnectionOptions.h
-qpid_ping_LDADD=$(lib_client) -lboost_program_options $(lib_common)
-
-#
-# Other test programs
-#
-
-check_PROGRAMS+=echotest
-echotest_INCLUDES=$(PUBLIC_INCLUDES)
-echotest_SOURCES=echotest.cpp TestOptions.h ConnectionOptions.h
-echotest_LDADD=$(lib_client)
-
-check_PROGRAMS+=publish
-publish_INCLUDES=$(PUBLIC_INCLUDES)
-publish_SOURCES=publish.cpp TestOptions.h ConnectionOptions.h
-publish_LDADD=$(lib_client)
-
-check_PROGRAMS+=consume
-consume_INCLUDES=$(PUBLIC_INCLUDES)
-consume_SOURCES=consume.cpp TestOptions.h ConnectionOptions.h
-consume_LDADD=$(lib_client)
-
-check_PROGRAMS+=header_test
-header_test_INCLUDES=$(PUBLIC_INCLUDES)
-header_test_SOURCES=header_test.cpp TestOptions.h ConnectionOptions.h
-header_test_LDADD=$(lib_client)
-
-check_PROGRAMS+=declare_queues
-declare_queues_INCLUDES=$(PUBLIC_INCLUDES)
-declare_queues_SOURCES=declare_queues.cpp
-declare_queues_LDADD=$(lib_client)
-
-check_PROGRAMS+=replaying_sender
-replaying_sender_INCLUDES=$(PUBLIC_INCLUDES)
-replaying_sender_SOURCES=replaying_sender.cpp
-replaying_sender_LDADD=$(lib_client)
-
-check_PROGRAMS+=resuming_receiver
-resuming_receiver_INCLUDES=$(PUBLIC_INCLUDES)
-resuming_receiver_SOURCES=resuming_receiver.cpp
-resuming_receiver_LDADD=$(lib_client)
-
-check_PROGRAMS+=txshift
-txshift_INCLUDES=$(PUBLIC_INCLUDES)
-txshift_SOURCES=txshift.cpp TestOptions.h ConnectionOptions.h
-txshift_LDADD=$(lib_client)
-
-check_PROGRAMS+=txjob
-txjob_INCLUDES=$(PUBLIC_INCLUDES)
-txjob_SOURCES=txjob.cpp TestOptions.h ConnectionOptions.h
-txjob_LDADD=$(lib_client)
-
-check_PROGRAMS+=PollerTest
-PollerTest_SOURCES=PollerTest.cpp
-PollerTest_LDADD=$(lib_common) $(lib_client) $(SOCKLIBS)
-
-check_PROGRAMS+=DispatcherTest
-DispatcherTest_SOURCES=DispatcherTest.cpp
-DispatcherTest_LDADD=$(lib_common) $(lib_client) $(SOCKLIBS)
-
-check_PROGRAMS+=datagen
-datagen_SOURCES=datagen.cpp
-datagen_LDADD=$(lib_common) $(lib_client)
-
-check_PROGRAMS+=qpid-stream
-qpid_stream_INCLUDES=$(PUBLIC_INCLUDES)
-qpid_stream_SOURCES=qpid-stream.cpp
-qpid_stream_LDADD=$(lib_messaging)
-
-check_PROGRAMS+=msg_group_test
-msg_group_test_INCLUDES=$(PUBLIC_INCLUDES)
-msg_group_test_SOURCES=msg_group_test.cpp
-msg_group_test_LDADD=$(lib_messaging)
-
-TESTS_ENVIRONMENT = \
- VALGRIND=$(VALGRIND) \
- LIBTOOL="$(LIBTOOL)" \
- QPID_DATA_DIR= \
- $(srcdir)/run_test
-
-system_tests = qpid-client-test quick_perftest quick_topictest run_header_test quick_txtest \
- run_msg_group_tests
-TESTS += start_broker $(system_tests) python_tests stop_broker \
- run_ha_tests run_interlink_tests swig_python_tests run_federation_tests run_federation_sys_tests \
- run_acl_tests run_cli_tests dynamic_log_level_test \
- dynamic_log_hires_timestamp run_queue_flow_limit_tests ipv6_test
-
-EXTRA_DIST += \
- run_test vg_check \
- run-unit-tests start_broker python_tests stop_broker \
- quick_topictest \
- quick_perftest \
- quick_txtest \
- topictest \
- run_header_test \
- header_test.py \
- ssl_test \
- ping_broker \
- config.null \
- swig_python_tests \
- run_federation_tests \
- run_federation_sys_tests \
- run_long_federation_sys_tests \
- run_cli_tests \
- run_acl_tests \
- .valgrind.supp \
- MessageUtils.h \
- TestMessageStore.h \
- TxMocks.h \
- run_perftest \
- ring_queue_test \
- run_ring_queue_test \
- run_paged_queue_tests \
- dynamic_log_level_test \
- dynamic_log_hires_timestamp \
- qpid-ctrl \
- CMakeLists.txt \
- windows/DisableWin32ErrorWindows.cpp \
- background.ps1 \
- find_prog.ps1 \
- python_tests.ps1 \
- quick_topictest.ps1 \
- run_federation_tests.ps1 \
- run_header_test.ps1 \
- run_test.ps1 \
- start_broker.ps1 \
- stop_broker.ps1 \
- topictest.ps1 \
- run_queue_flow_limit_tests \
- run_msg_group_tests \
- ipv6_test \
- run_ha_tests \
- ha_test.py \
- ha_tests.py \
- run_interlink_tests \
- interlink_tests.py \
- brokertest.py \
- test_env.ps1.in
-
-check_LTLIBRARIES += libdlclose_noop.la
-libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
-libdlclose_noop_la_SOURCES = dlclose_noop.c
-
-CLEANFILES+=valgrind.out *.log *.vglog* dummy_test qpidd.port $(unit_wrappers)
-
-# Longer running stability tests, not run by default check: target.
-# Not run under valgrind, too slow
-
-LONG_TESTS+=start_broker \
- fanout_perftest shared_perftest multiq_perftest topic_perftest run_ring_queue_test run_paged_queue_tests\
- run_msg_group_tests_soak \
- stop_broker \
- run_long_federation_sys_tests
-
-EXTRA_DIST+= \
- fanout_perftest \
- shared_perftest \
- multiq_perftest \
- topic_perftest \
- sasl_test_setup.sh \
- run_msg_group_tests_soak \
- qpidd-empty.conf \
- qpidd-p0
-
-check-long:
- $(MAKE) check TESTS="$(LONG_TESTS)" VALGRIND=
-
-# Things that should be built before the check target runs.
-check-am: python_prep test_env.sh install_env.sh sasl_config
-
-PYTHON_SRC_DIR=$(abs_srcdir)/../../../python
-PYTHON_BLD_DIR=$(abs_builddir)/python
-
-# Generate python client as part of the all-am target so it gets built before tests.
-all-am: python_prep
-
-python_prep:
- if test -d $(PYTHON_SRC_DIR); \
- then cd $(PYTHON_SRC_DIR) && python $(PYTHON_SRC_DIR)/setup.py install \
- --prefix=$(PYTHON_BLD_DIR) --install-lib=$(PYTHON_BLD_DIR) \
- --install-scripts=$(PYTHON_BLD_DIR)/commands; \
- else echo "WARNING: python client not built, missing $(PYTHON_SRC_DIR)"; fi
-
-sasl_config: sasl_test_setup.sh
- sh $(srcdir)/sasl_test_setup.sh
- touch sasl_config
-
-CLEAN_LOCAL += sasl_config
-
-clean-local:
- rm -rf $(CLEAN_LOCAL)
-
-include testagent.mk
-include brokermgmt.mk
-
diff --git a/qpid/cpp/src/tests/Shlib.cpp b/qpid/cpp/src/tests/Shlib.cpp
index d8ad4c14d8..7f01323e3c 100644
--- a/qpid/cpp/src/tests/Shlib.cpp
+++ b/qpid/cpp/src/tests/Shlib.cpp
@@ -35,13 +35,7 @@ typedef void (*CallMe)(int*);
QPID_AUTO_TEST_CASE(testShlib) {
- // The CMake-based build passes in the shared lib suffix; if it's not
- // there, this is a Linux/UNIX libtool-based build.
-#if defined (QPID_SHLIB_PREFIX) && defined (QPID_SHLIB_SUFFIX)
Shlib sh("./" QPID_SHLIB_PREFIX "shlibtest" QPID_SHLIB_POSTFIX QPID_SHLIB_SUFFIX);
-#else
- Shlib sh(".libs/libshlibtest.so");
-#endif
// Double cast to avoid ISO warning.
CallMe callMe=sh.getSymbol<CallMe>("callMe");
BOOST_REQUIRE(callMe != 0);
@@ -59,11 +53,7 @@ QPID_AUTO_TEST_CASE(testShlib) {
QPID_AUTO_TEST_CASE(testAutoShlib) {
int unloaded = 0;
{
-#if defined (QPID_SHLIB_PREFIX) && defined (QPID_SHLIB_SUFFIX)
AutoShlib sh("./" QPID_SHLIB_PREFIX "shlibtest" QPID_SHLIB_POSTFIX QPID_SHLIB_SUFFIX);
-#else
- AutoShlib sh(".libs/libshlibtest.so");
-#endif
CallMe callMe=sh.getSymbol<CallMe>("callMe");
BOOST_REQUIRE(callMe != 0);
callMe(&unloaded);
diff --git a/qpid/cpp/src/tests/brokermgmt.mk b/qpid/cpp/src/tests/brokermgmt.mk
deleted file mode 100644
index cf9a47200c..0000000000
--- a/qpid/cpp/src/tests/brokermgmt.mk
+++ /dev/null
@@ -1,44 +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.
-#
-
-# Build a unit test for the broker's internal management agent.
-
-BROKERMGMT_GEN_SRC= \
- brokermgmt_gen/qmf/org/apache/qpid/broker/mgmt/test/Package.cpp \
- brokermgmt_gen/qmf/org/apache/qpid/broker/mgmt/test/Package.h \
- brokermgmt_gen/qmf/org/apache/qpid/broker/mgmt/test/TestObject.h \
- brokermgmt_gen/qmf/org/apache/qpid/broker/mgmt/test/TestObject.cpp
-
-$(BROKERMGMT_GEN_SRC): brokermgmt_gen.timestamp
-
-if GENERATE
-BROKERMGMT_DEPS=../mgen.timestamp
-endif # GENERATE
-brokermgmt_gen.timestamp: BrokerMgmtAgent.xml ${BROKERMGMT_DEPS}
- $(QMF_GEN) -b -o brokermgmt_gen/qmf $(srcdir)/BrokerMgmtAgent.xml
- touch $@
-
-BrokerMgmtAgent.$(OBJEXT): $(BROKERMGMT_GEN_SRC)
-
-CLEANFILES+=$(BROKERMGMT_GEN_SRC) brokermgmt_gen.timestamp
-
-unit_test_SOURCES+=BrokerMgmtAgent.cpp ${BROKERMGMT_GEN_SRC}
-INCLUDES+= -Ibrokermgmt_gen
-
-EXTRA_DIST+=BrokerMgmtAgent.xml
diff --git a/qpid/cpp/src/tests/run-unit-tests b/qpid/cpp/src/tests/run-unit-tests
deleted file mode 100755
index 5337a3dc22..0000000000
--- a/qpid/cpp/src/tests/run-unit-tests
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-#
-# 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.
-#
-
-#
-# Library names (without path or .so) and CppUnit test paths can be
-# specified on the command line or in env var UNIT_TESTS. For example:
-#
-# Selected test classes:
-# ./run-unit-tests ValueTest ClientChannelTest
-#
-# Individual test method
-# ./run-unit-tests ValueTest :ValueTest::testStringValueEquals
-#
-# Build and run selected tests:
-# make check TESTS=run-unit-tests UNIT_TESTS=ClientChannelTest
-#
-
-for u in $* $UNIT_TESTS ; do
- case $u in
- :*) TEST_ARGS="$TEST_ARGS $u" ;; # A test path.
- *) TEST_ARGS="$TEST_ARGS .libs/$u.so" ;; # A test library.
- esac
-done
-test -z "$TEST_ARGS" && TEST_ARGS=".libs/*Test.so"
-
-test -z "$srcdir" && srcdir=.
-
-# libdlclose_noop prevents unloading symbols needed for valgrind output.
-export LD_PRELOAD=.libs/libdlclose_noop.so
-source $srcdir/run_test DllPlugInTester -c -b $TEST_ARGS
diff --git a/qpid/cpp/src/tests/run_cli_tests b/qpid/cpp/src/tests/run_cli_tests
index a7f55d58b7..e9590080a1 100755
--- a/qpid/cpp/src/tests/run_cli_tests
+++ b/qpid/cpp/src/tests/run_cli_tests
@@ -44,8 +44,8 @@ start_brokers() {
# look like they're xml related.
# if we start supporting xml on windows, it will need something similar
# here
- if [ -f ../.libs/xml.so ] ; then
- xargs="--load-module ../.libs/xml.so"
+ if [ -f ../xml.so ] ; then
+ xargs="--load-module ../xml.so"
if [ ! -f test.xquery ] ; then
create_test_xquery
fi
diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests
index 09219141ef..bf33f96ebd 100755
--- a/qpid/cpp/src/tests/run_federation_tests
+++ b/qpid/cpp/src/tests/run_federation_tests
@@ -25,7 +25,7 @@ source ./test_env.sh
#set -x
trap stop_brokers INT TERM QUIT
-if [ -f ../.libs/xml.so ] ; then
+if [ -f ../xml.so ] ; then
MODULES="--load-module xml" # Load the XML exchange and run XML exchange federation tests
SKIPTESTS=
else
diff --git a/qpid/cpp/src/tests/sasl.mk b/qpid/cpp/src/tests/sasl.mk
deleted file mode 100644
index 8c31192635..0000000000
--- a/qpid/cpp/src/tests/sasl.mk
+++ /dev/null
@@ -1,44 +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.
-#
-
-# Test that are only relevant if SASL is enabled.
-if HAVE_SASL
-
-# Note: sasl_version is not a test -- it is a tool used by tests.
-check_PROGRAMS+=sasl_version
-sasl_version_SOURCES=sasl_version.cpp
-sasl_version_LDADD=$(lib_client)
-
-TESTS += sasl_fed
- sasl_fed_ex_dynamic
- sasl_fed_ex_link
- sasl_fed_ex_queue
- sasl_fed_ex_route
- sasl_no_dir
-
-EXTRA_DIST += sasl_fed \
- sasl_fed_ex \
- sasl_fed_ex_dynamic \
- sasl_fed_ex_link \
- sasl_fed_ex_queue \
- sasl_fed_ex_route \
- sasl_no_dir
-
-
-endif # HAVE_SASL
diff --git a/qpid/cpp/src/tests/ssl.mk b/qpid/cpp/src/tests/ssl.mk
deleted file mode 100644
index 1544dc5e71..0000000000
--- a/qpid/cpp/src/tests/ssl.mk
+++ /dev/null
@@ -1,22 +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.
-#
-
-TESTS+=ssl_test
-EXTRA_DIST+=ssl_test
-CLEAN_LOCAL += test_cert_dir cert.password
diff --git a/qpid/cpp/src/tests/testagent.mk b/qpid/cpp/src/tests/testagent.mk
deleted file mode 100644
index 0492f3e3bb..0000000000
--- a/qpid/cpp/src/tests/testagent.mk
+++ /dev/null
@@ -1,51 +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.
-#
-
-# Build a simple qmf agent for test purposes.
-
-TESTAGENT_GEN_SRC= \
- testagent_gen/qmf/org/apache/qpid/agent/example/Parent.h \
- testagent_gen/qmf/org/apache/qpid/agent/example/Child.h \
- testagent_gen/qmf/org/apache/qpid/agent/example/Parent.cpp \
- testagent_gen/qmf/org/apache/qpid/agent/example/Child.cpp \
- testagent_gen/qmf/org/apache/qpid/agent/example/ArgsParentCreate_child.h \
- testagent_gen/qmf/org/apache/qpid/agent/example/EventChildCreated.h \
- testagent_gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.h \
- testagent_gen/qmf/org/apache/qpid/agent/example/EventChildCreated.cpp \
- testagent_gen/qmf/org/apache/qpid/agent/example/EventChildDestroyed.cpp \
- testagent_gen/qmf/org/apache/qpid/agent/example/Package.h \
- testagent_gen/qmf/org/apache/qpid/agent/example/Package.cpp
-
-$(TESTAGENT_GEN_SRC): testagent_gen.timestamp
-if GENERATE
-TESTAGENT_DEPS=../mgen.timestamp
-endif # GENERATE
-testagent_gen.timestamp: testagent.xml ${TESTAGENT_DEPS}
- $(QMF_GEN) -o testagent_gen/qmf $(srcdir)/testagent.xml
- touch $@
-
-CLEANFILES+=$(TESTAGENT_GEN_SRC) testagent_gen.timestamp
-
-testagent-testagent.$(OBJEXT): $(TESTAGENT_GEN_SRC)
-qpidexectest_PROGRAMS+=testagent
-testagent_CXXFLAGS=$(CXXFLAGS) -Itestagent_gen
-testagent_SOURCES=testagent.cpp $(TESTAGENT_GEN_SRC)
-testagent_LDADD=$(top_builddir)/src/libqmf.la $(top_builddir)/src/libqpidcommon.la $(top_builddir)/src/libqpidtypes.la $(top_builddir)/src/libqpidclient.la
-
-EXTRA_DIST+=testagent.xml
diff --git a/qpid/cpp/src/xml.mk b/qpid/cpp/src/xml.mk
deleted file mode 100644
index 9376cfd54a..0000000000
--- a/qpid/cpp/src/xml.mk
+++ /dev/null
@@ -1,29 +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.
-#
-dmoduleexec_LTLIBRARIES += xml.la
-
-xml_la_SOURCES = \
- qpid/xml/XmlExchange.cpp \
- qpid/xml/XmlExchange.h \
- qpid/xml/XmlExchangePlugin.cpp
-
-xml_la_LIBADD = -lxerces-c -lxqilla libqpidbroker.la
-xml_la_CXXFLAGS = $(AM_CXXFLAGS) -D_IN_QPID_BROKER
-xml_la_LDFLAGS = $(PLUGINLDFLAGS)
-