X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml.vcproj;h=de99854415a2bb6b6344f17df911f701d562efdb;hb=d553b4e66d3e96f8b18032abcda06ee3dfb2eb59;hp=25beeeb34ff677bdf1cdc041cb42da29f293aed8;hpb=77bc8d01cbddbe19edfa4ce9420acaa014317da8;p=shibboleth%2Fopensaml2.git

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 25beeeb..de99854 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -40,12 +40,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
 				BrowseInformation="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -56,17 +55,19 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling_1D.lib xerces-c_2D.lib xsec_1D.lib log4cppD.lib libeay32_0_9_8D.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_6D.dll"
+				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_0D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)2D.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -119,10 +120,9 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)&quot;;&quot;$(ProjectDir)\zlib&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
@@ -138,13 +138,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling_1.lib xerces-c_2.lib xsec_1.lib log4cpp.lib libeay32_0_9_8.lib"
-				OutputFile="$(OutDir)\$(ProjectName)_6.dll"
+				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"
+				OutputFile="$(OutDir)\$(ProjectName)2_0.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				ImportLibrary="$(TargetDir)$(ProjectName)2.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -189,6 +190,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CommonDomainCookie.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\util\SAMLConstants.cpp"
 					>
 				</File>
@@ -221,14 +226,6 @@
 					</Filter>
 				</Filter>
 				<Filter
-					Name="profile"
-					>
-					<Filter
-						Name="impl"
-						>
-					</Filter>
-				</Filter>
-				<Filter
 					Name="binding"
 					>
 					<Filter
@@ -243,6 +240,10 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml1\binding\impl\SAML1MessageDecoder.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml1\binding\impl\SAML1POSTDecoder.cpp"
 							>
 						</File>
@@ -251,6 +252,18 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPClient.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPEncoder.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml1\binding\impl\SAMLArtifactType0001.cpp"
 							>
 						</File>
@@ -260,6 +273,18 @@
 						</File>
 					</Filter>
 				</Filter>
+				<Filter
+					Name="profile"
+					>
+					<File
+						RelativePath=".\saml1\profile\AssertionValidator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\saml1\profile\BrowserSSOProfileValidator.cpp"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="signature"
@@ -283,6 +308,10 @@
 						Name="impl"
 						>
 						<File
+							RelativePath=".\saml2\core\impl\Assertions.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"
 							>
 						</File>
@@ -319,7 +348,7 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\FilesystemMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\DynamicMetadataProvider.cpp"
 							>
 						</File>
 						<File
@@ -335,7 +364,7 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\NullMetadataProvider.cpp"
 							>
 						</File>
 						<File
@@ -346,6 +375,10 @@
 							RelativePath=".\saml2\metadata\impl\WhitelistMetadataFilter.cpp"
 							>
 						</File>
+						<File
+							RelativePath=".\saml2\metadata\impl\XMLMetadataProvider.cpp"
+							>
+						</File>
 					</Filter>
 				</Filter>
 				<Filter
@@ -377,6 +410,10 @@
 							</FileConfiguration>
 						</File>
 						<File
+							RelativePath=".\saml2\binding\impl\SAML2ArtifactDecoder.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\binding\impl\SAML2ArtifactEncoder.cpp"
 							>
 						</File>
@@ -403,6 +440,18 @@
 							</FileConfiguration>
 						</File>
 						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2ECPEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2MessageDecoder.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\binding\impl\SAML2POSTDecoder.cpp"
 							>
 						</File>
@@ -410,8 +459,80 @@
 							RelativePath=".\saml2\binding\impl\SAML2POSTEncoder.cpp"
 							>
 						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2Redirect.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2RedirectDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2RedirectEncoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPClient.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPDecoder.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPEncoder.cpp"
+							>
+						</File>
 					</Filter>
 				</Filter>
+				<Filter
+					Name="profile"
+					>
+					<File
+						RelativePath=".\saml2\profile\Assertion20Validator.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+					<File
+						RelativePath=".\saml2\profile\BrowserSSOProfile20Validator.cpp"
+						>
+						<FileConfiguration
+							Name="Debug|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)\$(InputName)1.obj"
+								XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+							/>
+						</FileConfiguration>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="encryption"
@@ -422,57 +543,97 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="security"
+				Name="binding"
 				>
 				<Filter
 					Name="impl"
 					>
 					<File
-						RelativePath=".\security\impl\AbstractPKIXTrustEngine.cpp"
+						RelativePath=".\binding\impl\ArtifactMap.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\security\impl\ChainingTrustEngine.cpp"
+						RelativePath=".\binding\impl\ClientCertAuthRule.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\security\impl\ExplicitKeyTrustEngine.cpp"
+						RelativePath=".\binding\impl\MessageDecoder.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\security\impl\TrustEngine.cpp"
+						RelativePath=".\binding\impl\MessageEncoder.cpp"
 						>
 					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="binding"
-				>
-				<Filter
-					Name="impl"
-					>
 					<File
-						RelativePath=".\binding\impl\ArtifactMap.cpp"
+						RelativePath=".\binding\impl\MessageFlowRule.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\binding\impl\MessageDecoder.cpp"
+						RelativePath=".\binding\impl\NullSecurityRule.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\binding\impl\MessageEncoder.cpp"
+						RelativePath=".\binding\impl\SAMLArtifact.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\binding\impl\SAMLArtifact.cpp"
+						RelativePath=".\binding\impl\SecurityPolicy.cpp"
 						>
 					</File>
 					<File
-						RelativePath=".\binding\impl\URLEncoder.cpp"
+						RelativePath=".\binding\impl\SimpleSigningRule.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\SOAPClient.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\binding\impl\XMLSigningRule.cpp"
 						>
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="zlib"
+				>
+				<File
+					RelativePath=".\zlib\adler32.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\compress.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\crc32.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\deflate.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inffast.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inflate.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inftrees.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\trees.c"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zutil.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -480,6 +641,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath=".\Assertion.h"
+				>
+			</File>
+			<File
 				RelativePath=".\base.h"
 				>
 			</File>
@@ -492,6 +657,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\RootObject.h"
+				>
+			</File>
+			<File
 				RelativePath=".\SAMLConfig.h"
 				>
 			</File>
@@ -503,6 +672,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CommonDomainCookie.h"
+					>
+				</File>
+				<File
 					RelativePath=".\util\SAMLConstants.h"
 					>
 				</File>
@@ -523,34 +696,34 @@
 					</File>
 				</Filter>
 				<Filter
-					Name="profile"
-					>
-				</Filter>
-				<Filter
 					Name="binding"
 					>
 					<File
-						RelativePath=".\saml1\binding\SAML1ArtifactDecoder.h"
+						RelativePath=".\saml1\binding\SAML1MessageDecoder.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\binding\SAML1ArtifactEncoder.h"
+						RelativePath=".\saml1\binding\SAML1SOAPClient.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\binding\SAML1POSTDecoder.h"
+						RelativePath=".\saml1\binding\SAMLArtifactType0001.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\binding\SAML1POSTEncoder.h"
+						RelativePath=".\saml1\binding\SAMLArtifactType0002.h"
 						>
 					</File>
+				</Filter>
+				<Filter
+					Name="profile"
+					>
 					<File
-						RelativePath=".\saml1\binding\SAMLArtifactType0001.h"
+						RelativePath=".\saml1\profile\AssertionValidator.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\binding\SAMLArtifactType0002.h"
+						RelativePath=".\saml1\profile\BrowserSSOProfileValidator.h"
 						>
 					</File>
 				</Filter>
@@ -598,10 +771,26 @@
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\metadata\DynamicMetadataProvider.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\EndpointManager.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\metadata\Metadata.h"
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\metadata\MetadataCredentialContext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\MetadataCredentialCriteria.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\metadata\MetadataFilter.h"
 						>
 					</File>
@@ -622,19 +811,31 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactEncoder.h"
+						RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"
+						RelativePath=".\saml2\binding\SAML2MessageDecoder.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2POSTDecoder.h"
+						RelativePath=".\saml2\binding\SAML2Redirect.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2POSTEncoder.h"
+						RelativePath=".\saml2\binding\SAML2SOAPClient.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="profile"
+					>
+					<File
+						RelativePath=".\saml2\profile\AssertionValidator.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\profile\BrowserSSOProfileValidator.h"
 						>
 					</File>
 				</Filter>
@@ -648,50 +849,78 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="security"
+				Name="binding"
 				>
 				<File
-					RelativePath=".\security\AbstractPKIXTrustEngine.h"
+					RelativePath=".\binding\ArtifactMap.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\ChainingTrustEngine.h"
+					RelativePath=".\binding\MessageDecoder.h"
+					>
+				</File>
+				<File
+					RelativePath=".\binding\MessageEncoder.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\MetadataKeyInfoIterator.h"
+					RelativePath=".\binding\SAMLArtifact.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\TrustEngine.h"
+					RelativePath=".\binding\SecurityPolicy.h"
 					>
 				</File>
 				<File
-					RelativePath=".\security\X509TrustEngine.h"
+					RelativePath=".\binding\SecurityPolicyRule.h"
+					>
+				</File>
+				<File
+					RelativePath=".\binding\SOAPClient.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="binding"
+				Name="zlib"
 				>
 				<File
-					RelativePath=".\binding\ArtifactMap.h"
+					RelativePath=".\zlib\crc32.h"
 					>
 				</File>
 				<File
-					RelativePath=".\binding\MessageDecoder.h"
+					RelativePath=".\zlib\deflate.h"
 					>
 				</File>
 				<File
-					RelativePath=".\binding\MessageEncoder.h"
+					RelativePath=".\zlib\inffast.h"
 					>
 				</File>
 				<File
-					RelativePath=".\binding\SAMLArtifact.h"
+					RelativePath=".\zlib\inffixed.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inflate.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\inftrees.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\trees.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zconf.h"
 					>
 				</File>
 				<File
-					RelativePath=".\binding\URLEncoder.h"
+					RelativePath=".\zlib\zlib.h"
+					>
+				</File>
+				<File
+					RelativePath=".\zlib\zutil.h"
 					>
 				</File>
 			</Filter>
@@ -701,6 +930,10 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
+			<File
+				RelativePath=".\saml.rc"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>