Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ant format seems to have reformated these differently than what is in CVS

This commit is contained in:
Colin Sampaleanu 2004-04-13 21:59:02 +00:00
parent 2786312b8e
commit a09f2a4c18
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/test/java/org/acegisecurity/MockHttpServletRequest.java
View File

@ -48,8 +48,8 @@ public class MockHttpServletRequest implements HttpServletRequest {
//~ Instance fields ========================================================
private HttpSession session;
private Map paramMap = new HashMap();
private Map headersMap = new HashMap();
private Map paramMap = new HashMap();
private Principal principal;
private String contextPath = "";
private String queryString = null;
@ -66,16 +66,17 @@ public class MockHttpServletRequest implements HttpServletRequest {
this.queryString = queryString;
}
private MockHttpServletRequest() {
super();
}
public MockHttpServletRequest(Map headers, Principal principal, HttpSession session) {
public MockHttpServletRequest(Map headers, Principal principal,
HttpSession session) {
this.headersMap = headers;
this.principal = principal;
this.session = session;
}
private MockHttpServletRequest() {
super();
}
//~ Methods ================================================================
public void setAttribute(String arg0, Object arg1) {

4
core/src/test/java/org/acegisecurity/intercept/web/RegExpBasedFilterDefinitionMapTests.java
View File

@ -25,8 +25,8 @@ import net.sf.acegisecurity.SecurityConfig;
/**
* Tests parts of {@link RegExpBasedFilterInvocationDefinitionMap} not tested by {@link
* FilterInvocationDefinitionSourceEditorTests}.
* Tests parts of {@link RegExpBasedFilterInvocationDefinitionMap} not tested
* by {@link FilterInvocationDefinitionSourceEditorTests}.
*
* @author Ben Alex
* @version $Id$

2
integration-test/src/net/sf/acegisecurity/integrationtests/web/AbstractContactsTests.java
View File

@ -95,7 +95,7 @@ public abstract class AbstractContactsTests extends TestCase {
contactManager.getRandomContact();
fail("Should have thrown RemoteAccessException");
} catch (RemoteAccessException exception) {
assertTrue(true);
assertTrue(true);
}
}

7
samples/contacts/src/main/java/sample/contact/SecureIndexController.java
View File

@ -16,8 +16,8 @@
package sample.contact;
import net.sf.acegisecurity.Authentication;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.AuthenticationCredentialsNotFoundException;
import net.sf.acegisecurity.GrantedAuthority;
import net.sf.acegisecurity.context.ContextHolder;
import net.sf.acegisecurity.context.SecureContext;
@ -67,10 +67,11 @@ public class SecureIndexController implements Controller, InitializingBean {
public ModelAndView handleRequest(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException {
SecureContext secureContext = ((SecureContext) ContextHolder.getContext());
if (null == secureContext) {
throw new AuthenticationCredentialsNotFoundException(
"Authentication credentials were not found in the " +
"SecureContext");
"Authentication credentials were not found in the "
+ "SecureContext");
}
final Authentication currentUser = secureContext.getAuthentication();