X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=saml%2Fsaml.vcproj;h=d37a29ea80b5b9312504879483390548acdecdbb;hb=96437360be3fa1f0c182bdd13b54e00110e45f11;hp=af783b3edaaafdc88899181c95d273331c348c83;hpb=af7f1efa37a891c26dee19277e391c728cbd659b;p=shibboleth%2Fcpp-opensaml.git

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index af783b3..d37a29e 100644
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -40,7 +40,7 @@
 			<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"
@@ -55,13 +55,14 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.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"
@@ -119,7 +120,7 @@
 			/>
 			<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"
 				WarningLevel="3"
@@ -137,7 +138,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.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"
@@ -189,10 +190,6 @@
 				Name="util"
 				>
 				<File
-					RelativePath=".\util\CGIParser.cpp"
-					>
-				</File>
-				<File
 					RelativePath=".\util\CommonDomainCookie.cpp"
 					>
 				</File>
@@ -243,7 +240,7 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml1\binding\impl\SAML1MessageRule.cpp"
+							RelativePath=".\saml1\binding\impl\SAML1MessageDecoder.cpp"
 							>
 						</File>
 						<File
@@ -276,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"
@@ -299,6 +308,10 @@
 						Name="impl"
 						>
 						<File
+							RelativePath=".\saml2\core\impl\Assertions.cpp"
+							>
+						</File>
+						<File
 							RelativePath=".\saml2\core\impl\Assertions20Impl.cpp"
 							>
 						</File>
@@ -335,19 +348,19 @@
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\MetadataImpl.cpp"
+							RelativePath=".\saml2\metadata\impl\DynamicMetadataProvider.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\MetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\MetadataImpl.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\MetadataSchemaValidators.cpp"
+							RelativePath=".\saml2\metadata\impl\MetadataProvider.cpp"
 							>
 						</File>
 						<File
-							RelativePath=".\saml2\metadata\impl\ObservableMetadataProvider.cpp"
+							RelativePath=".\saml2\metadata\impl\MetadataSchemaValidators.cpp"
 							>
 						</File>
 						<File
@@ -423,7 +436,7 @@
 							</FileConfiguration>
 						</File>
 						<File
-							RelativePath=".\saml2\binding\impl\SAML2MessageRule.cpp"
+							RelativePath=".\saml2\binding\impl\SAML2MessageDecoder.cpp"
 							>
 						</File>
 						<File
@@ -460,6 +473,54 @@
 						</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"
@@ -496,6 +557,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\binding\impl\NullSecurityRule.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\binding\impl\SAMLArtifact.cpp"
 						>
 					</File>
@@ -512,10 +577,6 @@
 						>
 					</File>
 					<File
-						RelativePath=".\binding\impl\URLEncoder.cpp"
-						>
-					</File>
-					<File
 						RelativePath=".\binding\impl\XMLSigningRule.cpp"
 						>
 					</File>
@@ -568,6 +629,10 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
+				RelativePath=".\Assertion.h"
+				>
+			</File>
+			<File
 				RelativePath=".\base.h"
 				>
 			</File>
@@ -595,10 +660,6 @@
 				Name="util"
 				>
 				<File
-					RelativePath=".\util\CGIParser.h"
-					>
-				</File>
-				<File
 					RelativePath=".\util\CommonDomainCookie.h"
 					>
 				</File>
@@ -626,23 +687,7 @@
 					Name="binding"
 					>
 					<File
-						RelativePath=".\saml1\binding\SAML1ArtifactDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1ArtifactEncoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1MessageRule.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1POSTDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml1\binding\SAML1POSTEncoder.h"
+						RelativePath=".\saml1\binding\SAML1MessageDecoder.h"
 						>
 					</File>
 					<File
@@ -650,19 +695,23 @@
 						>
 					</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>
@@ -710,6 +759,10 @@
 						>
 					</File>
 					<File
+						RelativePath=".\saml2\metadata\DynamicMetadataProvider.h"
+						>
+					</File>
+					<File
 						RelativePath=".\saml2\metadata\EndpointManager.h"
 						>
 					</File>
@@ -718,11 +771,15 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\MetadataFilter.h"
+						RelativePath=".\saml2\metadata\MetadataCredentialContext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\saml2\metadata\MetadataCredentialCriteria.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\metadata\MetadataKeyInfoIterator.h"
+						RelativePath=".\saml2\metadata\MetadataFilter.h"
 						>
 					</File>
 					<File
@@ -742,27 +799,11 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml2\binding\SAML2ArtifactEncoder.h"
-						>
-					</File>
-					<File
 						RelativePath=".\saml2\binding\SAML2ArtifactType0004.h"
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2MessageRule.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml2\binding\SAML2POSTDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml2\binding\SAML2POSTEncoder.h"
+						RelativePath=".\saml2\binding\SAML2MessageDecoder.h"
 						>
 					</File>
 					<File
@@ -770,23 +811,19 @@
 						>
 					</File>
 					<File
-						RelativePath=".\saml2\binding\SAML2RedirectDecoder.h"
-						>
-					</File>
-					<File
-						RelativePath=".\saml2\binding\SAML2RedirectEncoder.h"
-						>
-					</File>
-					<File
 						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>
@@ -807,26 +844,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>
@@ -835,10 +852,6 @@
 					>
 				</File>
 				<File
-					RelativePath=".\binding\MessageFlowRule.h"
-					>
-				</File>
-				<File
 					RelativePath=".\binding\SAMLArtifact.h"
 					>
 				</File>
@@ -851,21 +864,9 @@
 					>
 				</File>
 				<File
-					RelativePath=".\binding\SimpleSigningRule.h"
-					>
-				</File>
-				<File
 					RelativePath=".\binding\SOAPClient.h"
 					>
 				</File>
-				<File
-					RelativePath=".\binding\URLEncoder.h"
-					>
-				</File>
-				<File
-					RelativePath=".\binding\XMLSigningRule.h"
-					>
-				</File>
 			</Filter>
 			<Filter
 				Name="zlib"
@@ -917,6 +918,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>