Getting the debug build going again.

diff --git a/Shibboleth.sln b/Shibboleth.sln
index d484a35..c54577a 100644 (file)
--- a/Shibboleth.sln
+++ b/Shibboleth.sln
@@ -82,6 +82,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmlproviders", "xmlprovider
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc_ccache", "odbc_ccache\odbc_ccache.vcproj", "{DAC7FB99-038A-45C9-A27C-21B6C8D4CD1E}"
        ProjectSection(ProjectDependencies) = postProject
+               {E6CAB6C8-1D73-4410-970A-52BF9EC57810} = {E6CAB6C8-1D73-4410-970A-52BF9EC57810}
+               {84890110-2190-4AAE-9BDC-58F90DF71E4F} = {84890110-2190-4AAE-9BDC-58F90DF71E4F}
+       EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_shib22", "apache\mod_shib22.vcproj", "{B44C0852-83B8-4FB2-A86E-097C9C8256D0}"
+       ProjectSection(ProjectDependencies) = postProject
                {84890110-2190-4AAE-9BDC-58F90DF71E4F} = {84890110-2190-4AAE-9BDC-58F90DF71E4F}
                {E6CAB6C8-1D73-4410-970A-52BF9EC57810} = {E6CAB6C8-1D73-4410-970A-52BF9EC57810}
        EndProjectSection
@@ -156,6 +162,10 @@ Global
                {DAC7FB99-038A-45C9-A27C-21B6C8D4CD1E}.Debug|Win32.Build.0 = Debug|Win32
                {DAC7FB99-038A-45C9-A27C-21B6C8D4CD1E}.Release|Win32.ActiveCfg = Release|Win32
                {DAC7FB99-038A-45C9-A27C-21B6C8D4CD1E}.Release|Win32.Build.0 = Release|Win32
+               {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|Win32.ActiveCfg = Debug|Win32
+               {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Debug|Win32.Build.0 = Debug|Win32
+               {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|Win32.ActiveCfg = Release|Win32
+               {B44C0852-83B8-4FB2-A86E-097C9C8256D0}.Release|Win32.Build.0 = Release|Win32
        EndGlobalSection
        GlobalSection(SolutionProperties) = preSolution
                HideSolutionNode = FALSE

diff --git a/apache/.gitignore b/apache/.gitignore
index 2af0e00..ed6c04d 100644 (file)
--- a/apache/.gitignore
+++ b/apache/.gitignore
@@ -12,4 +12,5 @@
 /mod_shib20___Win32_Debug
 /mod_shib20___Win32_Release
 /*.aps
-/*.user
\ No newline at end of file
+/*.user
+/mod_shib22___Win32_Debug

diff --git a/apache/mod_shib13.vcproj b/apache/mod_shib13.vcproj
index 15b13c3..a14ac1a 100644 (file)
--- a/apache/mod_shib13.vcproj
+++ b/apache/mod_shib13.vcproj
@@ -179,7 +179,7 @@
                                OutputFile="Debug/mod_shib_13.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\Apache\libexec"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug,\Apache\libexec"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/mod_shib_13.lib"
                                TargetMachine="1"

diff --git a/apache/mod_shib20.vcproj b/apache/mod_shib20.vcproj
index faad9dc..6b6edb7 100644 (file)
--- a/apache/mod_shib20.vcproj
+++ b/apache/mod_shib20.vcproj
@@ -179,7 +179,7 @@
                                OutputFile="mod_shib20___Win32_Debug/mod_shib_20.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\httpd-2.0.52\srclib\apr\Debug,\httpd-2.0.52\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug,\httpd-2.0.52\srclib\apr\Debug,\httpd-2.0.52\Debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\mod_shib20___Win32_Debug/mod_shib_20.lib"
                                TargetMachine="1"

diff --git a/apache/mod_shib22.vcproj b/apache/mod_shib22.vcproj
index a00d3e8..ad413f2 100644 (file)
--- a/apache/mod_shib22.vcproj
+++ b/apache/mod_shib22.vcproj
@@ -178,7 +178,7 @@
                                OutputFile="mod_shib22___Win32_Debug/mod_shib_22.so"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
-                               AdditionalLibraryDirectories="../../../opensaml/c/saml/Debug,\Apache22D\lib"\r
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug,\Apache22D\lib"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile=".\mod_shib22___Win32_Debug/mod_shib_22.pdb"\r
                                ImportLibrary=".\mod_shib22___Win32_Debug/mod_shib_22.lib"\r

diff --git a/isapi_shib/isapi_shib.vcproj b/isapi_shib/isapi_shib.vcproj
index ceb768d..9995335 100644 (file)
--- a/isapi_shib/isapi_shib.vcproj
+++ b/isapi_shib/isapi_shib.vcproj
@@ -147,7 +147,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories=".,..,..\..\cpp-opensaml1"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -182,7 +182,7 @@
                                OutputFile=".\Debug/isapi_shib.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/isapi_shib.lib"
                                TargetMachine="1"

diff --git a/nsapi_shib/nsapi_shib.vcproj b/nsapi_shib/nsapi_shib.vcproj
index b1a1dba..865c503 100644 (file)
--- a/nsapi_shib/nsapi_shib.vcproj
+++ b/nsapi_shib/nsapi_shib.vcproj
@@ -145,7 +145,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..,..\..\..\opensaml\c,\\KRAMER\iPlanet\plugins\include"
+                               AdditionalIncludeDirectories=".;..;&quot;..\..\cpp-opensaml1&quot;;\\KRAMER\iPlanet\plugins\include"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -179,7 +179,7 @@
                                OutputFile=".\Debug/nsapi_shib.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug,\\KRAMER\iPlanet\plugins\lib"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug,\\KRAMER\iPlanet\plugins\lib"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/nsapi_shib.lib"
                                TargetMachine="1"

diff --git a/odbc_ccache/odbc_ccache.vcproj b/odbc_ccache/odbc_ccache.vcproj
index 59ffee4..8d738da 100644 (file)
--- a/odbc_ccache/odbc_ccache.vcproj
+++ b/odbc_ccache/odbc_ccache.vcproj
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..;..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;"
                                PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -64,7 +64,7 @@
                                AdditionalDependencies="log4cppD.lib xerces-c_2D.lib saml_5D.lib"
                                OutputFile="$(OutDir)\$(ProjectName).so"
                                LinkIncremental="2"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                SubSystem="2"
                                TargetMachine="1"

diff --git a/posttest/posttest.vcproj b/posttest/posttest.vcproj
index 9149f65..c52cc14 100644 (file)
--- a/posttest/posttest.vcproj
+++ b/posttest/posttest.vcproj
@@ -137,7 +137,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;"
                                PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -171,7 +171,7 @@
                                OutputFile=".\Debug/posttest.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/shar/shar.vcproj b/shar/shar.vcproj
index 7851d34..a610096 100644 (file)
--- a/shar/shar.vcproj
+++ b/shar/shar.vcproj
@@ -137,7 +137,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c,..\oncrpc"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;..\oncrpc"
                                PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -171,7 +171,7 @@
                                OutputFile="Debug/shibd.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/shar/testclient.vcproj b/shar/testclient.vcproj
index 2526226..cc204c4 100644 (file)
--- a/shar/testclient.vcproj
+++ b/shar/testclient.vcproj
@@ -136,7 +136,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,../oncrpc,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..,../oncrpc,..\..\cpp-opensaml1"
                                PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -169,6 +169,7 @@
                                OutputFile=".\testclient___Win32_Debug/testclient.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
+                               AdditionalLibraryDirectories=""
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/shib-mysql-ccache/shib_mysql_ccache.vcproj b/shib-mysql-ccache/shib_mysql_ccache.vcproj
index 6695946..65839b4 100644 (file)
--- a/shib-mysql-ccache/shib_mysql_ccache.vcproj
+++ b/shib-mysql-ccache/shib_mysql_ccache.vcproj
@@ -47,7 +47,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..;..\..\..\opensaml\c;&quot;\mysql-5.0.16\include&quot;"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;;&quot;\mysql-5.0.16\include&quot;"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -81,7 +81,7 @@
                                OutputFile="Debug/shib-mysql-ccache.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug,\mysql-4.1.12\lib_debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug,\mysql-4.1.12\lib_debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/shib-mysql-ccache.lib"
                                TargetMachine="1"

diff --git a/shib-target/shibtarget.vcproj b/shib-target/shibtarget.vcproj
index 6df6c52..8735f0e 100644 (file)
--- a/shib-target/shibtarget.vcproj
+++ b/shib-target/shibtarget.vcproj
@@ -47,7 +47,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".,..,..\oncrpc,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories=".;..;..\oncrpc;&quot;..\..\cpp-opensaml1&quot;"
                                PreprocessorDefinitions="_WINDOWS;WANT_TCP_SHAR;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -81,7 +81,7 @@
                                OutputFile="Debug/shibtarget_5D.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/shibtarget_5D.lib"
                                TargetMachine="1"

diff --git a/shib/shib.vcproj b/shib/shib.vcproj
index 3086968..c2211c6 100644 (file)
--- a/shib/shib.vcproj
+++ b/shib/shib.vcproj
@@ -145,7 +145,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,.,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..;.;..\..\cpp-opensaml1"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -179,7 +179,7 @@
                                OutputFile="Debug/shib_6D.dll"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/shib_6D.lib"
                                TargetMachine="1"

diff --git a/shibtest/shibtest.vcproj b/shibtest/shibtest.vcproj
index 68f6904..5e67826 100644 (file)
--- a/shibtest/shibtest.vcproj
+++ b/shibtest/shibtest.vcproj
@@ -137,7 +137,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;"
                                PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -171,7 +171,7 @@
                                OutputFile=".\Debug/shibtest.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/siterefresh/siterefresh.vcproj b/siterefresh/siterefresh.vcproj
index 4aaa55d..b75c9c5 100644 (file)
--- a/siterefresh/siterefresh.vcproj
+++ b/siterefresh/siterefresh.vcproj
@@ -137,7 +137,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;"
                                PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -171,7 +171,7 @@
                                OutputFile=".\Debug/siterefresh.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                SubSystem="1"
                                TargetMachine="1"

diff --git a/xmlproviders/xmlproviders.vcproj b/xmlproviders/xmlproviders.vcproj
index c282191..c3e86fe 100644 (file)
--- a/xmlproviders/xmlproviders.vcproj
+++ b/xmlproviders/xmlproviders.vcproj
@@ -146,7 +146,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..,..\..\..\opensaml\c"
+                               AdditionalIncludeDirectories="..;&quot;..\..\cpp-opensaml1&quot;"
                                PreprocessorDefinitions="_WINDOWS;WIN32;_DEBUG"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="3"
@@ -180,7 +180,7 @@
                                OutputFile="Debug/xmlproviders.so"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
-                               AdditionalLibraryDirectories="..\..\..\opensaml\c\saml\Debug"
+                               AdditionalLibraryDirectories="..\..\cpp-opensaml1\saml\Debug"
                                GenerateDebugInformation="true"
                                ImportLibrary=".\Debug/xmlproviders.lib"
                                TargetMachine="1"