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 2008/05/01 13:07:20 UTC

svn commit: r652474 - in /activemq/activemq-cpp/trunk/vs2005-build: vs2005-activemq-example.vcproj vs2005-activemq-integration-tests.vcproj vs2005-activemq-unittests.vcproj vs2005-activemq.vcproj

Author: tabish
Date: Thu May  1 04:07:20 2008
New Revision: 652474

URL: http://svn.apache.org/viewvc?rev=652474&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103

Updated Project files for building ActiveMQ-CPP with the decaf code in its own name space.

Modified:
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj
    activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj?rev=652474&r1=652473&r2=652474&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-example.vcproj Thu May  1 04:07:20 2008
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;..\src\examples;..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\examples;..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;HAVE_WINSOCK2_H"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -66,10 +66,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib libdecafd.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Decaf\vs2005-build\Debug&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -151,10 +151,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -239,10 +239,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib decaf.lib"
+				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\ReleaseDLL&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -304,7 +304,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\examples;..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;"
+				AdditionalIncludeDirectories="..\src\examples;..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\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"

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj?rev=652474&r1=652473&r2=652474&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-integration-tests.vcproj Thu May  1 04:07:20 2008
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -67,9 +67,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib libdecafd.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib libaprutil-1.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\Decaf\vs2005-build\Debug&quot;;&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -129,7 +129,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;C:\Program Files\APR\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -151,9 +151,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib libdecaf.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\Release&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="false"
 				SubSystem="1"
@@ -215,7 +215,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;C:\Program Files\APR\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -237,9 +237,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib apr-1.lib aprutil-1.lib decaf.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\ReleaseDLL&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -302,7 +302,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;C:\Program Files\APR\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\src\test-integration&quot;;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -327,9 +327,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib decafd.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\DebugDLL&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"

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=652474&r1=652473&r2=652474&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq-unittests.vcproj Thu May  1 04:07:20 2008
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -66,10 +66,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib libdecafd.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\Decaf\vs2005-build\Debug&quot;;&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -129,7 +129,8 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;"
+				Optimization="2"
+				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -151,10 +152,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib libdecaf.lib libapr-1.lib libaprutil-1.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\Release&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -216,7 +217,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;"
+				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -238,10 +239,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunit.lib apr-1.lib aprutil-1.lib decaf.lib"
+				AdditionalDependencies="ws2_32.lib cppunit.lib apr-1.lib aprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\ReleaseDLL&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -303,7 +304,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;"
+				AdditionalIncludeDirectories="..\src\test;..\src\main;&quot;C:\Program Files\CPPUnit\include&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Apps\cppunit-1.11.6\include&quot;;&quot;E:\dev\cppunit-1.11.6\include&quot;;&quot;C:\Program Files\APR\include&quot;"
 				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;CMS_DLL;AMQCPP_DLL;DECAF_DLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -328,10 +329,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib decafd.lib"
+				AdditionalDependencies="ws2_32.lib cppunitd.lib apr-1.lib aprutil-1.lib"
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\Decaf\vs2005-build\DebugDLL&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\CPPUnit\lib&quot;;&quot;C:\Apps\cppunit-1.11.6\lib&quot;;&quot;E:\dev\cppunit-1.11.6\lib&quot;;&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&quot;"
 				ManifestFile="$(IntDir)\$(ProjectName)\$(TargetFileName).intermediate.manifest"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -3537,10 +3538,430 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="decaf"
+			>
+			<Filter
+				Name="internal"
+				>
+				<Filter
+					Name="nio"
+					>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\BufferFactoryTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\BufferFactoryTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\ByteArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\ByteArrayBufferTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\ByteArrayPerspectiveTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\ByteArrayPerspectiveTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\CharArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\CharArrayBufferTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\DoubleArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\DoubleArrayBufferTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\FloatArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\FloatArrayBufferTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\IntArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\IntArrayBufferTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\LongArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\LongArrayBufferTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\ShortArrayBufferTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\nio\ShortArrayBufferTest.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="util"
+					>
+					<File
+						RelativePath="..\src\test\decaf\internal\util\ByteArrayAdapterTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\internal\util\ByteArrayAdapterTest.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="io"
+				>
+				<File
+					RelativePath="..\src\test\decaf\io\BufferedInputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\BufferedInputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\BufferedOutputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\BufferedOutputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\ByteArrayInputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\ByteArrayInputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\ByteArrayOutputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\ByteArrayOutputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\DataInputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\DataInputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\DataOutputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\DataOutputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\FilterInputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\FilterInputStreamTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\FilterOutputStreamTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\io\FilterOutputStreamTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="lang"
+				>
+				<File
+					RelativePath="..\src\test\decaf\lang\BooleanTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\BooleanTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ByteTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ByteTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\CharacterTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\CharacterTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\DoubleTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\DoubleTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ExceptionTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ExceptionTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\FloatTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\FloatTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\IntegerTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\IntegerTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\LongTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\LongTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\MathTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\MathTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ShortTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ShortTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\SystemTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\SystemTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ThreadTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\lang\ThreadTest.h"
+					>
+				</File>
+				<Filter
+					Name="exceptions"
+					>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="net"
+				>
+				<File
+					RelativePath="..\src\test\decaf\net\SocketFactoryTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\SocketFactoryTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\SocketTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\SocketTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\URISyntaxExceptionTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\URISyntaxExceptionTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\URITest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\net\URITest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="nio"
+				>
+				<File
+					RelativePath="..\src\test\decaf\nio\BufferTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\nio\BufferTest.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="util"
+				>
+				<File
+					RelativePath="..\src\test\decaf\util\DateTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\DateTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\Endian.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\Endian.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\MapTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\MapTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\QueueTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\QueueTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\RandomTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\RandomTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\SetTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\SetTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\StringTokenizerTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\StringTokenizerTest.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\UUIDTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\test\decaf\util\UUIDTest.h"
+					>
+				</File>
+				<Filter
+					Name="concurrent"
+					>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\CountDownLatchTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\CountDownLatchTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\MutexTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\MutexTest.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\ThreadPoolTest.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\test\decaf\util\concurrent\ThreadPoolTest.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="logging"
+					>
+				</Filter>
+			</Filter>
+		</Filter>
 		<File
 			RelativePath="..\src\test\main.cpp"
 			>
 		</File>
+		<File
+			RelativePath="..\src\test\testRegistry.cpp"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>

Modified: activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj?rev=652474&r1=652473&r2=652474&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj (original)
+++ activemq/activemq-cpp/trunk/vs2005-build/vs2005-activemq.vcproj Thu May  1 04:07:20 2008
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
+				AdditionalIncludeDirectories="&quot;C:\Program Files\APR\include&quot;;..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;$(NOINHERIT)"
 				KeepComments="false"
 				MinimalRebuild="false"
@@ -181,8 +181,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;C:\Program Files\APR\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;CMS_DLL;CMS_EXPORTS;AMQCPP_DLL;AMQCPP_EXPORTS;$(NOINHERIT)"
+				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;CMS_DLL;CMS_EXPORTS;AMQCPP_DLL;AMQCPP_EXPORTS;DECAF_DLL;DECAF_EXPORTS;$(NOINHERIT)"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				ObjectFile="$(IntDir)\$(ProjectName)\"
@@ -204,9 +204,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib apr-1.lib aprutil-1.lib decaf.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\activemq-cpp.dll"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\Decaf\vs2005-build\ReleaseDLL&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\Decaf\vs2005-build\Release&quot;"
 				GenerateDebugInformation="true"
 			/>
 			<Tool
@@ -261,8 +261,8 @@
 				Name="VCCLCompilerTool"
 				UseUnicodeResponseFiles="false"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\Decaf\src\main&quot;;&quot;C:\Program Files\APR\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;CMS_DLL;CMS_EXPORTS;AMQCPP_DLL;AMQCPP_EXPORTS;$(NOINHERIT)"
+				AdditionalIncludeDirectories="..\src\main;&quot;C:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;D:\Program Files\Microsoft Platform SDK\Include&quot;;&quot;C:\Program Files\APR\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_DEPRECATE;NOMINMAX;_WINDOWS;_USRDLL;CMS_DLL;CMS_EXPORTS;AMQCPP_DLL;AMQCPP_EXPORTS;DECAF_DLL;DECAF_EXPORTS;$(NOINHERIT)"
 				KeepComments="false"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
@@ -288,9 +288,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib apr-1.lib aprutil-1.lib decafd.lib"
+				AdditionalDependencies="ws2_32.lib libapr-1.lib libaprutil-1.lib"
 				OutputFile="$(OutDir)\activemq-cppd.dll"
-				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\Decaf\vs2005-build\DebugDLL&quot;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\Microsoft Platform SDK\Lib&quot;;&quot;C:\Program Files\APR\lib&quot;;&quot;C:\Program Files\APR\bin&quot;"
 				GenerateDebugInformation="true"
 			/>
 			<Tool
@@ -4914,6 +4914,946 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="decaf"
+			>
+			<Filter
+				Name="internal"
+				>
+				<File
+					RelativePath="..\src\main\decaf\internal\AprPool.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\internal\AprPool.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\internal\AprRuntime.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\internal\AprRuntime.h"
+					>
+				</File>
+				<Filter
+					Name="net"
+					>
+				</Filter>
+				<Filter
+					Name="nio"
+					>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\ByteArrayAdapter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\ByteArrayAdapter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\HexStringParser.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\HexStringParser.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="util"
+					>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\BufferFactory.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\BufferFactory.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\ByteArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\ByteArrayBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\ByteArrayPerspective.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\ByteArrayPerspective.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\CharArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\CharArrayBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\DoubleArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\DoubleArrayBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\FloatArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\FloatArrayBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\IntArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\IntArrayBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\LongArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\LongArrayBuffer.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\ShortArrayBuffer.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\nio\ShortArrayBuffer.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="lang"
+				>
+				<File
+					RelativePath="..\src\main\decaf\lang\Appendable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Boolean.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Boolean.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Byte.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Byte.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Character.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Character.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\CharSequence.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Comparable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Double.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Double.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Exception.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Exception.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Float.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Float.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Integer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Integer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Iterable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Long.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Long.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Math.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Math.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Number.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Runnable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Short.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Short.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\System.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\System.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Thread.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Thread.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\lang\Throwable.h"
+					>
+				</File>
+				<Filter
+					Name="exceptions"
+					>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\ExceptionDefines.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\IllegalArgumentException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\IllegalMonitorStateException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\IllegalStateException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\IndexOutOfBoundsException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\InterruptedException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\InvalidStateException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\NoSuchElementException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\NullPointerException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\NumberFormatException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\RuntimeException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\lang\exceptions\UnsupportedOperationException.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="io"
+				>
+				<File
+					RelativePath="..\src\main\decaf\io\BlockingByteArrayInputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\BlockingByteArrayInputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\BufferedInputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\BufferedInputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\BufferedOutputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\BufferedOutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\ByteArrayInputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\ByteArrayInputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\ByteArrayOutputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\ByteArrayOutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\Closeable.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\DataInputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\DataInputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\DataOutputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\DataOutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\EOFException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\FilterInputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\FilterOutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\InputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\InterruptedIOException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\IOException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\OutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\Reader.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\StandardErrorOutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\io\Writer.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="net"
+				>
+				<File
+					RelativePath="..\src\main\decaf\net\BindException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\BufferedSocket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\BufferedSocket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\ConnectException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\HttpRetryException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\MalformedURLException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\NoRouteToHostException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\PortUnreachableException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\ProtocolException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\ServerSocket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\ServerSocket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\Socket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketError.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketError.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketFactory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketFactory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketInputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketInputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketOutputStream.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketOutputStream.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\SocketTimeoutException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\TcpSocket.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\TcpSocket.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\UnknownHostException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\UnknownServiceException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URI.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URI.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URISyntaxException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URL.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URL.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URLDecoder.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URLDecoder.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URLEncoder.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\net\URLEncoder.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="nio"
+				>
+				<File
+					RelativePath="..\src\main\decaf\nio\Buffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\Buffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\BufferOverflowException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\BufferUnderflowException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\ByteBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\ByteBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\CharBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\CharBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\DoubleBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\DoubleBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\FloatBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\FloatBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\IntBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\IntBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\InvalidMarkException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\LongBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\LongBuffer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\ReadOnlyBufferException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\ShortBuffer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\nio\ShortBuffer.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="secority"
+				>
+				<File
+					RelativePath="..\src\main\decaf\security\GeneralSecurityException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\InvalidKeyException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\Key.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\KeyException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\NoSuchAlgorithmException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\NoSuchProviderException.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\Principal.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\PublicKey.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\security\SignatureException.h"
+					>
+				</File>
+				<Filter
+					Name="auth"
+					>
+					<Filter
+						Name="x500"
+						>
+						<File
+							RelativePath="..\src\main\decaf\security\auth\x500\X500Principal.h"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="cert"
+					>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\Certificate.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateEncodingException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateExpiredException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateNotYetValidException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\CertificateParsingException.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\security\cert\X509Certificate.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="security_provider"
+				>
+				<Filter
+					Name="windows"
+					>
+				</Filter>
+			</Filter>
+			<Filter
+				Name="util"
+				>
+				<File
+					RelativePath="..\src\main\decaf\util\Collection.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Comparator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Date.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Date.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Iterator.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Map.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Properties.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Queue.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Random.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Random.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Set.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\StringTokenizer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\StringTokenizer.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\UUID.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\UUID.h"
+					>
+				</File>
+				<Filter
+					Name="concurrent"
+					>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\Concurrent.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\CountDownLatch.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\CountDownLatch.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\Lock.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\Mutex.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\Mutex.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\PooledThread.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\PooledThread.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\PooledThreadListener.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\Synchronizable.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\TaskListener.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\ThreadPool.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\concurrent\ThreadPool.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="logging"
+					>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\ConsoleHandler.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\Filter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\Formatter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\Handler.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\Logger.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\Logger.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LoggerCommon.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LoggerDefines.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LoggerHierarchy.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LoggerHierarchy.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LogManager.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LogManager.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LogRecord.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LogWriter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\LogWriter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\MarkBlockLogger.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\PropertiesChangeListener.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\SimpleFormatter.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\SimpleLogger.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\SimpleLogger.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\util\logging\StreamHandler.h"
+						>
+					</File>
+				</Filter>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>