Combine credential blocks.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1587 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/conf/dist.idp.xml b/src/conf/dist.idp.xml
index 1e37a3a..212dd69 100644 (file)
--- a/src/conf/dist.idp.xml
+++ b/src/conf/dist.idp.xml
@@ -77,11 +77,9 @@
                                <Path>$SHIB_HOME$/etc/idp-example.crt</Path>
                        </Certificate>
                </FileResolver>
-       </Credentials>
        
-       <!-- InQueue example (Deployments would need to generate an InQueue-compatible certificate) -->
-       <!--
-       <Credentials xmlns="urn:mace:shibboleth:credentials:1.0">
+               <!-- InQueue example (Deployments would need to generate an InQueue-compatible certificate) -->
+               <!--
                <FileResolver Id="inqueue_cred">
                        <Key>
                                <Path>$SHIB_HOME$/etc/idp-inqueue.key</Path>
@@ -90,7 +88,8 @@
                                <Path>$SHIB_HOME$/etc/idp-inqueue.crt</Path>
                        </Certificate>
                </FileResolver>
-       </Credentials> -->
+                -->
+       </Credentials>
 
 
        <!-- Protocol handlers specify what type of requests the IdP can respond to.  The default set listed here should work