X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=shibsp%2Fshibsp.vcproj;h=d3511c30d290aa38b1db47aae0d7e89cc83497f1;hb=20ff6ebf7102e56941b1610fc817023a3dcc9076;hp=72cf76322e2384cb74b3a5546bb3dfafb369ca5c;hpb=debc26fffdaf11c178f8dcc2b0fe836f4547e2b3;p=shibboleth%2Fsp.git

diff --git a/shibsp/shibsp.vcproj b/shibsp/shibsp.vcproj
index 72cf763..d3511c3 100644
--- a/shibsp/shibsp.vcproj
+++ b/shibsp/shibsp.vcproj
@@ -40,11 +40,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..;&quot;..\..\cpp-opensaml1&quot;;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories=".;..;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WANT_TCP_SHAR"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				BrowseInformation="1"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
@@ -54,16 +55,17 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;_DEBUG"
 			/>
 			<Tool
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4cppD.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib libeay32_0_9_8D.lib ssleay32_0_9_8D.lib"
+				AdditionalDependencies="log4shib1D.lib xerces-c_2D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)1_0D.dll"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;..\..\cpp-opensaml1\saml\Debug&quot;;&quot;..\..\cpp-opensaml2\Debug&quot;;&quot;..\..\cpp-xmltooling\Debug&quot;"
+				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				ImportLibrary="$(TargetDir)$(ProjectName)1D.lib"
@@ -119,7 +121,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".;..;&quot;..\..\cpp-opensaml1&quot;;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
+				AdditionalIncludeDirectories=".;..;&quot;..\..\cpp-opensaml2&quot;;&quot;..\..\cpp-xmltooling&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WANT_TCP_SHAR"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -137,10 +139,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="log4cpp.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib libeay32_0_9_8.lib ssleay32_0_9_8.lib"
+				AdditionalDependencies="log4shib1.lib xerces-c_2.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)1_0.dll"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="&quot;..\..\cpp-opensaml1\saml\Release&quot;;&quot;..\..\cpp-opensaml2\Release&quot;;&quot;..\..\cpp-xmltooling\Release&quot;"
+				AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -183,10 +185,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AbstractHandler.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\AbstractSPRequest.cpp"
 				>
 			</File>
@@ -199,10 +197,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\SessionCache.cpp"
-				>
-			</File>
-			<File
 				RelativePath=".\SPConfig.cpp"
 				>
 			</File>
@@ -233,6 +227,10 @@
 					RelativePath=".\security\PKIXTrustEngine.cpp"
 					>
 				</File>
+				<File
+					RelativePath=".\security\SecurityPolicy.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="metadata"
@@ -278,10 +276,6 @@
 				Name="impl"
 				>
 				<File
-					RelativePath=".\impl\RemotedSessionCache.cpp"
-					>
-				</File>
-				<File
 					RelativePath=".\impl\StorageServiceSessionCache.cpp"
 					>
 				</File>
@@ -306,13 +300,137 @@
 					>
 				</File>
 				<File
+					RelativePath=".\attribute\NameIDAttributeDecoder.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\attribute\ScopedAttributeDecoder.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\attribute\SimpleAttributeDecoder.cpp"
+					RelativePath=".\attribute\StringAttributeDecoder.cpp"
 					>
 				</File>
+				<Filter
+					Name="resolver"
+					>
+					<Filter
+						Name="impl"
+						>
+						<File
+							RelativePath=".\attribute\resolver\impl\ChainingAttributeExtractor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\resolver\impl\ChainingAttributeResolver.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\resolver\impl\QueryAttributeResolver.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\resolver\impl\XMLAttributeExtractor.cpp"
+							>
+						</File>
+					</Filter>
+				</Filter>
+				<Filter
+					Name="filtering"
+					>
+					<Filter
+						Name="impl"
+						>
+						<File
+							RelativePath=".\attribute\filtering\impl\AndMatchFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AnyMatchFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeIssuerInEntityGroupFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeIssuerRegexFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeIssuerStringFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeRequesterInEntityGroupFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeRequesterRegexFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeRequesterStringFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeScopeMatchesShibMDScopeFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeScopeRegexFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeScopeStringFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeValueRegexFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AttributeValueStringFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AuthenticationMethodRegexFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\AuthenticationMethodStringFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\ChainingAttributeFilter.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\MatchFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\NotMatchFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\NumberOfAttributeValuesFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\OrMatchFunctor.cpp"
+							>
+						</File>
+						<File
+							RelativePath=".\attribute\filtering\impl\XMLAttributeFilter.cpp"
+							>
+						</File>
+					</Filter>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="binding"
@@ -321,11 +439,119 @@
 					Name="impl"
 					>
 					<File
+						RelativePath=".\binding\impl\ArtifactResolver.cpp"
+						>
+					</File>
+					<File
 						RelativePath=".\binding\impl\SOAPClient.cpp"
 						>
 					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="handler"
+				>
+				<Filter
+					Name="impl"
+					>
+					<File
+						RelativePath=".\handler\impl\AbstractHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\AssertionConsumerService.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\AssertionLookup.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\ChainingLogoutInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\ChainingSessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\FormSessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\LocalLogoutInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\LogoutHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\MetadataGenerator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\RemotedHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML1Consumer.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML2ArtifactResolution.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML2Consumer.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML2Logout.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML2LogoutInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML2NameIDMgmt.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAML2SessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SAMLDSSessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SessionHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\SessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\Shib1SessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\StatusHandler.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\TransformSessionInitiator.cpp"
+						>
+					</File>
+					<File
+						RelativePath=".\handler\impl\WAYFSessionInitiator.cpp"
+						>
+					</File>
+				</Filter>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -333,10 +559,6 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\AbstractHandler.h"
-				>
-			</File>
-			<File
 				RelativePath=".\AbstractSPRequest.h"
 				>
 			</File>
@@ -357,10 +579,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\Handler.h"
-				>
-			</File>
-			<File
 				RelativePath=".\internal.h"
 				>
 			</File>
@@ -381,6 +599,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\SessionCacheEx.h"
+				>
+			</File>
+			<File
 				RelativePath=".\SPConfig.h"
 				>
 			</File>
@@ -427,14 +649,18 @@
 					RelativePath=".\security\PKIXTrustEngine.h"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="metadata"
-				>
 				<File
-					RelativePath=".\metadata\MetadataExt.h"
+					RelativePath=".\security\SecurityPolicy.h"
 					>
 				</File>
+				<Filter
+					Name="metadata"
+					>
+					<File
+						RelativePath=".\metadata\MetadataExt.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="remoting"
@@ -456,6 +682,10 @@
 					>
 				</File>
 				<File
+					RelativePath=".\attribute\AttributeDecoder.h"
+					>
+				</File>
+				<File
 					RelativePath=".\attribute\NameIDAttribute.h"
 					>
 				</File>
@@ -467,15 +697,87 @@
 					RelativePath=".\attribute\SimpleAttribute.h"
 					>
 				</File>
+				<Filter
+					Name="resolver"
+					>
+					<File
+						RelativePath=".\attribute\resolver\AttributeExtractor.h"
+						>
+					</File>
+					<File
+						RelativePath=".\attribute\resolver\AttributeResolver.h"
+						>
+					</File>
+					<File
+						RelativePath=".\attribute\resolver\ResolutionContext.h"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="filtering"
+					>
+					<File
+						RelativePath=".\attribute\filtering\AttributeFilter.h"
+						>
+					</File>
+					<File
+						RelativePath=".\attribute\filtering\BasicFilteringContext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\attribute\filtering\FilteringContext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\attribute\filtering\FilterPolicyContext.h"
+						>
+					</File>
+					<File
+						RelativePath=".\attribute\filtering\MatchFunctor.h"
+						>
+					</File>
+				</Filter>
 			</Filter>
 			<Filter
 				Name="binding"
 				>
 				<File
+					RelativePath=".\binding\ArtifactResolver.h"
+					>
+				</File>
+				<File
 					RelativePath=".\binding\SOAPClient.h"
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="handler"
+				>
+				<File
+					RelativePath=".\handler\AbstractHandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\AssertionConsumerService.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\Handler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\LogoutHandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\RemotedHandler.h"
+					>
+				</File>
+				<File
+					RelativePath=".\handler\SessionInitiator.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"