X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2Fshibboleth2.xml.in;h=d45397fbbabee21733f9d8dcd4c9aab31034431e;hb=f6b3bd59c63980a5d0e6b892da540d800ecccf7b;hp=2f7034f569ec9add8d1c98a9fddf27ead932da60;hpb=b22d0e89f3992535781f8cb5846a874e141bd349;p=shibboleth%2Fsp.git

diff --git a/configs/shibboleth2.xml.in b/configs/shibboleth2.xml.in
index 2f7034f..d45397f 100644
--- a/configs/shibboleth2.xml.in
+++ b/configs/shibboleth2.xml.in
@@ -73,24 +73,15 @@
     </RequestMapper>
 
     <!--
-    The Applications element is where most of Shibboleth's SAML bits are defined.
+    The ApplicationDefaults element is where most of Shibboleth's SAML bits are defined.
     Resource requests are mapped by the RequestMapper to an applicationId that
     points into to this section.
     -->
-    <Applications id="default" policyId="default" entityID="https://sp.example.org/shibboleth"
+    <ApplicationDefaults id="default" policyId="default"
+        entityID="https://sp.example.org/shibboleth"
         homeURL="https://sp.example.org/index.html"
         REMOTE_USER="eppn persistent-id targeted-id"
-        localLogout="@-PKGSYSCONFDIR-@/localLogout.html"
-        globalLogout="@-PKGSYSCONFDIR-@/globalLogout.html
-        authType="TLS"
-        artifactEndpointIndex="1"
-        signing="false"
-        encryption="false"
-        requireConfidentiality="true"
-        requireTransportAuth="true"
-        signedAssertions="false"
-        chunkedEncoding="false"
-        connectTimeout="15" timeout="30"
+        signing="false" encryption="false"
         >
 
         <!--
@@ -207,6 +198,8 @@
             metadata="@-PKGSYSCONFDIR-@/metadataError.html"
             access="@-PKGSYSCONFDIR-@/accessError.html"
             ssl="@-PKGSYSCONFDIR-@/sslError.html"
+            localLogout="@-PKGSYSCONFDIR-@/localLogout.html"
+            globalLogout="@-PKGSYSCONFDIR-@/globalLogout.html"
             supportContact="root@localhost"
             logoLocation="/shibboleth-sp/logo.jpg"
             styleSheet="/shibboleth-sp/main.css"/>
@@ -255,30 +248,6 @@
             </Certificate>
         </CredentialResolver>
 
-        <!-- Advanced resolver allowing for multiple keypairs. -->
-        <!--
-        <CredentialResolver type="Chaining">
-            <CredentialResolver type="File">
-                <Key>
-                    <Name>DefaultKey</Name>
-                    <Path>@-PKGSYSCONFDIR-@/sp-example.key</Path>
-                </Key>
-                <Certificate>
-                    <Path>@-PKGSYSCONFDIR-@/sp-example.crt</Path>
-                </Certificate>
-            </CredentialResolver>
-            <CredentialResolver type="File">
-                <Key>
-                    <Name>SpecialKey</Name>
-                    <Path>@-PKGSYSCONFDIR-@/special.key</Path>
-                </Key>
-                <Certificate>
-                    <Path>@-PKGSYSCONFDIR-@/special.crt</Path>
-                </Certificate>
-            </CredentialResolver>
-        </CredentialResolver>
-        -->
-        
     </Applications>
     
     <!-- Each policy defines a set of rules to use to secure messages. -->