You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2009/01/23 22:47:12 UTC
svn commit: r737201 - in /qpid/trunk/qpid/cpp/src: MaxMethodBodySize.vcproj
broker.vcproj common.vcproj qpid.sln qpid/broker/Link.cpp
qpid/broker/LinkRegistry.cpp
Author: shuston
Date: Fri Jan 23 13:47:11 2009
New Revision: 737201
URL: http://svn.apache.org/viewvc?rev=737201&view=rev
Log:
Catch up on recent file additions/removals; fix compile errors on Windows
Removed:
qpid/trunk/qpid/cpp/src/MaxMethodBodySize.vcproj
Modified:
qpid/trunk/qpid/cpp/src/broker.vcproj
qpid/trunk/qpid/cpp/src/common.vcproj
qpid/trunk/qpid/cpp/src/qpid.sln
qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
Modified: qpid/trunk/qpid/cpp/src/broker.vcproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/broker.vcproj?rev=737201&r1=737200&r2=737201&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/broker.vcproj (original)
+++ qpid/trunk/qpid/cpp/src/broker.vcproj Fri Jan 23 13:47:11 2009
@@ -760,6 +760,9 @@
RelativePath="qpid\broker\QueueCleaner.cpp">
</File>
<File
+ RelativePath="qpid\broker\QueueEvents.cpp">
+ </File>
+ <File
RelativePath="qpid\broker\QueueListeners.cpp">
</File>
<File
@@ -781,6 +784,9 @@
RelativePath="qpid\broker\RecoveryManagerImpl.cpp">
</File>
<File
+ RelativePath="qpid\broker\RetryList.cpp">
+ </File>
+ <File
RelativePath="qpid\broker\SecureConnection.cpp">
</File>
<File
@@ -1166,6 +1172,9 @@
RelativePath="qpid\broker\QueueCleaner.h">
</File>
<File
+ RelativePath="qpid\broker\QueueEvents.h">
+ </File>
+ <File
RelativePath="qpid\broker\QueueListeners.h">
</File>
<File
@@ -1208,6 +1217,9 @@
RelativePath="qpid\broker\RecoveryManagerImpl.h">
</File>
<File
+ RelativePath="qpid\broker\RetryList.h">
+ </File>
+ <File
RelativePath="qpid\broker\SaslAuthenticator.h">
</File>
<File
Modified: qpid/trunk/qpid/cpp/src/common.vcproj
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/common.vcproj?rev=737201&r1=737200&r2=737201&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/common.vcproj (original)
+++ qpid/trunk/qpid/cpp/src/common.vcproj Fri Jan 23 13:47:11 2009
@@ -354,9 +354,6 @@
RelativePath="gen\qpid\framing\AMQP_ServerProxy.cpp">
</File>
<File
- RelativePath="gen\qpid\framing\BodyHolder_gen.cpp">
- </File>
- <File
RelativePath="gen\qpid\framing\ClientInvoker.cpp">
</File>
<File
@@ -630,6 +627,9 @@
RelativePath="gen\qpid\framing\MethodBodyDefaultVisitor.cpp">
</File>
<File
+ RelativePath="gen\qpid\framing\MethodBodyFactory.cpp">
+ </File>
+ <File
RelativePath="gen\qpid\framing\QueueDeclareBody.cpp">
</File>
<File
@@ -786,15 +786,9 @@
RelativePath="qpid\framing\Array.cpp">
</File>
<File
- RelativePath="qpid\framing\Blob.cpp">
- </File>
- <File
RelativePath="qpid\framing\BodyHandler.cpp">
</File>
<File
- RelativePath="qpid\framing\BodyHolder.cpp">
- </File>
- <File
RelativePath="qpid\framing\Buffer.cpp">
</File>
<File
@@ -813,9 +807,6 @@
RelativePath="qpid\framing\FrameSet.cpp">
</File>
<File
- RelativePath="qpid\framing\MaxMethodBodySize.h">
- </File>
- <File
RelativePath="qpid\framing\ProtocolInitiation.cpp">
</File>
<File
@@ -933,10 +924,7 @@
RelativePath="qpid\sys\Dispatcher.cpp">
</File>
<File
- RelativePath="qpid\sys\PollableCondition.h">
- </File>
- <File
- RelativePath="qpid\sys\PollableQueue.h">
+ RelativePath="qpid\sys\LatencyMetric.cpp">
</File>
<File
RelativePath="qpid\sys\Runnable.cpp">
@@ -1522,15 +1510,12 @@
RelativePath="qpid\framing\Array.h">
</File>
<File
- RelativePath="qpid\framing\Blob.h">
+ RelativePath="qpid\framing\BodyFactory.h">
</File>
<File
RelativePath="qpid\framing\BodyHandler.h">
</File>
<File
- RelativePath="qpid\framing\BodyHolder.h">
- </File>
- <File
RelativePath="qpid\framing\Buffer.h">
</File>
<File
@@ -1576,7 +1561,7 @@
RelativePath="qpid\framing\Invoker.h">
</File>
<File
- RelativePath="qpid\framing\MaxMethodBodySize.h">
+ RelativePath="qpid\framing\MethodBodyFactory.h">
</File>
<File
RelativePath="qpid\framing\MethodContent.h">
@@ -1768,6 +1753,9 @@
RelativePath="qpid\sys\IOHandle.h">
</File>
<File
+ RelativePath="qpid\sys\LatencyMetric.h">
+ </File>
+ <File
RelativePath="qpid\sys\LockFile.h">
</File>
<File
Modified: qpid/trunk/qpid/cpp/src/qpid.sln
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid.sln?rev=737201&r1=737200&r2=737201&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid.sln (original)
+++ qpid/trunk/qpid/cpp/src/qpid.sln Fri Jan 23 13:47:11 2009
@@ -8,8 +8,6 @@
#
# MPC Command:
# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 -static qpid.mwc
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaxMethodBodySize", "MaxMethodBodySize.vcproj", "{CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broker", "broker.vcproj", "{09613D48-FECA-1BAD-9D20-8C374564ADCF}"
ProjectSection(ProjectDependencies) = postProject
{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF} = {C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}
@@ -21,9 +19,6 @@
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common.vcproj", "{C961EF23-FECA-1BAD-BB9C-8C3A4564ADCF}"
- ProjectSection(ProjectDependencies) = postProject
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF} = {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qmfconsole", "qmfconsole.vcproj", "{C95DE177-FECA-1BAD-5EDC-8FFA4564ADCF}"
ProjectSection(ProjectDependencies) = postProject
@@ -38,14 +33,6 @@
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|Win32.Build.0 = Debug|Win32
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.ActiveCfg = Debug|x64
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Debug|x64.Build.0 = Debug|x64
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.ActiveCfg = Release|Win32
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|Win32.Build.0 = Release|Win32
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.ActiveCfg = Release|x64
- {CB5C939B-FECA-1BAD-BB9C-8C3A4564ADCF}.Release|x64.Build.0 = Release|x64
{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.ActiveCfg = Debug|Win32
{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|Win32.Build.0 = Debug|Win32
{09613D48-FECA-1BAD-9D20-8C374564ADCF}.Debug|x64.ActiveCfg = Debug|x64
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp?rev=737201&r1=737200&r2=737201&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Link.cpp Fri Jan 23 13:47:11 2009
@@ -288,7 +288,7 @@
connection->requestIOProcessing (boost::bind(&Link::ioThreadProcessing, this));
}
-void Link::reconnect(const TcpAddress& a)
+void Link::reconnect(const qpid::TcpAddress& a)
{
Mutex::ScopedLock mutex(lock);
host = a.host;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp?rev=737201&r1=737200&r2=737201&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/LinkRegistry.cpp Fri Jan 23 13:47:11 2009
@@ -67,14 +67,14 @@
reMappings.clear();
}
-void LinkRegistry::changeAddress(const TcpAddress& oldAddress, const TcpAddress& newAddress)
+void LinkRegistry::changeAddress(const qpid::TcpAddress& oldAddress, const qpid::TcpAddress& newAddress)
{
//done on periodic maintenance thread; hold changes in separate
//map to avoid modifying the link map that is iterated over
reMappings[createKey(oldAddress)] = newAddress;
}
-bool LinkRegistry::updateAddress(const std::string& oldKey, const TcpAddress& newAddress)
+bool LinkRegistry::updateAddress(const std::string& oldKey, const qpid::TcpAddress& newAddress)
{
std::string newKey = createKey(newAddress);
if (links.find(newKey) != links.end()) {
@@ -296,7 +296,7 @@
}
-std::string LinkRegistry::createKey(const TcpAddress& a)
+std::string LinkRegistry::createKey(const qpid::TcpAddress& a)
{
stringstream keystream;
keystream << a.host << ":" << a.port;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org