Convert tests to use Chaining cred resolver.

git-svn-id: https://svn.shibboleth.net/cpp-xmltooling/branches/REL_1@938 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltoolingtest/EncryptionTest.h b/xmltoolingtest/EncryptionTest.h
index e93d1cf..b70c70f 100644 (file)
--- a/xmltoolingtest/EncryptionTest.h
+++ b/xmltoolingtest/EncryptionTest.h
@@ -43,7 +43,7 @@ public:
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
         XercesJanitor<DOMDocument> janitor(doc);
         m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
-            FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
+            CHAINING_CREDENTIAL_RESOLVER,doc->getDocumentElement()
             );
         XMLObjectBuilder::registerDefaultBuilder(new UnknownElementBuilder());
     }

diff --git a/xmltoolingtest/FilesystemCredentialResolverTest.h b/xmltoolingtest/FilesystemCredentialResolverTest.h
index 66f07e4..4b5cf53 100644 (file)
--- a/xmltoolingtest/FilesystemCredentialResolverTest.h
+++ b/xmltoolingtest/FilesystemCredentialResolverTest.h
@@ -41,7 +41,7 @@ public:
 
         auto_ptr<CredentialResolver> credResolver(
             XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
-                FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
+                CHAINING_CREDENTIAL_RESOLVER,doc->getDocumentElement()
                 )
             );
 

diff --git a/xmltoolingtest/SignatureTest.h b/xmltoolingtest/SignatureTest.h
index 60a639b..49b528e 100644 (file)
--- a/xmltoolingtest/SignatureTest.h
+++ b/xmltoolingtest/SignatureTest.h
@@ -90,7 +90,7 @@ public:
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
         XercesJanitor<DOMDocument> janitor(doc);
         m_resolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
-            FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
+            CHAINING_CREDENTIAL_RESOLVER,doc->getDocumentElement()
             );
     }
 

diff --git a/xmltoolingtest/data/FilesystemCredentialResolver.xml b/xmltoolingtest/data/FilesystemCredentialResolver.xml
index 8276dfb..7a960ed 100644 (file)
--- a/xmltoolingtest/data/FilesystemCredentialResolver.xml
+++ b/xmltoolingtest/data/FilesystemCredentialResolver.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<FilesystemCredentialResolver>
-    <Key>
-        <Path>../xmltoolingtest/data/key.pem</Path>
-        <Name>Sample Key</Name>
-    </Key>
-    <Certificate>
-        <Path>../xmltoolingtest/data/cert.pem</Path>
-    </Certificate>
-</FilesystemCredentialResolver>
+<CredentialResolver type="Chaining">
+    <CredentialResolver type="File">
+        <Key>
+            <Path>../xmltoolingtest/data/key.pem</Path>
+            <Name>Sample Key</Name>
+        </Key>
+        <Certificate>
+            <Path>../xmltoolingtest/data/cert.pem</Path>
+        </Certificate>
+    </CredentialResolver>
+</CredentialResolver>