[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: metadata/example-metadata.xml system/conf/webf...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  2 17:15:09 2014
New Revision: 6032

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6032&view=rev
Log:
IDP-230 - basic working ECP flow layed on SSO flow

Added:
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-ecp-flow.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml

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=6032&r1=6031&r2=6032&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Mon Jun  2 17:15:09 2014
@@ -70,7 +70,9 @@
         <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:2.0:bindings:HTTP-Artifact" Location="https://localhost:8443/sp/SAML2/Artifact/ACS" index="5"/>
+
+        <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://localhost:8443/sp/SAML2/PAOS/ACS" index="6"/>
         
         <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"/>

Modified: trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml?rev=6032&r1=6031&r2=6032&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml Mon Jun  2 17:15:09 2014
@@ -38,6 +38,7 @@
         <webflow:flow-location id="profile/SAML2/POST-SimpleSign/SSO" path="/saml/saml2/sso-post-flow.xml" />
         <webflow:flow-location id="profile/SAML2/Redirect/SSO" path="/saml/saml2/sso-redirect-flow.xml" />
         <webflow:flow-location id="profile/SAML2/Unsolicited/SSO" path="/saml/saml2/sso-unsolicited-flow.xml" />
+        <webflow:flow-location id="profile/SAML2/SOAP/ECP" path="/saml/saml2/sso-ecp-flow.xml" />
         <webflow:flow-location id="profile/SAML2/SOAP/AttributeQuery" path="/saml/saml2/attribute-query-flow.xml" />
         <webflow:flow-location id="profile/SAML2/SOAP/ArtifactResolution" path="/saml/saml2/artifact-resolution-flow.xml" />
 

Modified: trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml?rev=6032&r1=6031&r2=6032&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml Mon Jun  2 17:15:09 2014
@@ -224,7 +224,7 @@
 
     <bean id="EncodeMessage" class="org.opensaml.profile.action.impl.EncodeMessage" scope="prototype"
         p:messageEncoderFactory-ref="messageEncoderFactory"
-        p:messageHandler="#{getObject('${shibboleth.BindingSpecificMessageHandler:null}')}" />
+        p:messageHandler="#{getObject('shibboleth.BindingSpecificMessageHandler')}" />
 
     <bean id="RecordResponseComplete" class="net.shibboleth.idp.profile.impl.RecordResponseComplete" scope="prototype" />