Implemented Scott's suggestions for the credential loader:
[java-idp.git] / data / credentials2.xml
index b58dadc..7991f42 100644 (file)
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Credentials xmlns="urn:mace:shibboleth:credentials" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 
+<Credentials xmlns="urn:mace:shibboleth:credentials:1.0" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-       xsi:schemaLocation="urn:mace:shibboleth:credentials shibboleth.xsd">
+       xsi:schemaLocation="urn:mace:shibboleth:credentials:1.0 credentials.xsd">
        
-       <FileCredResolver id="test">
+       <FileResolver Id="test">
+               <Key format="DER">
+                       <Path>/conf/test.pkcs8.derkey</Path>
+               </Key>
                <Certificate format="PEM">
                        <Path>/conf/test.pemcrt</Path>
                </Certificate>
-               <Key format="PEM">
-                       <Path>/conf/test.pemkey</Path>
-               </Key>
-       </FileCredResolver>
+       </FileResolver>
 </Credentials>
\ No newline at end of file