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

[noreply at shibboleth.net]

Author: scantor
Date: Sun Jun 22 18:39:23 2014
New Revision: 6151

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6151&view=rev
Log:
Cleanup of authn config, convert field names to match legacy conventions.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
    trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
    trunk/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/jaas-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/ldap-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/authn/remoteuser-internal-authn-config.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/subject-c14n.xml
    trunk/idp-conf/src/main/resources/system/conf/utilities.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml?rev=6151&r1=6150&r2=6151&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/authn-comparison.xml Sun Jun 22 18:39:23 2014
@@ -30,14 +30,13 @@
         -->
     </bean>
 
-    <bean id="shibboleth.BetterDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-
     <bean id="shibboleth.MinimumClassRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
-
-    <bean id="shibboleth.MinimumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
 
     <bean id="shibboleth.MaximumClassRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
 
+    <!-- DeclRefs are rarely used in SAML, so you likely won't bother with these. -->
+    <bean id="shibboleth.BetterDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
+    <bean id="shibboleth.MinimumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
     <bean id="shibboleth.MaximumDeclRefMatchFactory" parent="shibboleth.InexactMatchFactory" />
     
     

Modified: trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml?rev=6151&r1=6150&r2=6151&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/general-authn.xml Sun Jun 22 18:39:23 2014
@@ -39,13 +39,13 @@
             </property>
         </bean>
         
-        <bean id="authn/RemoteUserInternal" parent="shibboleth.AuthenticationFlow" />
-
         <bean id="authn/RemoteUser" parent="shibboleth.AuthenticationFlow"
             p:nonBrowserSupported="false" />
 
         <bean id="authn/External" parent="shibboleth.AuthenticationFlow"
             p:nonBrowserSupported="false" />
+
+        <bean id="authn/RemoteUserInternal" parent="shibboleth.AuthenticationFlow" />
 
         <bean id="authn/JAAS" parent="shibboleth.AuthenticationFlow"
                 p:passiveAuthenticationSupported="true"

Modified: trunk/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml?rev=6151&r1=6150&r2=6151&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn/ipaddress-authn-config.xml Sun Jun 22 18:39:23 2014
@@ -10,21 +10,10 @@
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 
-    <!-- Simple transforms to apply to address before validation. -->
-    <bean id="shibboleth.authn.IPAddress.Lowercase" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-    <bean id="shibboleth.authn.IPAddress.Uppercase" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="false" />
-    </bean>
-    <bean id="shibboleth.authn.IPAddress.Trim" class="java.lang.Boolean">
-        <constructor-arg type="boolean" value="true" />
-    </bean>
+    <!-- Apply any regular expression replacement pairs to address before validation. -->
+    <util:list id="shibboleth.authn.IPAddress.Transforms" />
 
-    <!-- Apply any regular expression replacement pairs before validation. -->
-    <util:list id="shibboleth.authn.IPAddress.Transforms"/>
-

[... 252 lines stripped ...]