diff options
| author | Alan Conway <aconway@apache.org> | 2010-10-27 18:01:27 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-10-27 18:01:27 +0000 |
| commit | 326dddd0d0d48401d14ca93044b3fc0e35ad87d9 (patch) | |
| tree | 019a45480d8cdf832f62d7176b7a10a5d0971535 /cpp/src/cluster.mk | |
| parent | aae11121cfcf891b2365241141f9ab9cb47d3024 (diff) | |
| download | qpid-python-326dddd0d0d48401d14ca93044b3fc0e35ad87d9.tar.gz | |
Revert experimental cluster code, too close to 0.8 release.
Reverts revisions:
r1023966 "Introduce broker::Cluster interface."
r1024275 "Fix compile error: outline set/getCluster fucntions on Broker."
r1027210 "New cluster: core framework and initial implementation of enqueue logic."
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1028055 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/cluster.mk')
| -rw-r--r-- | cpp/src/cluster.mk | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/cpp/src/cluster.mk b/cpp/src/cluster.mk index 7cd4a18c9e..2a648e968c 100644 --- a/cpp/src/cluster.mk +++ b/cpp/src/cluster.mk @@ -35,6 +35,7 @@ endif if HAVE_LIBCPG dmodule_LTLIBRARIES += cluster.la + cluster_la_SOURCES = \ $(CMAN_SOURCES) \ qpid/cluster/Cluster.cpp \ @@ -98,27 +99,6 @@ cluster_la_LIBADD= -lcpg $(libcman) libqpidbroker.la libqpidclient.la cluster_la_CXXFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing cluster_la_LDFLAGS = $(PLUGINLDFLAGS) -# Experimental new cluster plugin -dmodule_LTLIBRARIES += cluster2.la -cluster2_la_LIBADD = -lcpg libqpidbroker.la -cluster2_la_LDFLAGS = $(PLUGINLDFLAGS) -cluster2_la_SOURCES = \ - qpid/cluster/BrokerHandler.cpp \ - qpid/cluster/BrokerHandler.h \ - qpid/cluster/Cluster2Plugin.cpp \ - qpid/cluster/Core.cpp \ - qpid/cluster/Core.h \ - qpid/cluster/Cpg.cpp \ - qpid/cluster/Cpg.h \ - qpid/cluster/EventHandler.cpp \ - qpid/cluster/EventHandler.h \ - qpid/cluster/MessageHandler.cpp \ - qpid/cluster/MessageHandler.h \ - qpid/cluster/MessageId.cpp \ - qpid/cluster/MessageId.h \ - qpid/cluster/PollerDispatch.cpp \ - qpid/cluster/PollerDispatch.h - # The watchdog plugin and helper executable dmodule_LTLIBRARIES += watchdog.la watchdog_la_SOURCES = qpid/cluster/WatchDogPlugin.cpp |