SEC-2783: XML Configuration Defaults Should Match JavaConfig

* j_username -> username
* j_password -> password
* j_spring_security_check -> login
* j_spring_cas_security_check -> login/cas
* j_spring_cas_security_proxyreceptor -> login/cas/proxyreceptor
* j_spring_openid_security_login -> login/openid
* j_spring_security_switch_user -> login/impersonate
* j_spring_security_exit_user -> logout/impersonate
* login_error -> error
* use-expressions=true by default

samples/cas/sample-xml/src/integration-test/groovy/org/springframework/security/samples/cas/CasSampleTests.groovy

@@ -52,7 +52,7 @@ class CasSampleTests extends AbstractCasTests {
 
     def 'authenticate attempt with invaid ticket fails'() {
         when: 'present invalid ticket'
-        go "j_spring_cas_security_check?ticket=invalid"
+        go "login/cas?ticket=invalid"
         then: 'the login failed page is displayed'
         $("h2").text() == 'Login to CAS failed!'
     }

samples/cas/sample-xml/src/main/webapp/WEB-INF/applicationContext-security.xml

@@ -10,7 +10,7 @@
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <http entry-point-ref="casEntryPoint" use-expressions="true">
+    <http entry-point-ref="casEntryPoint">
         <intercept-url pattern="/" access="permitAll"/>
         <intercept-url pattern="/index.jsp" access="permitAll"/>
         <intercept-url pattern="/cas-logout.jsp" access="permitAll"/>
@@ -41,7 +41,7 @@
     <b:bean id="singleLogoutFilter" class="org.jasig.cas.client.session.SingleSignOutFilter"/>
     <!-- This filter redirects to the CAS Server to signal Single Logout should be performed -->
     <b:bean id="requestSingleLogoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter"
-        p:filterProcessesUrl="/j_spring_cas_security_logout">
+        p:filterProcessesUrl="/logout/cas">
         <b:constructor-arg value="https://${cas.server.host}/cas/logout"/>
         <b:constructor-arg>
             <b:bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler"/>
@@ -50,7 +50,7 @@
 
     <b:bean id="serviceProperties"
         class="org.springframework.security.cas.ServiceProperties"
-        p:service="https://${cas.service.host}/cas-sample/j_spring_cas_security_check"
+        p:service="https://${cas.service.host}/cas-sample/login/cas"
         p:authenticateAllArtifacts="true"/>
     <b:bean id="casEntryPoint"
         class="org.springframework.security.cas.web.CasAuthenticationEntryPoint"
@@ -60,10 +60,10 @@
         p:authenticationManager-ref="authManager"
         p:serviceProperties-ref="serviceProperties"
         p:proxyGrantingTicketStorage-ref="pgtStorage"
-        p:proxyReceptorUrl="/j_spring_cas_security_proxyreceptor">
+        p:proxyReceptorUrl="/login/cas/proxyreceptor">
         <b:property name="authenticationDetailsSource">
             <b:bean class="org.springframework.security.cas.web.authentication.ServiceAuthenticationDetailsSource">
-            	<b:constructor-arg ref="serviceProperties"/>
+                <b:constructor-arg ref="serviceProperties"/>
             </b:bean>
         </b:property>
         <b:property name="authenticationFailureHandler">
@@ -89,7 +89,7 @@
             <b:bean
                 class="org.jasig.cas.client.validation.Cas20ProxyTicketValidator"
                 p:acceptAnyProxy="true"
-                p:proxyCallbackUrl="https://${cas.service.host}/cas-sample/j_spring_cas_security_proxyreceptor"
+                p:proxyCallbackUrl="https://${cas.service.host}/cas-sample/login/cas/proxyreceptor"
                 p:proxyGrantingTicketStorage-ref="pgtStorage">
                 <b:constructor-arg value="https://${cas.server.host}/cas" />
             </b:bean>

samples/cas/sample-xml/src/main/webapp/cas-logout.jsp

@@ -9,7 +9,7 @@
 
 <p>You have logged out of this application, but may still have an active single-sign on session with CAS.</p>
 
-<p><a href="j_spring_cas_security_logout">Logout of CAS</a></p>
+<p><a href="logout/cas">Logout of CAS</a></p>
 
 </body>
 </html>

samples/cas/sample-xml/src/main/webapp/secure/extreme/index.jsp

@@ -6,7 +6,7 @@ This is a protected page. You can only see me if you are a supervisor.
 <p><a href="../../">Home</a>
 <p><a href="../../secure/index.jsp">Secure page</a></p>
 <p><a href="../../secure/ptSample">Proxy Ticket Sample page</a></p>
-<p><a href="../../j_spring_security_logout">Logout</a>
+<p><a href="../../logout">Logout</a>
 <
 </body>
 </html>

samples/cas/sample-xml/src/main/webapp/secure/index.jsp

@@ -10,6 +10,6 @@ or if you've authenticated this session.</p>
 
 <p><a href="../">Home</a>
 <p><a href="ptSample">Proxy Ticket Sample page</a></p>
-<p><a href="../j_spring_security_logout">Logout</a>
+<p><a href="../logout">Logout</a>
 </body>
 </html>