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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Feb 22 16:12:15 2014
New Revision: 5454

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5454&view=rev
Log:
- rework testbed Encode action to use new binding config
- move binding config to system tree
- remove other encoder lookup proposals

Added:
    trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
      - copied, changed from r5440, trunk/idp-conf/src/main/resources/conf/saml-binding-config.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/saml-binding-config.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5454&r1=5453&r2=5454&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Sat Feb 22 16:12:15 2014
@@ -14,7 +14,6 @@
 	<import resource="authn-comparison.xml" />
 	<import resource="authn-flow-descriptors.xml" />
     <import resource="subject-config.xml" />
-    <import resource="saml-binding-config.xml" />
 	<import resource="attribute-params-config.xml" />
 
 </beans>

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5454&r1=5453&r2=5454&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Sat Feb 22 16:12:15 2014
@@ -31,6 +31,7 @@
             p:cacheSeconds="300" p:basename="file://${idp.home}/conf/messages" />
 
     <import resource="session-manager.xml" />
+    <import resource="saml-binding-config.xml" />
     
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->
     
@@ -132,6 +133,10 @@
     <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LogbackLogging"
         p:storage-ref="shibboleth.StorageService" p:strict="true" />
 
+    <bean id="shibboleth.SAMLArtifactMap" depends-on="shibboleth.StorageService"
+        class="org.opensaml.saml.common.binding.artifact.StorageServiceSAMLArtifactMap"
+        p:storageService-ref="shibboleth.StorageService" />
+
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.idp.service.ReloadableSpringService" depends-on="shibboleth.VelocityEngine"
         c:claz="net.shibboleth.idp.attribute.filter.AttributeFilter"
         p:serviceConfigurations-ref="shibboleth.AttributeFilterResources"

Copied: trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml (from r5440, trunk/idp-conf/src/main/resources/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?p2=trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml&p1=trunk/idp-conf/src/main/resources/conf/saml-binding-config.xml&r1=5440&r2=5454&rev=5454&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-binding-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml Sat Feb 22 16:12:15 2014
@@ -22,24 +22,67 @@
     In most cases, simply leaving this alone, or reordering the bindings to fit your preferences, is enough. 
     -->
     
-    <bean id="shibboleth.BindingDescriptor" class="org.opensaml.saml.common.binding.BindingDescriptor" abstract="true" />
+    <bean id="shibboleth.BindingDescriptor" class="net.shibboleth.idp.saml.binding.BindingDescriptor" abstract="true" />
     
-    <util:list id="shibboleth.OutgoingSAML1Bindings">
-        <bean parent="shibboleth.BindingDescriptor" c:id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" />
-        <bean parent="shibboleth.BindingDescriptor" c:id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" />
+    <util:list id="shibboleth.OutgoingSAML1SSOBindings">
+        <bean parent="shibboleth.BindingDescriptor" c:id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
+            p:encoderBeanId="shibboleth.Encoders.SAML1PostEncoder" />
+        <bean parent="shibboleth.BindingDescriptor" c:id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
+            p:encoderBeanId="shibboleth.Encoders.SAML1ArtifactEncoder" />
     </util:list>
 
     <util:list id="shibboleth.OutgoingSAML2SSOBindings">

[... 169 lines stripped ...]