From 843a20e691ad14b5a08cb36747f3e8fe7fe73c36 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 29 Nov 2007 13:14:15 +0000
Subject: [PATCH] Changed default namespace in config files to "security" for
 clarity.

---
 .../security/config/http-security.xml         | 40 +++++++++----------
 .../security/config/method-security.xml       | 32 +++++++--------
 .../applicationContext-security-ns.xml        | 40 +++++++++----------
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/core/src/test/resources/org/springframework/security/config/http-security.xml b/core/src/test/resources/org/springframework/security/config/http-security.xml
index 0f407beb1e..e75a215d60 100644
--- a/core/src/test/resources/org/springframework/security/config/http-security.xml
+++ b/core/src/test/resources/org/springframework/security/config/http-security.xml
@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:security="http://www.springframework.org/schema/security"
+<beans:beans xmlns="http://www.springframework.org/schema/security"
+    xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
-    <security:http createSession="ifRequired" pathType="ant" lowerCaseComparisons="true">
-        <security:intercept-url pattern="/unprotected" filters="none" />
-        <security:intercept-url pattern="/somepath" access="ROLE_SPECIAL,ROLE_USER" requiresChannel="http" />
-        <security:intercept-url pattern="/**" access="ROLE_USER" />
+    <http createSession="ifRequired" pathType="ant" lowerCaseComparisons="true">
+        <intercept-url pattern="/unprotected" filters="none" />
+        <intercept-url pattern="/somepath" access="ROLE_SPECIAL,ROLE_USER" requiresChannel="http" />
+        <intercept-url pattern="/**" access="ROLE_USER" />
 
         <!-- Default form login configuration. Will create filter and entry point -->
-        <security:form-login loginUrl="/j_spring_security_check" />
+        <form-login loginUrl="/j_spring_security_check" />
 
         <!-- Default basic auth configuration. Will create filter and entry point -->
-        <security:http-basic realm="NamespaceTestRealm" />
+        <http-basic realm="NamespaceTestRealm" />
 
         <!-- Default logout configuration -->
-        <security:logout logoutUrl="/j_spring_security_logout" logoutSuccessUrl="/" invalidateSession="true" />
+        <logout logoutUrl="/j_spring_security_logout" logoutSuccessUrl="/" invalidateSession="true" />
 
-        <security:concurrent-session-control maxSessions="1"/>
+        <concurrent-session-control maxSessions="1"/>
 
-        <security:remember-me key="doesntmatter" tokenRepository="tokenRepo"/>
-    </security:http>
+        <remember-me key="doesntmatter" tokenRepository="tokenRepo"/>
+    </http>
 
-    <security:authentication-provider>
-        <security:user-service>
-            <security:user name="bob" password="bobspassword" authorities="ROLE_A,ROLE_B" />
-            <security:user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B,AUTH_OTHER" />
-        </security:user-service>
-    </security:authentication-provider>
+    <authentication-provider>
+        <user-service>
+            <user name="bob" password="bobspassword" authorities="ROLE_A,ROLE_B" />
+            <user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B,AUTH_OTHER" />
+        </user-service>
+    </authentication-provider>
 
-    <bean name="tokenRepo" class="org.springframework.security.ui.rememberme.InMemoryTokenRepositoryImpl"/>
+    <beans:bean name="tokenRepo" class="org.springframework.security.ui.rememberme.InMemoryTokenRepositoryImpl"/>
 
     <!-- bean name="rememberMeServices" class="org.springframework.security.ui.rememberme.NullRememberMeServices"/ -->
 
-</beans>
\ No newline at end of file
+</beans:beans>
\ No newline at end of file
diff --git a/core/src/test/resources/org/springframework/security/config/method-security.xml b/core/src/test/resources/org/springframework/security/config/method-security.xml
index 3ba61d90fd..d34240fce4 100644
--- a/core/src/test/resources/org/springframework/security/config/method-security.xml
+++ b/core/src/test/resources/org/springframework/security/config/method-security.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:security="http://www.springframework.org/schema/security"
+<b:beans xmlns="http://www.springframework.org/schema/security"
+    xmlns:b="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
-    <bean id="target" class="org.springframework.security.config.TestBusinessBeanImpl">
+    <b:bean id="target" class="org.springframework.security.config.TestBusinessBeanImpl">
         <!-- This will add a security interceptor to the bean -->
-        <security:intercept-methods>
+        <intercept-methods>
             <!-- TODO: It would be better if we didn't need the package/interface names here -->
-            <security:protect method="org.springframework.security.config.TestBusinessBean.set*" access="ROLE_ADMIN" />
-            <security:protect method="org.springframework.security.config.TestBusinessBean.get*" access="ROLE_ADMIN,ROLE_USER" />
-            <security:protect method="org.springframework.security.config.TestBusinessBean.doSomething" access="ROLE_USER" />
-        </security:intercept-methods>
-    </bean>
+            <protect method="org.springframework.security.config.TestBusinessBean.set*" access="ROLE_ADMIN" />
+            <protect method="org.springframework.security.config.TestBusinessBean.get*" access="ROLE_ADMIN,ROLE_USER" />
+            <protect method="org.springframework.security.config.TestBusinessBean.doSomething" access="ROLE_USER" />
+        </intercept-methods>
+    </b:bean>
 
-    <security:authentication-provider>
-        <security:user-service>
-            <security:user name="bob" password="bobspassword" authorities="ROLE_A,ROLE_B" />
-            <security:user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B,AUTH_OTHER" />
-        </security:user-service>
-    </security:authentication-provider>
+    <authentication-provider>
+        <user-service>
+            <user name="bob" password="bobspassword" authorities="ROLE_A,ROLE_B" />
+            <user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B,AUTH_OTHER" />
+        </user-service>
+    </authentication-provider>
 
-</beans>
\ No newline at end of file
+</b:beans>
\ No newline at end of file
diff --git a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
index 91452ea7ef..5920282ff6 100644
--- a/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
+++ b/samples/tutorial/src/main/webapp/WEB-INF/applicationContext-security-ns.xml
@@ -6,32 +6,32 @@
   - $Id$
   -->
 
-<beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:security="http://www.springframework.org/schema/security"
+<beans:beans xmlns="http://www.springframework.org/schema/security"
+    xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.xsd">
 
-    <security:http>
-        <security:intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>
-        <security:intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" />
-        <security:intercept-url pattern="/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
+    <http>
+        <intercept-url pattern="/secure/extreme/**" access="ROLE_SUPERVISOR"/>
+        <intercept-url pattern="/secure/**" access="IS_AUTHENTICATED_REMEMBERED" />
+        <intercept-url pattern="/**" access="IS_AUTHENTICATED_ANONYMOUSLY" />
 
-        <security:form-login />
-        <security:http-basic realm="SpringSecurityTutorialApp"  />
-        <security:logout />
-        <security:concurrent-session-control maxSessions="1" exceptionIfMaximumExceeded="true"/>
+        <form-login />
+        <http-basic realm="SpringSecurityTutorialApp"  />
+        <logout />
+        <concurrent-session-control maxSessions="1" exceptionIfMaximumExceeded="true"/>
 
-        <security:remember-me key="doesntmatter" tokenRepository="tokenRepo"/>
-    </security:http>
+        <remember-me key="doesntmatter" tokenRepository="tokenRepo"/>
+    </http>
 
-    <bean name="tokenRepo" class="org.springframework.security.ui.rememberme.InMemoryTokenRepositoryImpl"/>
+    <beans:bean name="tokenRepo" class="org.springframework.security.ui.rememberme.InMemoryTokenRepositoryImpl"/>
 
-    <security:authentication-provider>
-        <security:user-service>
-            <security:user name="bob" password="bobspassword" authorities="ROLE_SUPERVISOR" />
-            <security:user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B" />
-        </security:user-service>
-    </security:authentication-provider>
+    <authentication-provider>
+        <user-service>
+            <user name="bob" password="bobspassword" authorities="ROLE_SUPERVISOR" />
+            <user name="bill" password="billspassword" authorities="ROLE_A,ROLE_B" />
+        </user-service>
+    </authentication-provider>
 
-</beans>
\ No newline at end of file
+</beans:beans>
\ No newline at end of file