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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 21 14:59:50 2013
New Revision: 4890

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4890&view=rev
Log:
Sync with testbed

Added:
    trunk/idp-conf/src/main/resources/flows/authn/authn-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/authn/authn-subflow-abstract-flow.xml   (with props)
    trunk/idp-conf/src/main/resources/flows/authn/simple-subject-c14n-beans.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/simple-subject-c14n-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/subject-c14n-beans.xml

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=4890&r1=4889&r2=4890&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Mon Oct 21 14:59:50 2013
@@ -10,14 +10,6 @@
     
     <webflow:flow-registry id="flowRegistry" base-path="file://${idp.home}/flows" flow-builder-services="flowBuilderServices">
 
-        <!-- Use dot-separated convention for abstract flows. -->
-        <webflow:flow-location id="SAML2.SSO.Abstract" path="/saml2/sso-abstract-flow.xml"  />
-        
-        <!-- Use slash-separated convention for web-executable flows. -->
-        <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="Authentication.Abstract" path="/authn/authn-abstract-flow.xml" />
         <webflow:flow-location id="Authentication.Subflow.Abstract" path="/authn/authn-subflow-abstract-flow.xml" />
         <webflow:flow-location id="Authentication" path="/authn/authn-flow.xml" />

Modified: trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml?rev=4890&r1=4889&r2=4890&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml Mon Oct 21 14:59:50 2013
@@ -1,6 +1,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow classpath:/org/springframework/webflow/engine/model/builder/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow classpath:/org/springframework/webflow/engine/model/builder/spring-webflow-2.0.xsd"
+      parent="Authentication.Abstract">
 
     <!--
     This is the Authentication subflow. It handles retrieval of an existing session,
@@ -86,23 +87,6 @@
         <transition on="InputOutputError" to="proceed" />
     </action-state>
 
-    <!-- Successful completion of subflow. -->
-    <end-state id="proceed" />
-
-    <!-- Error events to reflect back from this subflow. -->    
-    <end-state id="InputOutputError" />
-    <end-state id="InvalidCredentials" />
-    <end-state id="InvalidProfileContext" />
-    <end-state id="NoCredentials" />
-    <end-state id="NoPotentialFlow" />
-    <end-state id="RequestUnsupported" />
-    <end-state id="SubjectCanonicalizationError" />
-
-    <!-- Default is to turn any event into its own end-state. -->
-    <global-transitions>
-        <transition on="#{true}" to="#{currentEvent.id}" />
-    </global-transitions>
-
     <bean-import resource="authn-beans.xml" />
 
 </flow>

Modified: trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml?rev=4890&r1=4889&r2=4890&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-flow.xml Mon Oct 21 14:59:50 2013
@@ -1,6 +1,7 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

[... 197 lines stripped ...]