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

[noreply at shibboleth.net]

Author: scantor
Date: Tue May 27 13:30:17 2014
New Revision: 5971

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5971&view=rev
Log:
Rename existing remoteuser login flow and reserve a new flow for external version.

Added:
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-internal-authn-config.xml
      - copied, changed from r5965, trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml
      - copied, changed from r5965, trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-flow.xml
      - copied, changed from r5965, trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-flow.xml
Modified:
    trunk/idp-conf/src/main/resources/conf/authn/general-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml
    trunk/idp-conf/src/main/resources/system/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-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=5971&r1=5970&r2=5971&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 Tue May 27 13:30:17 2014
@@ -55,6 +55,8 @@
             </property>
         </bean>
         
+        <bean id="authn/RemoteUserInternal" parent="shibboleth.AbstractAuthenticationFlowBean" />
+
         <bean id="authn/RemoteUser" parent="shibboleth.AbstractAuthenticationFlowBean" />
 
         <bean id="authn/External" parent="shibboleth.AbstractAuthenticationFlowBean" />

Copied: trunk/idp-conf/src/main/resources/conf/authn/remoteuser-internal-authn-config.xml (from r5965, trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/remoteuser-internal-authn-config.xml?p2=trunk/idp-conf/src/main/resources/conf/authn/remoteuser-internal-authn-config.xml&p1=trunk/idp-conf/src/main/resources/conf/authn/remoteuser-authn-config.xml&r1=5965&r2=5971&rev=5971&view=diff
==============================================================================
    (empty)

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=5971&r1=5970&r2=5971&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 Tue May 27 13:30:17 2014
@@ -53,9 +53,10 @@
 
         <!-- Login methods. -->
         <webflow:flow-location id="authn/IPAddress" path="/authn/ipaddress-authn-flow.xml" />
-        <webflow:flow-location id="authn/RemoteUser" path="/authn/remoteuser-authn-flow.xml" />
+        <webflow:flow-location id="authn/RemoteUserInternal" path="/authn/remoteuser-internal-authn-flow.xml" />
         <webflow:flow-location id="authn/JAAS" path="/authn/jaas-authn-flow.xml" />
         <webflow:flow-location id="authn/LDAP" path="/authn/ldap-authn-flow.xml" />
+        <webflow:flow-location id="authn/RemoteUser" path="/authn/remoteuser-authn-flow.xml" />
         <webflow:flow-location id="authn/External" path="/authn/external-authn-flow.xml" />
 
         <!-- Master flows for post-authn and SAML subject c14n. -->

Copied: trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml (from r5965, trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml?p2=trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml&p1=trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml&r1=5965&r2=5971&rev=5971&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-authn-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/remoteuser-internal-authn-beans.xml Tue May 27 13:30:17 2014
@@ -12,7 +12,7 @@
        default-init-method="initialize"
        default-destroy-method="destroy">
     
-    <import resource="../../../conf/authn/remoteuser-authn-config.xml" />
+    <import resource="../../../conf/authn/remoteuser-internal-authn-config.xml" />
 

[... 17 lines stripped ...]