[opensaml2] 23/38: CPPOST-94 Make some fixes to SAMLTEST to reflect the move to new build locations

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch master
in repository opensaml2.

commit 30b83b61c775762c52f223f4e299d3405cb6ca72
Author: Rod Widdowson <rdw at steadingsoftware.com>
Date:   Sun Jun 5 15:11:20 2016 +0100

    CPPOST-94 Make some fixes to SAMLTEST to reflect the move to new build locations
    
    https://issues.shibboleth.net/jira/browse/CPPOST-94
---
 Projects/vc14/saml/saml.vcxproj                      | 1 +
 Projects/vc14/saml/saml.vcxproj.filters              | 3 +++
 samltest/data/saml2/metadata/XMLMetadataProvider.xml | 4 ++--
 samltest/samltest.h                                  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Projects/vc14/saml/saml.vcxproj b/Projects/vc14/saml/saml.vcxproj
index a9b1149..eac950d 100644
--- a/Projects/vc14/saml/saml.vcxproj
+++ b/Projects/vc14/saml/saml.vcxproj
@@ -192,6 +192,7 @@
     <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityAttributesMetadataFilter.cpp" />
     <ClCompile Include="..\..\..\saml\saml2\metadata\impl\FolderMetadataProvider.cpp" />
     <ClCompile Include="..\..\..\saml\saml2\metadata\impl\NameEntityMatcher.cpp" />
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\RegistrationAuthorityEntityMatcher.cpp" />
     <ClCompile Include="..\..\..\saml\SAMLConfig.cpp" />
     <ClCompile Include="..\..\..\saml\util\CommonDomainCookie.cpp" />
     <ClCompile Include="..\..\..\saml\util\SAMLConstants.cpp" />
diff --git a/Projects/vc14/saml/saml.vcxproj.filters b/Projects/vc14/saml/saml.vcxproj.filters
index c704db3..9edae66 100644
--- a/Projects/vc14/saml/saml.vcxproj.filters
+++ b/Projects/vc14/saml/saml.vcxproj.filters
@@ -375,6 +375,9 @@
     <ClCompile Include="..\..\..\saml\saml2\metadata\impl\EntityAttributesEntityMatcher.cpp">
       <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\saml\saml2\metadata\impl\RegistrationAuthorityEntityMatcher.cpp">
+      <Filter>Source Files\saml2\metadata\impl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\saml\Assertion.h">
diff --git a/samltest/data/saml2/metadata/XMLMetadataProvider.xml b/samltest/data/saml2/metadata/XMLMetadataProvider.xml
index 8302ff0..8da61b9 100644
--- a/samltest/data/saml2/metadata/XMLMetadataProvider.xml
+++ b/samltest/data/saml2/metadata/XMLMetadataProvider.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FilesystemMetadataProvider path="../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
+<FilesystemMetadataProvider path="../../../samltest/data/saml2/metadata/InCommon-metadata.xml" validate="0">
     <SignatureMetadataFilter>
         <CredentialResolver type="File">
             <Certificate>
-                <Path>../samltest/data/incommon.pem</Path>
+                <Path>../../../samltest/data/incommon.pem</Path>
             </Certificate>
         </CredentialResolver>
     </SignatureMetadataFilter>
diff --git a/samltest/samltest.h b/samltest/samltest.h
index 687e2f0..70f05c5 100644
--- a/samltest/samltest.h
+++ b/samltest/samltest.h
@@ -30,7 +30,7 @@ using namespace opensaml;
 
 //#define SAML_LEAKCHECK
 
-std::string data_path = "../samltest/data/";
+std::string data_path = "../../../samltest/data/";
 
 class SAMLFixture : public CxxTest::GlobalFixture
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/opensaml2.git