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

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 19 16:41:04 2014
New Revision: 5404

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5404&view=rev
Log:
Replace mock action with draft actions for outbound context mgmt

Modified:
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.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=5404&r1=5403&r2=5404&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Wed Feb 19 16:41:04 2014
@@ -1,6 +1,9 @@
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.example.org">
     <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol" AuthnRequestsSigned="false">
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost/sp/SAML2/POST/ACS" index="1"/>
+        <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:1.0:profiles:browser-post" Location="https://sp.example.org/SAML1/POST/ACS" index="10"/>
         

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml?rev=5404&r1=5403&r2=5404&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml Wed Feb 19 16:41:04 2014
@@ -108,8 +108,6 @@
     
     <bean id="BuildResponse" class="idp.BuildMockSaml2Response" />
     
-    <bean id="PrepareOutboundMessageContext" class="idp.PrepareOutboundMessageContext" />
-    
     <bean id="outboundMessageHandlerChain" class="org.opensaml.messaging.handler.impl.BasicMessageHandlerChain" scope="prototype">
         <property name="handlers">
             <util:list>
@@ -192,6 +190,18 @@
        <constructor-arg ref="shibboleth.AttributeFilterService"/>
     </bean>
 
+    <bean
+        id="InitializeOutboundMessageContext"
+        class="net.shibboleth.idp.saml.impl.profile.InitializeOutboundMessageContext"
+        scope="prototype" />
+
+    <bean
+        id="PopulateBindingAndEndpointContexts"
+        class="net.shibboleth.idp.saml.impl.profile.PopulateBindingAndEndpointContexts"
+        scope="prototype"
+        p:endpointResolver-ref="shibboleth.EndpointResolver"
+        p:bindings-ref="shibboleth.OutgoingSAML2SSOBindings" />
+
     <!-- TODO replace with eventual relying-party.xml config -->
     <bean id="RelyingPartyConfiguration" class="net.shibboleth.idp.relyingparty.RelyingPartyConfiguration"
             p:id="ActivatedRelyingPartyConfiguration"

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml?rev=5404&r1=5403&r2=5404&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml Wed Feb 19 16:41:04 2014
@@ -46,7 +46,17 @@
     
     <action-state id="SelectProfileConfiguration">
         <evaluate expression="SelectProfileConfiguration" />
-        <transition on="proceed" to="InitializeAuthenticationContext"/>
+        <transition on="proceed" to="InitializeOutboundMessageContext" />
+    </action-state>
+
+    <action-state id="InitializeOutboundMessageContext">
+        <evaluate expression="InitializeOutboundMessageContext" />
+        <transition on="proceed" to="PopulateBindingAndEndpointContexts" />
+    </action-state>
+    
+    <action-state id="PopulateBindingAndEndpointContexts">
+        <evaluate expression="PopulateBindingAndEndpointContexts" />
+        <transition on="proceed" to="InitializeAuthenticationContext" />
     </action-state>
         
     <action-state id="InitializeAuthenticationContext">
@@ -78,11 +88,6 @@
        

[... 11 lines stripped ...]