Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing $Id$ markers and stripping trailing whitespace from the codebase.

Browse Source
This commit is contained in:
Luke Taylor
2010-01-08 16:06:05 +00:00
parent 9a323f15bc
commit 052537c8b0
877 changed files with 12140 additions and 12851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
itest/context/src/main/java/org/springframework/security/integration/UserRepository.java
+1 -1
View File
@@ -3,5 +3,5 @@ package org.springframework.security.integration;
public interface UserRepository {
public void doSomething();
}
itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPrePostInvocationAttributeFactory.java
+3 -3
View File
@@ -12,10 +12,10 @@ import org.springframework.security.access.prepost.PrePostInvocationAttributeFac
public class PythonInterpreterPrePostInvocationAttributeFactory implements PrePostInvocationAttributeFactory{
public PythonInterpreterPrePostInvocationAttributeFactory() {
PythonInterpreter.initialize(System.getProperties(), null, new String[] {});
PythonInterpreter.initialize(System.getProperties(), null, new String[] {});
}
public PreInvocationAttribute createPreInvocationAttribute(PreFilter preFilter, PreAuthorize preAuthorize) {
return new PythonInterpreterPreInvocationAttribute(preAuthorize.value());
}
itest/context/src/test/java/org/springframework/security/integration/SEC933ApplicationContextTests.java
+1 -1
View File
@@ -15,7 +15,7 @@ public class SEC933ApplicationContextTests {
@Autowired
private UserDetailsService userDetailsService;
@Test
public void testSimpleApplicationContextBootstrap() throws Exception {
assertNotNull(userDetailsService);
itest/context/src/test/java/org/springframework/security/integration/SEC936ApplicationContextTests.java
-1
View File
@@ -12,7 +12,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Luke Taylor
* @version $Id$
* @since 2.0
*/
@ContextConfiguration(locations={"/sec-936-app-context.xml"})
itest/context/src/test/java/org/springframework/security/performance/FilterChainPerformanceTests.java
-1
View File
@@ -29,7 +29,6 @@ import org.springframework.util.StopWatch;
/**
*
* @author Luke Taylor
* @version $Id$
* @since 2.0
*/
@ContextConfiguration(locations={"/filter-chain-performance-app-context.xml"})
itest/context/src/test/resources/filter-chain-performance-app-context.xml
+94 -95
View File
@@ -1,105 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
- $Id: applicationContext-security-ns.xml 2396 2007-12-23 16:36:44Z luke_t $
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:sec="http://www.springframework.org/schema/security"
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-3.0.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
<bean id="fcpMinimalStack" class="org.springframework.security.web.FilterChainProxy">
<sec:filter-chain-map path-type="ant">
<sec:filter-chain pattern="/**" filters="scpf,preAuthFilter,etf,fsi"/>
</sec:filter-chain-map>
</bean>
<bean id="fcpFullStack" class="org.springframework.security.web.FilterChainProxy">
<sec:filter-chain-map path-type="ant">
<sec:filter-chain pattern="/**" filters="scpf,preAuthFilter,apf,basicPf,logoutFilter,scharf,etf,fsi"/>
</sec:filter-chain-map>
</bean>
<bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
<property name="providers">
<list>
<bean class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
<property name="userDetailsService" ref="userService"/>
</bean>
</list>
</property>
</bean>
<sec:user-service id="userService">
<sec:user name="bob" password="bobspassword" authorities="ROLE_0,ROLE_1"/>
</sec:user-service>
<?xml version="1.0" encoding="UTF-8"?>
<!--
-
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:sec="http://www.springframework.org/schema/security"
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-3.0.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
<bean id="fcpMinimalStack" class="org.springframework.security.web.FilterChainProxy">
<sec:filter-chain-map path-type="ant">
<sec:filter-chain pattern="/**" filters="scpf,preAuthFilter,etf,fsi"/>
</sec:filter-chain-map>
</bean>
<bean id="fcpFullStack" class="org.springframework.security.web.FilterChainProxy">
<sec:filter-chain-map path-type="ant">
<sec:filter-chain pattern="/**" filters="scpf,preAuthFilter,apf,basicPf,logoutFilter,scharf,etf,fsi"/>
</sec:filter-chain-map>
</bean>
<bean id="authenticationManager" class="org.springframework.security.authentication.ProviderManager">
<property name="providers">
<list>
<bean class="org.springframework.security.authentication.dao.DaoAuthenticationProvider">
<property name="userDetailsService" ref="userService"/>
</bean>
</list>
</property>
</bean>
<sec:user-service id="userService">
<sec:user name="bob" password="bobspassword" authorities="ROLE_0,ROLE_1"/>
</sec:user-service>
<bean id="scpf" class="org.springframework.security.web.context.SecurityContextPersistenceFilter"/>
<bean id="apf" class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
<property name="authenticationManager" ref="authenticationManager"/>
</bean>
<bean id="basicPf" class="org.springframework.security.web.authentication.www.BasicAuthenticationFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="ignoreFailure" value="true"/>
</bean>
<bean id="preAuthFilter" class="org.springframework.security.web.authentication.preauth.RequestHeaderAuthenticationFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="exceptionIfHeaderMissing" value="false" />
</bean>
<bean id="scharf" class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter" />
<bean id="preAuthenticatedProcessingFilterEntryPoint"
class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
<bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
<constructor-arg value="/"/>
<constructor-arg>
<list>
<bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler"/>
</list>
</constructor-arg>
</bean>
<bean id="etf" class="org.springframework.security.web.access.ExceptionTranslationFilter">
<property name="authenticationEntryPoint" ref="preAuthenticatedProcessingFilterEntryPoint"/>
</bean>
<bean id="apf" class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
<property name="authenticationManager" ref="authenticationManager"/>
</bean>
<bean id="basicPf" class="org.springframework.security.web.authentication.www.BasicAuthenticationFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="ignoreFailure" value="true"/>
</bean>
<bean id="preAuthFilter" class="org.springframework.security.web.authentication.preauth.RequestHeaderAuthenticationFilter">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="exceptionIfHeaderMissing" value="false" />
</bean>
<bean id="scharf" class="org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter" />
<bean id="preAuthenticatedProcessingFilterEntryPoint"
class="org.springframework.security.web.authentication.Http403ForbiddenEntryPoint"/>
<bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
<constructor-arg value="/"/>
<constructor-arg>
<list>
<bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler"/>
</list>
</constructor-arg>
</bean>
<bean id="etf" class="org.springframework.security.web.access.ExceptionTranslationFilter">
<property name="authenticationEntryPoint" ref="preAuthenticatedProcessingFilterEntryPoint"/>
</bean>
<bean id="preAuthenticatedAuthenticationProvider" class="org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationProvider">
<property name="preAuthenticatedUserDetailsService" ref="preAuthenticatedUserDetailsService"/>
</bean>
<bean id="preAuthenticatedUserDetailsService" class="org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper">
<property name="userDetailsService" ref="userService"/>
</bean>
<bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="false"/>
<property name="decisionVoters">
<list>
<ref bean="roleVoter"/>
</list>
</property>
</bean>
<bean id="fsi" class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor">
</bean>
<bean id="preAuthenticatedUserDetailsService" class="org.springframework.security.core.userdetails.UserDetailsByNameServiceWrapper">
<property name="userDetailsService" ref="userService"/>
</bean>
<bean id="accessDecisionManager" class="org.springframework.security.access.vote.AffirmativeBased">
<property name="allowIfAllAbstainDecisions" value="false"/>
<property name="decisionVoters">
<list>
<ref bean="roleVoter"/>
</list>
</property>
</bean>
<bean id="fsi" class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor">
<property name="authenticationManager" ref="authenticationManager"/>
<property name="accessDecisionManager" ref="accessDecisionManager"/>
<property name="accessDecisionManager" ref="accessDecisionManager"/>
<property name="securityMetadataSource">
<sec:filter-security-metadata-source>
<sec:intercept-url pattern="/secure/extreme/**" access="ROLE_2"/>
<sec:intercept-url pattern="/secure/**" access="ROLE_1"/>
<sec:intercept-url pattern="/**" access="ROLE_0"/>
</sec:filter-security-metadata-source>
</property>
</bean>
<bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
</beans>
</sec:filter-security-metadata-source>
</property>
</bean>
<bean id="roleVoter" class="org.springframework.security.access.vote.RoleVoter"/>
</beans>
itest/context/src/test/resources/log4j.properties
-1
View File
@@ -1,6 +1,5 @@
# Logging
#
# $Id$
log4j.rootLogger=WARN, stdout
itest/misc/pom.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<version>${spring.version}</version>
<scope>test</scope>
</dependency>
<!--
<!--
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security</artifactId>
itest/misc/src/test/java/org/springframework/security/concurrent/SessionRegistryImplMTTests.java
-1
View File
@@ -26,7 +26,6 @@ import java.util.Random;
* Tests concurrency access to SessionRegistryImpl.
*
* @author Luke Taylor
* @version $Id$
*/
public class SessionRegistryImplMTTests extends TestCase {
private static final Random rnd = new Random();
itest/misc/src/test/java/org/springframework/security/context/SecurityContextHolderMTTests.java
+7 -7
View File
@@ -11,7 +11,7 @@ import org.springframework.security.providers.UsernamePasswordAuthenticationToke
/**
* Multi-threaded tests for SecurityContextHolder
*
*
* @author Ben Alex
* @Author Luke Taylor
*/
@@ -23,8 +23,8 @@ public class SecurityContextHolderMTTests extends TestCase{
public final void setUp() throws Exception {
SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_INHERITABLETHREADLOCAL);
}
}
public void testSynchronizationCustomStrategyLoading() {
SecurityContextHolder.setStrategyName(InheritableThreadLocalSecurityContextHolderStrategy.class.getName());
assertTrue(new SecurityContextHolder().toString()
@@ -53,8 +53,8 @@ public class SecurityContextHolderMTTests extends TestCase{
SecurityContextHolder.setStrategyName(SecurityContextHolder.MODE_THREADLOCAL);
loadStartAndWaitForThreads(true, "Main_", NUM_THREADS, false, false);
assertEquals("Thread errors detected; review log output for details", 0, errors);
}
}
private void startAndRun(Thread[] threads) {
// Start them up
for (int i = 0; i < threads.length; i++) {
@@ -77,8 +77,8 @@ public class SecurityContextHolderMTTests extends TestCase{
}
return false;
}
}
private void loadStartAndWaitForThreads(boolean topLevelThread, String prefix, int createThreads,
boolean expectAllThreadsToUseIdenticalAuthentication, boolean expectChildrenToShareAuthenticationWithParent) {
Thread[] threads = new Thread[createThreads];
itest/web/src/main/webapp/WEB-INF/classes/log4j.properties
+18 -18
View File
@@ -1,18 +1,18 @@
# Global logging configuration
log4j.rootLogger=INFO, stdout, fileout
log4j.logger.org.springframework.security=DEBUG
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
# Rolling log file output...
log4j.appender.fileout=org.apache.log4j.FileAppender
log4j.appender.fileout.File=itest-web.log
log4j.appender.fileout.Append=false
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n
# Global logging configuration
log4j.rootLogger=INFO, stdout, fileout
log4j.logger.org.springframework.security=DEBUG
# Console output...
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.conversionPattern=[%p,%c{1},%t] %m%n
# Rolling log file output...
log4j.appender.fileout=org.apache.log4j.FileAppender
log4j.appender.fileout.File=itest-web.log
log4j.appender.fileout.Append=false
log4j.appender.fileout.layout=org.apache.log4j.PatternLayout
log4j.appender.fileout.layout.conversionPattern=%d{ABSOLUTE} %5p %c{1},%t:%L - %m%n
itest/web/src/main/webapp/WEB-INF/web.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
itest/web/src/main/webapp/login.jsp
+2 -2
View File
@@ -10,13 +10,13 @@
<body>
<h1>Custom Spring Security Login</h1>
<%
<%
if (request.getParameter("login_error") != null) {
%>
<font color="red">
Your login attempt was not successful, try again.<br/><br/>
</font>
<%
<%
}
%>
itest/web/src/main/webapp/secure/secure1body.jsp
+1 -1
View File
@@ -1,2 +1,2 @@
Params: x=<%= request.getParameter("x") %>, y=<%= request.getParameter("y") %>
xcount=<%= request.getParameterValues("x").length %>
xcount=<%= request.getParameterValues("x").length %>
itest/web/src/test/java/org/springframework/security/integration/AbstractWebServerIntegrationTests.java
-1
View File
@@ -24,7 +24,6 @@ import org.testng.annotations.BeforeClass;
* starting up the webapp.
*
* @author Luke Taylor
* @version $Id$
*/
public abstract class AbstractWebServerIntegrationTests {
private Server server;
itest/web/src/test/java/org/springframework/security/integration/CustomConcurrentSessionManagementTests.java
-1
View File
@@ -7,7 +7,6 @@ import org.testng.annotations.Test;
/**
* @author Luke Taylor
* @version $Id: InMemoryProviderWebAppTests.java 3949 2009-10-11 15:24:17Z ltaylor $
*/
public class CustomConcurrentSessionManagementTests extends AbstractWebServerIntegrationTests {
itest/web/src/test/java/org/springframework/security/integration/InMemoryProviderWebAppTests.java
-1
View File
@@ -6,7 +6,6 @@ import org.testng.annotations.Test;
/**
* @author Luke Taylor
* @version $Id$
*/
public class InMemoryProviderWebAppTests extends AbstractWebServerIntegrationTests {
itest/web/src/test/java/org/springframework/security/integration/LdapWebAppTests.java
-1
View File
@@ -4,7 +4,6 @@ import org.testng.annotations.*;
/**
* @author Luke Taylor
* @version $Id$
*/
public class LdapWebAppTests extends AbstractWebServerIntegrationTests {