[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/saml-binding-config.xml flows/saml...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  1 17:07:59 2016
New Revision: 8112

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8112&view=rev
Log:
Cleanup duplication of binding descriptor beans, and leverage that to get BindingDescriptor injected during inbound decode.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/artifact-resolution-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/idwsf-ssos-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-back-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-post-simplesign-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/slo-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-simplesign-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml?rev=8112&r1=8111&r2=8112&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml	(original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml	Tue Mar  1 17:07:59 2016
@@ -22,57 +22,104 @@
     Note: the p:id syntax MUST be used to specify the binding URI. Using id alone will cause problems due to
     duplicate bean IDs. 
     -->
-    
+        
     <bean id="shibboleth.BindingDescriptor" class="net.shibboleth.idp.saml.binding.BindingDescriptor" abstract="true" />
     
+    <!-- SAML 1 Bindings -->
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.LegacyShibboleth"
+        p:id="urn:mace:shibboleth:1.0:profiles:AuthnRequest"
+        p:shortName="Shibboleth" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML1POST"
+        p:id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
+        p:shortName="POST"
+        p:encoderBeanId="shibboleth.Encoders.SAML1PostEncoder" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML1Artifact"
+        p:id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
+        p:shortName="Artifact"
+        p:encoderBeanId="shibboleth.Encoders.SAML1ArtifactEncoder"
+        p:artifact="true"
+        p:activationCondition="%{idp.artifact.enabled:true}" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML1SOAP"
+        p:id="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding"
+        p:shortName="SOAP"
+        p:encoderBeanId="shibboleth.Encoders.SAML1SOAPEncoder"
+        p:synchronous="true" />
+    
+    <!-- SAML 2 Bindings -->
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML2Unsolicited"
+        p:id="urn:mace:shibboleth:2.0:profiles:AuthnRequest"
+        p:shortName="Unsolicited" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML2Redirect"
+        p:id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+        p:shortName="Redirect"
+        p:encoderBeanId="shibboleth.Encoders.SAML2RedirectEncoder"
+        p:signatureCapable="true" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML2POST"
+        p:id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+        p:shortName="POST"
+        p:encoderBeanId="shibboleth.Encoders.SAML2PostEncoder" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML2POSTSimpleSign"
+        p:id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign"
+        p:shortName="POST-SimpleSign"
+        p:encoderBeanId="shibboleth.Encoders.SAML2PostSimpleSignEncoder"
+        p:signatureCapable="true" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML2Artifact"
+        p:id="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact"
+        p:shortName="Artifact"
+        p:encoderBeanId="shibboleth.Encoders.SAML2ArtifactEncoder"
+        p:artifact="true"
+        p:activationCondition="%{idp.artifact.enabled:true}" />
+    <bean parent="shibboleth.BindingDescriptor" id="shibboleth.Binding.SAML2SOAP"
+        p:id="urn:oasis:names:tc:SAML:2.0:bindings:SOAP"

[... 367 lines stripped ...]