generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-02-24 15:26:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/pocoproject/poco into develop

Browse Source
This commit is contained in:
Guenter Obiltschnig 2015-03-15 17:52:37 +01:00
commit 2711037d4e
21 changed files with 292 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Data_CE_vs90.vcproj
View File

@ -480,6 +480,8 @@
RelativePath=".\include\Poco\Data\DynamicLOB.h"/>
<File
RelativePath=".\include\Poco\Data\Extraction.h"/>
<File
RelativePath=".\include\Poco\Data\JSONRowFormatter.h"/>
<File
RelativePath=".\include\Poco\Data\Limit.h"/>
<File
@ -549,6 +551,8 @@
RelativePath=".\src\Date.cpp"/>
<File
RelativePath=".\src\DynamicLOB.cpp"/>
<File
RelativePath=".\src\JSONRowFormatter.cpp"/>
<File
RelativePath=".\src\Limit.cpp"/>
<File

4
Data/Data_VS90.vcproj
View File

@ -434,6 +434,8 @@
RelativePath=".\include\Poco\Data\DynamicLOB.h"/>
<File
RelativePath=".\include\Poco\Data\Extraction.h"/>
<File
RelativePath=".\include\Poco\Data\JSONRowFormatter.h"/>
<File
RelativePath=".\include\Poco\Data\Limit.h"/>
<File
@ -503,6 +505,8 @@
RelativePath=".\src\Date.cpp"/>
<File
RelativePath=".\src\DynamicLOB.cpp"/>
<File
RelativePath=".\src\JSONRowFormatter.cpp"/>
<File
RelativePath=".\src\Limit.cpp"/>
<File

2
Data/Data_WEC2013_vs110.vcxproj
View File

@ -278,6 +278,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -319,6 +320,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\Position.cpp"/>

24
Data/Data_WEC2013_vs110.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{a1bfd020-b311-4242-bf10-601154718a3d}</UniqueIdentifier>
<UniqueIdentifier>{afbe04f4-c69d-4aa6-babe-74358ec23a11}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{219ad8dc-b490-4530-b8d3-01498270a1f3}</UniqueIdentifier>
<UniqueIdentifier>{d1251bfb-7216-448b-9c0d-80f2903cede1}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{8f0dc745-8909-4d14-b51d-133b293998b8}</UniqueIdentifier>
<UniqueIdentifier>{1f439df2-f931-4c1f-82ae-ea11d441d15f}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{c894d0e2-44ef-45ae-a2b3-828dba29fc2b}</UniqueIdentifier>
<UniqueIdentifier>{3f8e9d0d-856d-419d-89fb-16904fa29e75}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{0a33e09f-93ef-494f-9aab-ff2e0d61f617}</UniqueIdentifier>
<UniqueIdentifier>{b57716e0-d030-4913-900e-bd96775f8104}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{70be8877-fa7b-4bfa-b4dc-9245311f2cd3}</UniqueIdentifier>
<UniqueIdentifier>{8025d438-78ca-430a-8d22-78167c783e60}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{f8ce7a66-6687-4431-a6c0-e3fcd7e37145}</UniqueIdentifier>
<UniqueIdentifier>{3308a18c-dd06-4ff2-a3eb-3b6b4c951692}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{a6c983ab-082d-4dee-8661-8a6ec57c5f5d}</UniqueIdentifier>
<UniqueIdentifier>{542b344c-2aa2-48f8-be67-6fd1a163c65c}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{af269556-481e-4d92-86da-492a9976484b}</UniqueIdentifier>
<UniqueIdentifier>{bcf7a9da-332c-4e6b-81f1-37a0e116d440}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

2
Data/Data_WEC2013_vs120.vcxproj
View File

@ -279,6 +279,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -320,6 +321,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\PooledSessionHolder.cpp"/>

24
Data/Data_WEC2013_vs120.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{ef49fad2-cda8-4d2c-8be0-79383202ce43}</UniqueIdentifier>
<UniqueIdentifier>{354b9974-53b2-41e9-9c2e-3ac1cd8eb8d3}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{c5bf437b-2a1d-4335-ba14-f2806861ce95}</UniqueIdentifier>
<UniqueIdentifier>{5d9f9bc9-be52-4e03-ac89-2b65dc319a89}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{27e0e145-fe5d-4b55-b4ad-0ceda6253245}</UniqueIdentifier>
<UniqueIdentifier>{af5514fc-85fd-4cc6-8ec1-dea22f75254b}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{5732012a-0f7f-40e5-89ef-fe90ad6a842a}</UniqueIdentifier>
<UniqueIdentifier>{4322305c-46ae-47e4-8f31-dd781863da06}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{339bca35-4827-47b9-a730-767fd55f05ec}</UniqueIdentifier>
<UniqueIdentifier>{f9f2d600-a830-4875-93b3-95ca11c98c84}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{081f9fc3-c730-44c5-ba4f-db0f74447172}</UniqueIdentifier>
<UniqueIdentifier>{e62f6698-aec4-4277-b174-a01c7787d74e}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{707f0c5e-2133-4efb-8884-c193759cf2f9}</UniqueIdentifier>
<UniqueIdentifier>{45b79b11-4c90-47b9-a699-ea7ae733f83c}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{d628db45-980c-490e-989d-d2141d1a8107}</UniqueIdentifier>
<UniqueIdentifier>{6cc994a0-ce43-4776-8e76-bf115b162172}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{0d886a65-e7cd-4d7e-854b-d22a62ff3f25}</UniqueIdentifier>
<UniqueIdentifier>{5178771d-b672-4247-877d-9c244c4208f5}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

2
Data/Data_vs100.vcxproj
View File

@ -296,6 +296,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -337,6 +338,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\Position.cpp"/>

24
Data/Data_vs100.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{5918ab93-9893-493f-a411-c7b145fc2328}</UniqueIdentifier>
<UniqueIdentifier>{be69cd09-bdcb-445d-a786-c3281f3e2b95}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{afc1af1b-5e1a-4d44-9b65-d04434356f5b}</UniqueIdentifier>
<UniqueIdentifier>{f5c6a3bb-d7c4-4b8c-a73b-0665c3fd7d95}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{6a64db96-c0d0-4392-8cc3-8baf35394fc0}</UniqueIdentifier>
<UniqueIdentifier>{549457d8-8db4-4b04-a0a7-d519a9d02022}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{6e405ccb-1a2f-488f-825d-a3269dabcef9}</UniqueIdentifier>
<UniqueIdentifier>{8ab4fb6b-1a8e-447d-b040-83de61742648}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{6c9ae24c-8211-40e9-8513-4ff4d662e6f4}</UniqueIdentifier>
<UniqueIdentifier>{157043c4-81e2-4ddd-8072-34fba98fc592}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{2f018bc7-8439-49b7-be8d-2bd3221b0d6d}</UniqueIdentifier>
<UniqueIdentifier>{108ed356-cffa-474c-a869-1fc054ed7055}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{fab04917-1e46-4698-8eeb-3210bb17cda1}</UniqueIdentifier>
<UniqueIdentifier>{9548a9ac-16cb-476a-a421-2b1c10c5a81b}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{0bdf6b6d-5205-4f00-b963-9c3c896f89d2}</UniqueIdentifier>
<UniqueIdentifier>{7d225c11-32c6-4dd5-aff5-a8a77dfa9a35}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{cdfe6934-8d4f-46d6-9762-ce1d1b12f611}</UniqueIdentifier>
<UniqueIdentifier>{f353e68d-4b10-4cb2-b16d-74daff8b79aa}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

2
Data/Data_vs110.vcxproj
View File

@ -297,6 +297,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -338,6 +339,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\Position.cpp"/>

24
Data/Data_vs110.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{696ecd7f-5f09-4c8c-9a58-733e6021e695}</UniqueIdentifier>
<UniqueIdentifier>{13941e34-926f-4790-884e-388490d4b01d}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{13807a52-e8db-4852-8eb5-b458527852c8}</UniqueIdentifier>
<UniqueIdentifier>{baa01be7-9bc1-41f8-865d-a0b8d9d4754e}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{601e0697-8260-4a00-814d-15a035349da2}</UniqueIdentifier>
<UniqueIdentifier>{d2bb2ec8-5b51-47ee-a1c1-9fd5787ae588}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{d4da890b-c018-4f9c-82b8-c36bea74d83e}</UniqueIdentifier>
<UniqueIdentifier>{655c43a6-82ba-4280-b46f-bc2634a70243}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{5db081b6-7732-4a68-bff2-80b87784e755}</UniqueIdentifier>
<UniqueIdentifier>{b9d07856-a3ab-4ba0-a427-c374dfbd1f86}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{70f878fb-2681-4b2f-a87b-f08b9acbd53c}</UniqueIdentifier>
<UniqueIdentifier>{f1ef23ca-f09d-4446-8e62-fcde07be98fa}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{99174893-8694-4a46-80ac-64e1547e08cf}</UniqueIdentifier>
<UniqueIdentifier>{b5220b8e-2aca-4343-b230-ee448396856f}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{bd56b395-1374-437f-9c60-d3a15288f203}</UniqueIdentifier>
<UniqueIdentifier>{e008522f-0e91-4fbc-a41e-05cfec564b95}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{160c1b3f-f769-4190-a650-5637ef9eec75}</UniqueIdentifier>
<UniqueIdentifier>{849d4fbc-dd98-48ce-81f7-a0e5557e5010}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

2
Data/Data_vs120.vcxproj
View File

@ -298,6 +298,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -339,6 +340,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\PooledSessionHolder.cpp"/>

24
Data/Data_vs120.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{bb91bb23-0897-45a3-a0e8-49d84123eca4}</UniqueIdentifier>
<UniqueIdentifier>{96284adb-5513-4ea1-bda9-6d1567822723}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{624cfcec-7066-4d21-8a33-46b10ad831df}</UniqueIdentifier>
<UniqueIdentifier>{71da1e92-4917-4c21-9731-27f533096f39}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{e1dff34a-6159-4bf3-9ff7-401e9ec9ff94}</UniqueIdentifier>
<UniqueIdentifier>{ddf362d8-b56a-4045-9224-158eaa585af4}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{99b21241-b3e8-46c6-94d0-174e6ddfcedc}</UniqueIdentifier>
<UniqueIdentifier>{b503747f-b110-4760-907d-9f0f5fde8e41}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{547bccb5-00fb-48b9-bfd9-5ac93fcc330c}</UniqueIdentifier>
<UniqueIdentifier>{28633c43-cd5e-4b47-8bc4-0e1d4efc63fd}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{e9513500-c482-4b0c-bc25-8ea90f8dc131}</UniqueIdentifier>
<UniqueIdentifier>{40eef1ac-a741-44b8-be26-944ccdcc9591}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{ffb1d991-9bb0-4e00-99a4-0dbb756871b9}</UniqueIdentifier>
<UniqueIdentifier>{7254f23a-e098-4d53-bda4-04d2e9c03ae9}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{2e0ee7c7-c273-4275-8686-9591c9b361c8}</UniqueIdentifier>
<UniqueIdentifier>{f5ad66d8-f2ff-4155-aeaa-0c47ad2649d0}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{e6ff4f08-b153-4a24-8405-cada44797ef9}</UniqueIdentifier>
<UniqueIdentifier>{a5858e96-5d61-432d-bb65-0bb9769b2c3b}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

2
Data/Data_x64_vs100.vcxproj
View File

@ -294,6 +294,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -335,6 +336,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\Position.cpp"/>

24
Data/Data_x64_vs100.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{c2acec6a-18df-46e7-b572-452480bd7942}</UniqueIdentifier>
<UniqueIdentifier>{67cf767e-e296-4d25-a81b-b5aa6f29f7ce}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{bc232914-3042-447f-b824-bd9602b2fd00}</UniqueIdentifier>
<UniqueIdentifier>{5f440626-1ced-451c-9bdb-fa3e6de7db42}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{2c4df99a-3763-427d-9eec-6a7d0e57f450}</UniqueIdentifier>
<UniqueIdentifier>{cda06993-f08e-4a0d-9554-ccf479c58704}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{b1647c25-70ef-48bc-88d5-e53bfd3d673c}</UniqueIdentifier>
<UniqueIdentifier>{add1dd78-0f4d-46d3-ac01-47319cace033}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{0f187ba9-b6c7-4dbe-a2f6-d42be87040b2}</UniqueIdentifier>
<UniqueIdentifier>{32bc0385-c3cd-4525-993d-d22c4486b13f}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{6d9652a8-2888-45aa-a91e-2a53440ddd0b}</UniqueIdentifier>
<UniqueIdentifier>{7cc87a93-7176-4b51-a874-0f20463589f7}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{3bdd1bc7-e1f1-4f9c-81c6-aad1989d50c4}</UniqueIdentifier>
<UniqueIdentifier>{e9bf763a-a2c4-4e09-898c-07102909a8df}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{d81f2976-7408-452a-968c-296622fb86e1}</UniqueIdentifier>
<UniqueIdentifier>{e87ae4ea-35d1-4620-8f2f-3480104d264b}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{a84ef3a7-b988-497a-85fa-07d7d26f3067}</UniqueIdentifier>
<UniqueIdentifier>{4841b0ad-623c-4314-9a63-cd5594730000}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

2
Data/Data_x64_vs110.vcxproj
View File

@ -302,6 +302,7 @@
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
@ -343,6 +344,7 @@
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\Position.cpp"/>

24
Data/Data_x64_vs110.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{2bbb5307-7be4-489f-ba3b-0bce01e56cb2}</UniqueIdentifier>
<UniqueIdentifier>{351b94c7-ddf8-4fd4-a1f0-f2fc3ef80835}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{830d615a-da6c-4986-b551-dad4aba3dc80}</UniqueIdentifier>
<UniqueIdentifier>{a796da8d-189c-4fdf-9568-ba65cc01a492}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{127b108e-aa9d-4679-9476-959738c302bd}</UniqueIdentifier>
<UniqueIdentifier>{84de6d34-c63b-4832-8aa7-6ba626785fb9}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{0b3f4bbd-9f2b-4c61-a597-6b6a51805bd1}</UniqueIdentifier>
<UniqueIdentifier>{a447b486-38e9-41fb-8a95-e9c933e7615d}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{5b868b59-99ef-4c82-a9b7-bdb604ff4d74}</UniqueIdentifier>
<UniqueIdentifier>{121ec0b1-6e84-498c-b42f-b66f46848b9b}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{28141386-bfb6-43df-b230-543640f2bf32}</UniqueIdentifier>
<UniqueIdentifier>{658a8428-7533-40f3-a3df-3ecac65bb2b8}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{65bfb828-6ca9-4663-a85c-5e8211d1d8f1}</UniqueIdentifier>
<UniqueIdentifier>{5a30c806-beb9-429b-b435-23c284e2bd9e}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{a094b222-f606-4d9f-a447-bc80a4f37a2a}</UniqueIdentifier>
<UniqueIdentifier>{2fd504a3-8dd8-4236-8277-f7370c99a6ab}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{ae4df5ff-4dc0-416d-95a2-94d1954639a1}</UniqueIdentifier>
<UniqueIdentifier>{ef9093b3-204f-4590-afd8-8e1f360ad64f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -212,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>

218
Data/Data_x64_vs120.vcxproj
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="debug_shared|x64">
@ -32,7 +32,7 @@
<RootNamespace>Data</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
@ -63,27 +63,27 @@
<CharacterSet>MultiByte</CharacterSet>
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
<ImportGroup Label="ExtensionSettings"/>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Label="UserMacros"/>
<PropertyGroup>
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
<TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoData64d</TargetName>
@ -132,7 +132,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeader/>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAs>Default</CompileAs>
@ -164,9 +164,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeader/>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat />
<DebugInformationFormat/>
<CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -195,7 +195,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoDatamtd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -221,9 +221,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeader/>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat />
<DebugInformationFormat/>
<CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -244,7 +244,7 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeader/>
<ProgramDataBaseFileName>..\lib64\PocoDatamdd.pdb</ProgramDataBaseFileName>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -270,9 +270,9 @@
<TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
<ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeader/>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat />
<DebugInformationFormat/>
<CompileAs>Default</CompileAs>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
@ -281,95 +281,95 @@
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="include\Poco\Data\AbstractBinder.h" />
<ClInclude Include="include\Poco\Data\AbstractBinding.h" />
<ClInclude Include="include\Poco\Data\AbstractExtraction.h" />
<ClInclude Include="include\Poco\Data\AbstractExtractor.h" />
<ClInclude Include="include\Poco\Data\AbstractPreparation.h" />
<ClInclude Include="include\Poco\Data\AbstractPreparator.h" />
<ClInclude Include="include\Poco\Data\AbstractSessionImpl.h" />
<ClInclude Include="include\Poco\Data\ArchiveStrategy.h" />
<ClInclude Include="include\Poco\Data\AutoTransaction.h" />
<ClInclude Include="include\Poco\Data\Binding.h" />
<ClInclude Include="include\Poco\Data\Bulk.h" />
<ClInclude Include="include\Poco\Data\BulkBinding.h" />
<ClInclude Include="include\Poco\Data\BulkExtraction.h" />
<ClInclude Include="include\Poco\Data\Column.h" />
<ClInclude Include="include\Poco\Data\Connector.h" />
<ClInclude Include="include\Poco\Data\Constants.h" />
<ClInclude Include="include\Poco\Data\Data.h" />
<ClInclude Include="include\Poco\Data\DataException.h" />
<ClInclude Include="include\Poco\Data\Date.h" />
<ClInclude Include="include\Poco\Data\DynamicDateTime.h" />
<ClInclude Include="include\Poco\Data\DynamicLOB.h" />
<ClInclude Include="include\Poco\Data\Extraction.h" />
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h" />
<ClInclude Include="include\Poco\Data\Limit.h" />
<ClInclude Include="include\Poco\Data\LOB.h" />
<ClInclude Include="include\Poco\Data\LOBStream.h" />
<ClInclude Include="include\Poco\Data\MetaColumn.h" />
<ClInclude Include="include\Poco\Data\PooledSessionHolder.h" />
<ClInclude Include="include\Poco\Data\PooledSessionImpl.h" />
<ClInclude Include="include\Poco\Data\Position.h" />
<ClInclude Include="include\Poco\data\Preparation.h" />
<ClInclude Include="include\Poco\Data\Range.h" />
<ClInclude Include="include\Poco\Data\RecordSet.h" />
<ClInclude Include="include\Poco\Data\Row.h" />
<ClInclude Include="include\Poco\Data\RowFilter.h" />
<ClInclude Include="include\Poco\Data\RowFormatter.h" />
<ClInclude Include="include\Poco\Data\RowIterator.h" />
<ClInclude Include="include\Poco\Data\Session.h" />
<ClInclude Include="include\Poco\Data\SessionFactory.h" />
<ClInclude Include="include\Poco\Data\SessionImpl.h" />
<ClInclude Include="include\Poco\Data\SessionPool.h" />
<ClInclude Include="include\Poco\Data\SessionPoolContainer.h" />
<ClInclude Include="include\Poco\Data\SimpleRowFormatter.h" />
<ClInclude Include="include\Poco\Data\SQLChannel.h" />
<ClInclude Include="include\Poco\Data\Statement.h" />
<ClInclude Include="include\Poco\Data\StatementCreator.h" />
<ClInclude Include="include\Poco\Data\StatementImpl.h" />
<ClInclude Include="include\Poco\Data\Time.h" />
<ClInclude Include="include\Poco\Data\Transaction.h" />
<ClInclude Include="include\Poco\Data\TypeHandler.h" />
<ClInclude Include="include\Poco\Data\AbstractBinder.h"/>
<ClInclude Include="include\Poco\Data\AbstractBinding.h"/>
<ClInclude Include="include\Poco\Data\AbstractExtraction.h"/>
<ClInclude Include="include\Poco\Data\AbstractExtractor.h"/>
<ClInclude Include="include\Poco\Data\AbstractPreparation.h"/>
<ClInclude Include="include\Poco\Data\AbstractPreparator.h"/>
<ClInclude Include="include\Poco\Data\AbstractSessionImpl.h"/>
<ClInclude Include="include\Poco\Data\ArchiveStrategy.h"/>
<ClInclude Include="include\Poco\Data\AutoTransaction.h"/>
<ClInclude Include="include\Poco\Data\Binding.h"/>
<ClInclude Include="include\Poco\Data\Bulk.h"/>
<ClInclude Include="include\Poco\Data\BulkBinding.h"/>
<ClInclude Include="include\Poco\Data\BulkExtraction.h"/>
<ClInclude Include="include\Poco\Data\Column.h"/>
<ClInclude Include="include\Poco\Data\Connector.h"/>
<ClInclude Include="include\Poco\Data\Constants.h"/>
<ClInclude Include="include\Poco\Data\Data.h"/>
<ClInclude Include="include\Poco\Data\DataException.h"/>
<ClInclude Include="include\Poco\Data\Date.h"/>
<ClInclude Include="include\Poco\Data\DynamicDateTime.h"/>
<ClInclude Include="include\Poco\Data\DynamicLOB.h"/>
<ClInclude Include="include\Poco\Data\Extraction.h"/>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\Limit.h"/>
<ClInclude Include="include\Poco\Data\LOB.h"/>
<ClInclude Include="include\Poco\Data\LOBStream.h"/>
<ClInclude Include="include\Poco\Data\MetaColumn.h"/>
<ClInclude Include="include\Poco\Data\PooledSessionHolder.h"/>
<ClInclude Include="include\Poco\Data\PooledSessionImpl.h"/>
<ClInclude Include="include\Poco\Data\Position.h"/>
<ClInclude Include="include\Poco\data\Preparation.h"/>
<ClInclude Include="include\Poco\Data\Range.h"/>
<ClInclude Include="include\Poco\Data\RecordSet.h"/>
<ClInclude Include="include\Poco\Data\Row.h"/>
<ClInclude Include="include\Poco\Data\RowFilter.h"/>
<ClInclude Include="include\Poco\Data\RowFormatter.h"/>
<ClInclude Include="include\Poco\Data\RowIterator.h"/>
<ClInclude Include="include\Poco\Data\Session.h"/>
<ClInclude Include="include\Poco\Data\SessionFactory.h"/>
<ClInclude Include="include\Poco\Data\SessionImpl.h"/>
<ClInclude Include="include\Poco\Data\SessionPool.h"/>
<ClInclude Include="include\Poco\Data\SessionPoolContainer.h"/>
<ClInclude Include="include\Poco\Data\SimpleRowFormatter.h"/>
<ClInclude Include="include\Poco\Data\SQLChannel.h"/>
<ClInclude Include="include\Poco\Data\Statement.h"/>
<ClInclude Include="include\Poco\Data\StatementCreator.h"/>
<ClInclude Include="include\Poco\Data\StatementImpl.h"/>
<ClInclude Include="include\Poco\Data\Time.h"/>
<ClInclude Include="include\Poco\Data\Transaction.h"/>
<ClInclude Include="include\Poco\Data\TypeHandler.h"/>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\AbstractBinder.cpp" />
<ClCompile Include="src\AbstractBinding.cpp" />
<ClCompile Include="src\AbstractExtraction.cpp" />
<ClCompile Include="src\AbstractExtractor.cpp" />
<ClCompile Include="src\AbstractPreparation.cpp" />
<ClCompile Include="src\AbstractPreparator.cpp" />
<ClCompile Include="src\ArchiveStrategy.cpp" />
<ClCompile Include="src\Bulk.cpp" />
<ClCompile Include="src\Connector.cpp" />
<ClCompile Include="src\DataException.cpp" />
<ClCompile Include="src\Date.cpp" />
<ClCompile Include="src\DynamicLOB.cpp" />
<ClCompile Include="src\JSONRowFormatter.cpp" />
<ClCompile Include="src\Limit.cpp" />
<ClCompile Include="src\MetaColumn.cpp" />
<ClCompile Include="src\PooledSessionHolder.cpp" />
<ClCompile Include="src\PooledSessionImpl.cpp" />
<ClCompile Include="src\Position.cpp" />
<ClCompile Include="src\Range.cpp" />
<ClCompile Include="src\RecordSet.cpp" />
<ClCompile Include="src\Row.cpp" />
<ClCompile Include="src\RowFilter.cpp" />
<ClCompile Include="src\RowFormatter.cpp" />
<ClCompile Include="src\RowIterator.cpp" />
<ClCompile Include="src\Session.cpp" />
<ClCompile Include="src\SessionFactory.cpp" />
<ClCompile Include="src\SessionImpl.cpp" />
<ClCompile Include="src\SessionPool.cpp" />
<ClCompile Include="src\SessionPoolContainer.cpp" />
<ClCompile Include="src\SimpleRowFormatter.cpp" />
<ClCompile Include="src\SQLChannel.cpp" />
<ClCompile Include="src\Statement.cpp" />
<ClCompile Include="src\StatementCreator.cpp" />
<ClCompile Include="src\StatementImpl.cpp" />
<ClCompile Include="src\Time.cpp" />
<ClCompile Include="src\Transaction.cpp" />
<ClCompile Include="src\AbstractBinder.cpp"/>
<ClCompile Include="src\AbstractBinding.cpp"/>
<ClCompile Include="src\AbstractExtraction.cpp"/>
<ClCompile Include="src\AbstractExtractor.cpp"/>
<ClCompile Include="src\AbstractPreparation.cpp"/>
<ClCompile Include="src\AbstractPreparator.cpp"/>
<ClCompile Include="src\ArchiveStrategy.cpp"/>
<ClCompile Include="src\Bulk.cpp"/>
<ClCompile Include="src\Connector.cpp"/>
<ClCompile Include="src\DataException.cpp"/>
<ClCompile Include="src\Date.cpp"/>
<ClCompile Include="src\DynamicLOB.cpp"/>
<ClCompile Include="src\JSONRowFormatter.cpp"/>
<ClCompile Include="src\Limit.cpp"/>
<ClCompile Include="src\MetaColumn.cpp"/>
<ClCompile Include="src\PooledSessionHolder.cpp"/>
<ClCompile Include="src\PooledSessionImpl.cpp"/>
<ClCompile Include="src\Position.cpp"/>
<ClCompile Include="src\Range.cpp"/>
<ClCompile Include="src\RecordSet.cpp"/>
<ClCompile Include="src\Row.cpp"/>
<ClCompile Include="src\RowFilter.cpp"/>
<ClCompile Include="src\RowFormatter.cpp"/>
<ClCompile Include="src\RowIterator.cpp"/>
<ClCompile Include="src\Session.cpp"/>
<ClCompile Include="src\SessionFactory.cpp"/>
<ClCompile Include="src\SessionImpl.cpp"/>
<ClCompile Include="src\SessionPool.cpp"/>
<ClCompile Include="src\SessionPoolContainer.cpp"/>
<ClCompile Include="src\SimpleRowFormatter.cpp"/>
<ClCompile Include="src\SQLChannel.cpp"/>
<ClCompile Include="src\Statement.cpp"/>
<ClCompile Include="src\StatementCreator.cpp"/>
<ClCompile Include="src\StatementImpl.cpp"/>
<ClCompile Include="src\Time.cpp"/>
<ClCompile Include="src\Transaction.cpp"/>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
</Project>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
<ImportGroup Label="ExtensionTargets"/>
</Project>

30
Data/Data_x64_vs120.vcxproj.filters
View File

@ -2,31 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="DataCore">
<UniqueIdentifier>{3db17930-0098-4c7c-9ffc-308de3b05863}</UniqueIdentifier>
<UniqueIdentifier>{03057cf0-0a45-4f05-b3f1-49efe69676b6}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Header Files">
<UniqueIdentifier>{e6d79dca-ec63-42f2-a2aa-29d02a26bb3f}</UniqueIdentifier>
<UniqueIdentifier>{3ab9e6b0-fe0f-459c-8a11-e5abab3ba5e4}</UniqueIdentifier>
</Filter>
<Filter Include="DataCore\Source Files">
<UniqueIdentifier>{412f4b4c-ccc2-4147-bcbc-db67fcd992df}</UniqueIdentifier>
<UniqueIdentifier>{f65032c5-960b-4de0-a633-4e866549ede3}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling">
<UniqueIdentifier>{ec157c71-4d2c-4052-97ce-5d2f1de40122}</UniqueIdentifier>
<UniqueIdentifier>{4ad5318f-4fd1-40cc-8ab7-b793d43f7235}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Header Files">
<UniqueIdentifier>{ff5a6a54-6d9b-4fc8-8350-c1f54c789295}</UniqueIdentifier>
<UniqueIdentifier>{958bdce1-8813-4dc8-9b20-f66ac7489960}</UniqueIdentifier>
</Filter>
<Filter Include="SessionPooling\Source Files">
<UniqueIdentifier>{db703cd2-b565-4058-8b67-5ae8606163c1}</UniqueIdentifier>
<UniqueIdentifier>{5439178f-11b9-4417-bbe3-55840d9e4676}</UniqueIdentifier>
</Filter>
<Filter Include="Logging">
<UniqueIdentifier>{1a9e7bc5-1910-4cf2-a681-9965d08553d6}</UniqueIdentifier>
<UniqueIdentifier>{e7d1d571-4a86-4db3-8689-5c16fce4db5c}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Header Files">
<UniqueIdentifier>{208ef637-6927-40ca-9e0c-2b60bbc81129}</UniqueIdentifier>
<UniqueIdentifier>{8632f9be-aff4-4f36-8d38-9a0d7ea6aa3f}</UniqueIdentifier>
</Filter>
<Filter Include="Logging\Source Files">
<UniqueIdentifier>{734e9191-0bec-46c5-b757-20a997803fec}</UniqueIdentifier>
<UniqueIdentifier>{433c5e7f-11d4-415f-8640-1e2d0b75af57}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@ -93,6 +93,9 @@
<ClInclude Include="include\Poco\Data\Extraction.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\Limit.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
@ -177,9 +180,6 @@
<ClInclude Include="include\Poco\Data\SQLChannel.h">
<Filter>Logging\Header Files</Filter>
</ClInclude>
<ClInclude Include="include\Poco\Data\JSONRowFormatter.h">
<Filter>DataCore\Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\AbstractBinder.cpp">
@ -215,6 +215,9 @@
<ClCompile Include="src\DynamicLOB.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\Limit.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
@ -287,8 +290,5 @@
<ClCompile Include="src\SQLChannel.cpp">
<Filter>Logging\Source Files</Filter>
</ClCompile>
<ClCompile Include="src\JSONRowFormatter.cpp">
<Filter>DataCore\Source Files</Filter>
</ClCompile>
</ItemGroup>
</Project>

4
Data/Data_x64_vs90.vcproj
View File

@ -439,6 +439,8 @@
RelativePath=".\include\Poco\Data\DynamicLOB.h"/>
<File
RelativePath=".\include\Poco\Data\Extraction.h"/>
<File
RelativePath=".\include\Poco\Data\JSONRowFormatter.h"/>
<File
RelativePath=".\include\Poco\Data\Limit.h"/>
<File
@ -508,6 +510,8 @@
RelativePath=".\src\Date.cpp"/>
<File
RelativePath=".\src\DynamicLOB.cpp"/>
<File
RelativePath=".\src\JSONRowFormatter.cpp"/>
<File
RelativePath=".\src\Limit.cpp"/>
<File

12
Util/include/Poco/Util/ServerApplication.h
View File

@ -168,6 +168,16 @@ protected:
void defineOptions(OptionSet& options);
#endif
#if defined(POCO_OS_FAMILY_WINDOWS) && !defined(_WIN32_WCE)
static HDEVNOTIFY registerServiceDeviceNotification(LPVOID filter, DWORD flags);
/// Registers the ServerApplication to receive SERVICE_CONTROL_DEVICEEVENT
/// events via handleDeviceEvent().
virtual DWORD handleDeviceEvent(DWORD event_type, LPVOID event_data);
/// Handles the SERVICE_CONTROL_DEVICEEVENT event. The default
/// implementation does nothing and returns ERROR_CALL_NOT_IMPLEMENTED.
#endif
private:
#if defined(POCO_VXWORKS)
static Poco::Event _terminate;
@ -188,7 +198,7 @@ private:
SRV_UNREGISTER
};
static BOOL __stdcall ConsoleCtrlHandler(DWORD ctrlType);
static void __stdcall ServiceControlHandler(DWORD control);
static DWORD __stdcall ServiceControlHandler(DWORD control, DWORD event_type, LPVOID event_data, LPVOID context);
#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
static void __stdcall ServiceMain(DWORD argc, LPWSTR* argv);
#else

30
Util/src/ServerApplication.cpp
View File

@ -132,8 +132,23 @@ BOOL ServerApplication::ConsoleCtrlHandler(DWORD ctrlType)
}
void ServerApplication::ServiceControlHandler(DWORD control)
HDEVNOTIFY ServerApplication::registerServiceDeviceNotification(LPVOID filter, DWORD flags)
{
return RegisterDeviceNotification(_serviceStatusHandle, filter, flags);
}
DWORD ServerApplication::handleDeviceEvent(DWORD /*event_type*/, LPVOID /*event_data*/)
{
return ERROR_CALL_NOT_IMPLEMENTED;
}
DWORD ServerApplication::ServiceControlHandler(DWORD control, DWORD event_type, LPVOID event_data, LPVOID context)
{
DWORD result = NO_ERROR;
ServerApplication* pThis = reinterpret_cast<ServerApplication*>(context);
switch (control)
{
case SERVICE_CONTROL_STOP:
@ -142,9 +157,16 @@ void ServerApplication::ServiceControlHandler(DWORD control)
_serviceStatus.dwCurrentState = SERVICE_STOP_PENDING;
break;
case SERVICE_CONTROL_INTERROGATE:
break;
break;
case SERVICE_CONTROL_DEVICEEVENT:
if (pThis)
{
result = pThis->handleDeviceEvent(event_type, event_data);
}
break;
}
SetServiceStatus(_serviceStatusHandle, &_serviceStatus);
return result;
}
@ -159,9 +181,9 @@ void ServerApplication::ServiceMain(DWORD argc, LPTSTR* argv)
app.config().setBool("application.runAsService", true);
#if defined(POCO_WIN32_UTF8) && !defined(POCO_NO_WSTRING)
_serviceStatusHandle = RegisterServiceCtrlHandlerW(L"", ServiceControlHandler);
_serviceStatusHandle = RegisterServiceCtrlHandlerExW(L"", ServiceControlHandler, &app);
#else
_serviceStatusHandle = RegisterServiceCtrlHandlerA("", ServiceControlHandler);
_serviceStatusHandle = RegisterServiceCtrlHandlerExA("", ServiceControlHandler, &app);
#endif
if (!_serviceStatusHandle)
throw SystemException("cannot register service control handler");