[java-idp-testbed COMMIT] in /trunk/src/main/resources: conf/global-beans.xml flows/authn/ipaddress-authn-beans.xml f...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Oct 16 12:00:12 2013
New Revision: 11

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=11&view=rev
Log:
Baby step simplifying a login method config.

Modified:
    trunk/src/main/resources/conf/global-beans.xml
    trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml
    trunk/src/main/resources/flows/authn/remoteuser-authn-flow.xml

Modified: trunk/src/main/resources/conf/global-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/conf/global-beans.xml?rev=11&r1=10&r2=11&view=diff
==============================================================================
--- trunk/src/main/resources/conf/global-beans.xml (original)
+++ trunk/src/main/resources/conf/global-beans.xml Wed Oct 16 12:00:12 2013
@@ -19,6 +19,7 @@
         <property name="converters">
             <list>
                 <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter"/>
+                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter"/>
             </list>
         </property>
     </bean>

Modified: trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml?rev=11&r1=10&r2=11&view=diff
==============================================================================
--- trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml (original)
+++ trunk/src/main/resources/flows/authn/ipaddress-authn-beans.xml Wed Oct 16 12:00:12 2013
@@ -21,7 +21,7 @@
             p:principalName="jdoe">
         <property name="designatedRanges">
             <list>
-                <bean class="net.shibboleth.utilities.java.support.net.IPRange" factory-method="parseCIDRBlock" c:cidrBlock="127.0.0.1/32" />
+                <value>127.0.0.1/32</value>
             </list>
         </property>
     </bean>

Modified: trunk/src/main/resources/flows/authn/remoteuser-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/main/resources/flows/authn/remoteuser-authn-flow.xml?rev=11&r1=10&r2=11&view=diff
==============================================================================
--- trunk/src/main/resources/flows/authn/remoteuser-authn-flow.xml (original)
+++ trunk/src/main/resources/flows/authn/remoteuser-authn-flow.xml Wed Oct 16 12:00:12 2013
@@ -27,7 +27,6 @@
     <end-state id="proceed" />
 
     <!-- Error events to reflect back from this subflow. -->    
-    <end-state id="IdentitySwitch" />
     <end-state id="InputOutputError" />
     <end-state id="InvalidCredentials" />
     <end-state id="InvalidProfileContext" />