summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorStephen D. Huston <shuston@apache.org>2009-01-07 23:05:45 +0000
committerStephen D. Huston <shuston@apache.org>2009-01-07 23:05:45 +0000
commit86199848cf73f9fbe33fca1cd9854747e1548098 (patch)
tree5dab1a26f26a4a0ed8a1de6da54f8a376642af36 /cpp/src
parenta86c15588f403dcc50613061b5e8cc5a18e9062d (diff)
downloadqpid-python-86199848cf73f9fbe33fca1cd9854747e1548098.tar.gz
Add cluster-related content to generated sources; re-gen vc projects. Fixes QPID-1559
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@732549 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/broker.vcproj12
-rw-r--r--cpp/src/client.vcproj9
-rw-r--r--cpp/src/common.vcproj138
-rw-r--r--cpp/src/protocol_gen.mak10
-rw-r--r--cpp/src/qmfconsole.vcproj3
5 files changed, 166 insertions, 6 deletions
diff --git a/cpp/src/broker.vcproj b/cpp/src/broker.vcproj
index 63174dad73..662307d0d7 100644
--- a/cpp/src/broker.vcproj
+++ b/cpp/src/broker.vcproj
@@ -781,6 +781,12 @@
RelativePath="qpid\broker\RecoveryManagerImpl.cpp">
</File>
<File
+ RelativePath="qpid\broker\SecureConnection.cpp">
+ </File>
+ <File
+ RelativePath="qpid\broker\SecureConnectionFactory.cpp">
+ </File>
+ <File
RelativePath="qpid\broker\SemanticState.cpp">
</File>
<File
@@ -1205,6 +1211,12 @@
RelativePath="qpid\broker\SaslAuthenticator.h">
</File>
<File
+ RelativePath="qpid\broker\SecureConnection.h">
+ </File>
+ <File
+ RelativePath="qpid\broker\SecureConnectionFactory.h">
+ </File>
+ <File
RelativePath="qpid\broker\SemanticState.h">
</File>
<File
diff --git a/cpp/src/client.vcproj b/cpp/src/client.vcproj
index f7fbffeff1..e724e04d98 100644
--- a/cpp/src/client.vcproj
+++ b/cpp/src/client.vcproj
@@ -414,6 +414,9 @@
RelativePath="qpid\client\Results.cpp">
</File>
<File
+ RelativePath="qpid\client\SaslFactory.cpp">
+ </File>
+ <File
RelativePath="qpid\client\SessionBase_0_10.cpp">
</File>
<File
@@ -538,6 +541,12 @@
RelativePath="qpid\client\Results.h">
</File>
<File
+ RelativePath="qpid\client\Sasl.h">
+ </File>
+ <File
+ RelativePath="qpid\client\SaslFactory.h">
+ </File>
+ <File
RelativePath="qpid\client\Session.h">
</File>
<File
diff --git a/cpp/src/common.vcproj b/cpp/src/common.vcproj
index 253bdcba58..b88995987c 100644
--- a/cpp/src/common.vcproj
+++ b/cpp/src/common.vcproj
@@ -360,6 +360,72 @@
RelativePath="gen\qpid\framing\ClientInvoker.cpp">
</File>
<File
+ RelativePath="gen\qpid\framing\ClusterConfigChangeBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionAccumulatedAckBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionConsumerStateBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionDeliverCloseBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionDeliverDoOutputBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionDeliveryRecordBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionExchangeBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionMembershipBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionQueueBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionQueuePositionBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionSessionStateBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionShadowReadyBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxAcceptBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxDequeueBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxEndBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxEnqueueBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxPublishBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxStartBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterDumpOfferBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterDumpRequestBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterReadyBody.cpp">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterShutdownBody.cpp">
+ </File>
+ <File
RelativePath="gen\qpid\framing\ConnectionCloseBody.cpp">
</File>
<File
@@ -1000,6 +1066,72 @@
RelativePath="gen\qpid\framing\ClientInvoker.h">
</File>
<File
+ RelativePath="gen\qpid\framing\ClusterConfigChangeBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionAccumulatedAckBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionConsumerStateBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionDeliverCloseBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionDeliverDoOutputBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionDeliveryRecordBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionExchangeBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionMembershipBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionQueueBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionQueuePositionBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionSessionStateBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionShadowReadyBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxAcceptBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxDequeueBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxEndBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxEnqueueBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxPublishBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterConnectionTxStartBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterDumpOfferBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterDumpRequestBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterReadyBody.h">
+ </File>
+ <File
+ RelativePath="gen\qpid\framing\ClusterShutdownBody.h">
+ </File>
+ <File
RelativePath="gen\qpid\framing\ConnectionCloseBody.h">
</File>
<File
@@ -1591,6 +1723,9 @@
RelativePath="qpid\sys\BlockingQueue.h">
</File>
<File
+ RelativePath="qpid\sys\Codec.h">
+ </File>
+ <File
RelativePath="qpid\sys\Condition.h">
</File>
<File
@@ -1666,6 +1801,9 @@
RelativePath="qpid\sys\ScopedIncrement.h">
</File>
<File
+ RelativePath="qpid\sys\SecurityLayer.h">
+ </File>
+ <File
RelativePath="qpid\sys\Semaphore.h">
</File>
<File
diff --git a/cpp/src/protocol_gen.mak b/cpp/src/protocol_gen.mak
index 2680bf220e..5c61eb90d5 100644
--- a/cpp/src/protocol_gen.mak
+++ b/cpp/src/protocol_gen.mak
@@ -7,16 +7,14 @@
# repository.
specdir = ..\..\specs
-# To add cluster support, add ..\xml\cluster.xml to specs, then add sources
-# to project files.
-specs = $(specdir)\amqp.0-10-qpid-errata.xml
+specs = $(specdir)\amqp.0-10-qpid-errata.xml ..\xml\cluster.xml
rgen_dir=..\rubygen
mgen_dir=..\managementgen
-mgmt_specs=$(specdir)\management-schema.xml .\qpid\acl\management-schema.xml
-# To add cluser management, add the next line to mgen_specs:
-# .\qpid\cluster\management-schema.xml
+mgmt_specs=$(specdir)\management-schema.xml \
+ .\qpid\acl\management-schema.xml \
+ .\qpid\cluster\management-schema.xml
all: rubygen.mk gen\generate_MaxMethodBodySize_h.cpp managementgen.mk
diff --git a/cpp/src/qmfconsole.vcproj b/cpp/src/qmfconsole.vcproj
index a9dd414c0f..c37055adec 100644
--- a/cpp/src/qmfconsole.vcproj
+++ b/cpp/src/qmfconsole.vcproj
@@ -351,6 +351,9 @@
RelativePath="qpid\console\ClassKey.cpp">
</File>
<File
+ RelativePath="qpid\console\Event.cpp">
+ </File>
+ <File
RelativePath="qpid\console\Object.cpp">
</File>
<File