Author: scantor
Date: Mon Apr 28 23:23:23 2014
New Revision: 5784
URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5784&view=rev
Log:
Populate artifact context, change data type on artifact type setting.
Modified:
trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
trunk/idp-conf/src/main/resources/system/conf/saml-binding-config.xml
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/LogoutTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1ArtifactTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML1AttributeQueryTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ArtifactTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2AttributeQueryTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2BrowserSSOProfileTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/SAML2ECPProfileTest.java
trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/saml/ShibbolethSSOProfileTest.java
trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/relying-party.xml
trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/ecpValues.xml
trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2SSOValues.xml
trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/saml2attributeQueryValues.xml
trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/saml/shibbolethSSOValues.xml
trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/BasicSAMLArtifactConfiguration.java
trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/profile/config/SAMLArtifactConfiguration.java
trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/profile/impl/PopulateBindingAndEndpointContexts.java
Modified: trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/metadata/example-metadata.xml?rev=5784&r1=5783&r2=5784&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Mon Apr 28 23:23:23 2014
@@ -57,8 +57,10 @@
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:8443/sp/SAML2/POST/ACS" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost/sp/SAML2/POST/ACS" index="3"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost:8080/sp/SAML2/POST/ACS" index="4"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:8443/sp/SAML2/Artifact/ACS" index="2"/>
<AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://localhost:8443/sp/SAML1/POST/ACS" index="10"/>
+ <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost:8443/sp/SAML1/Artifact/ACS" index="11"/>
</SPSSODescriptor>
</EntityDescriptor>
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=5784&r1=5783&r2=5784&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 Mon Apr 28 23:23:23 2014
@@ -25,10 +25,12 @@
<bean id="shibboleth.BindingDescriptor" class="net.shibboleth.idp.saml.binding.BindingDescriptor" abstract="true" />
<util:list id="shibboleth.OutgoingSAML1SSOBindings">
+ <!--
<bean parent="shibboleth.BindingDescriptor" id="urn:oasis:names:tc:SAML:1.0:profiles:browser-post"
p:encoderBeanId="shibboleth.Encoders.SAML1PostEncoder" />
+ -->
<bean parent="shibboleth.BindingDescriptor" id="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01"
- p:encoderBeanId="shibboleth.Encoders.SAML1ArtifactEncoder" />
+ p:encoderBeanId="shibboleth.Encoders.SAML1ArtifactEncoder" p:artifact="true" />
</util:list>
<util:list id="shibboleth.OutgoingSAML2SSOBindings">
@@ -37,7 +39,7 @@
[... 498 lines stripped ...]