SSPCPP-689 Move VC files into Projects folders

https://issues.shibboleth.net/jira/browse/SSPCPP-689

As a result we also remove a lot from the .gitignore files in
the project folders.

diff --git a/.gitignore b/.gitignore
index 45b5f55..b8a456d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,14 +15,17 @@
 *.wixpdb\r
 *.msi\r
 *.wixlib\r
+*.sdf\r
+*.opensdf\r
+*.suo\r
 *~\r
 *.#*\r
 .*.swp\r
 .DS_store\r
 *.vcxproj.user\r
-Debug\r
-Release\r
-x64\r
+**/Debug\r
+**/Release\r
+**/x64\r
 # Simulated Subversion default ignores end here\r
 # The contents of the svn:ignore property on the branch root.\r
 /aclocal.m4\r
@@ -46,12 +49,26 @@ x64
 /.autotools\r
 /.cproject\r
 /.project\r
-/*.suo\r
 /Portfile\r
 /pkginfo\r
 /*.gz\r
-/*.sdf\r
-/*.opensdf\r
-/ipch\r
 /build-aux\r
 /build\r
+\r
+Projects/VC??/adfs/adfs-lite-Debug/\r
+Projects/VC??/adfs/adfs-lite-Release/\r
+Projects/VC??/apache/mod_shib_20-Debug/\r
+Projects/VC??/apache/mod_shib_20-Release/\r
+Projects/VC??/apache/mod_shib_22-Debug/\r
+Projects/VC??/apache/mod_shib_22-Release/\r
+Projects/VC??/apache/mod_shib_24-Debug/\r
+Projects/VC??/apache/mod_shib_24-Release/\r
+Projects/VC??/fastcgi/shibauthorizer-Debug/\r
+Projects/VC??/fastcgi/shibauthorizer-Release/\r
+Projects/VC??/fastcgi/shibresponder-Debug/\r
+Projects/VC??/fastcgi/shibresponder-Release/\r
+Projects/VC??/ipch/\r
+Projects/VC??/plugins/plugins-lite-Debug/\r
+Projects/VC??/plugins/plugins-lite-Release/\r
+Projects/VC??/shibsp/shibsp-lite-Debug/\r
+Projects/VC??/shibsp/shibsp-lite-Release/
\ No newline at end of file

diff --git a/Shibboleth.sln b/Projects/VC10/Shibboleth.sln
similarity index 80%
rename from Shibboleth.sln
rename to Projects/VC10/Shibboleth.sln
index 9f2e620..f30dd9d 100644 (file)
--- a/Shibboleth.sln
+++ b/Projects/VC10/Shibboleth.sln
@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 14\r
-VisualStudioVersion = 14.0.24720.0\r
-MinimumVisualStudioVersion = 10.0.40219.1\r
+# Visual Studio 2010\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server Modules", "Server Modules", "{26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}"\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}"\r
@@ -19,88 +17,88 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fastcgi", "fastcgi", "{8E1A
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{0F172F71-BDD7-44D1-9147-061DC20683BD}"\r
        ProjectSection(SolutionItems) = preProject\r
-               schemas\catalog.xml.in = schemas\catalog.xml.in\r
-               schemas\Makefile.am = schemas\Makefile.am\r
-               schemas\shibboleth-2.0-afp-mf-basic.xsd = schemas\shibboleth-2.0-afp-mf-basic.xsd\r
-               schemas\shibboleth-2.0-afp-mf-saml.xsd = schemas\shibboleth-2.0-afp-mf-saml.xsd\r
-               schemas\shibboleth-2.0-afp.xsd = schemas\shibboleth-2.0-afp.xsd\r
-               schemas\shibboleth-2.0-attribute-map.xsd = schemas\shibboleth-2.0-attribute-map.xsd\r
-               schemas\shibboleth-2.0-native-sp-config.xsd = schemas\shibboleth-2.0-native-sp-config.xsd\r
-               schemas\shibboleth-2.0-native-sp-protocols.xsd = schemas\shibboleth-2.0-native-sp-protocols.xsd\r
-               schemas\shibboleth-2.0-sp-notify.xsd = schemas\shibboleth-2.0-sp-notify.xsd\r
-               schemas\shibboleth-metadata-1.0.xsd = schemas\shibboleth-metadata-1.0.xsd\r
-               schemas\shibboleth.xsd = schemas\shibboleth.xsd\r
-               schemas\WS-Trust.xsd = schemas\WS-Trust.xsd\r
+               ..\..\schemas\catalog.xml.in = ..\..\schemas\catalog.xml.in\r
+               ..\..\schemas\Makefile.am = ..\..\schemas\Makefile.am\r
+               ..\..\schemas\shibboleth-2.0-afp-mf-basic.xsd = ..\..\schemas\shibboleth-2.0-afp-mf-basic.xsd\r
+               ..\..\schemas\shibboleth-2.0-afp-mf-saml.xsd = ..\..\schemas\shibboleth-2.0-afp-mf-saml.xsd\r
+               ..\..\schemas\shibboleth-2.0-afp.xsd = ..\..\schemas\shibboleth-2.0-afp.xsd\r
+               ..\..\schemas\shibboleth-2.0-attribute-map.xsd = ..\..\schemas\shibboleth-2.0-attribute-map.xsd\r
+               ..\..\schemas\shibboleth-2.0-native-sp-config.xsd = ..\..\schemas\shibboleth-2.0-native-sp-config.xsd\r
+               ..\..\schemas\shibboleth-2.0-native-sp-protocols.xsd = ..\..\schemas\shibboleth-2.0-native-sp-protocols.xsd\r
+               ..\..\schemas\shibboleth-2.0-sp-notify.xsd = ..\..\schemas\shibboleth-2.0-sp-notify.xsd\r
+               ..\..\schemas\shibboleth-metadata-1.0.xsd = ..\..\schemas\shibboleth-metadata-1.0.xsd\r
+               ..\..\schemas\shibboleth.xsd = ..\..\schemas\shibboleth.xsd\r
+               ..\..\schemas\WS-Trust.xsd = ..\..\schemas\WS-Trust.xsd\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Config", "Config", "{2543BCFE-B3D7-4D08-AAA5-2E284903890E}"\r
        ProjectSection(SolutionItems) = preProject\r
-               configs\accessError.html = configs\accessError.html\r
-               configs\apache.config.in = configs\apache.config.in\r
-               configs\apache2.config.in = configs\apache2.config.in\r
-               configs\apache22.config.in = configs\apache22.config.in\r
-               configs\apache24.config.in = configs\apache24.config.in\r
-               configs\attrChecker.html = configs\attrChecker.html\r
-               configs\attribute-map.xml = configs\attribute-map.xml\r
-               configs\attribute-policy.xml = configs\attribute-policy.xml\r
-               configs\bindingTemplate.html = configs\bindingTemplate.html\r
-               configs\console.logger = configs\console.logger\r
-               configs\discoveryTemplate.html = configs\discoveryTemplate.html\r
-               configs\example-metadata.xml = configs\example-metadata.xml\r
-               configs\example-shibboleth2.xml = configs\example-shibboleth2.xml\r
-               configs\globalLogout.html = configs\globalLogout.html\r
-               configs\keygen.bat = configs\keygen.bat\r
-               configs\keygen.sh = configs\keygen.sh\r
-               configs\localLogout.html = configs\localLogout.html\r
-               configs\Makefile.am = configs\Makefile.am\r
-               configs\metadataError.html = configs\metadataError.html\r
-               configs\metagen.sh = configs\metagen.sh\r
-               configs\native.logger.in = configs\native.logger.in\r
-               configs\partialLogout.html = configs\partialLogout.html\r
-               configs\postTemplate.html = configs\postTemplate.html\r
-               configs\protocols.xml = configs\protocols.xml\r
-               configs\security-policy.xml = configs\security-policy.xml\r
-               configs\SetService32.bat = configs\SetService32.bat\r
-               configs\SetService64.bat = configs\SetService64.bat\r
-               configs\shibboleth2.xml = configs\shibboleth2.xml\r
-               configs\shibd-debian.in = configs\shibd-debian.in\r
-               configs\shibd-osx.plist.in = configs\shibd-osx.plist.in\r
-               configs\shibd-redhat.in = configs\shibd-redhat.in\r
-               configs\shibd-suse.in = configs\shibd-suse.in\r
-               configs\shibd.logger.in = configs\shibd.logger.in\r
-               configs\sslError.html = configs\sslError.html\r
-               configs\syslog.logger = configs\syslog.logger\r
-               configs\upgrade.xsl = configs\upgrade.xsl\r
-               configs\win-shibboleth2.xml = configs\win-shibboleth2.xml\r
-               configs\xsltproc.js = configs\xsltproc.js\r
+               ..\..\configs\accessError.html = ..\..\configs\accessError.html\r
+               ..\..\configs\apache.config.in = ..\..\configs\apache.config.in\r
+               ..\..\configs\apache2.config.in = ..\..\configs\apache2.config.in\r
+               ..\..\configs\apache22.config.in = ..\..\configs\apache22.config.in\r
+               ..\..\configs\apache24.config.in = ..\..\configs\apache24.config.in\r
+               ..\..\configs\attrChecker.html = ..\..\configs\attrChecker.html\r
+               ..\..\configs\attribute-map.xml = ..\..\configs\attribute-map.xml\r
+               ..\..\configs\attribute-policy.xml = ..\..\configs\attribute-policy.xml\r
+               ..\..\configs\bindingTemplate.html = ..\..\configs\bindingTemplate.html\r
+               ..\..\configs\console.logger = ..\..\configs\console.logger\r
+               ..\..\configs\discoveryTemplate.html = ..\..\configs\discoveryTemplate.html\r
+               ..\..\configs\example-metadata.xml = ..\..\configs\example-metadata.xml\r
+               ..\..\configs\example-shibboleth2.xml = ..\..\configs\example-shibboleth2.xml\r
+               ..\..\configs\globalLogout.html = ..\..\configs\globalLogout.html\r
+               ..\..\configs\keygen.bat = ..\..\configs\keygen.bat\r
+               ..\..\configs\keygen.sh = ..\..\configs\keygen.sh\r
+               ..\..\configs\localLogout.html = ..\..\configs\localLogout.html\r
+               ..\..\configs\Makefile.am = ..\..\configs\Makefile.am\r
+               ..\..\configs\metadataError.html = ..\..\configs\metadataError.html\r
+               ..\..\configs\metagen.sh = ..\..\configs\metagen.sh\r
+               ..\..\configs\native.logger.in = ..\..\configs\native.logger.in\r
+               ..\..\configs\partialLogout.html = ..\..\configs\partialLogout.html\r
+               ..\..\configs\postTemplate.html = ..\..\configs\postTemplate.html\r
+               ..\..\configs\protocols.xml = ..\..\configs\protocols.xml\r
+               ..\..\configs\security-policy.xml = ..\..\configs\security-policy.xml\r
+               ..\..\configs\SetService32.bat = ..\..\configs\SetService32.bat\r
+               ..\..\configs\SetService64.bat = ..\..\configs\SetService64.bat\r
+               ..\..\configs\shibboleth2.xml = ..\..\configs\shibboleth2.xml\r
+               ..\..\configs\shibd-debian.in = ..\..\configs\shibd-debian.in\r
+               ..\..\configs\shibd-osx.plist.in = ..\..\configs\shibd-osx.plist.in\r
+               ..\..\configs\shibd-redhat.in = ..\..\configs\shibd-redhat.in\r
+               ..\..\configs\shibd-suse.in = ..\..\configs\shibd-suse.in\r
+               ..\..\configs\shibd.logger.in = ..\..\configs\shibd.logger.in\r
+               ..\..\configs\sslError.html = ..\..\configs\sslError.html\r
+               ..\..\configs\syslog.logger = ..\..\configs\syslog.logger\r
+               ..\..\configs\upgrade.xsl = ..\..\configs\upgrade.xsl\r
+               ..\..\configs\win-shibboleth2.xml = ..\..\configs\win-shibboleth2.xml\r
+               ..\..\configs\xsltproc.js = ..\..\configs\xsltproc.js\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Misc", "Misc", "{31B171C1-E06C-464F-A541-38724AB52D79}"\r
        ProjectSection(SolutionItems) = preProject\r
-               m4\acinclude.m4 = m4\acinclude.m4\r
-               m4\acx_pthread.m4 = m4\acx_pthread.m4\r
-               m4\boost.m4 = m4\boost.m4\r
-               config_win32.h = config_win32.h\r
-               configure.ac = configure.ac\r
-               doxygen.am = doxygen.am\r
-               doxygen.cfg = doxygen.cfg\r
-               m4\doxygen.m4 = m4\doxygen.m4\r
-               Makefile.am = Makefile.am\r
-               shibboleth.spec.in = shibboleth.spec.in\r
+               ..\..\m4\acinclude.m4 = ..\..\m4\acinclude.m4\r
+               ..\..\m4\acx_pthread.m4 = ..\..\m4\acx_pthread.m4\r
+               ..\..\m4\boost.m4 = ..\..\m4\boost.m4\r
+               ..\..\config_win32.h = ..\..\config_win32.h\r
+               ..\..\configure.ac = ..\..\configure.ac\r
+               ..\..\doxygen.am = ..\..\doxygen.am\r
+               ..\..\doxygen.cfg = ..\..\doxygen.cfg\r
+               ..\..\m4\doxygen.m4 = ..\..\m4\doxygen.m4\r
+               ..\..\Makefile.am = ..\..\Makefile.am\r
+               ..\..\shibboleth.spec.in = ..\..\shibboleth.spec.in\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{6ED5E3E7-1B0E-43FB-A8D1-77A0FCAE9AC8}"\r
        ProjectSection(SolutionItems) = preProject\r
-               doc\CREDITS.txt = doc\CREDITS.txt\r
-               doc\FASTCGI.LICENSE = doc\FASTCGI.LICENSE\r
-               doc\LICENSE.txt = doc\LICENSE.txt\r
-               doc\LOG4CPP.LICENSE = doc\LOG4CPP.LICENSE\r
-               doc\main.css = doc\main.css\r
-               doc\Makefile.am = doc\Makefile.am\r
-               doc\NOTICE.txt = doc\NOTICE.txt\r
-               doc\OPENSSL.LICENSE = doc\OPENSSL.LICENSE\r
-               doc\README.txt = doc\README.txt\r
-               doc\RELEASE.txt = doc\RELEASE.txt\r
+               ..\..\doc\CREDITS.txt = ..\..\doc\CREDITS.txt\r
+               ..\..\doc\FASTCGI.LICENSE = ..\..\doc\FASTCGI.LICENSE\r
+               ..\..\doc\LICENSE.txt = ..\..\doc\LICENSE.txt\r
+               ..\..\doc\LOG4CPP.LICENSE = ..\..\doc\LOG4CPP.LICENSE\r
+               ..\..\doc\main.css = ..\..\doc\main.css\r
+               ..\..\doc\Makefile.am = ..\..\doc\Makefile.am\r
+               ..\..\doc\NOTICE.txt = ..\..\doc\NOTICE.txt\r
+               ..\..\doc\OPENSSL.LICENSE = ..\..\doc\OPENSSL.LICENSE\r
+               ..\..\doc\README.txt = ..\..\doc\README.txt\r
+               ..\..\doc\RELEASE.txt = ..\..\doc\RELEASE.txt\r
        EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isapi_shib", "isapi_shib\isapi_shib.vcxproj", "{87C25D4E-8D19-4513-B0BA-BC668BC2DEE3}"\r
@@ -146,12 +144,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugins-lite", "plugins\plu
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeModules", "msi\WiX\MergeModules\MergeModules.vcxproj", "{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeModules", "Wix\MergeModules.vcxproj", "{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {81F0F7A6-DC36-46EF-957F-F9E81D4403F6} = {81F0F7A6-DC36-46EF-957F-F9E81D4403F6}\r
        EndProjectSection\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "msi\WiX\Installer.vcxproj", "{C2B1BB79-C88B-42B4-9AEC-170F91910F70}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Installer", "Wix\Installer.vcxproj", "{C2B1BB79-C88B-42B4-9AEC-170F91910F70}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {1396D80A-8672-4224-9B02-95F3F4207CDB} = {1396D80A-8672-4224-9B02-95F3F4207CDB}\r
                {D243B43E-728E-4F32-BDFF-B3A897037C6D} = {D243B43E-728E-4F32-BDFF-B3A897037C6D}\r
@@ -352,17 +350,17 @@ Global
                {68E9568B-476C-4289-B93C-893432378ADC} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}\r
                {1396D80A-8672-4224-9B02-95F3F4207CDB} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}\r
                {B44C0852-83B8-4FB2-A86E-097C9C8256D0} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}\r
+               {B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}\r
                {666A63A7-983F-4C19-8411-207F24305197} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
                {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83A} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
                {26D4FABF-ACDE-4947-9C4A-7AE1B50CD83B} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
+               {666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
+               {A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
+               {A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
                {F13141B6-6C87-40BB-8D4E-5CC56EBB4C5A} = {FED80230-119E-4B2F-9F53-D2660A5F022B}\r
                {F13141B6-6C87-40BB-8D4E-5CC56EBB4C59} = {FED80230-119E-4B2F-9F53-D2660A5F022B}\r
                {8CF7DDFA-EAA0-416E-853E-3DCB210C4AE0} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}\r
                {B2423DCE-048D-4BAA-9AB9-F5D1FCDD3D25} = {8E1AF2CF-24E1-4983-8681-394D89DF9AD2}\r
-               {666A63A7-983F-4C19-8411-207F24305198} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
-               {A2140D6E-C2C6-4329-84E3-2F530CEBE445} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
-               {B44C0852-83B8-4FB2-A86E-097C9C8256D1} = {26BA8F84-6E42-41FA-9B13-5D3F4B5B2050}\r
-               {A2140D6E-C2C6-4329-84E3-2F530CEBE442} = {96AE4FC9-45EF-4C18-9F3B-EDA439E26E4C}\r
                {EFF65B5B-85AB-4FD5-A217-7E6CA4219951} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}\r
                {C2B1BB79-C88B-42B4-9AEC-170F91910F70} = {BF389E01-8F97-4ECA-8C62-2DBB8F0480DD}\r
        EndGlobalSection\r

diff --git a/msi/WiX/Installer.vcxproj b/Projects/VC10/Wix/Installer.vcxproj
similarity index 52%
rename from msi/WiX/Installer.vcxproj
rename to Projects/VC10/Wix/Installer.vcxproj
index 5fbb6cc..ece3d98 100644 (file)
--- a/msi/WiX/Installer.vcxproj
+++ b/Projects/VC10/Wix/Installer.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -36,57 +36,61 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
-  <Import Project="..\..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <PropertyGroup Label="UserMacros" />\r
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make clean</NMakeBuildCommandLine>\r
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\\r
+nmake /f Installer.make clean</NMakeBuildCommandLine>\r
     <NMakeCleanCommandLine>del *.wixobj *.msi *.wixlib</NMakeCleanCommandLine>\r
     <NMakeReBuildCommandLine>nmake /f Installer.make clean</NMakeReBuildCommandLine>\r
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *86.wixobj\r
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\\r
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) all32</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\\r
+del *86.wixobj\r
 del *86.msi\r
 del *.wixlib\r
 del *x86.wixpdb</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>\r
+    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId32=$(ShibbolethId32) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId32=$(ShibbolethId32) rebuild32</NMakeReBuildCommandLine>\r
     <NMakePreprocessorDefinitions>\r
     </NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <NMakeBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *64.wixobj\r
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\\r
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) all64</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\\r
+del *64.wixobj\r
 del *64.msmi\r
 del *.wixlib\r
 del *64.wixpdb</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir) ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>\r
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\\r
+nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ ShibbolethVersion=$(ShibbolethVersion) ShibbolethPatchVersion=$(ShibbolethPatchVersion) ShibbolethId64=$(ShibbolethId64) ShibbolethUpgradeCode=$(ShibbolethUpgradeCode) ShibbolethId64=$(ShibbolethId64) rebuild64</NMakeReBuildCommandLine>\r
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Dialog.bmp" />\r
-    <None Include="Installer.make" />\r
-    <None Include="license.rtf" />\r
-    <None Include="ShibbolethSP-defs-x86.wxi" />\r
-    <None Include="ShibbolethSP-exe-x64.wxs">\r
-      <SubType>Designer</SubType>\r
-    </None>\r
-    <None Include="ShibbolethSP-exe-x86.wxs" />\r
-    <None Include="ShibbolethSP-gui.wxs" />\r
-    <None Include="ShibbolethSP-install-dlg.wxs" />\r
-    <None Include="ShibbolethSP-main-x64.wxs" />\r
-    <None Include="ShibbolethSP-main-x86.wxs" />\r
-    <None Include="ShibbolethSP-noarch.wxs" />\r
-    <None Include="ShibbolethSP-properties.wxi" />\r
-    <None Include="ShibbolethSP-registry-x64.wxs" />\r
-    <None Include="ShibbolethSP-registry-x86.wxs" />\r
-    <None Include="ShibbolethSP-update-dlg.wxs" />\r
-    <None Include="TopBanner.bmp" />\r
+    <None Include="H:\Perforce\devel\cpp-sp\msi\wix\Dialog.bmp" />\r
+    <None Include="..\..\..\msi\wix\Installer.make" />\r
+    <None Include="..\..\..\msi\wix\license.rtf" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-defs-x86.wxi" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-exe-x64.wxs"/>\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-exe-x86.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-gui.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-install-dlg.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-main-x64.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-main-x86.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-noarch.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-properties.wxi" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-registry-x64.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-registry-x86.wxs" />\r
+    <None Include="..\..\..\msi\wix\ShibbolethSP-update-dlg.wxs" />\r
+    <None Include="..\..\..\msi\wix\TopBanner.bmp" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
   </ImportGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r

diff --git a/adfs/adfs-lite.vcxproj b/Projects/VC10/adfs/adfs-lite.vcxproj
similarity index 82%
rename from adfs/adfs-lite.vcxproj
rename to Projects/VC10/adfs/adfs-lite.vcxproj
index 96d7521..1885037 100644 (file)
--- a/adfs/adfs-lite.vcxproj
+++ b/Projects/VC10/adfs/adfs-lite.vcxproj
@@ -58,19 +58,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\VC10\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\VC10\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -93,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
@@ -107,7 +109,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -120,7 +122,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
@@ -134,7 +136,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -143,7 +145,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -154,7 +156,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -168,7 +170,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -179,7 +181,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -189,19 +191,19 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="adfs.cpp" />\r
+    <ClCompile Include="..\..\..\adfs\adfs.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="adfs.rc" />\r
+    <ResourceCompile Include="..\..\..\adfs\adfs.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\adfs\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\adfs\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/adfs/adfs.vcxproj b/Projects/VC10/adfs/adfs.vcxproj
similarity index 80%
rename from adfs/adfs.vcxproj
rename to Projects/VC10/adfs/adfs.vcxproj
index 45272c7..b4ef4b8 100644 (file)
--- a/adfs/adfs.vcxproj
+++ b/Projects/VC10/adfs/adfs.vcxproj
@@ -58,17 +58,19 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\..\Build\vc10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\Build\vc10\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -91,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -105,7 +107,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -118,7 +120,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
@@ -132,7 +134,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -141,7 +143,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -149,7 +151,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -163,7 +165,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\adfs;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -171,7 +173,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -181,19 +183,19 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="adfs.cpp" />\r
+    <ClCompile Include="..\..\..\adfs\adfs.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="adfs.rc" />\r
+    <ResourceCompile Include="..\..\..\adfs\adfs.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\adfs\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\adfs\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f6}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/apache/mod_shib13.vcxproj b/Projects/VC10/apache/mod_shib13.vcxproj
similarity index 84%
rename from apache/mod_shib13.vcxproj
rename to Projects/VC10/apache/mod_shib13.vcxproj
index c5fcfb9..2f27c77 100644 (file)
--- a/apache/mod_shib13.vcxproj
+++ b/Projects/VC10/apache/mod_shib13.vcxproj
@@ -61,17 +61,19 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -104,7 +106,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;$(Apache13Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache13Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;EAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -117,7 +119,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -136,7 +138,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;EAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -149,7 +151,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;ApacheCore.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -167,7 +169,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;$(Apache13Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache13Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;EAPI;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -181,7 +183,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;ApacheCore.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache13Root)\libexec;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -199,7 +201,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;EAPI;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -213,32 +215,32 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;ApacheCore.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\apache\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="mod_shib.cpp">\r
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="mod_shib_13.cpp" />\r
+    <ClCompile Include="..\..\..\apache\mod_shib_13.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="mod_shib_13.rc" />\r
+    <ResourceCompile Include="..\..\..\apache\mod_shib_13.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\apache\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/apache/mod_shib20.vcxproj b/Projects/VC10/apache/mod_shib20.vcxproj
similarity index 84%
rename from apache/mod_shib20.vcxproj
rename to Projects/VC10/apache/mod_shib20.vcxproj
index 5c0f793..0271950 100644 (file)
--- a/apache/mod_shib20.vcxproj
+++ b/Projects/VC10/apache/mod_shib20.vcxproj
@@ -61,19 +61,21 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -106,7 +108,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;$(Apache20Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache20Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -120,7 +122,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -139,7 +141,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -153,7 +155,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -171,7 +173,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;$(Apache20Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache20Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -186,7 +188,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache20Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -204,7 +206,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -219,32 +221,32 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;libapr.lib;libaprutil.lib;libhttpd.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\apache\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="mod_shib.cpp">\r
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="mod_shib_20.cpp" />\r
+    <ClCompile Include="..\..\..\apache\mod_shib_20.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="mod_shib_20.rc" />\r
+    <ResourceCompile Include="..\..\..\apache\mod_shib_20.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\apache\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/apache/mod_shib22.vcxproj b/Projects/VC10/apache/mod_shib22.vcxproj
similarity index 84%
rename from apache/mod_shib22.vcxproj
rename to Projects/VC10/apache/mod_shib22.vcxproj
index e5a680b..8ad6165 100644 (file)
--- a/apache/mod_shib22.vcxproj
+++ b/Projects/VC10/apache/mod_shib22.vcxproj
@@ -61,19 +61,21 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -106,7 +108,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;$(Apache22Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -119,7 +121,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -141,7 +143,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;$(Apache22Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -154,7 +156,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -175,7 +177,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;$(Apache22Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -189,7 +191,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache22Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -210,7 +212,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;$(Apache22Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache22Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -224,7 +226,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache22Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -234,25 +236,25 @@
     </Bscmake>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\apache\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="mod_shib.cpp">\r
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="mod_shib_22.cpp" />\r
+    <ClCompile Include="..\..\..\apache\mod_shib_22.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="mod_shib_22.rc" />\r
+    <ResourceCompile Include="..\..\..\apache\mod_shib_22.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\apache\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/apache/mod_shib24.vcxproj b/Projects/VC10/apache/mod_shib24.vcxproj
similarity index 82%
rename from apache/mod_shib24.vcxproj
rename to Projects/VC10/apache/mod_shib24.vcxproj
index d3510e3..dc15a15 100644 (file)
--- a/apache/mod_shib24.vcxproj
+++ b/Projects/VC10/apache/mod_shib24.vcxproj
@@ -61,19 +61,21 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -97,7 +99,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;$(Apache24Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -110,7 +112,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -123,7 +125,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>..;$(Apache24Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -136,7 +138,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -148,7 +150,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;$(Apache24Root)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -162,7 +164,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);$(Apache24Root)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -174,7 +176,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..;$(Apache24Root64)\include;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..;$(Apache24Root64)\include;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -188,7 +190,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;libapr-1.lib;libaprutil-1.lib;libhttpd.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);$(Apache24Root64)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -198,25 +200,25 @@
     </Bscmake>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\apache\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="mod_shib.cpp">\r
+    <ClCompile Include="..\..\..\apache\mod_shib.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="mod_shib_24.cpp" />\r
+    <ClCompile Include="..\..\..\apache\mod_shib_24.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="mod_shib_24.rc" />\r
+    <ResourceCompile Include="..\..\..\apache\mod_shib_24.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\apache\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/fastcgi/shibauthorizer.vcxproj b/Projects/VC10/fastcgi/shibauthorizer.vcxproj
similarity index 84%
rename from fastcgi/shibauthorizer.vcxproj
rename to Projects/VC10/fastcgi/shibauthorizer.vcxproj
index d66b2f7..93b6d32 100644 (file)
--- a/fastcgi/shibauthorizer.vcxproj
+++ b/Projects/VC10/fastcgi/shibauthorizer.vcxproj
@@ -60,19 +60,22 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -96,7 +99,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -108,7 +111,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -124,7 +127,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -136,7 +139,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -150,7 +153,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -164,7 +167,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -179,7 +182,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -193,7 +196,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -201,10 +204,10 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\fastcgi\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="shibauthorizer.cpp">\r
+    <ClCompile Include="..\..\..\fastcgi\shibauthorizer.cpp">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
@@ -216,7 +219,7 @@
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="shibauthorizer.rc" />\r
+    <ResourceCompile Include="..\..\..\fastcgi\shibauthorizer.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r

diff --git a/fastcgi/shibresponder.vcxproj b/Projects/VC10/fastcgi/shibresponder.vcxproj
similarity index 84%
rename from fastcgi/shibresponder.vcxproj
rename to Projects/VC10/fastcgi/shibresponder.vcxproj
index 9bb4ef0..6d267f3 100644 (file)
--- a/fastcgi/shibresponder.vcxproj
+++ b/Projects/VC10/fastcgi/shibresponder.vcxproj
@@ -61,19 +61,22 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -97,7 +100,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -109,7 +112,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -125,7 +128,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -137,7 +140,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling1.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -151,7 +154,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -165,7 +168,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -180,7 +183,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\fastcgi\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -194,7 +197,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling1D.lib;libfcgi.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);\fcgi-2.4.0-VC9\Win32\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -202,10 +205,10 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\fastcgi\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="shibresponder.cpp">\r
+    <ClCompile Include="..\..\..\fastcgi\shibresponder.cpp">\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
@@ -217,7 +220,7 @@
     </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="shibresponder.rc" />\r
+    <ResourceCompile Include="..\..\..\fastcgi\shibresponder.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r

diff --git a/isapi_shib/isapi_shib.vcxproj b/Projects/VC10/isapi_shib/isapi_shib.vcxproj
similarity index 85%
rename from isapi_shib/isapi_shib.vcxproj
rename to Projects/VC10/isapi_shib/isapi_shib.vcxproj
index 27ffe44..a26641a 100644 (file)
--- a/isapi_shib/isapi_shib.vcxproj
+++ b/Projects/VC10/isapi_shib/isapi_shib.vcxproj
@@ -58,17 +58,20 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -97,7 +100,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -111,7 +114,7 @@
     <Link>\r
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -131,7 +134,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -145,7 +148,7 @@
     <Link>\r
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -164,7 +167,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -178,7 +181,7 @@
     <Link>\r
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -197,7 +200,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\isapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;WIN32_LEAN_AND_MEAN;_WIN32_WINNT=0x0400;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -211,7 +214,7 @@
     <Link>\r
       <AdditionalOptions>/export:GetExtensionVersion /export:GetFilterVersion /export:TerminateExtension /export:TerminateFilter /export:HttpFilterProc /export:HttpExtensionProc %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <RandomizedBaseAddress>false</RandomizedBaseAddress>\r
       <DataExecutionPrevention>\r
@@ -219,16 +222,16 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="isapi_shib.cpp" />\r
+    <ClCompile Include="..\..\..\Isapi_Shib\isapi_shib.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="isapi_shib.rc" />\r
+    <ResourceCompile Include="..\..\..\Isapi_Shib\isapi_shib.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\Isapi_Shib\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/memcache-store/memcache-store.vcxproj b/Projects/VC10/memcache-store/memcache-store.vcxproj
similarity index 80%
rename from memcache-store/memcache-store.vcxproj
rename to Projects/VC10/memcache-store/memcache-store.vcxproj
index c6b50c4..7c1fd30 100644 (file)
--- a/memcache-store/memcache-store.vcxproj
+++ b/Projects/VC10/memcache-store/memcache-store.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>\r
+<?xml version="1.0" encoding="utf-8"?>\r
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup Label="ProjectConfigurations">\r
     <ProjectConfiguration Include="Debug|Win32">\r
@@ -58,17 +58,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -91,7 +94,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..;..\..\..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -103,7 +106,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;memcached.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -116,7 +119,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -128,7 +131,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -137,13 +140,13 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..;..\..\..\..\cpp-xmltooling;$(BuildRoot)\libmemcached;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level3</WarningLevel>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;memcached.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Configuration);$(BuildRoot)\libmemcached\visualc\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -157,13 +160,13 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;..\..\..\libmemcached\visualc\toolset;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level3</WarningLevel>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -173,19 +176,19 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\memcache-store\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="memcache-store.cpp" />\r
+    <ClCompile Include="..\..\..\memcache-store\memcache-store.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="memcache-store.rc" />\r
+    <ResourceCompile Include="..\..\..\memcache-store\memcache-store.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\memcache-store\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f6}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/nsapi_shib/nsapi_shib.vcxproj b/Projects/VC10/nsapi_shib/nsapi_shib.vcxproj
similarity index 83%
rename from nsapi_shib/nsapi_shib.vcxproj
rename to Projects/VC10/nsapi_shib/nsapi_shib.vcxproj
index ab11054..e182ae0 100644 (file)
--- a/nsapi_shib/nsapi_shib.vcxproj
+++ b/Projects/VC10/nsapi_shib/nsapi_shib.vcxproj
@@ -60,17 +60,20 @@
     <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -99,7 +102,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -112,7 +115,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -131,7 +134,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;_WINDOWS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -144,7 +147,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3.lib;xmltooling-lite1.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -162,7 +165,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -176,7 +179,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -194,7 +197,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\nsapi_shib\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_WINDOWS;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -208,26 +211,26 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>xerces-c_3D.lib;xmltooling-lite1D.lib;ns-httpd30.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\nsapi_shib\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="nsapi_shib.cpp" />\r
+    <ClCompile Include="..\..\..\nsapi_shib\nsapi_shib.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="nsapi_shib.rc" />\r
+    <ResourceCompile Include="..\..\..\nsapi_shib\nsapi_shib.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\nsapi_shib\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp-lite.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f7}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/odbc-store/odbc-store.vcxproj b/Projects/VC10/odbc-store/odbc-store.vcxproj
similarity index 82%
rename from odbc-store/odbc-store.vcxproj
rename to Projects/VC10/odbc-store/odbc-store.vcxproj
index fe6b684..9c54825 100644 (file)
--- a/odbc-store/odbc-store.vcxproj
+++ b/Projects/VC10/odbc-store/odbc-store.vcxproj
@@ -58,17 +58,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -91,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -103,7 +107,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -116,7 +120,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -128,7 +132,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -137,13 +141,13 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level3</WarningLevel>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -157,13 +161,13 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level3</WarningLevel>\r
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -173,16 +177,16 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\odbc-store\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="odbc-store.cpp" />\r
+    <ClCompile Include="..\..\..\odbc-store\odbc-store.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="odbc-store.rc" />\r
+    <ResourceCompile Include="..\..\..\odbc-store\odbc-store.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\odbc-store\resource.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/plugins/plugins-lite.vcxproj b/Projects/VC10/plugins/plugins-lite.vcxproj
similarity index 82%
rename from plugins/plugins-lite.vcxproj
rename to Projects/VC10/plugins/plugins-lite.vcxproj
index a4b7303..dece135 100644 (file)
--- a/plugins/plugins-lite.vcxproj
+++ b/Projects/VC10/plugins/plugins-lite.vcxproj
@@ -60,17 +60,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -99,14 +102,14 @@
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <BrowseInformation>true</BrowseInformation>\r
       <MinimalRebuild>false</MinimalRebuild>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -116,7 +119,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
@@ -130,7 +133,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -146,14 +149,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -162,7 +165,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -170,7 +173,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -180,18 +183,18 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="plugins.cpp" />\r
-    <ClCompile Include="TimeAccessControl.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\plugins.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\TimeAccessControl.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="internal.h" />\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\plugins\internal.h" />\r
+    <ClInclude Include="..\..\..\plugins\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\plugins\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="plugins.rc" />\r
+    <ResourceCompile Include="..\..\..\plugins\plugins.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\shibsp\shibsp-lite.vcxproj">\r

diff --git a/plugins/plugins.vcxproj b/Projects/VC10/plugins/plugins.vcxproj
similarity index 77%
rename from plugins/plugins.vcxproj
rename to Projects/VC10/plugins/plugins.vcxproj
index 2a123af..80d23e1 100644 (file)
--- a/plugins/plugins.vcxproj
+++ b/Projects/VC10/plugins/plugins.vcxproj
@@ -60,17 +60,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -97,14 +100,14 @@
       <WarningLevel>Level3</WarningLevel>\r
       <Optimization>Disabled</Optimization>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <BrowseInformation>true</BrowseInformation>\r
       <MinimalRebuild>false</MinimalRebuild>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -114,7 +117,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>\r
@@ -128,7 +131,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;saml2D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -144,14 +147,14 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ClCompile>\r
     <Link>\r
       <SubSystem>Windows</SubSystem>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
       <OptimizeReferences>true</OptimizeReferences>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
     </Link>\r
   </ItemDefinitionGroup>\r
@@ -160,7 +163,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\plugins\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <PrecompiledHeader>\r
       </PrecompiledHeader>\r
@@ -168,7 +171,7 @@
     </ClCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;saml2.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -178,22 +181,22 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="CaseFoldingAttributeResolver.cpp" />\r
-    <ClCompile Include="GSSAPIAttributeExtractor.cpp" />\r
-    <ClCompile Include="plugins.cpp" />\r
-    <ClCompile Include="TemplateAttributeResolver.cpp" />\r
-    <ClCompile Include="TimeAccessControl.cpp" />\r
-    <ClCompile Include="TransformAttributeResolver.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\CaseFoldingAttributeResolver.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\GSSAPIAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\plugins.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\TemplateAttributeResolver.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\TimeAccessControl.cpp" />\r
+    <ClCompile Include="..\..\..\plugins\TransformAttributeResolver.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="internal.h" />\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\plugins\internal.h" />\r
+    <ClInclude Include="..\..\..\plugins\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\plugins\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="plugins.rc" />\r
+    <ResourceCompile Include="..\..\..\plugins\plugins.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\shibsp\shibsp.vcxproj">\r

diff --git a/plugins/plugins.vcxproj.filters b/Projects/VC10/plugins/plugins.vcxproj.filters
similarity index 100%
rename from plugins/plugins.vcxproj.filters
rename to Projects/VC10/plugins/plugins.vcxproj.filters

diff --git a/shibd/shibd.vcxproj b/Projects/VC10/shibd/shibd.vcxproj
similarity index 79%
rename from shibd/shibd.vcxproj
rename to Projects/VC10/shibd/shibd.vcxproj
index 4fe5c20..9b1b0fe 100644 (file)
--- a/shibd/shibd.vcxproj
+++ b/Projects/VC10/shibd/shibd.vcxproj
@@ -57,17 +57,19 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -91,7 +93,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -104,7 +106,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>wsock32.lib;log4shib1.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -120,7 +122,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -133,7 +135,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>wsock32.lib;log4shib1.lib;xmltooling1.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -147,7 +149,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -161,7 +163,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>wsock32.lib;log4shib1D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -176,7 +178,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibd\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -190,7 +192,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>wsock32.lib;log4shib1D.lib;xmltooling1D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -198,20 +200,20 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
+    <None Include="..\..\..\shibd\Makefile.am" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\shibd\resource.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="shibd.cpp" />\r
-    <ClCompile Include="shibd_win32.cpp" />\r
+    <ClCompile Include="..\..\..\shibd\shibd.cpp" />\r
+    <ClCompile Include="..\..\..\shibd\shibd_win32.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="shibd.rc" />\r
+    <ResourceCompile Include="..\..\..\shibd\shibd.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\shibsp\shibsp.vcxproj">\r
+    <ProjectReference Include="..\..\..\Projects\VC10\shibsp\shibsp.vcxproj">\r
       <Project>{81f0f7a6-dc36-46ef-957f-f9e81d4403f6}</Project>\r
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>\r
     </ProjectReference>\r

diff --git a/shibsp/shibsp-lite.vcxproj b/Projects/VC10/shibsp/shibsp-lite.vcxproj
similarity index 53%
rename from shibsp/shibsp-lite.vcxproj
rename to Projects/VC10/shibsp/shibsp-lite.vcxproj
index f3facff..890746c 100644 (file)
--- a/shibsp/shibsp-lite.vcxproj
+++ b/Projects/VC10/shibsp/shibsp-lite.vcxproj
@@ -58,19 +58,22 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(ProjectName)-$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -93,7 +96,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\shibsp;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -105,7 +108,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -119,7 +122,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <BrowseInformation>true</BrowseInformation>\r
@@ -131,7 +134,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xmltooling-lite1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -141,7 +144,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp;..\..\..\;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level3</WarningLevel>\r
     </ClCompile>\r
@@ -150,7 +153,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -165,7 +168,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;SHIBSP_LITE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <WarningLevel>Level3</WarningLevel>\r
     </ClCompile>\r
@@ -174,7 +177,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xmltooling-lite1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Windows</SubSystem>\r
       <OptimizeReferences>true</OptimizeReferences>\r
@@ -185,118 +188,118 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="AbstractSPRequest.cpp" />\r
-    <ClCompile Include="Application.cpp" />\r
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp" />\r
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp" />\r
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp" />\r
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp" />\r
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SecuredHandler.cpp" />\r
-    <ClCompile Include="ServiceProvider.cpp" />\r
-    <ClCompile Include="SPConfig.cpp" />\r
-    <ClCompile Include="util\CGIParser.cpp" />\r
-    <ClCompile Include="util\DOMPropertySet.cpp" />\r
-    <ClCompile Include="util\IPRange.cpp" />\r
-    <ClCompile Include="util\SPConstants.cpp" />\r
-    <ClCompile Include="util\TemplateParameters.cpp" />\r
-    <ClCompile Include="remoting\impl\ddf.cpp" />\r
-    <ClCompile Include="remoting\impl\ListenerService.cpp" />\r
-    <ClCompile Include="remoting\impl\SocketListener.cpp" />\r
-    <ClCompile Include="remoting\impl\TCPListener.cpp" />\r
-    <ClCompile Include="impl\ChainingAccessControl.cpp" />\r
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp" />\r
-    <ClCompile Include="impl\XMLAccessControl.cpp" />\r
-    <ClCompile Include="impl\XMLRequestMapper.cpp" />\r
-    <ClCompile Include="impl\XMLServiceProvider.cpp" />\r
-    <ClCompile Include="attribute\Attribute.cpp" />\r
-    <ClCompile Include="attribute\BinaryAttribute.cpp" />\r
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp" />\r
-    <ClCompile Include="attribute\NameIDAttribute.cpp" />\r
-    <ClCompile Include="attribute\ScopedAttribute.cpp" />\r
-    <ClCompile Include="attribute\SimpleAttribute.cpp" />\r
-    <ClCompile Include="attribute\XMLAttribute.cpp" />\r
-    <ClCompile Include="handler\impl\AbstractHandler.cpp" />\r
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp" />\r
-    <ClCompile Include="handler\impl\AssertionLookup.cpp" />\r
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\LogoutHandler.cpp" />\r
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp" />\r
-    <ClCompile Include="handler\impl\RemotedHandler.cpp" />\r
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2Logout.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SessionHandler.cpp" />\r
-    <ClCompile Include="handler\impl\SessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\StatusHandler.cpp" />\r
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp" />\r
-    <ClCompile Include="lite\CommonDomainCookie.cpp" />\r
-    <ClCompile Include="lite\SAMLConstants.cpp" />\r
-    <ClCompile Include="version.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\Application.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\lite\CommonDomainCookie.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\lite\SAMLConstants.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\version.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="binding\ProtocolProvider.h" />\r
-    <ClInclude Include="GSSRequest.h" />\r
-    <ClInclude Include="handler\LogoutInitiator.h" />\r
-    <ClInclude Include="handler\SecuredHandler.h" />\r
-    <ClInclude Include="remoting\impl\SocketListener.h" />\r
-    <ClInclude Include="AbstractSPRequest.h" />\r
-    <ClInclude Include="AccessControl.h" />\r
-    <ClInclude Include="Application.h" />\r
-    <ClInclude Include="base.h" />\r
-    <ClInclude Include="config_pub_win32.h" />\r
-    <ClInclude Include="exceptions.h" />\r
-    <ClInclude Include="internal.h" />\r
-    <ClInclude Include="RequestMapper.h" />\r
-    <ClInclude Include="resource.h" />\r
-    <ClInclude Include="ServiceProvider.h" />\r
-    <ClInclude Include="SessionCache.h" />\r
-    <ClInclude Include="SessionCacheEx.h" />\r
-    <ClInclude Include="SPConfig.h" />\r
-    <ClInclude Include="SPRequest.h" />\r
-    <ClInclude Include="version.h" />\r
-    <ClInclude Include="util\CGIParser.h" />\r
-    <ClInclude Include="util\DOMPropertySet.h" />\r
-    <ClInclude Include="util\IPRange.h" />\r
-    <ClInclude Include="util\PropertySet.h" />\r
-    <ClInclude Include="util\SPConstants.h" />\r
-    <ClInclude Include="util\TemplateParameters.h" />\r
-    <ClInclude Include="remoting\ddf.h" />\r
-    <ClInclude Include="remoting\ListenerService.h" />\r
-    <ClInclude Include="attribute\Attribute.h" />\r
-    <ClInclude Include="attribute\BinaryAttribute.h" />\r
-    <ClInclude Include="attribute\ExtensibleAttribute.h" />\r
-    <ClInclude Include="attribute\NameIDAttribute.h" />\r
-    <ClInclude Include="attribute\ScopedAttribute.h" />\r
-    <ClInclude Include="attribute\SimpleAttribute.h" />\r
-    <ClInclude Include="attribute\XMLAttribute.h" />\r
-    <ClInclude Include="handler\AbstractHandler.h" />\r
-    <ClInclude Include="handler\AssertionConsumerService.h" />\r
-    <ClInclude Include="handler\Handler.h" />\r
-    <ClInclude Include="handler\LogoutHandler.h" />\r
-    <ClInclude Include="handler\RemotedHandler.h" />\r
-    <ClInclude Include="handler\SessionInitiator.h" />\r
-    <ClInclude Include="lite\CommonDomainCookie.h" />\r
-    <ClInclude Include="lite\SAMLConstants.h" />\r
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h" />\r
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h" />\r
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h" />\r
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h" />\r
+    <ClInclude Include="..\..\..\shibsp\Application.h" />\r
+    <ClInclude Include="..\..\..\shibsp\base.h" />\r
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h" />\r
+    <ClInclude Include="..\..\..\shibsp\exceptions.h" />\r
+    <ClInclude Include="..\..\..\shibsp\internal.h" />\r
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h" />\r
+    <ClInclude Include="..\..\..\shibsp\resource.h" />\r
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h" />\r
+    <ClInclude Include="..\..\..\shibsp\version.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h" />\r
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h" />\r
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h" />\r
+    <ClInclude Include="..\..\..\shibsp\lite\CommonDomainCookie.h" />\r
+    <ClInclude Include="..\..\..\shibsp\lite\SAMLConstants.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="shibsp.rc" />\r
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <None Include="Makefile.am" />\r
-    <None Include="paths.h.in" />\r
-    <None Include="config_pub.h.in" />\r
+    <None Include="..\..\..\shibsp\Makefile.am" />\r
+    <None Include="..\..\..\shibsp\paths.h.in" />\r
+    <None Include="..\..\..\shibsp\config_pub.h.in" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/shibsp/shibsp-lite.vcxproj.filters b/Projects/VC10/shibsp/shibsp-lite.vcxproj.filters
similarity index 100%
rename from shibsp/shibsp-lite.vcxproj.filters
rename to Projects/VC10/shibsp/shibsp-lite.vcxproj.filters

diff --git a/Projects/VC10/shibsp/shibsp.vcxproj b/Projects/VC10/shibsp/shibsp.vcxproj
new file mode 100644 (file)
index 0000000..8755d1d
--- /dev/null
+++ b/Projects/VC10/shibsp/shibsp.vcxproj
@@ -0,0 +1,367 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|x64">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|x64">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{81F0F7A6-DC36-46EF-957F-F9E81D4403F6}</ProjectGuid>\r
+    <RootNamespace>shibsp</RootNamespace>\r
+    <Keyword>Win32Proj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+    <WholeProgramOptimization>true</WholeProgramOptimization>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
+    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
+    <CharacterSet>MultiByte</CharacterSet>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <PropertyGroup Label="UserMacros" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
+  <Import Project="$(ParentRoot)\Versions.props" />\r
+  <Import Project="$(ParentRoot)\Includes.props" />\r
+  <PropertyGroup>\r
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
+    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>\r
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <Optimization>Disabled</Optimization>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
+      <BrowseInformation>true</BrowseInformation>\r
+      <WarningLevel>Level3</WarningLevel>\r
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
+    </ClCompile>\r
+    <ResourceCompile>\r
+      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+    </ResourceCompile>\r
+    <Link>\r
+      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <WarningLevel>Level3</WarningLevel>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <Midl>\r
+      <TargetEnvironment>X64</TargetEnvironment>\r
+    </Midl>\r
+    <ClCompile>\r
+      <AdditionalIncludeDirectories>..\..\..\shibsp\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
+      <WarningLevel>Level3</WarningLevel>\r
+    </ClCompile>\r
+    <Link>\r
+      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
+      <SubSystem>Windows</SubSystem>\r
+      <OptimizeReferences>true</OptimizeReferences>\r
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
+      <DataExecutionPrevention>\r
+      </DataExecutionPrevention>\r
+      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>\r
+    </Link>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <ClCompile Include="..\..\..\shibsp\AbstractSPRequest.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\Application.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\Base64AttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\DummyAttributeFilter.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NameIDQualifierStringFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\AssertionAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\MetadataAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\binding\impl\XMLProtocolProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AttributeCheckerHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\DiscoveryFeed.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ExternalAuthHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SecuredHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLSecurityPolicyProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\ServiceProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\SPConfig.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\CGIParser.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\DOMPropertySet.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\IPRange.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\SPConstants.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\util\TemplateParameters.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\security\PKIXTrustEngine.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\security\SecurityPolicy.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\metadata\DynamicMetadataProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtImpl.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataExtSchemaValidators.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ddf.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\ListenerService.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\SocketListener.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\remoting\impl\TCPListener.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\ChainingAccessControl.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\StorageServiceSessionCache.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\TransactionLog.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLAccessControl.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLRequestMapper.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\impl\XMLServiceProvider.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\Attribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\BinaryAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\DOMAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\ExtensibleAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\KeyInfoAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\NameIDFromScopedAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\ScopedAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\SimpleAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\StringAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttribute.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\XMLAttributeDecoder.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\ChainingAttributeResolver.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\DelegationAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\QueryAttributeResolver.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\resolver\impl\XMLAttributeExtractor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AndMatchFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AnyMatchFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeFilter.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeScopeStringFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueRegexFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AttributeValueStringFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\BasicFilteringContext.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\ChainingAttributeFilter.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\MatchFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NotMatchFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\OrMatchFunctor.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\attribute\filtering\impl\XMLAttributeFilter.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\binding\impl\ArtifactResolver.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\binding\impl\SOAPClient.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AbstractHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionConsumerService.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\AssertionLookup.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingLogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\ChainingSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\CookieSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\FormSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LocalLogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\LogoutHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\MetadataGenerator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\RemotedHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML1Consumer.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2ArtifactResolution.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Consumer.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2Logout.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2LogoutInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2NameIDMgmt.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAML2SessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SAMLDSSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\SessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\Shib1SessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\StatusHandler.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\TransformSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\handler\impl\WAYFSessionInitiator.cpp" />\r
+    <ClCompile Include="..\..\..\shibsp\version.cpp" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ClInclude Include="..\..\..\shibsp\binding\ProtocolProvider.h" />\r
+    <ClInclude Include="..\..\..\shibsp\GSSRequest.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutInitiator.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\SecuredHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\remoting\impl\SocketListener.h" />\r
+    <ClInclude Include="..\..\..\shibsp\AbstractSPRequest.h" />\r
+    <ClInclude Include="..\..\..\shibsp\AccessControl.h" />\r
+    <ClInclude Include="..\..\..\shibsp\Application.h" />\r
+    <ClInclude Include="..\..\..\shibsp\base.h" />\r
+    <ClInclude Include="..\..\..\shibsp\config_pub_win32.h" />\r
+    <ClInclude Include="..\..\..\shibsp\exceptions.h" />\r
+    <ClInclude Include="..\..\..\shibsp\internal.h" />\r
+    <ClInclude Include="..\..\..\shibsp\RequestMapper.h" />\r
+    <ClInclude Include="..\..\..\shibsp\resource.h" />\r
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicyProvider.h" />\r
+    <ClInclude Include="..\..\..\shibsp\ServiceProvider.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SessionCache.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SessionCacheEx.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SPConfig.h" />\r
+    <ClInclude Include="..\..\..\shibsp\SPRequest.h" />\r
+    <ClInclude Include="..\..\..\shibsp\TransactionLog.h" />\r
+    <ClInclude Include="..\..\..\shibsp\version.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\CGIParser.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\DOMPropertySet.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\IPRange.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\PropertySet.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\SPConstants.h" />\r
+    <ClInclude Include="..\..\..\shibsp\util\TemplateParameters.h" />\r
+    <ClInclude Include="..\..\..\shibsp\security\PKIXTrustEngine.h" />\r
+    <ClInclude Include="..\..\..\shibsp\security\SecurityPolicy.h" />\r
+    <ClInclude Include="..\..\..\shibsp\remoting\ddf.h" />\r
+    <ClInclude Include="..\..\..\shibsp\remoting\ListenerService.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\Attribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\BinaryAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\AttributeDecoder.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\ExtensibleAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\NameIDAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\ScopedAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\SimpleAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\XMLAttribute.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeExtractor.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\AttributeResolver.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\resolver\ResolutionContext.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\AttributeFilter.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\BasicFilteringContext.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilteringContext.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\FilterPolicyContext.h" />\r
+    <ClInclude Include="..\..\..\shibsp\attribute\filtering\MatchFunctor.h" />\r
+    <ClInclude Include="..\..\..\shibsp\binding\ArtifactResolver.h" />\r
+    <ClInclude Include="..\..\..\shibsp\binding\SOAPClient.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\AbstractHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\AssertionConsumerService.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\Handler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\LogoutHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\RemotedHandler.h" />\r
+    <ClInclude Include="..\..\..\shibsp\handler\SessionInitiator.h" />\r
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataExt.h" />\r
+    <ClInclude Include="..\..\..\shibsp\metadata\MetadataProviderCriteria.h" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <ResourceCompile Include="..\..\..\shibsp\shibsp.rc" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <None Include="..\..\..\shibsp\Makefile.am" />\r
+    <None Include="..\..\..\shibsp\paths.h.in" />\r
+    <None Include="..\..\..\shibsp\config_pub.h.in" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>\r

diff --git a/shibsp/shibsp.vcxproj.filters b/Projects/VC10/shibsp/shibsp.vcxproj.filters
similarity index 100%
rename from shibsp/shibsp.vcxproj.filters
rename to Projects/VC10/shibsp/shibsp.vcxproj.filters

diff --git a/util/mdquery.vcxproj b/Projects/VC10/util/mdquery.vcxproj
similarity index 81%
rename from util/mdquery.vcxproj
rename to Projects/VC10/util/mdquery.vcxproj
index 2f06754..ebb2a38 100644 (file)
--- a/util/mdquery.vcxproj
+++ b/Projects/VC10/util/mdquery.vcxproj
@@ -57,17 +57,20 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -91,7 +94,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\.;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -104,7 +107,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -120,7 +123,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\.;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -133,7 +136,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -147,7 +150,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\.;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -161,7 +164,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -176,7 +179,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\.;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -190,7 +193,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -198,7 +201,7 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="mdquery.cpp" />\r
+    <ClCompile Include="..\..\..\util\mdquery.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\shibsp\shibsp.vcxproj">\r
@@ -207,10 +210,10 @@
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="mdquery.rc" />\r
+    <ResourceCompile Include="..\..\..\util\mdquery.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\util\resource.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/util/resolvertest.vcxproj b/Projects/VC10/util/resolvertest.vcxproj
similarity index 81%
rename from util/resolvertest.vcxproj
rename to Projects/VC10/util/resolvertest.vcxproj
index 19773c9..97f195f 100644 (file)
--- a/util/resolvertest.vcxproj
+++ b/Projects/VC10/util/resolvertest.vcxproj
@@ -59,18 +59,21 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
   </ImportGroup>\r
   <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
   <Import Project="$(ParentRoot)\Versions.props" />\r
   <Import Project="$(ParentRoot)\Includes.props" />\r
 \r
   <PropertyGroup>\r
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\..\..\Build\VC10\$(Platform)\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)\..\..\Build\VC10\\$(Configuration)\</OutDir>\r
+\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
@@ -94,7 +97,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\util;..\..\..;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -107,7 +110,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -123,7 +126,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\util\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <FunctionLevelLinking>true</FunctionLevelLinking>\r
@@ -136,7 +139,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1.lib;saml2.lib;xmltooling1.lib;xerces-c_3.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
       </DataExecutionPrevention>\r
@@ -150,7 +153,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\util\;..\..\..\;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -164,7 +167,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -179,7 +182,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>..\..\..\;..\..\..\util;..\..\..\..\cpp-opensaml;..\..\..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <RuntimeTypeInfo>true</RuntimeTypeInfo>\r
@@ -193,7 +196,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>log4shib1D.lib;saml2D.lib;xmltooling1D.lib;xerces-c_3D.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
+      <AdditionalLibraryDirectories>..\..\..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <SubSystem>Console</SubSystem>\r
       <DataExecutionPrevention>\r
@@ -201,7 +204,7 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <ClCompile Include="resolvertest.cpp" />\r
+    <ClCompile Include="..\..\..\util\resolvertest.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ProjectReference Include="..\shibsp\shibsp.vcxproj">\r
@@ -210,10 +213,10 @@
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="resolvertest.rc" />\r
+    <ResourceCompile Include="..\..\..\util\resolvertest.rc" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ClInclude Include="resource.h" />\r
+    <ClInclude Include="..\..\..\util\resource.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r

diff --git a/Projects/VC10/wix/MergeModules.vcxproj b/Projects/VC10/wix/MergeModules.vcxproj
new file mode 100644 (file)
index 0000000..caf8cfd
--- /dev/null
+++ b/Projects/VC10/wix/MergeModules.vcxproj
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <ItemGroup Label="ProjectConfigurations">\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Debug|Win32">\r
+      <Configuration>Debug</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>Win32</Platform>\r
+    </ProjectConfiguration>\r
+    <ProjectConfiguration Include="Release|Win32">\r
+      <Configuration>Release</Configuration>\r
+      <Platform>x64</Platform>\r
+    </ProjectConfiguration>\r
+  </ItemGroup>\r
+  <PropertyGroup Label="Globals">\r
+    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>\r
+    <Keyword>MakeFileProj</Keyword>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
+  <PropertyGroup Label="Configuration">\r
+    <ConfigurationType>Makefile</ConfigurationType>\r
+    <UseDebugLibraries>false</UseDebugLibraries>\r
+  </PropertyGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
+  <ImportGroup Label="ExtensionSettings">\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
+  </ImportGroup>\r
+  <Import Project="..\..\..\..\BuildPath.props" />\r
+  <Import Project="$(ParentRoot)\Versions.props" />\r
+  <PropertyGroup Label="UserMacros" />\r
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+nmake /f MergeModules.make clean</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+del *.wixobj</NMakeCleanCommandLine>\r
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+nmake /f MergeModules.make clean</NMakeReBuildCommandLine>\r
+    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
+    <NMakeBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) MsVCVersion=vc10 all32</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+del *86.wixobj\r
+del *86.msm\r
+del *x86.wixpdb\r
+del OpenSAML-schemas.wixpdb\r
+del OpenSAML-schemas.wixobj\r
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) MsVCVersion=vc10 rebuild32</NMakeReBuildCommandLine>\r
+    <NMakePreprocessorDefinitions>\r
+    </NMakePreprocessorDefinitions>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
+    <NMakeBuildCommandLine>\r
+cd ..\..\..\msi\Wix\MergeModules\r
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) MsVCVersion=vc10 all64</NMakeBuildCommandLine>\r
+    <NMakeCleanCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+del *64.wixobj\r
+del *64.msm \r
+del *64.wixpdb \r
+del OpenSAML-schemas.wixpdb \r
+del OpenSAML-schemas.wixobj\r
+del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
+    <NMakeReBuildCommandLine>cd ..\..\..\msi\Wix\MergeModules\r
+nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir)..\..\ OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) MsVCVersion=vc10 rebuild64</NMakeReBuildCommandLine>\r
+    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
+  </PropertyGroup>\r
+  <ItemDefinitionGroup>\r
+  </ItemDefinitionGroup>\r
+  <ItemGroup>\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Curl-x64.wxs">\r
+      <SubType>Designer</SubType>\r
+    </None>\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Curl-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\FastCGI-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\FastCGI-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\MergeModules.make" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Log4Shib-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Log4Shib-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-schemas.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-x64.wxs">\r
+      <SubType>Designer</SubType>\r
+    </None>\r
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSAML-x86.wxs">\r
+      <SubType>Designer</SubType>\r
+    </None>\r
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\OpenSSL-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-schemas.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Shibboleth-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Xerces-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Xerces-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\XmlSec-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\XmlSec-x86.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Zlib-x64.wxs" />\r
+    <None Include="..\..\..\msi\Wix\MergeModules\Zlib-x86.wxs" />\r
+  </ItemGroup>\r
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
+  <ImportGroup Label="ExtensionTargets">\r
+  </ImportGroup>\r
+</Project>
\ No newline at end of file

diff --git a/adfs/.gitignore b/adfs/.gitignore
deleted file mode 100644 (file)
index 090baf1..0000000
--- a/adfs/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-/*.user
-/adfs-lite-Debug
-/Release
-/Debug
-/adfs-lite-Release
-/x64
-/.deps
-/Makefile.in
-/Makefile

diff --git a/apache/.gitignore b/apache/.gitignore
index e6ea852..1b06ef2 100644 (file)
--- a/apache/.gitignore
+++ b/apache/.gitignore
@@ -11,10 +11,4 @@
 /*.mak\r
 /*.aps\r
 /*.user\r
-/mod_shib_20-Debug\r
-/mod_shib_22-Debug\r
-/mod_shib_22-Release\r
-/mod_shib_20-Release\r
-/x64\r
-/mod_shib_24-Debug/
-/mod_shib_24-Release/
+

diff --git a/fastcgi/.gitignore b/fastcgi/.gitignore
index 09e3a08..589009b 100644 (file)
--- a/fastcgi/.gitignore
+++ b/fastcgi/.gitignore
@@ -1,9 +1,3 @@
-/*.user
-/shibauthorizer-Release
-/shibresponder-Release
-/shibresponder-Debug
-/shibauthorizer-Debug
-/x64
 /.deps
 /Makefile.in
 /Makefile

diff --git a/isapi_shib/.gitignore b/isapi_shib/.gitignore
index eddeb4e..e7009e6 100644 (file)
--- a/isapi_shib/.gitignore
+++ b/isapi_shib/.gitignore
@@ -1,7 +1,3 @@
 /*.plg
-/Release
-/Debug
 /*.dep
 /*.mak
-/*.user
-/x64

diff --git a/memcache-store/.gitignore b/memcache-store/.gitignore
index 9d7f3e7..589009b 100644 (file)
--- a/memcache-store/.gitignore
+++ b/memcache-store/.gitignore
@@ -1,7 +1,3 @@
-/*.user
-/Debug
-/Release
 /.deps
 /Makefile.in
 /Makefile
-/x64

diff --git a/msi/.gitignore b/msi/.gitignore
index d5e13b4..b9f60fa 100644 (file)
--- a/msi/.gitignore
+++ b/msi/.gitignore
@@ -1,2 +1 @@
-/*.msi
 /compile.log

diff --git a/msi/WiX/MergeModules/MergeModules.vcxproj b/msi/WiX/MergeModules/MergeModules.vcxproj
deleted file mode 100644 (file)
index 1c2109d..0000000
--- a/msi/WiX/MergeModules/MergeModules.vcxproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{EFF65B5B-85AB-4FD5-A217-7E6CA4219951}</ProjectGuid>\r
-    <Keyword>MakeFileProj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Label="Configuration">\r
-    <ConfigurationType>Makefile</ConfigurationType>\r
-    <UseDebugLibraries>false</UseDebugLibraries>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <Import Project="..\..\..\..\BuildPath.props" />\r
-  <Import Project="$(ParentRoot)\Versions.props" />\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make clean</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *.wixobj</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make clean</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d) SolutionDir=$(SolutionDir) OpenSAMLFileVersion=$(OpenSAMLFileVersion) OpenSAMLVersion=$(OpenSAMLVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) MsVCVersion=vc10 all32</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *86.wixobj\r
-del *86.msm\r
-del *x86.wixpdb\r
-del OpenSAML-schemas.wixpdb\r
-del OpenSAML-schemas.wixobj\r
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion)  Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent32=$(Log4ShibComponent32) Log4ShibComponent32d=$(Log4ShibComponent32d)  SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent32=$(SamlComponent32) XMLToolingComponent32=$(XMLToolingComponent32) XMLToolingLiteComponent32=$(XMLToolingLiteComponent32) SamlComponent32d=$(SamlComponent32d) XMLToolingComponent32d=$(XMLToolingComponent32d) XMLToolingLiteComponent32d=$(XMLToolingLiteComponent32d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay32Component=$(LibEay32Component) SSlEay32Component=$(SSlEay32Component) LibEay32Componentd=$(LibEay32Componentd) SSlEay32Componentd=$(SSlEay32Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll32Component=$(ShibDll32Component) ShibDllLite32Component=$(ShibDllLite32Component) ShibDll32Componentd=$(ShibDll32Componentd) ShibDllLite32Componentd=$(ShibDllLite32Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces32Component=$(Xerces32Component) Xerces32Componentd=$(Xerces32Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec32Component=$(XmlSec32Component) XmlSec32Componentd=$(XmlSec32Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib32Component=$(Zlib32Component) Zlib32Componentd=$(Zlib32Componentd) MsVCVersion=vc10 rebuild32</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>\r
-    </NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <NMakeBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion)  FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) MsVCVersion=vc10 all64</NMakeBuildCommandLine>\r
-    <NMakeCleanCommandLine>del *64.wixobj\r
-del *64.msm \r
-del *64.wixpdb \r
-del OpenSAML-schemas.wixpdb \r
-del OpenSAML-schemas.wixobj\r
-del OpenSAML-schemas.msm</NMakeCleanCommandLine>\r
-    <NMakeReBuildCommandLine>nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) FastCGIVersion=$(FastCGIVersion) Log4ShibVersion=$(Log4ShibVersion) Log4ShibFileVersion=$(Log4ShibFileVersion) Log4ShibComponent64=$(Log4ShibComponent64) Log4ShibComponent64d=$(Log4ShibComponent64d) SolutionDir=$(SolutionDir) OpenSAMLVersion=$(OpenSAMLVersion) OpenSAMLFileVersion=$(OpenSAMLFileVersion) XmlToolingFileVersion=$(XmlToolingFileVersion) SamlComponent64=$(SamlComponent64) XMLToolingComponent64=$(XMLToolingComponent64) XMLToolingLiteComponent64=$(XMLToolingLiteComponent64) SamlComponent64d=$(SamlComponent64d) XMLToolingComponent64d=$(XMLToolingComponent64d) XMLToolingLiteComponent64d=$(XMLToolingLiteComponent64d) OpenSSLVersion=$(OpenSSLVersion) OpenSSLDirVersion=$(OpenSSLDirVersion) OpenSSLFileVersion=$(OpenSSLFileVersion) LibEay64Component=$(LibEay64Component) SSlEay64Component=$(SSlEay64Component) LibEay64Componentd=$(LibEay64Componentd) SSlEay64Componentd=$(SSlEay64Componentd) ShibbolethDllVersion=$(ShibbolethDllVersion) ShibbolethDllFileVersion=$(ShibbolethDllFileVersion) ShibDll64Component=$(ShibDll64Component) ShibDllLite64Component=$(ShibDllLite64Component) ShibDll64Componentd=$(ShibDll64Componentd) ShibDllLite64Componentd=$(ShibDllLite64Componentd) XercesVersion=$(XercesVersion) XercesFileVersion=$(XercesFileVersion) Xerces64Component=$(Xerces64Component) Xerces64Componentd=$(Xerces64Componentd) XmlSecVersion=$(XmlSecVersion) XmlSecFileVersion=$(XmlSecFileVersion) XmlSec64Component=$(XmlSec64Component) XmlSec64Componentd=$(XmlSec64Componentd) ZlibVersion=$(ZlibVersion) ZlibFileVersion=$(ZlibFileVersion) Zlib64Component=$(Zlib64Component) Zlib64Componentd=$(Zlib64Componentd) MsVCVersion=vc10 rebuild64</NMakeReBuildCommandLine>\r
-    <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <None Include="Curl-x64.wxs">\r
-      <SubType>Designer</SubType>\r
-    </None>\r
-    <None Include="Curl-x86.wxs" />\r
-    <None Include="FastCGI-x86.wxs" />\r
-    <None Include="FastCGI-x64.wxs" />\r
-    <None Include="MergeModules.make" />\r
-    <None Include="Log4Shib-x64.wxs" />\r
-    <None Include="Log4Shib-x86.wxs" />\r
-    <None Include="OpenSAML-schemas.wxs" />\r
-    <None Include="OpenSAML-x64.wxs">\r
-      <SubType>Designer</SubType>\r
-    </None>\r
-    <None Include="OpenSAML-x86.wxs">\r
-      <SubType>Designer</SubType>\r
-    </None>\r
-    <None Include="OpenSSL-x64.wxs" />\r
-    <None Include="OpenSSL-x86.wxs" />\r
-    <None Include="Shibboleth-schemas.wxs" />\r
-    <None Include="Shibboleth-x64.wxs" />\r
-    <None Include="Shibboleth-x86.wxs" />\r
-    <None Include="Xerces-x64.wxs" />\r
-    <None Include="Xerces-x86.wxs" />\r
-    <None Include="XmlSec-x64.wxs" />\r
-    <None Include="XmlSec-x86.wxs" />\r
-    <None Include="Zlib-x64.wxs" />\r
-    <None Include="Zlib-x86.wxs" />\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file

diff --git a/nsapi_shib/.gitignore b/nsapi_shib/.gitignore
index e031e71..1484cd0 100644 (file)
--- a/nsapi_shib/.gitignore
+++ b/nsapi_shib/.gitignore
@@ -1,6 +1,4 @@
 /*.plg
-/Release
-/Debug
 /*.dep
 /*.mak
 /*.aps
@@ -8,4 +6,3 @@
 /.deps
 /Makefile.in
 /Makefile
-/*.user

diff --git a/odbc-store/.gitignore b/odbc-store/.gitignore
index 3af948c..589009b 100644 (file)
--- a/odbc-store/.gitignore
+++ b/odbc-store/.gitignore
@@ -1,7 +1,3 @@
-/*.user
-/Debug
-/Release
-/x64
 /.deps
 /Makefile.in
 /Makefile

diff --git a/plugins/.gitignore b/plugins/.gitignore
index 5b9f7b4..10a7e8d 100644 (file)
--- a/plugins/.gitignore
+++ b/plugins/.gitignore
@@ -1,3 +1 @@
-/Makefile.in\r
-/plugins-lite-Release/
-/plugins-lite-Debug/
+/Makefile.in

diff --git a/shibd/.gitignore b/shibd/.gitignore
index c803346..da85bd7 100644 (file)
--- a/shibd/.gitignore
+++ b/shibd/.gitignore
@@ -7,10 +7,6 @@
 /*.plg
 /testclient___Win32_Debug
 /testclient___Win32_Release
-/Debug
-/Release
 /*.dep
 /*.mak
-/*.user
 /*.aps
-/x64

diff --git a/shibsp/shibsp.vcxproj b/shibsp/shibsp.vcxproj
deleted file mode 100644 (file)
index 1cf274f..0000000
--- a/shibsp/shibsp.vcxproj
+++ /dev/null
@@ -1,365 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{81F0F7A6-DC36-46EF-957F-F9E81D4403F6}</ProjectGuid>\r
-    <RootNamespace>shibsp</RootNamespace>\r
-    <Keyword>Win32Proj</Keyword>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>DynamicLibrary</ConfigurationType>\r
-    <CharacterSet>MultiByte</CharacterSet>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <Import Project="..\..\BuildPath.props" />\r
-  <Import Project="$(ParentRoot)\Versions.props" />\r
-  <Import Project="$(ParentRoot)\Includes.props" />\r
-  <PropertyGroup>\r
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>\r
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>\r
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>\r
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />\r
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>\r
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)1_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)1_5D</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)1_5</TargetName>\r
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)1_5</TargetName>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
-      <BrowseInformation>true</BrowseInformation>\r
-      <WarningLevel>Level3</WarningLevel>\r
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-    </ClCompile>\r
-    <ResourceCompile>\r
-      <PreprocessorDefinitions>_UNICODE;UNICODE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-    </ResourceCompile>\r
-    <Link>\r
-      <AdditionalDependencies>log4shib1D.lib;xerces-c_3D.lib;xsec_1D.lib;saml2D.lib;xmltooling1D.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <ImportLibrary>$(TargetDir)$(ProjectName)1D.lib</ImportLibrary>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WarningLevel>Level3</WarningLevel>\r
-    </ClCompile>\r
-    <Link>\r
-      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <SubSystem>Windows</SubSystem>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <Midl>\r
-      <TargetEnvironment>X64</TargetEnvironment>\r
-    </Midl>\r
-    <ClCompile>\r
-      <AdditionalIncludeDirectories>.;..;..\..\cpp-opensaml;..\..\cpp-xmltooling;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <WarningLevel>Level3</WarningLevel>\r
-    </ClCompile>\r
-    <Link>\r
-      <AdditionalDependencies>log4shib1.lib;xerces-c_3.lib;xsec_1.lib;saml2.lib;xmltooling1.lib;wsock32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <AdditionalLibraryDirectories>..\..\cpp-opensaml\Build\VC10\$(Platform)\$(Configuration);..\..\cpp-xmltooling\Build\VC10\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <SubSystem>Windows</SubSystem>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <DataExecutionPrevention>\r
-      </DataExecutionPrevention>\r
-      <ImportLibrary>$(TargetDir)$(ProjectName)1.lib</ImportLibrary>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="AbstractSPRequest.cpp" />\r
-    <ClCompile Include="Application.cpp" />\r
-    <ClCompile Include="attribute\Base64AttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityAttributeFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerEntityMatcherFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityAttributeFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterEntityMatcherFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\DummyAttributeFilter.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\NameIDQualifierStringFunctor.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\AssertionAttributeExtractor.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\MetadataAttributeExtractor.cpp" />\r
-    <ClCompile Include="binding\impl\XMLProtocolProvider.cpp" />\r
-    <ClCompile Include="handler\impl\AttributeCheckerHandler.cpp" />\r
-    <ClCompile Include="handler\impl\DiscoveryFeed.cpp" />\r
-    <ClCompile Include="handler\impl\ExternalAuthHandler.cpp" />\r
-    <ClCompile Include="handler\impl\LogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SecuredHandler.cpp" />\r
-    <ClCompile Include="impl\XMLSecurityPolicyProvider.cpp" />\r
-    <ClCompile Include="ServiceProvider.cpp" />\r
-    <ClCompile Include="SPConfig.cpp" />\r
-    <ClCompile Include="util\CGIParser.cpp" />\r
-    <ClCompile Include="util\DOMPropertySet.cpp" />\r
-    <ClCompile Include="util\IPRange.cpp" />\r
-    <ClCompile Include="util\SPConstants.cpp" />\r
-    <ClCompile Include="util\TemplateParameters.cpp" />\r
-    <ClCompile Include="security\PKIXTrustEngine.cpp" />\r
-    <ClCompile Include="security\SecurityPolicy.cpp" />\r
-    <ClCompile Include="metadata\DynamicMetadataProvider.cpp" />\r
-    <ClCompile Include="metadata\MetadataExtImpl.cpp" />\r
-    <ClCompile Include="metadata\MetadataExtSchemaValidators.cpp" />\r
-    <ClCompile Include="metadata\MetadataProviderCriteria.cpp" />\r
-    <ClCompile Include="remoting\impl\ddf.cpp" />\r
-    <ClCompile Include="remoting\impl\ListenerService.cpp" />\r
-    <ClCompile Include="remoting\impl\SocketListener.cpp" />\r
-    <ClCompile Include="remoting\impl\TCPListener.cpp" />\r
-    <ClCompile Include="impl\ChainingAccessControl.cpp" />\r
-    <ClCompile Include="impl\StorageServiceSessionCache.cpp" />\r
-    <ClCompile Include="impl\TransactionLog.cpp" />\r
-    <ClCompile Include="impl\XMLAccessControl.cpp" />\r
-    <ClCompile Include="impl\XMLRequestMapper.cpp" />\r
-    <ClCompile Include="impl\XMLServiceProvider.cpp" />\r
-    <ClCompile Include="attribute\Attribute.cpp" />\r
-    <ClCompile Include="attribute\BinaryAttribute.cpp" />\r
-    <ClCompile Include="attribute\DOMAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\ExtensibleAttribute.cpp" />\r
-    <ClCompile Include="attribute\KeyInfoAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\NameIDAttribute.cpp" />\r
-    <ClCompile Include="attribute\NameIDAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\NameIDFromScopedAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\ScopedAttribute.cpp" />\r
-    <ClCompile Include="attribute\ScopedAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\SimpleAttribute.cpp" />\r
-    <ClCompile Include="attribute\StringAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\XMLAttribute.cpp" />\r
-    <ClCompile Include="attribute\XMLAttributeDecoder.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeExtractor.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\ChainingAttributeResolver.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\DelegationAttributeExtractor.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\KeyDescriptorAttributeExtractor.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\QueryAttributeResolver.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\SimpleAggregationAttributeResolver.cpp" />\r
-    <ClCompile Include="attribute\resolver\impl\XMLAttributeExtractor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AndMatchFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AnyMatchFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeFilter.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeIssuerStringFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeRequesterStringFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeRegexFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeScopeStringFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeValueRegexFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AttributeValueStringFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\BasicFilteringContext.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\ChainingAttributeFilter.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\MatchFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\NotMatchFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\OrMatchFunctor.cpp" />\r
-    <ClCompile Include="attribute\filtering\impl\XMLAttributeFilter.cpp" />\r
-    <ClCompile Include="binding\impl\ArtifactResolver.cpp" />\r
-    <ClCompile Include="binding\impl\SOAPClient.cpp" />\r
-    <ClCompile Include="handler\impl\AbstractHandler.cpp" />\r
-    <ClCompile Include="handler\impl\AssertionConsumerService.cpp" />\r
-    <ClCompile Include="handler\impl\AssertionLookup.cpp" />\r
-    <ClCompile Include="handler\impl\ChainingLogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\ChainingSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\CookieSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\FormSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\LocalLogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\LogoutHandler.cpp" />\r
-    <ClCompile Include="handler\impl\MetadataGenerator.cpp" />\r
-    <ClCompile Include="handler\impl\RemotedHandler.cpp" />\r
-    <ClCompile Include="handler\impl\SAML1Consumer.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2ArtifactResolution.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2Consumer.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2Logout.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2LogoutInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2NameIDMgmt.cpp" />\r
-    <ClCompile Include="handler\impl\SAML2SessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SAMLDSSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\SessionHandler.cpp" />\r
-    <ClCompile Include="handler\impl\SessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\Shib1SessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\StatusHandler.cpp" />\r
-    <ClCompile Include="handler\impl\TransformSessionInitiator.cpp" />\r
-    <ClCompile Include="handler\impl\WAYFSessionInitiator.cpp" />\r
-    <ClCompile Include="version.cpp" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="binding\ProtocolProvider.h" />\r
-    <ClInclude Include="GSSRequest.h" />\r
-    <ClInclude Include="handler\LogoutInitiator.h" />\r
-    <ClInclude Include="handler\SecuredHandler.h" />\r
-    <ClInclude Include="remoting\impl\SocketListener.h" />\r
-    <ClInclude Include="AbstractSPRequest.h" />\r
-    <ClInclude Include="AccessControl.h" />\r
-    <ClInclude Include="Application.h" />\r
-    <ClInclude Include="base.h" />\r
-    <ClInclude Include="config_pub_win32.h" />\r
-    <ClInclude Include="exceptions.h" />\r
-    <ClInclude Include="internal.h" />\r
-    <ClInclude Include="RequestMapper.h" />\r
-    <ClInclude Include="resource.h" />\r
-    <ClInclude Include="security\SecurityPolicyProvider.h" />\r
-    <ClInclude Include="ServiceProvider.h" />\r
-    <ClInclude Include="SessionCache.h" />\r
-    <ClInclude Include="SessionCacheEx.h" />\r
-    <ClInclude Include="SPConfig.h" />\r
-    <ClInclude Include="SPRequest.h" />\r
-    <ClInclude Include="TransactionLog.h" />\r
-    <ClInclude Include="version.h" />\r
-    <ClInclude Include="util\CGIParser.h" />\r
-    <ClInclude Include="util\DOMPropertySet.h" />\r
-    <ClInclude Include="util\IPRange.h" />\r
-    <ClInclude Include="util\PropertySet.h" />\r
-    <ClInclude Include="util\SPConstants.h" />\r
-    <ClInclude Include="util\TemplateParameters.h" />\r
-    <ClInclude Include="security\PKIXTrustEngine.h" />\r
-    <ClInclude Include="security\SecurityPolicy.h" />\r
-    <ClInclude Include="remoting\ddf.h" />\r
-    <ClInclude Include="remoting\ListenerService.h" />\r
-    <ClInclude Include="attribute\Attribute.h" />\r
-    <ClInclude Include="attribute\BinaryAttribute.h" />\r
-    <ClInclude Include="attribute\AttributeDecoder.h" />\r
-    <ClInclude Include="attribute\ExtensibleAttribute.h" />\r
-    <ClInclude Include="attribute\NameIDAttribute.h" />\r
-    <ClInclude Include="attribute\ScopedAttribute.h" />\r
-    <ClInclude Include="attribute\SimpleAttribute.h" />\r
-    <ClInclude Include="attribute\XMLAttribute.h" />\r
-    <ClInclude Include="attribute\resolver\AttributeExtractor.h" />\r
-    <ClInclude Include="attribute\resolver\AttributeResolver.h" />\r
-    <ClInclude Include="attribute\resolver\ResolutionContext.h" />\r
-    <ClInclude Include="attribute\filtering\AttributeFilter.h" />\r
-    <ClInclude Include="attribute\filtering\BasicFilteringContext.h" />\r
-    <ClInclude Include="attribute\filtering\FilteringContext.h" />\r
-    <ClInclude Include="attribute\filtering\FilterPolicyContext.h" />\r
-    <ClInclude Include="attribute\filtering\MatchFunctor.h" />\r
-    <ClInclude Include="binding\ArtifactResolver.h" />\r
-    <ClInclude Include="binding\SOAPClient.h" />\r
-    <ClInclude Include="handler\AbstractHandler.h" />\r
-    <ClInclude Include="handler\AssertionConsumerService.h" />\r
-    <ClInclude Include="handler\Handler.h" />\r
-    <ClInclude Include="handler\LogoutHandler.h" />\r
-    <ClInclude Include="handler\RemotedHandler.h" />\r
-    <ClInclude Include="handler\SessionInitiator.h" />\r
-    <ClInclude Include="metadata\MetadataExt.h" />\r
-    <ClInclude Include="metadata\MetadataProviderCriteria.h" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ResourceCompile Include="shibsp.rc" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <None Include="Makefile.am" />\r
-    <None Include="paths.h.in" />\r
-    <None Include="config_pub.h.in" />\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>\r