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

[noreply at shibboleth.net]

Author: scantor
Date: Wed May  7 20:18:36 2014
New Revision: 5877

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5877&view=rev
Log:
Renaming flows to make user-override cleaner 

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/artifact-resolution-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/attribute-query-flow.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/artifact-resolution-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/attribute-query-flow.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-post-simplesign-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

Modified: trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml?rev=5877&r1=5876&r2=5877&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml Wed May  7 20:18:36 2014
@@ -44,7 +44,7 @@
     <!-- Now the actual list. -->
     <util:list id="shibboleth.AvailableAuthenticationFlows">
         
-        <bean id="AuthenticationFlow/IPAddress" parent="shibboleth.AbstractAuthenticationFlowBean"
+        <bean id="authn/IPAddress" parent="shibboleth.AbstractAuthenticationFlowBean"
                 p:passiveAuthenticationSupported="true"
                 p:lifetime="PT60S" p:inactivityTimeout="PT60S">
             <property name="supportedPrincipals">
@@ -55,13 +55,13 @@
             </property>
         </bean>
         
-        <bean id="AuthenticationFlow/RemoteUser" parent="shibboleth.AbstractAuthenticationFlowBean" />
+        <bean id="authn/RemoteUser" parent="shibboleth.AbstractAuthenticationFlowBean" />
 
-        <bean id="AuthenticationFlow/JAAS" parent="shibboleth.AbstractAuthenticationFlowBean"
+        <bean id="authn/JAAS" parent="shibboleth.AbstractAuthenticationFlowBean"
                 p:passiveAuthenticationSupported="true"
                 p:forcedAuthenticationSupported="true" />
 
-        <bean id="AuthenticationFlow/LDAP" parent="shibboleth.AbstractAuthenticationFlowBean"
+        <bean id="authn/LDAP" parent="shibboleth.AbstractAuthenticationFlowBean"
                 p:passiveAuthenticationSupported="true"
                 p:forcedAuthenticationSupported="true" />
 

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=5877&r1=5876&r2=5877&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/webflow-config.xml Wed May  7 20:18:36 2014
@@ -20,9 +20,9 @@
     <webflow:flow-registry id="flowRegistry" parent="userFlowRegistry" base-path="file:///${idp.home}/system/flows" flow-builder-services="flowBuilderServices">
 
         <!-- Abstract flows underpinning SAML profiles. -->
-        <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" />
+        <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" />
         
         <!-- SAML profile flows. -->
         <webflow:flow-location id="profile/Shibboleth/SSO" path="/saml/saml1/sso-unsolicited-flow.xml"  />
@@ -45,14 +45,14 @@

[... 312 lines stripped ...]