Return-Path: 
 <commits-return-22373-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
X-Original-To: apmail-activemq-commits-archive@www.apache.org
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 997BBFB02
	for <apmail-activemq-commits-archive@www.apache.org>;
 Thu,  2 May 2013 22:09:26 +0000 (UTC)
Received: (qmail 56883 invoked by uid 500); 2 May 2013 22:09:26 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 56842 invoked by uid 500); 2 May 2013 22:09:26 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 56828 invoked by uid 99); 2 May 2013 22:09:26 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 22:09:26 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 May 2013 22:09:23 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0C24A238897D;
	Thu,  2 May 2013 22:09:03 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1478587 -
 /activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/
Date: Thu, 02 May 2013 22:09:02 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130502220903.0C24A238897D@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tabish
Date: Thu May  2 22:09:02 2013
New Revision: 1478587

URL: http://svn.apache.org/r1478587
Log:
Update projects for all recent changes

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-receiver.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-sender.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-example.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-producer.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.sln
    activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-receiver.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-receiver.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-receiver.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-receiver.vcproj Thu May  2 22:09:02 2013
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -103,11 +103,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -124,24 +125,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4290, 4101"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -154,16 +150,18 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,9 +189,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="ReleaseDLL|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
@@ -217,7 +215,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -226,6 +224,7 @@
 				WarningLevel="2"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -238,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -277,12 +276,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="DebugDLL|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -299,20 +297,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4290;4101;4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -325,18 +326,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,12 +363,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseDLL|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -386,20 +384,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4251"
+				DisableSpecificWarnings="4290, 4101"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -412,18 +414,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -451,7 +451,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseDLL|x64"
+			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -478,7 +478,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -487,7 +487,6 @@
 				WarningLevel="2"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -500,7 +499,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -539,11 +538,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugDLL|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="ReleaseDLL|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -560,23 +560,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4290;4101;4251"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -591,14 +589,16 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-sender.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-sender.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-sender.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cmstemplate-sender.vcproj Thu May  2 22:09:02 2013
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -103,11 +103,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
 			ConfigurationType="1"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -124,24 +125,19 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4290, 4101"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -154,16 +150,18 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -191,9 +189,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
+			Name="ReleaseDLL|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)\$(ProjectName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
 			WholeProgramOptimization="1"
@@ -217,7 +215,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -226,6 +224,7 @@
 				WarningLevel="2"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -238,7 +237,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -277,12 +276,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="DebugDLL|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -299,20 +297,23 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+				DisableSpecificWarnings="4290;4101;4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -325,18 +326,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -364,12 +363,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseDLL|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="Debug|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
-			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -386,20 +384,24 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
-				RuntimeLibrary="2"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="2"
-				Detect64BitPortabilityProblems="false"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4251"
+				DisableSpecificWarnings="4290, 4101"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -412,18 +414,16 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -451,7 +451,7 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="ReleaseDLL|x64"
+			Name="Release|x64"
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
@@ -478,7 +478,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -487,7 +487,6 @@
 				WarningLevel="2"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
-				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -500,7 +499,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -539,11 +538,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="DebugDLL|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			Name="ReleaseDLL|x64"
+			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			CharacterSet="0"
+			WholeProgramOptimization="1"
 			BuildLogFile="$(IntDir)\$(ProjectName)\BuildLog.htm"
 			>
 			<Tool
@@ -560,23 +560,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
 				AdditionalIncludeDirectories="../src/example;..\src\main;&quot;$(PLATFORM_SDK)\include&quot;;&quot;$(CPPUNIT_DIST)\include&quot;;&quot;$(APR_DIST)\include&quot;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				DisableSpecificWarnings="4290;4101;4251"
+				WarningLevel="2"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				DisableSpecificWarnings="4251"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -591,14 +589,16 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-example.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-example.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-example.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-example.vcproj Thu May  2 22:09:02 2013
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -242,7 +242,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -416,7 +416,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -593,7 +593,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-integration-tests.vcproj Thu May  2 22:09:02 2013
@@ -71,7 +71,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
@@ -242,7 +242,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
@@ -413,7 +413,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
@@ -588,7 +588,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
@@ -741,6 +741,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\test-integration\activemq\test\BulkMessageTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test-integration\activemq\test\BulkMessageTest.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\test-integration\activemq\test\CmsConnectionStartStopTest.cpp"
 						>
 					</File>
@@ -980,6 +988,22 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireNonBlockingRedeliveryTest.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireNonBlockingRedeliveryTest.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireOptimizedAckTest.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireOptimizedAckTest.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\test-integration\activemq\test\openwire\OpenwireQueueBrowserTest.cpp"
 							>
 						</File>
@@ -1056,6 +1080,14 @@
 							>
 						</File>
 						<File
+							RelativePath="..\src\test-integration\activemq\test\stomp\StompBulkMessageTest.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\test-integration\activemq\test\stomp\StompBulkMessageTest.h"
+							>
+						</File>
+						<File
 							RelativePath="..\src\test-integration\activemq\test\stomp\StompCmsTemplateTest.cpp"
 							>
 						</File>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-producer.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-producer.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-producer.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-producer.vcproj Thu May  2 22:09:02 2013
@@ -66,7 +66,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -221,7 +221,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -380,7 +380,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -531,7 +531,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp-unittests.vcproj Thu May  2 22:09:02 2013
@@ -70,7 +70,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -242,7 +242,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -416,7 +416,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -592,7 +592,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
@@ -743,6 +743,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQMessageAuditTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ActiveMQMessageAuditTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\activemq\core\ActiveMQSessionTest.cpp"
 					>
 				</File>
@@ -751,6 +759,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\activemq\core\ConnectionAuditTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\activemq\core\ConnectionAuditTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\activemq\core\FifoMessageDispatchChannelTest.cpp"
 					>
 				</File>
@@ -2331,6 +2347,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\decaf\util\CollectionsTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\CollectionsTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\util\DateTest.cpp"
 					>
 				</File>
@@ -2363,6 +2387,30 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\test\decaf\util\HashSetTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\HashSetTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\LinkedHashMapTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\LinkedHashMapTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\LinkedHashSetTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\LinkedHashSetTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\util\LinkedListTest.cpp"
 					>
 				</File>
@@ -2723,6 +2771,14 @@
 				Name="security"
 				>
 				<File
+					RelativePath="..\src\test\decaf\security\MessageDigestTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\security\MessageDigestTest.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\test\decaf\security\SecureRandomTest.cpp"
 					>
 				</File>

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.sln
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.sln?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.sln (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.sln Thu May  2 22:09:02 2013
@@ -32,6 +32,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
 		{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26} = {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activemq-cmstemplate-stressor", "activemq-cmstemplate-stressor.vcproj", "{D3FF58B4-F851-4868-A5AE-015F2C79757C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26} = {60E51A46-2E46-47A4-9BD8-C9D6A7EFCD26}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -242,6 +247,22 @@ Global
 		{B6315CCF-8961-4439-ADB2-10AAD98005CF}.Release-SSL|Win32.ActiveCfg = Release|Win32
 		{B6315CCF-8961-4439-ADB2-10AAD98005CF}.Release-SSL|Win32.Build.0 = Release|Win32
 		{B6315CCF-8961-4439-ADB2-10AAD98005CF}.Release-SSL|x64.ActiveCfg = Release|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Debug|x64.ActiveCfg = Debug|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.DebugDLL|Win32.ActiveCfg = DebugDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.DebugDLL|x64.ActiveCfg = DebugDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.DebugDLL-SSL|Win32.ActiveCfg = DebugDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.DebugDLL-SSL|x64.ActiveCfg = DebugDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Debug-SSL|Win32.ActiveCfg = DebugDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Debug-SSL|x64.ActiveCfg = DebugDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Release|Win32.ActiveCfg = Release|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Release|x64.ActiveCfg = Release|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.ReleaseDLL|Win32.ActiveCfg = ReleaseDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.ReleaseDLL-SSL|Win32.ActiveCfg = ReleaseDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.ReleaseDLL-SSL|x64.ActiveCfg = ReleaseDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Release-SSL|Win32.ActiveCfg = ReleaseDLL|Win32
+		{D3FF58B4-F851-4868-A5AE-015F2C79757C}.Release-SSL|x64.ActiveCfg = ReleaseDLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj?rev=1478587&r1=1478586&r2=1478587&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/vs2008-build/activemq-cpp.vcproj Thu May  2 22:09:02 2013
@@ -348,7 +348,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\activemq-cpp.dll"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -512,7 +512,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\activemq-cppd.dll"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -960,7 +960,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\activemq-cppd.dll"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -1124,7 +1124,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib"
 				OutputFile="$(OutDir)\activemq-cpp.dll"
 				AdditionalLibraryDirectories="&quot;$(PLATFORM_SDK)\lib&quot;;&quot;$(CPPUNIT_DIST)\lib&quot;;&quot;$(APR_DIST)\lib&quot;;&quot;$(APR_DIST)\bin&quot;"
 				GenerateDebugInformation="true"
@@ -2673,6 +2673,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\activemq\core\ActiveMQMessageAudit.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\activemq\core\ActiveMQMessageAudit.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\activemq\core\ActiveMQProducer.cpp"
 					>
 				</File>
@@ -2745,6 +2753,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\activemq\core\ConnectionAudit.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\activemq\core\ConnectionAudit.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\activemq\core\DispatchData.cpp"
 					>
 				</File>
@@ -4815,6 +4831,30 @@
 				<Filter
 					Name="security"
 					>
+					<File
+						RelativePath="..\src\main\decaf\internal\security\Engine.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\security\Engine.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\security\SecurityRuntime.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\security\SecurityRuntime.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\security\ServiceRegistry.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\security\ServiceRegistry.h"
+						>
+					</File>
 					<Filter
 						Name="windows"
 						>
@@ -4827,6 +4867,62 @@
 							>
 						</File>
 					</Filter>
+					<Filter
+						Name="provider"
+						>
+						<File
+							RelativePath="..\src\main\decaf\internal\security\provider\DefaultMessageDigestProviderService.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\internal\security\provider\DefaultMessageDigestProviderService.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\internal\security\provider\DefaultProvider.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\internal\security\provider\DefaultProvider.h"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\internal\security\provider\DefaultSecureRandomProviderService.cpp"
+							>
+						</File>
+						<File
+							RelativePath="..\src\main\decaf\internal\security\provider\DefaultSecureRandomProviderService.h"
+							>
+						</File>
+						<Filter
+							Name="crypto"
+							>
+							<File
+								RelativePath="..\src\main\decaf\internal\security\provider\crypto\MD4MessageDigestSpi.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\decaf\internal\security\provider\crypto\MD4MessageDigestSpi.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\decaf\internal\security\provider\crypto\MD5MessageDigestSpi.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\decaf\internal\security\provider\crypto\MD5MessageDigestSpi.h"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\decaf\internal\security\provider\crypto\SHA1MessageDigestSpi.cpp"
+								>
+							</File>
+							<File
+								RelativePath="..\src\main\decaf\internal\security\provider\crypto\SHA1MessageDigestSpi.h"
+								>
+							</File>
+						</Filter>
+					</Filter>
 				</Filter>
 			</Filter>
 			<Filter
@@ -5048,6 +5144,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\CloneNotSupportedException.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\CloneNotSupportedException.h"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\lang\exceptions\ExceptionDefines.h"
 						>
 					</File>
@@ -6161,38 +6265,122 @@
 				Name="secority"
 				>
 				<File
+					RelativePath="..\src\main\decaf\security\DigestException.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\DigestException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\GeneralSecurityException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\GeneralSecurityException.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\InvalidKeyException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\InvalidKeyException.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\Key.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\Key.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\KeyException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\KeyException.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\KeyManagementException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\KeyManagementException.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\MessageDigest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\MessageDigest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\MessageDigestSpi.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\MessageDigestSpi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\NoSuchAlgorithmException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\NoSuchAlgorithmException.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\NoSuchProviderException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\NoSuchProviderException.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\Principal.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\Principal.h"
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\Provider.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\Provider.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\ProviderException.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\ProviderException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\ProviderService.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\ProviderService.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\PublicKey.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\PublicKey.h"
 					>
 				</File>
@@ -6213,6 +6401,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\security\Security.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\Security.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\SecuritySpi.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\SecuritySpi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\SignatureException.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\security\SignatureException.h"
 					>
 				</File>
@@ -6223,6 +6431,10 @@
 						Name="x500"
 						>
 						<File
+							RelativePath="..\src\main\decaf\security\auth\x500\X500Principal.cpp"
+							>
+						</File>
+						<File
 							RelativePath="..\src\main\decaf\security\auth\x500\X500Principal.h"
 							>
 						</File>
@@ -6232,30 +6444,58 @@
 					Name="cert"
 					>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\Certificate.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\Certificate.h"
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateEncodingException.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\CertificateEncodingException.h"
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateException.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\CertificateException.h"
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateExpiredException.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\CertificateExpiredException.h"
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateNotYetValidException.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\CertificateNotYetValidException.h"
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateParsingException.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\CertificateParsingException.h"
 						>
 					</File>
 					<File
+						RelativePath="..\src\main\decaf\security\cert\X509Certificate.cpp"
+						>
+					</File>
+					<File
 						RelativePath="..\src\main\decaf\security\cert\X509Certificate.h"
 						>
 					</File>
@@ -6405,6 +6645,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\HashSet.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\HashSet.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\Iterator.cpp"
 					>
 				</File>
@@ -6413,6 +6661,22 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\util\LinkedHashMap.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\LinkedHashMap.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\LinkedHashSet.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\LinkedHashSet.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\util\LinkedList.cpp"
 					>
 				</File>