You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2012/08/10 12:49:49 UTC
svn commit: r1371647 - in /qpid/trunk/qpid/cpp: ./ src/ src/qpid/cluster/
src/tests/
Author: gsim
Date: Fri Aug 10 10:49:46 2012
New Revision: 1371647
URL: http://svn.apache.org/viewvc?rev=1371647&view=rev
Log:
Remove cluster (prerequisite for QPID-4178)
Removed:
qpid/trunk/qpid/cpp/src/cluster.cmake
qpid/trunk/qpid/cpp/src/cluster.mk
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterMap.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterSettings.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterTimer.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ClusterTimer.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionCodec.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ConnectionCodec.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Cpg.h
qpid/trunk/qpid/cpp/src/qpid/cluster/CredentialsExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/CredentialsExchange.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Decoder.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Dispatchable.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ErrorCheck.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ErrorCheck.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Event.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Event.h
qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ExpiryPolicy.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/ExpiryPolicy.h
qpid/trunk/qpid/cpp/src/qpid/cluster/FailoverExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/FailoverExchange.h
qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/InitialStatusMap.h
qpid/trunk/qpid/cpp/src/qpid/cluster/LockedConnectionMap.h
qpid/trunk/qpid/cpp/src/qpid/cluster/McastFrameHandler.h
qpid/trunk/qpid/cpp/src/qpid/cluster/MemberSet.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/MemberSet.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.h
qpid/trunk/qpid/cpp/src/qpid/cluster/NoOpConnectionOutputHandler.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Numbering.h
qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.h
qpid/trunk/qpid/cpp/src/qpid/cluster/PollableQueue.h
qpid/trunk/qpid/cpp/src/qpid/cluster/PollerDispatch.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/PollerDispatch.h
qpid/trunk/qpid/cpp/src/qpid/cluster/ProxyInputHandler.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_cman.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Quorum_null.h
qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/RetractClient.h
qpid/trunk/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/SecureConnectionFactory.h
qpid/trunk/qpid/cpp/src/qpid/cluster/StoreStatus.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/StoreStatus.h
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateDataExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateDataExchange.h
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateExchange.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateExchange.h
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateReceiver.h
qpid/trunk/qpid/cpp/src/qpid/cluster/WatchDogPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/management-schema.xml
qpid/trunk/qpid/cpp/src/qpid/cluster/qpidd_watchdog.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/types.h
qpid/trunk/qpid/cpp/src/tests/cluster.cmake
qpid/trunk/qpid/cpp/src/tests/cluster.mk
Modified:
qpid/trunk/qpid/cpp/CMakeLists.txt
qpid/trunk/qpid/cpp/configure.ac
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/Makefile.am
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
qpid/trunk/qpid/cpp/src/tests/Makefile.am
qpid/trunk/qpid/cpp/src/tests/sasl.mk
Modified: qpid/trunk/qpid/cpp/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/CMakeLists.txt?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/CMakeLists.txt Fri Aug 10 10:49:46 2012
@@ -60,7 +60,6 @@ set (QPIDD_CONF_FILE ${QPID_INSTALL_CONF
"Name of the Qpid broker configuration file")
install(FILES LICENSE NOTICE DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(FILES xml/cluster.xml DESTINATION ${QPID_INSTALL_DATADIR})
if (WIN32)
set (CMAKE_DEBUG_POSTFIX "d")
Modified: qpid/trunk/qpid/cpp/configure.ac
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/configure.ac?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/configure.ac (original)
+++ qpid/trunk/qpid/cpp/configure.ac Fri Aug 10 10:49:46 2012
@@ -256,54 +256,6 @@ AC_SUBST(DOWNLOAD_URL)
AC_CHECK_HEADERS([boost/shared_ptr.hpp uuid/uuid.h],,
AC_MSG_ERROR([Missing required header files.]))
-# Check for optional cluster requirements.
-tmp_LIBS=$LIBS
-tmp_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -L/usr/lib/openais -L/usr/lib64/openais -L/usr/lib/corosync -L/usr/lib64/corosync"
-AC_CHECK_LIB([cpg],[cpg_local_get],[have_libcpg=yes],)
-AC_CHECK_HEADERS([openais/cpg.h corosync/cpg.h],[have_cpg_h=yes],)
-AC_ARG_WITH([cpg],
- [AS_HELP_STRING([--with-cpg], [Build with CPG support for clustering.])],
- [case "${withval}" in
- yes) # yes - require dependencies
- test x$have_libcpg = xyes || AC_MSG_ERROR([libcpg not found, install openais-devel or corosync-devel])
- test x$have_cpg_h = xyes || AC_MSG_ERROR([cpg.h not found, install openais-devel or corosync-devel])
- with_cpg=yes
- ;;
- no) with_cpg=no ;;
- *) AC_MSG_ERROR([Bad value ${withval} for --with-cpg option]) ;;
- esac],
- [ # not specified - use if present
- test x$have_libcpg = xyes -a x$have_cpg_h = xyes && with_cpg=yes
- ]
-)
-AM_CONDITIONAL([HAVE_LIBCPG], [test x$with_cpg = xyes])
-AC_SUBST(USE_CPG, [$with_cpg])
-
-# Clean up unnceccassary flags if we don't use clustering
-AS_IF([test ! x$with_cpg = xyes], [LDFLAGS=$tmp_LDFLAGS])
-
-AC_CHECK_LIB([cman],[cman_is_quorate],have_libcman=yes,)
-AC_CHECK_HEADERS([libcman.h],have_libcman_h=yes,)
-AC_ARG_WITH([libcman],
- [AS_HELP_STRING([--with-libcman], [Integration with libcman quorum service.])],
- [case "${withval}" in
- yes) # yes - require dependencies
- test x$have_libcman = xyes || AC_MSG_ERROR([libcman not found, install cman-devel or cmanlib-devel])
- test x$have_libcman_h = xyes || AC_MSG_ERROR([libcman.h not found, install cman-devel or cmanlib-devel])
- with_libcman=yes
- ;;
- no) with_libcman=no ;;
- *) AC_MSG_ERROR([Bad value ${withval} for --with-libcman option]) ;;
- esac],
- [ # not specified - use if present and we're using with_cpg
- test x$have_libcman = xyes -a x$have_libcman_h = xyes -a x$with_cpg = xyes && with_libcman=yes
- ]
-)
-AM_CONDITIONAL([HAVE_LIBCMAN], [test x$with_libcman = xyes])
-
-LIBS=$tmp_LIBS
-
# Setup --with-sasl/--without-sasl as arguments to configure
AC_ARG_WITH([sasl],
[AS_HELP_STRING([--with-sasl], [Build with SASL authentication support])],
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Fri Aug 10 10:49:46 2012
@@ -167,7 +167,7 @@ inherit_value ("winver_LEGAL_COPYRIGHT"
# check if we generate source as part of the build
-# - rubygen generates the amqp spec and clustering
+# - rubygen generates the amqp spec
# - managementgen generates the broker management code
#
# rubygen subdir is excluded from stable distributions
@@ -186,7 +186,7 @@ if (EXISTS ${AMQP_SPEC})
message(FATAL_ERROR "Can't locate python, needed to generate source files.")
endif (NOT PYTHON_EXECUTABLE)
- set(specs ${AMQP_SPEC} ${qpid-cpp_SOURCE_DIR}/xml/cluster.xml)
+ set(specs ${AMQP_SPEC})
set(regen_amqp OFF)
set(rgen_dir ${qpid-cpp_SOURCE_DIR}/rubygen)
file(GLOB_RECURSE rgen_progs ${rgen_dir}/*.rb)
@@ -207,7 +207,6 @@ execute_process(COMMAND ${RUBY_EXECUTABL
set(mgmt_specs ${AMQP_SPEC_DIR}/management-schema.xml
${CMAKE_CURRENT_SOURCE_DIR}/qpid/acl/management-schema.xml
- ${CMAKE_CURRENT_SOURCE_DIR}/qpid/cluster/management-schema.xml
${CMAKE_CURRENT_SOURCE_DIR}/qpid/ha/management-schema.xml
)
set(mgen_dir ${qpid-cpp_SOURCE_DIR}/managementgen)
@@ -672,9 +671,6 @@ if (BUILD_HA)
COMPONENT ${QPID_COMPONENT_BROKER})
endif (BUILD_HA)
-# Check for optional cluster support requirements
-include (cluster.cmake)
-
# Check for optional RDMA support requirements
include (rdma.cmake)
Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Fri Aug 10 10:49:46 2012
@@ -85,7 +85,7 @@ if GENERATE
# AMQP_FINAL_XML is defined in ../configure.ac
amqp_0_10_xml=@AMQP_FINAL_XML@
-specs=$(amqp_0_10_xml) $(top_srcdir)/xml/cluster.xml
+specs=$(amqp_0_10_xml)
# Ruby generator.
rgen_dir=$(top_srcdir)/rubygen
@@ -104,7 +104,6 @@ $(srcdir)/rubygen.cmake: $(rgen_generato
mgen_dir=$(top_srcdir)/managementgen
mgen_xml=$(top_srcdir)/../specs/management-schema.xml \
$(srcdir)/qpid/acl/management-schema.xml \
- $(srcdir)/qpid/cluster/management-schema.xml \
$(srcdir)/qpid/ha/management-schema.xml
mgen_cmd=$(mgen_dir)/qmf-gen -m $(srcdir)/managementgen.mk \
-c $(srcdir)/managementgen.cmake -q -b -l -o qmf \
@@ -217,7 +216,6 @@ cmoduleexecdir=$(libdir)/qpid/client
dmoduleexec_LTLIBRARIES =
cmoduleexec_LTLIBRARIES =
-include cluster.mk
include ha.mk
include acl.mk
include qmf.mk
@@ -292,7 +290,6 @@ endif
EXTRA_DIST +=\
CMakeLists.txt \
- cluster.cmake \
config.h.cmake \
rdma.cmake \
ssl.cmake \
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Fri Aug 10 10:49:46 2012
@@ -165,10 +165,6 @@ remember_location(unit_test)
add_library (shlibtest MODULE shlibtest.cpp)
-if (BUILD_CLUSTER)
- include (cluster.cmake)
-endif (BUILD_CLUSTER)
-
# FIXME aconway 2009-11-30: enable SSL
#if SSL
#include ssl.mk
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Fri Aug 10 10:49:46 2012
@@ -142,7 +142,6 @@ test_store_la_SOURCES = test_store.cpp
test_store_la_LIBADD = $(lib_broker)
test_store_la_LDFLAGS = -module
-include cluster.mk
include sasl.mk
if SSL
include ssl.mk
@@ -338,7 +337,6 @@ EXTRA_DIST += \
dynamic_log_level_test \
qpid-ctrl \
CMakeLists.txt \
- cluster.cmake \
windows/DisableWin32ErrorWindows.cpp \
background.ps1 \
find_prog.ps1 \
@@ -372,14 +370,6 @@ LONG_TESTS+=start_broker \
stop_broker \
run_long_federation_sys_tests
-if HAVE_LIBCPG
-
-LONG_TESTS+= federated_cluster_test_with_node_failure \
- run_failover_soak \
- reliable_replication_test
-
-endif HAVE_LIBCPG
-
EXTRA_DIST+= \
fanout_perftest \
shared_perftest \
Modified: qpid/trunk/qpid/cpp/src/tests/sasl.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/sasl.mk?rev=1371647&r1=1371646&r2=1371647&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/sasl.mk (original)
+++ qpid/trunk/qpid/cpp/src/tests/sasl.mk Fri Aug 10 10:49:46 2012
@@ -20,13 +20,6 @@
# Test that are only relevant if SASL is enabled.
if HAVE_SASL
-if HAVE_LIBCPG
-check_PROGRAMS+=cluster_authentication_soak
-cluster_authentication_soak_INCLUDES=$(PUBLIC_INCLUDES)
-cluster_authentication_soak_SOURCES=cluster_authentication_soak.cpp ForkedBroker.h ForkedBroker.cpp
-cluster_authentication_soak_LDADD=$(lib_client) $(lib_broker)
-endif HAVE_LIBCPG
-
# Note: sasl_version is not a test -- it is a tool used by tests.
check_PROGRAMS+=sasl_version
sasl_version_SOURCES=sasl_version.cpp
@@ -39,30 +32,12 @@ TESTS += sasl_fed
sasl_fed_ex_route
sasl_no_dir
-if HAVE_LIBCPG
-
-TESTS += run_cluster_authentication_test \
- sasl_fed_ex_route_cluster \
- sasl_fed_ex_link_cluster \
- sasl_fed_ex_queue_cluster \
- sasl_fed_ex_dynamic_cluster
-
-LONG_TESTS += run_cluster_authentication_soak
-
-endif HAVE_LIBCPG
-
-EXTRA_DIST += run_cluster_authentication_test \
- sasl_fed \
+EXTRA_DIST += sasl_fed \
sasl_fed_ex \
- run_cluster_authentication_soak \
sasl_fed_ex_dynamic \
sasl_fed_ex_link \
sasl_fed_ex_queue \
sasl_fed_ex_route \
- sasl_fed_ex_dynamic_cluster \
- sasl_fed_ex_link_cluster \
- sasl_fed_ex_queue_cluster \
- sasl_fed_ex_route_cluster \
sasl_no_dir
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org