[cpp-xmltooling COMMIT] in /branches/REL_1/xmltoolingtest: EncryptionTest.h FilesystemCredentialResolverTest.h Signat...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 15 08:24:34 2011
New Revision: 938

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=938&view=rev
Log:
Convert tests to use Chaining cred resolver.

Modified:
    branches/REL_1/xmltoolingtest/EncryptionTest.h
    branches/REL_1/xmltoolingtest/FilesystemCredentialResolverTest.h
    branches/REL_1/xmltoolingtest/SignatureTest.h
    branches/REL_1/xmltoolingtest/data/FilesystemCredentialResolver.xml

Modified: branches/REL_1/xmltoolingtest/EncryptionTest.h
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltoolingtest/EncryptionTest.h?rev=938&r1=937&r2=938&view=diff
==============================================================================
--- branches/REL_1/xmltoolingtest/EncryptionTest.h (original)
+++ branches/REL_1/xmltoolingtest/EncryptionTest.h Thu Dec 15 08:24:34 2011
@@ -43,7 +43,7 @@
         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());
     }

Modified: branches/REL_1/xmltoolingtest/FilesystemCredentialResolverTest.h
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltoolingtest/FilesystemCredentialResolverTest.h?rev=938&r1=937&r2=938&view=diff
==============================================================================
--- branches/REL_1/xmltoolingtest/FilesystemCredentialResolverTest.h (original)
+++ branches/REL_1/xmltoolingtest/FilesystemCredentialResolverTest.h Thu Dec 15 08:24:34 2011
@@ -41,7 +41,7 @@
 
         auto_ptr<CredentialResolver> credResolver(
             XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
-                FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
+                CHAINING_CREDENTIAL_RESOLVER,doc->getDocumentElement()
                 )
             );
 

Modified: branches/REL_1/xmltoolingtest/SignatureTest.h
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltoolingtest/SignatureTest.h?rev=938&r1=937&r2=938&view=diff
==============================================================================
--- branches/REL_1/xmltoolingtest/SignatureTest.h (original)
+++ branches/REL_1/xmltoolingtest/SignatureTest.h Thu Dec 15 08:24:34 2011
@@ -90,7 +90,7 @@
         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()
             );
     }
 

Modified: branches/REL_1/xmltoolingtest/data/FilesystemCredentialResolver.xml
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltoolingtest/data/FilesystemCredentialResolver.xml?rev=938&r1=937&r2=938&view=diff
==============================================================================
--- branches/REL_1/xmltoolingtest/data/FilesystemCredentialResolver.xml (original)
+++ branches/REL_1/xmltoolingtest/data/FilesystemCredentialResolver.xml Thu Dec 15 08:24:34 2011
@@ -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>