You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2009/03/20 16:02:22 UTC

svn commit: r756504 [2/3] - in /activemq/activemq-cpp/trunk/vs2005-build: vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj?rev=756504&r1=756503&r2=756504&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Fri Mar 20 15:02:21 2009
@@ -374,603 +374,1031 @@
 			Name="activemq"
 			>
 			<Filter
-				Name="connector"
+				Name="core"
+				>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQConnectionFactoryTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQConnectionFactoryTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQConnectionTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQConnectionTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQSessionTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQSessionTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="exceptions"
+				>
+				<File
+					RelativePath="..\src\test\activemq\exceptions\ActiveMQExceptionTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\exceptions\ActiveMQExceptionTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="transport"
+				>
+				<File
+					RelativePath="..\src\test\activemq\transport\IOTransportTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\transport\IOTransportTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\transport\TransportRegistryTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\transport\TransportRegistryTest.h"
+					>
+				</File>
+				<Filter
+					Name="correlator"
+					>
+					<File
+						RelativePath="..\src\test\activemq\transport\correlator\ResponseCorrelatorTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\activemq\transport\correlator\ResponseCorrelatorTest.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="failover"
+					>
+					<File
+						RelativePath="..\src\test\activemq\transport\failover\FailoverTransportTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\activemq\transport\failover\FailoverTransportTest.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="mock"
+					>
+					<File
+						RelativePath="..\src\test\activemq\transport\mock\MockTransportFactoryTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\activemq\transport\mock\MockTransportFactoryTest.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="util"
+				>
+				<File
+					RelativePath="..\src\test\activemq\util\LongSequenceGeneratorTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\LongSequenceGeneratorTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\MemoryUsageTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\MemoryUsageTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\PrimitiveListTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\PrimitiveListTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\PrimitiveMapTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\PrimitiveMapTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\PrimitiveValueNodeTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\PrimitiveValueNodeTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\TaskRunnerTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\TaskRunnerTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\URISupportTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\util\URISupportTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="cmsutil"
+				>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\CmsAccessorTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\CmsAccessorTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\CmsDestinationAccessorTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\CmsDestinationAccessorTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\CmsTemplateTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\CmsTemplateTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\DummyConnection.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\DummyConnectionFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\DummyProducer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\DummySession.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\DynamicDestinationResolverTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\DynamicDestinationResolverTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\SessionPoolTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\cmsutil\SessionPoolTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="state"
 				>
 				<File
-					RelativePath="..\src\test\activemq\connector\ConnectorFactoryMapRegistrarTest.cpp"
+					RelativePath="..\src\test\activemq\state\ConnectionStateTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ConnectionStateTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ConnectionStateTrackerTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ConnectionStateTrackerTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ConsumerStateTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ConsumerStateTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ProducerStateTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\ProducerStateTest.h"
 					>
 				</File>
 				<File
-					RelativePath="..\src\test\activemq\connector\ConnectorFactoryMapRegistrarTest.h"
+					RelativePath="..\src\test\activemq\state\SessionStateTest.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\src\test\activemq\connector\ConnectorFactoryMapTest.cpp"
+					RelativePath="..\src\test\activemq\state\SessionStateTest.h"
 					>
 				</File>
 				<File
-					RelativePath="..\src\test\activemq\connector\ConnectorFactoryMapTest.h"
+					RelativePath="..\src\test\activemq\state\TransactionStateTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\state\TransactionStateTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="wireformat"
+				>
+				<File
+					RelativePath="..\src\test\activemq\wireformat\WireFormatRegistryTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\wireformat\WireFormatRegistryTest.h"
 					>
 				</File>
 				<Filter
 					Name="openwire"
 					>
 					<File
-						RelativePath="..\src\test\activemq\connector\openwire\OpenWireFormatTest.cpp"
+						RelativePath="..\src\test\activemq\wireformat\openwire\OpenWireFormatTest.cpp"
 						>
 					</File>
 					<File
-						RelativePath="..\src\test\activemq\connector\openwire\OpenWireFormatTest.h"
+						RelativePath="..\src\test\activemq\wireformat\openwire\OpenWireFormatTest.h"
 						>
 					</File>
 					<Filter
-						Name="commands"
+						Name="marshal"
 						>
 						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQBytesMessageTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQBytesMessageTest.h"
+							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\BaseDataStreamMarshallerTest.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQDestinationTest2.cpp"
+							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\BaseDataStreamMarshallerTest.h"
 							>
 						</File>
 						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQDestinationTest2.h"
+							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\PrimitiveMapMarshallerTest.cpp"
 							>
 						</File>
 						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQMapMessageTest.cpp"
+							RelativePath="..\src\test\activemq\wireformat\openwire\marshal\PrimitiveMapMarshallerTest.h"
 							>
 						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQMapMessageTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQMessageTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQMessageTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQQueueTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQQueueTest.h"
+						<Filter
+							Name="v3"
 							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTempQueueTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTempQueueTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTempTopicTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTempTopicTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTextMessageTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTextMessageTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTopicTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\ActiveMQTopicTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\BrokerIdTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\BrokerIdTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\BrokerInfoTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\commands\BrokerInfoTest.h"
-							>
-						</File>
-					</Filter>
-					<Filter
-						Name="marshal"
-						>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\marshal\BaseDataStreamMarshallerTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\marshal\BaseDataStreamMarshallerTest.h"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\marshal\PrimitiveMapMarshallerTest.cpp"
-							>
-						</File>
-						<File
-							RelativePath="..\src\test\activemq\connector\openwire\marshal\PrimitiveMapMarshallerTest.h"
-							>
-						</File>
-						<Filter
-							Name="v2"
-							>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQBytesMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQBytesMessageMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQMapMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQMapMessageMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQMessageMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQObjectMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQObjectMessageMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQQueueMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQQueueMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQStreamMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQStreamMessageMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTempQueueMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTempQueueMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTempTopicMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTempTopicMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTextMessageMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTextMessageMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTopicMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ActiveMQTopicMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\BaseCommandMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\BaseCommandMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\BrokerIdMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\BrokerIdMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\BrokerInfoMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\BrokerInfoMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionControlMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionControlMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionErrorMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionErrorMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionIdMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionIdMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionInfoMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConnectionInfoMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConsumerControlMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConsumerControlMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConsumerIdMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConsumerIdMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConsumerInfoMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ConsumerInfoMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ControlCommandMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ControlCommandMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DataArrayResponseMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DataArrayResponseMarshallerTest.h"
-								>
-							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DataResponseMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DataResponseMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DestinationInfoMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DestinationInfoMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DiscoveryEventMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\DiscoveryEventMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ExceptionResponseMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ExceptionResponseMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\FlushCommandMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\FlushCommandMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\IntegerResponseMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\IntegerResponseMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalQueueAckMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalQueueAckMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalTopicAckMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalTopicAckMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalTraceMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalTraceMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalTransactionMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\JournalTransactionMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\KeepAliveInfoMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\KeepAliveInfoMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\LastPartialCommandMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\LastPartialCommandMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\LocalTransactionIdMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\LocalTransactionIdMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageAckMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageAckMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageDispatchMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageDispatchMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageDispatchNotificationMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageDispatchNotificationMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageIdMarshallerTest.cpp"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessageIdMarshallerTest.h"
-								>
-							</File>
-							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessagePullMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQBlobMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\MessagePullMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQBlobMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\NetworkBridgeFilterMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQBytesMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\NetworkBridgeFilterMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQBytesMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\PartialCommandMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQMapMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\PartialCommandMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQMapMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ProducerIdMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ProducerIdMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ProducerInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQObjectMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ProducerInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQObjectMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\RemoveInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQQueueMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\RemoveInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQQueueMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\RemoveSubscriptionInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQStreamMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\RemoveSubscriptionInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQStreamMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ReplayCommandMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTempQueueMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ReplayCommandMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTempQueueMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ResponseMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTempTopicMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ResponseMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTempTopicMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\SessionIdMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTextMessageMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\SessionIdMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTextMessageMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\SessionInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTopicMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\SessionInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ActiveMQTopicMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ShutdownInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\BrokerIdMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\ShutdownInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\BrokerIdMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\SubscriptionInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\BrokerInfoMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\SubscriptionInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\BrokerInfoMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\TransactionInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionControlMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\TransactionInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionControlMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\WireFormatInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionErrorMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\WireFormatInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionErrorMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\XATransactionIdMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionIdMarshallerTest.cpp"
 								>
+								<FileConfiguration
+									Name="Debug|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="Release|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="ReleaseDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
+								<FileConfiguration
+									Name="DebugDLL|Win32"
+									>
+									<Tool
+										Name="VCCLCompilerTool"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
+									/>
+								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v2\XATransactionIdMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionIdMarshallerTest.h"
 								>
 							</File>
-						</Filter>
-						<Filter
-							Name="v1"
-							>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQBytesMessageMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionInfoMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -978,8 +1406,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -987,8 +1415,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -996,25 +1424,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQBytesMessageMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConnectionInfoMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQMapMessageMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConsumerControlMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1022,8 +1450,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1031,8 +1459,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1040,25 +1468,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQMapMessageMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConsumerControlMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQMessageMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConsumerIdMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1066,8 +1494,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1075,8 +1503,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1084,25 +1512,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQMessageMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConsumerIdMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQObjectMessageMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConsumerInfoMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1110,8 +1538,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1119,8 +1547,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1128,25 +1556,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQObjectMessageMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ConsumerInfoMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQQueueMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ControlCommandMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1154,8 +1582,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1163,8 +1591,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1172,25 +1600,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQQueueMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ControlCommandMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQStreamMessageMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DataArrayResponseMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1198,8 +1626,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1207,8 +1635,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1216,25 +1644,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQStreamMessageMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DataArrayResponseMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTempQueueMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DataResponseMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1242,8 +1670,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1251,8 +1679,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1260,25 +1688,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTempQueueMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DataResponseMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTempTopicMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DestinationInfoMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1286,8 +1714,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1295,8 +1723,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1304,25 +1732,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTempTopicMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DestinationInfoMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTextMessageMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DiscoveryEventMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1330,8 +1758,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1339,8 +1767,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1348,25 +1776,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTextMessageMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\DiscoveryEventMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTopicMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ExceptionResponseMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1374,8 +1802,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1383,8 +1811,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1392,25 +1820,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ActiveMQTopicMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\ExceptionResponseMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\BrokerIdMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\FlushCommandMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1418,8 +1846,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1427,8 +1855,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1436,25 +1864,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\BrokerIdMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\FlushCommandMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\BrokerInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\IntegerResponseMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1462,8 +1890,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1471,8 +1899,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1480,25 +1908,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\BrokerInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\IntegerResponseMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionControlMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalQueueAckMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1506,8 +1934,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1515,8 +1943,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1524,25 +1952,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionControlMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalQueueAckMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionErrorMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalTopicAckMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1550,8 +1978,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1559,8 +1987,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1568,25 +1996,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionErrorMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalTopicAckMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionIdMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalTraceMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1594,8 +2022,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1603,8 +2031,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1612,25 +2040,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionIdMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalTraceMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionInfoMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalTransactionMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1638,8 +2066,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1647,8 +2075,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1656,25 +2084,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConnectionInfoMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\JournalTransactionMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConsumerControlMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\KeepAliveInfoMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1682,8 +2110,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1691,8 +2119,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1700,25 +2128,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConsumerControlMarshallerTest.h"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\KeepAliveInfoMarshallerTest.h"
 								>
 							</File>
 							<File
-								RelativePath="..\src\test\activemq\connector\openwire\marshal\v1\ConsumerIdMarshallerTest.cpp"
+								RelativePath="..\src\test\activemq\wireformat\openwire\marshal\v3\LastPartialCommandMarshallerTest.cpp"
 								>
 								<FileConfiguration
 									Name="Debug|Win32"
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1726,8 +2154,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1735,8 +2163,8 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"
-										XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+										ObjectFile="$(IntDir)\$(InputName)2.obj"
+										XMLDocumentationFileName="$(IntDir)\$(InputName)2.xdc"
 									/>
 								</FileConfiguration>
 								<FileConfiguration
@@ -1744,25 +2172,25 @@
 									>
 									<Tool
 										Name="VCCLCompilerTool"
-										ObjectFile="$(IntDir)\$(InputName)1.obj"

[... 5117 lines stripped ...]