svn commit: r768053 [3/3] - in /qpid/branches/cmake/qpid/cpp: ./ rubygen/framing.0-10/ src/ src/qpid/amqp_0_10/ src/qpid/broker/ src/qpid/client/ src/qpid/cluster/ src/qpid/framing/ src/qpid/sys/ src/qpid/sys/windows/ src/tests/ xml/

Thu, 23 Apr 2009 14:21:02 -0700 

Modified: qpid/branches/cmake/qpid/cpp/src/tests/txtest.vcproj
URL: 
http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/src/tests/txtest.vcproj?rev=768053&r1=768052&r2=768053&view=diff
==============================================================================
--- qpid/branches/cmake/qpid/cpp/src/tests/txtest.vcproj (original)
+++ qpid/branches/cmake/qpid/cpp/src/tests/txtest.vcproj Thu Apr 23 21:06:35 
2009
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"
        Version="9.00"
        Name="txtest"
-       ProjectGUID="{697786BE-FECA-1BAD-2431-8A11DB0D67CE}"
+       ProjectGUID="{697786BE-FECA-1BAD-2431-8A11CDC7409E}"
        RootNamespace="txtest"
        Keyword="Win32Proj"
        SignManifests="true"

Modified: qpid/branches/cmake/qpid/cpp/src/tests/unit_test.vcproj
URL: 
http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/src/tests/unit_test.vcproj?rev=768053&r1=768052&r2=768053&view=diff
==============================================================================
--- qpid/branches/cmake/qpid/cpp/src/tests/unit_test.vcproj (original)
+++ qpid/branches/cmake/qpid/cpp/src/tests/unit_test.vcproj Thu Apr 23 21:06:35 
2009
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"
        Version="9.00"
        Name="unit_test"
-       ProjectGUID="{51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}"
+       ProjectGUID="{51E5F6B9-FECA-1BAD-2431-8A11CDC7409E}"
        RootNamespace="unit_test"
        Keyword="Win32Proj"
        SignManifests="true"
@@ -76,7 +76,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="qpidcommond.lib 
qpidclientd.lib qpidbrokerd.lib qmfconsoled.lib"
+                               AdditionalDependencies="qpidcommond.lib 
qpidclientd.lib qpidbrokerd.lib qmfconsoled.lib ws2_32.lib"
                                OutputFile="$(OutDir)\unit_test.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
@@ -155,7 +155,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="qpidcommon.lib 
qpidclient.lib qpidbroker.lib qmfconsole.lib"
+                               AdditionalDependencies="qpidcommon.lib 
qpidclient.lib qpidbroker.lib qmfconsole.lib ws2_32.lib"
                                OutputFile="$(OutDir)\unit_test.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
@@ -240,7 +240,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/machine:AMD64"
-                               AdditionalDependencies="qpidcommond.lib 
qpidclientd.lib qpidbrokerd.lib qmfconsoled.lib"
+                               AdditionalDependencies="qpidcommond.lib 
qpidclientd.lib qpidbrokerd.lib qmfconsoled.lib ws2_32.lib"
                                OutputFile="$(OutDir)\unit_test.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
@@ -320,7 +320,7 @@
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/machine:AMD64"
-                               AdditionalDependencies="qpidcommon.lib 
qpidclient.lib qpidbroker.lib qmfconsole.lib"
+                               AdditionalDependencies="qpidcommon.lib 
qpidclient.lib qpidbroker.lib qmfconsole.lib ws2_32.lib"
                                OutputFile="$(OutDir)\unit_test.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"

Modified: qpid/branches/cmake/qpid/cpp/xml/cluster.xml
URL: 
http://svn.apache.org/viewvc/qpid/branches/cmake/qpid/cpp/xml/cluster.xml?rev=768053&r1=768052&r2=768053&view=diff
==============================================================================
--- qpid/branches/cmake/qpid/cpp/xml/cluster.xml (original)
+++ qpid/branches/cmake/qpid/cpp/xml/cluster.xml Thu Apr 23 21:06:35 2009
@@ -48,6 +48,19 @@
       <field name="id" type="uint64"/>
     </control>
     
+    <domain name="error-type" type="uint8" label="Types of error">
+      <enum>
+       <choice name="none" value="0"/>
+       <choice name="session" value="1"/>
+       <choice name="connection" value="2"/>
+      </enum>
+    </domain>
+       
+    <control name="error-check" code="0x13">
+      <field name="type" type="error-type"/>
+      <field name="frame-seq" type="uint64"/>
+    </control>
+    
     <control name="shutdown" code="0x20" label="Shut down entire cluster"/>
 
   </class>
@@ -132,6 +145,7 @@
     <control name="membership" code="0x21" label="Cluster membership details.">
       <field name="joiners" type="map"/> <!-- member-id -> URL -->
       <field name="members" type="map"/> <!-- member-id -> state -->
+      <field name="frame-seq" type="uint64"/>   <!-- frame sequence number -->
     </control>
 
     <!-- Set the position of a replicated queue. -->
@@ -146,5 +160,6 @@
 
     <!-- Set expiry-id for subsequent messages. -->
     <control name="expiry-id" code="0x33"><field name="expiry-id" 
type="uint64"/></control>
+
   </class>
 </amqp>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org

Reply via email to