[java-identity-provider COMMIT] in /trunk/idp-conf: pom.xml src/main/resources/conf/webflow-config.xml src/main/resou...

noreply at shibboleth.net noreply at shibboleth.net
Mon Mar 10 15:44:15 EDT 2014 

Author: scantor
Date: Mon Mar 10 15:44:15 2014
New Revision: 5554

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5554&view=rev
Log:
Refactor SAML SSO flows, and implement SAML 2 flow modeled on SAML 1 flow for now.

Added:
    trunk/idp-conf/src/main/resources/system/flows/saml/
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-beans.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/
      - copied from r5550, trunk/idp-conf/src/main/resources/system/flows/saml1/
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
      - copied, changed from r5551, trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/
      - copied from r5550, trunk/idp-conf/src/main/resources/system/flows/saml2/
Modified:
    trunk/idp-conf/pom.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-unsolicited-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-post-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-redirect-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-unsolicited-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/
    trunk/idp-conf/src/main/resources/system/flows/saml2/

Modified: trunk/idp-conf/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/pom.xml?rev=5554&r1=5553&r2=5554&view=diff
==============================================================================
Binary files - no diff available.

Modified: trunk/idp-conf/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/webflow-config.xml?rev=5554&r1=5553&r2=5554&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Mon Mar 10 15:44:15 2014
@@ -24,14 +24,15 @@
     <webflow:flow-registry id="flowRegistry" parent="userFlowRegistry" base-path="file://${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
 
         <!-- Use dot-separated convention for abstract flows. -->
-        <webflow:flow-location id="SAML1.SSO.Abstract" path="/saml1/sso-abstract-flow.xml" />
-        <webflow:flow-location id="SAML2.SSO.Abstract" path="/saml2/sso-abstract-flow.xml" />
+        <webflow:flow-location id="SAML.Abstract" path="/saml/saml-abstract-flow.xml" />
+        <webflow:flow-location id="SAML1.SSO.Abstract" path="/saml/saml1/sso-abstract-flow.xml" />
+        <webflow:flow-location id="SAML2.SSO.Abstract" path="/saml/saml2/sso-abstract-flow.xml" />
         
         <!-- Use slash-separated convention for web-executable flows. -->
-        <webflow:flow-location id="Shibboleth/SSO" path="/saml1/sso-unsolicited-flow.xml"  />
-        <webflow:flow-location id="SAML2/Redirect/SSO" path="/saml2/sso-redirect-flow.xml" />
-        <webflow:flow-location id="SAML2/POST/SSO" path="/saml2/sso-post-flow.xml"  />
-        <webflow:flow-location id="SAML2/Unsolicited/SSO" path="/saml2/sso-unsolicited-flow.xml"  />
+        <webflow:flow-location id="Shibboleth/SSO" path="/saml/saml1/sso-unsolicited-flow.xml"  />
+        <webflow:flow-location id="SAML2/Redirect/SSO" path="/saml/saml2/sso-redirect-flow.xml" />
+        <webflow:flow-location id="SAML2/POST/SSO" path="/saml/saml2/sso-post-flow.xml"  />
+        <webflow:flow-location id="SAML2/Unsolicited/SSO" path="/saml/saml2/sso-unsolicited-flow.xml"  />
     
         <!-- Master flow for authentication. -->
         <webflow:flow-location id="Authentication.Abstract" path="/authn/authn-abstract-flow.xml" />

Copied: trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml (from r5551, trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml?p2=trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml&p1=trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml&r1=5551&r2=5554&rev=5554&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml Mon Mar 10 15:44:15 2014
@@ -14,28 +14,17 @@
 

[... 834 lines stripped ...]

More information about the commits mailing list