From commits-return-7962-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org Fri Feb 01 17:45:13 2008
Return-Path: <commits-return-7962-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 83543 invoked from network); 1 Feb 2008 17:45:13 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 1 Feb 2008 17:45:13 -0000
Received: (qmail 56528 invoked by uid 500); 1 Feb 2008 17:45:04 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 56481 invoked by uid 500); 1 Feb 2008 17:45:04 -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 56464 invoked by uid 99); 1 Feb 2008 17:45:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 09:45:04 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2008 17:44:56 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EDDDD1A9838; Fri,  1 Feb 2008 09:44:46 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r617572 - in /activemq/activemq-cpp/decaf/trunk/vs2005-build:
 vs2005-decaf-example.vcproj vs2005-decaf-unittests.vcproj vs2005-decaf.vcproj
Date: Fri, 01 Feb 2008 17:44:45 -0000
To: commits@activemq.apache.org
From: tabish@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080201174446.EDDDD1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tabish
Date: Fri Feb  1 09:44:42 2008
New Revision: 617572

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

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

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj?rev=617572&r1=617571&r2=617572&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-example.vcproj Fri Feb  1 09:44:42 2008
@@ -41,8 +41,8 @@
 			<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;"
-				PreprocessorDefinitions="WIN32;WIN32_LEAN_AND_MEAN;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;NOMINMAX"
+				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;APR_DECLARE_STATIC;APU_DECLARE_STATIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -66,10 +66,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib"
+				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib libapr-1.lib libaprutil-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;"
+				AdditionalLibraryDirectories="&quot;C:\Program Files\APR\bin&quot;;&quot;C:\Program Files\APR\lib&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"

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj?rev=617572&r1=617571&r2=617572&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf-unittests.vcproj Fri Feb  1 09:44:42 2008
@@ -41,7 +41,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;"
+				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"
+				AdditionalDependencies="ws2_32.lib rpcrt4.lib cppunitd.lib libapr-1.lib libaprutil-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;"
+				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"
@@ -423,6 +423,22 @@
 					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"
@@ -436,6 +452,46 @@
 					>
 				</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>
@@ -452,6 +508,30 @@
 					>
 				</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>
@@ -459,6 +539,10 @@
 					RelativePath="..\src\test\decaf\lang\ThreadTest.h"
 					>
 				</File>
+				<Filter
+					Name="exceptions"
+					>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="util"
@@ -480,11 +564,35 @@
 					>
 				</File>
 				<File
-					RelativePath="..\src\test\decaf\util\GuidTest.cpp"
+					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\GuidTest.h"
+					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
@@ -495,6 +603,14 @@
 					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"
 					>
@@ -523,10 +639,158 @@
 						>
 					</File>
 				</Filter>
+				<Filter
+					Name="logging"
+					>
+				</Filter>
+			</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="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="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>
 		<File
 			RelativePath="..\src\test\main.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\src\test\testRegistry.cpp"
 			>
 		</File>
 	</Files>

Modified: activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj?rev=617572&r1=617571&r2=617572&view=diff
==============================================================================
--- activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj (original)
+++ activemq/activemq-cpp/decaf/trunk/vs2005-build/vs2005-decaf.vcproj Fri Feb  1 09:44:42 2008
@@ -42,7 +42,7 @@
 				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;"
+				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"
@@ -53,7 +53,7 @@
 				ObjectFile="$(IntDir)\$(ProjectName)\"
 				ProgramDataBaseFileName="$(IntDir)\$(ProjectName)\vc80.pdb"
 				XMLDocumentationFileName="$(IntDir)\$(ProjectName)\"
-				WarningLevel="3"
+				WarningLevel="2"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4290;4101"
@@ -427,6 +427,10 @@
 				Name="lang"
 				>
 				<File
+					RelativePath="..\src\main\decaf\lang\Appendable.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\lang\Boolean.cpp"
 					>
 				</File>
@@ -435,10 +439,38 @@
 					>
 				</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>
@@ -447,6 +479,14 @@
 					>
 				</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>
@@ -455,6 +495,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\lang\Iterable.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\lang\Long.cpp"
 					>
 				</File>
@@ -463,6 +507,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\lang\Math.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\lang\Math.h"
 					>
 				</File>
@@ -475,6 +523,22 @@
 					>
 				</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>
@@ -539,6 +603,10 @@
 				Name="net"
 				>
 				<File
+					RelativePath="..\src\main\decaf\net\BindException.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\net\BufferedSocket.cpp"
 					>
 				</File>
@@ -547,6 +615,30 @@
 					>
 				</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>
@@ -571,6 +663,14 @@
 					>
 				</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>
@@ -587,6 +687,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\src\main\decaf\net\SocketTimeoutException.h"
+					>
+				</File>
+				<File
 					RelativePath="..\src\main\decaf\net\TcpSocket.cpp"
 					>
 				</File>
@@ -594,28 +698,76 @@
 					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="util"
 				>
 				<File
-					RelativePath="..\src\main\decaf\util\Config.h"
+					RelativePath="..\src\main\decaf\util\Collection.h"
 					>
 				</File>
 				<File
-					RelativePath="..\src\main\decaf\util\Date.cpp"
+					RelativePath="..\src\main\decaf\util\Comparator.h"
 					>
 				</File>
 				<File
-					RelativePath="..\src\main\decaf\util\Date.h"
+					RelativePath="..\src\main\decaf\util\Config.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\main\decaf\util\Date.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\src\main\decaf\util\Guid.cpp"
+					RelativePath="..\src\main\decaf\util\Date.h"
 					>
 				</File>
 				<File
-					RelativePath="..\src\main\decaf\util\Guid.h"
+					RelativePath="..\src\main\decaf\util\Iterator.h"
 					>
 				</File>
 				<File
@@ -631,6 +783,14 @@
 					>
 				</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>
@@ -642,6 +802,14 @@
 					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="logging"
 					>
@@ -785,6 +953,342 @@
 						RelativePath="..\src\main\decaf\util\concurrent\ThreadPool.h"
 						>
 					</File>
+				</Filter>
+			</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="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\BigInt.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\BigInt.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\BitOps.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\BitOps.h"
+						>
+					</File>
+					<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\FloatingPointParser.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\FloatingPointParser.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\HexStringParser.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\HexStringParser.h"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\NumberConverter.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\src\main\decaf\internal\util\NumberConverter.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="security"
+				>
+				<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="unix"
+					>
+					<Filter
+						Name="openssl"
+						>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="windows"
+					>
 				</Filter>
 			</Filter>
 		</Filter>