X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=saml%2Fsaml.vcproj;h=72a4a195b36d23a9f1f60d7ec637ac11f8d97389;hb=2b6d8b64f63a05b9a883b4269d68f08baf340e88;hp=3183249ad046fd14bf5ce2f524f8e50a39d8ed89;hpb=c3c89629114e8a29b8c9a769956b6b4e7e2c4c24;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 3183249..72a4a19 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,13 +55,14 @@
 			/>
 			<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"
+				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"
@@ -120,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"
@@ -139,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling_1.lib xerces-c_2.lib xsec_1.lib log4cpp.lib libeay32_0_9_8.lib"
+				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"
@@ -191,6 +190,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CommonDomainCookie.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\util\SAMLConstants.cpp"
 					>
 				</File>
@@ -223,14 +226,6 @@
 					</Filter>
 				</Filter>
 				<Filter
-					Name="profile"
-					>
-					<Filter
-						Name="impl"
-						>
-					</Filter>
-				</Filter>
-				<Filter
 					Name="binding"
 					>
 					<Filter
@@ -245,6 +240,10 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml1\binding\impl\SAML1MessageRule.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml1\binding\impl\SAML1POSTDecoder.cpp"
 							>
 						</File>
@@ -253,6 +252,10 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml1\binding\impl\SAML1SOAPClient.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml1\binding\impl\SAML1SOAPDecoder.cpp"
 							>
 						</File>
@@ -270,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"
@@ -293,6 +308,10 @@
 						Name="impl"
 						>
 						<File
+							RelativePath=".\saml2\core\impl\Assertions.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"
 							>
 						</File>
@@ -329,7 +348,7 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\FilesystemMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\DynamicMetadataProvider.cpp"
 							>
 						</File>
 						<File
@@ -345,15 +364,15 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\SignatureMetadataFilter.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\SignatureMetadataFilter.cpp"
+							RelativePath=".\saml2\metadata\impl\WhitelistMetadataFilter.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\WhitelistMetadataFilter.cpp"
+							RelativePath=".\saml2\metadata\impl\XMLMetadataProvider.cpp"
 							>
 						</File>
 					</Filter>
@@ -417,6 +436,10 @@
 							</FileConfiguration>
 						</File>
 						<File
+							RelativePath=".\saml2\binding\impl\SAML2MessageRule.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\binding\impl\SAML2POSTDecoder.cpp"
 							>
 						</File>
@@ -437,6 +460,10 @@
 							>
 						</File>
 						<File
+							RelativePath=".\saml2\binding\impl\SAML2SOAPClient.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\binding\impl\SAML2SOAPDecoder.cpp"
 							>
 						</File>
@@ -446,40 +473,64 @@
 						</File>
 					</Filter>
 				</Filter>
-			</Filter>
-			<Filter
-				Name="encryption"
-				>
-				<File
-					RelativePath=".\encryption\EncryptedKeyResolver.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="security"
-				>
 				<Filter
-					Name="impl"
+					Name="profile"
 					>
 					<File
-						RelativePath=".\security\impl\AbstractPKIXTrustEngine.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\security\impl\ChainingTrustEngine.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\security\impl\ExplicitKeyTrustEngine.cpp"
+						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=".\security\impl\TrustEngine.cpp"
+						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"
+				>
+				<File
+					RelativePath=".\encryption\EncryptedKeyResolver.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
 				Name="binding"
 				>
 				<Filter
@@ -506,6 +557,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\binding\impl\NullSecurityRule.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\binding\impl\SAMLArtifact.cpp"
 						>
 					</File>
@@ -518,7 +573,7 @@
 						>
 					</File>
 					<File
-						RelativePath=".\binding\impl\URLEncoder.cpp"
+						RelativePath=".\binding\impl\SOAPClient.cpp"
 						>
 					</File>
 					<File
@@ -574,6 +629,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath=".\Assertion.h"
+				>
+			</File>
+			<File
 				RelativePath=".\base.h"
 				>
 			</File>
@@ -601,6 +660,10 @@
 				Name="util"
 				>
 				<File
+					RelativePath=".\util\CommonDomainCookie.h"
+					>
+				</File>
+				<File
 					RelativePath=".\util\SAMLConstants.h"
 					>
 				</File>
@@ -621,42 +684,30 @@
 					</File>
 				</Filter>
 				<Filter
-					Name="profile"
-					>
-				</Filter>
-				<Filter
 					Name="binding"
 					>
 					<File
-						RelativePath=".\saml1\binding\SAML1ArtifactDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1ArtifactEncoder.h"
+						RelativePath=".\saml1\binding\SAML1SOAPClient.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\binding\SAML1POSTDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1POSTEncoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1SOAPDecoder.h"
+						RelativePath=".\saml1\binding\SAMLArtifactType0001.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml1\binding\SAML1SOAPEncoder.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>
@@ -704,47 +755,47 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\Metadata.h"
+						RelativePath=".\saml2\metadata\DynamicMetadataProvider.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\MetadataFilter.h"
+						RelativePath=".\saml2\metadata\EndpointManager.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\MetadataProvider.h"
+						RelativePath=".\saml2\metadata\Metadata.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\ObservableMetadataProvider.h"
+						RelativePath=".\saml2\metadata\MetadataCredentialContext.h"
 						>
 					</File>
-				</Filter>
-				<Filter
-					Name="binding"
-					>
 					<File
-						RelativePath=".\saml2\binding\SAML2Artifact.h"
+						RelativePath=".\saml2\metadata\MetadataCredentialCriteria.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactDecoder.h"
+						RelativePath=".\saml2\metadata\MetadataFilter.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactEncoder.h"
+						RelativePath=".\saml2\metadata\MetadataProvider.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"
+						RelativePath=".\saml2\metadata\ObservableMetadataProvider.h"
 						>
 					</File>
+				</Filter>
+				<Filter
+					Name="binding"
+					>
 					<File
-						RelativePath=".\saml2\binding\SAML2POSTDecoder.h"
+						RelativePath=".\saml2\binding\SAML2Artifact.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2POSTEncoder.h"
+						RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"
 						>
 					</File>
 					<File
@@ -752,19 +803,19 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2RedirectDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml2\binding\SAML2RedirectEncoder.h"
+						RelativePath=".\saml2\binding\SAML2SOAPClient.h"
 						>
 					</File>
+				</Filter>
+				<Filter
+					Name="profile"
+					>
 					<File
-						RelativePath=".\saml2\binding\SAML2SOAPDecoder.h"
+						RelativePath=".\saml2\profile\AssertionValidator.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2SOAPEncoder.h"
+						RelativePath=".\saml2\profile\BrowserSSOProfileValidator.h"
 						>
 					</File>
 				</Filter>
@@ -778,30 +829,6 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="security"
-				>
-				<File
-					RelativePath=".\security\AbstractPKIXTrustEngine.h"
-					>
-				</File>
-				<File
-					RelativePath=".\security\ChainingTrustEngine.h"
-					>
-				</File>
-				<File
-					RelativePath=".\security\MetadataKeyInfoIterator.h"
-					>
-				</File>
-				<File
-					RelativePath=".\security\TrustEngine.h"
-					>
-				</File>
-				<File
-					RelativePath=".\security\X509TrustEngine.h"
-					>
-				</File>
-			</Filter>
-			<Filter
 				Name="binding"
 				>
 				<File
@@ -809,26 +836,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\binding\ClientCertAuthRule.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\GenericRequest.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\GenericResponse.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\HTTPRequest.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\HTTPResponse.h"
-					>
-				</File>
-				<File
 					RelativePath=".\binding\MessageDecoder.h"
 					>
 				</File>
@@ -837,10 +844,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\binding\MessageFlowRule.h"
-					>
-				</File>
-				<File
 					RelativePath=".\binding\SAMLArtifact.h"
 					>
 				</File>
@@ -853,15 +856,7 @@
 					>
 				</File>
 				<File
-					RelativePath=".\binding\SimpleSigningRule.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\URLEncoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\XMLSigningRule.h"
+					RelativePath=".\binding\SOAPClient.h"
 					>
 				</File>
 			</Filter>
@@ -915,6 +910,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>