cleanup default configuration
authorwnorris <wnorris@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 10 Sep 2007 18:46:57 +0000 (18:46 +0000)
committerwnorris <wnorris@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Mon, 10 Sep 2007 18:46:57 +0000 (18:46 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2378 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

resources/conf/attribute-resolver.xml
resources/conf/relying-party.xml

index 417438c..2d950eb 100644 (file)
                                       jdbcPassword="mypassword" />
         <QueryTemplate>
             <![CDATA[
-                 SELECT * FROM student WHERE gzbtpid = ${principal}
+                 SELECT * FROM student WHERE gzbtpid = $requestContext.principalName
              ]]>
         </QueryTemplate>
     
                             principalCredential="myServicePassword">
         <FilterTemplate>
             <![CDATA[
-                (uid=${principal})
+                (uid=$requestContext.principalName)
             ]]>
         </FilterTemplate>
     
index ea30879..64baf3c 100644 (file)
@@ -85,8 +85,6 @@
     <!--     Security Configurations                -->
     <!-- ========================================== -->
     <security:SecurityPolicy id="shibboleth.DefaultSecurityPolicy" xsi:type="security:SecurityPolicyType">
-        <security:Rule xsi:type="samlsec:SAML1Protocol"/>
-        <security:Rule xsi:type="samlsec:SAML2Protocol"/>
         <security:Rule xsi:type="samlsec:Replay"/>
         <security:Rule xsi:type="samlsec:IssueInstant"/>
         <security:Rule xsi:type="samlsec:MandatoryIssuer"/>