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/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/JaasXmlTests.groovy

@@ -52,7 +52,7 @@ class JaasXmlTests extends GebReportingSpec {
         when: 'user logs out'
         logout()
         then: 'the default logout success page is displayed'
-        at HomePage
+        at LogoutPage
         when: 'Unauthenticated user accesses the Secure Page'
         via SecurePage
         then: 'The login page is displayed'

samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LoginPage.groovy

@@ -27,8 +27,8 @@ class LoginPage extends Page {
     static at = { assert driver.title == 'Login Page'; true}
     static content = {
         login(required:false) { user='user', password='user' ->
-            loginForm.j_username = user
-            loginForm.j_password = password
+            loginForm.username = user
+            loginForm.password = password
             submit.click()
         }
         loginForm { $('form') }

samples/jaas-xml/src/integration-test/groovy/org/springframework/security/samples/pages/LogoutPage.groovy

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.security.samples.pages
+
+import geb.Page
+
+/**
+ * The login page.
+ *
+ * @author Rob Winch
+ */
+class LogoutPage extends LoginPage {
+    static url = 'login'
+    static at = { assert driver.title == 'Login Page' && $('p').text() == 'You have been logged out'; true}
+}

samples/jaas-xml/src/main/resources/applicationContext-security.xml

@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:sec="http://www.springframework.org/schema/security"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:sec="http://www.springframework.org/schema/security"
+    xmlns:p="http://www.springframework.org/schema/p"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
 
-	<sec:http auto-config="true" use-expressions="true" jaas-api-provision="true">
-		<sec:intercept-url pattern="/secure/**" access="isAuthenticated()"/>
-	</sec:http>
-	
-	<sec:authentication-manager>
-		<sec:authentication-provider ref="jaasAuthProvider"/>
-	</sec:authentication-manager>
+    <sec:http auto-config="true" jaas-api-provision="true">
+        <sec:intercept-url pattern="/secure/**" access="isAuthenticated()"/>
+    </sec:http>
 
-	<bean id="jaasAuthProvider"
-	class="org.springframework.security.authentication.jaas.DefaultJaasAuthenticationProvider">
-		<property name="configuration">
-			<bean
-				class="org.springframework.security.authentication.jaas.memory.InMemoryConfiguration">
-				<constructor-arg>
-					<map>
-						<entry key="SPRINGSECURITY">
-							<array>
-								<bean class="javax.security.auth.login.AppConfigurationEntry">
-									<constructor-arg
-										value="samples.jaas.UsernameEqualsPasswordLoginModule" />
-									<constructor-arg>
-										<util:constant
-											static-field="javax.security.auth.login.AppConfigurationEntry$LoginModuleControlFlag.REQUIRED" />
-									</constructor-arg>
-									<constructor-arg>
-										<map></map>
-									</constructor-arg>
-								</bean>
-							</array>
-						</entry>
-					</map>
-				</constructor-arg>
-			</bean>
-		</property>
-		<property name="authorityGranters">
-			<list>
-				<bean class="samples.jaas.RoleUserAuthorityGranter" />
-			</list>
-		</property>
-	</bean>
+    <sec:authentication-manager>
+        <sec:authentication-provider ref="jaasAuthProvider"/>
+    </sec:authentication-manager>
+
+    <bean id="jaasAuthProvider"
+    class="org.springframework.security.authentication.jaas.DefaultJaasAuthenticationProvider">
+        <property name="configuration">
+            <bean
+                class="org.springframework.security.authentication.jaas.memory.InMemoryConfiguration">
+                <constructor-arg>
+                    <map>
+                        <entry key="SPRINGSECURITY">
+                            <array>
+                                <bean class="javax.security.auth.login.AppConfigurationEntry">
+                                    <constructor-arg
+                                        value="samples.jaas.UsernameEqualsPasswordLoginModule" />
+                                    <constructor-arg>
+                                        <util:constant
+                                            static-field="javax.security.auth.login.AppConfigurationEntry$LoginModuleControlFlag.REQUIRED" />
+                                    </constructor-arg>
+                                    <constructor-arg>
+                                        <map></map>
+                                    </constructor-arg>
+                                </bean>
+                            </array>
+                        </entry>
+                    </map>
+                </constructor-arg>
+            </bean>
+        </property>
+        <property name="authorityGranters">
+            <list>
+                <bean class="samples.jaas.RoleUserAuthorityGranter" />
+            </list>
+        </property>
+    </bean>
 </beans>

samples/jaas-xml/src/main/webapp/secure/index.jsp

@@ -49,7 +49,7 @@
 <%		}
 %>
 
-<form action="<c:url value="/j_spring_security_logout"/>" method="post">
+<form action="<c:url value="/logout"/>" method="post">
     <input type="submit" value="Log Out"/>
     <sec:csrfInput/>
 </form>