Skip to content

Commit c4046ed

Browse files
author
Tareq Abedrabbo
committed
SWS-559 - Upgrade Spring Security to 3.0.2
1 parent 3b8661d commit c4046ed

30 files changed

+725
-139
lines changed

‎parent/pom.xml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -538,31 +538,33 @@
538538
<dependency>
539539
<groupId>org.springframework.security</groupId>
540540
<artifactId>spring-security-core</artifactId>
541-
<version>2.0.5.RELEASE</version>
541+
<version>3.0.2.RELEASE</version>
542542
<exclusions>
543543
<exclusion>
544544
<groupId>org.springframework</groupId>
545545
<artifactId>spring-support</artifactId>
546546
</exclusion>
547547
</exclusions>
548548
</dependency>
549-
<dependency>
550-
<groupId>org.springframework.security</groupId>
551-
<artifactId>spring-security-core-tiger</artifactId>
552-
<version>2.0.5.RELEASE</version>
553-
</dependency>
554549
<dependency>
555550
<groupId>org.springframework.security</groupId>
556551
<artifactId>spring-security-core</artifactId>
557-
<version>2.0.5.RELEASE</version>
552+
<version>3.0.2.RELEASE</version>
558553
<classifier>tests</classifier>
559554
<exclusions>
560555
<exclusion>
561556
<groupId>org.springframework</groupId>
562557
<artifactId>spring-support</artifactId>
563558
</exclusion>
564559
</exclusions>
565-
</dependency>
560+
</dependency>
561+
<!-- X.509 dependencies -->
562+
<dependency>
563+
<groupId>net.sf.ehcache</groupId>
564+
<artifactId>ehcache-core</artifactId>
565+
<version>2.0.1</version>
566+
<optional>true</optional>
567+
</dependency>
566568
<!-- JEE dependencies -->
567569
<dependency>
568570
<groupId>javax.xml.soap</groupId>

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@
408408
<artifactItem>
409409
<groupId>org.springframework.security</groupId>
410410
<artifactId>spring-security-core</artifactId>
411-
<version>2.0.5.RELEASE</version>
411+
<version>3.0.2.RELEASE</version>
412412
<outputDirectory>${project.build.directory}/dependency/spring-security/</outputDirectory>
413413
</artifactItem>
414414
<!--Java EE-->

‎samples/airline/server/pom.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,6 @@
246246
<groupId>org.springframework.security</groupId>
247247
<artifactId>spring-security-core</artifactId>
248248
</dependency>
249-
<dependency>
250-
<groupId>org.springframework.security</groupId>
251-
<artifactId>spring-security-core-tiger</artifactId>
252-
</dependency>
253249
<dependency>
254250
<groupId>org.apache.activemq</groupId>
255251
<artifactId>activemq-core</artifactId>
@@ -269,7 +265,7 @@
269265
<dependency>
270266
<groupId>org.springframework.security</groupId>
271267
<artifactId>spring-security-core</artifactId>
272-
<version>2.0.5.RELEASE</version>
268+
<version>3.0.2.RELEASE</version>
273269
<classifier>tests</classifier>
274270
<scope>test</scope>
275271
</dependency>

‎samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/FrequentFlyerDetails.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,12 @@
1616

1717
package org.springframework.ws.samples.airline.security;
1818

19-
import org.springframework.security.GrantedAuthority;
20-
import org.springframework.security.GrantedAuthorityImpl;
21-
import org.springframework.security.userdetails.UserDetails;
19+
import java.util.ArrayList;
20+
import java.util.Collection;
21+
22+
import org.springframework.security.core.GrantedAuthority;
23+
import org.springframework.security.core.authority.GrantedAuthorityImpl;
24+
import org.springframework.security.core.userdetails.UserDetails;
2225
import org.springframework.ws.samples.airline.domain.FrequentFlyer;
2326

2427
/**
@@ -31,14 +34,17 @@ public class FrequentFlyerDetails implements UserDetails {
3134

3235
private FrequentFlyer frequentFlyer;
3336

34-
public static final GrantedAuthority[] GRANTED_AUTHORITIES =
35-
new GrantedAuthority[]{new GrantedAuthorityImpl("ROLE_FREQUENT_FLYER")};
37+
public static final Collection<GrantedAuthority> GRANTED_AUTHORITIES =
38+
new ArrayList<GrantedAuthority>();
39+
{
40+
GRANTED_AUTHORITIES.add(new GrantedAuthorityImpl("ROLE_FREQUENT_FLYER"));
41+
};
3642

3743
public FrequentFlyerDetails(FrequentFlyer frequentFlyer) {
3844
this.frequentFlyer = frequentFlyer;
3945
}
4046

41-
public GrantedAuthority[] getAuthorities() {
47+
public Collection<GrantedAuthority> getAuthorities() {
4248
return GRANTED_AUTHORITIES;
4349
}
4450

‎samples/airline/server/src/main/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
package org.springframework.ws.samples.airline.security;
1818

1919
import org.springframework.dao.DataAccessException;
20-
import org.springframework.security.Authentication;
21-
import org.springframework.security.context.SecurityContext;
22-
import org.springframework.security.context.SecurityContextHolder;
23-
import org.springframework.security.userdetails.UserDetails;
24-
import org.springframework.security.userdetails.UserDetailsService;
25-
import org.springframework.security.userdetails.UsernameNotFoundException;
20+
import org.springframework.security.core.Authentication;
21+
import org.springframework.security.core.context.SecurityContext;
22+
import org.springframework.security.core.context.SecurityContextHolder;
23+
import org.springframework.security.core.userdetails.UserDetails;
24+
import org.springframework.security.core.userdetails.UserDetailsService;
25+
import org.springframework.security.core.userdetails.UsernameNotFoundException;
2626
import org.springframework.transaction.annotation.Transactional;
2727
import org.springframework.ws.samples.airline.dao.FrequentFlyerDao;
2828
import org.springframework.ws.samples.airline.domain.FrequentFlyer;

‎samples/airline/server/src/main/java/org/springframework/ws/samples/airline/service/impl/AirlineServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.joda.time.LocalDate;
2424

2525
import org.springframework.beans.factory.annotation.Autowired;
26-
import org.springframework.security.annotation.Secured;
26+
import org.springframework.security.access.annotation.Secured;
2727
import org.springframework.stereotype.Service;
2828
import org.springframework.transaction.annotation.Transactional;
2929
import org.springframework.util.Assert;

‎samples/airline/server/src/test/java/org/springframework/ws/samples/airline/security/SpringFrequentFlyerSecurityServiceTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import junit.framework.TestCase;
2020
import static org.easymock.EasyMock.*;
2121

22-
import org.springframework.security.context.SecurityContext;
23-
import org.springframework.security.context.SecurityContextHolder;
24-
import org.springframework.security.context.SecurityContextImpl;
25-
import org.springframework.security.providers.TestingAuthenticationToken;
26-
import org.springframework.security.GrantedAuthority;
22+
import org.springframework.security.core.context.SecurityContext;
23+
import org.springframework.security.core.context.SecurityContextHolder;
24+
import org.springframework.security.core.context.SecurityContextImpl;
25+
import org.springframework.security.authentication.TestingAuthenticationToken;
26+
import org.springframework.security.core.GrantedAuthority;
2727
import org.springframework.ws.samples.airline.dao.FrequentFlyerDao;
2828
import org.springframework.ws.samples.airline.domain.FrequentFlyer;
2929

@@ -42,7 +42,7 @@ protected void setUp() throws Exception {
4242
public void testGetCurrentlyAuthenticatedFrequentFlyer() throws Exception {
4343
FrequentFlyer frequentFlyer = new FrequentFlyer("john");
4444
FrequentFlyerDetails detail = new FrequentFlyerDetails(frequentFlyer);
45-
TestingAuthenticationToken token = new TestingAuthenticationToken(detail, null, (GrantedAuthority[])null);
45+
TestingAuthenticationToken token = new TestingAuthenticationToken(detail, null, new GrantedAuthority[]{});
4646
SecurityContext context = new SecurityContextImpl();
4747
context.setAuthentication(token);
4848
SecurityContextHolder.setContext(context);
@@ -60,4 +60,4 @@ public void testGetFrequentFlyer() throws Exception {
6060
assertEquals("Invalid result", frequentFlyer, result);
6161
verify(flyerDaoMock);
6262
}
63-
}
63+
}

‎security/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@
107107
<dependency>
108108
<groupId>org.springframework.security</groupId>
109109
<artifactId>spring-security-core</artifactId>
110+
</dependency>
111+
<!-- X.509 dependencies -->
112+
<dependency>
113+
<groupId>net.sf.ehcache</groupId>
114+
<artifactId>ehcache-core</artifactId>
110115
<optional>true</optional>
111116
</dependency>
112117
<!-- JEE dependencies -->
@@ -118,7 +123,7 @@
118123
<dependency>
119124
<groupId>org.springframework.security</groupId>
120125
<artifactId>spring-security-core</artifactId>
121-
<version>2.0.5.RELEASE</version>
126+
<version>3.0.2.RELEASE</version>
122127
<classifier>tests</classifier>
123128
<scope>test</scope>
124129
</dependency>

‎security/src/main/java/org/springframework/ws/soap/security/support/SpringSecurityUtils.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515

1616
package org.springframework.ws.soap.security.support;
1717

18-
import org.springframework.security.userdetails.UserDetails;
19-
import org.springframework.security.LockedException;
20-
import org.springframework.security.DisabledException;
21-
import org.springframework.security.AccountExpiredException;
22-
import org.springframework.security.CredentialsExpiredException;
18+
import org.springframework.security.core.userdetails.UserDetails;
19+
import org.springframework.security.authentication.LockedException;
20+
import org.springframework.security.authentication.DisabledException;
21+
import org.springframework.security.authentication.AccountExpiredException;
22+
import org.springframework.security.authentication.CredentialsExpiredException;
2323

2424
/**
2525
* Generic utility methods for Spring Security

‎security/src/main/java/org/springframework/ws/soap/security/wss4j/callback/SpringDigestPasswordValidationCallbackHandler.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424

2525
import org.springframework.beans.factory.InitializingBean;
2626
import org.springframework.dao.DataAccessException;
27-
import org.springframework.security.context.SecurityContextHolder;
28-
import org.springframework.security.providers.UsernamePasswordAuthenticationToken;
29-
import org.springframework.security.providers.dao.UserCache;
30-
import org.springframework.security.providers.dao.cache.NullUserCache;
31-
import org.springframework.security.userdetails.UserDetails;
32-
import org.springframework.security.userdetails.UserDetailsService;
33-
import org.springframework.security.userdetails.UsernameNotFoundException;
27+
import org.springframework.security.core.context.SecurityContextHolder;
28+
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
29+
import org.springframework.security.core.userdetails.UserCache;
30+
import org.springframework.security.core.userdetails.cache.NullUserCache;
31+
import org.springframework.security.core.userdetails.UserDetails;
32+
import org.springframework.security.core.userdetails.UserDetailsService;
33+
import org.springframework.security.core.userdetails.UsernameNotFoundException;
3434
import org.springframework.util.Assert;
3535
import org.springframework.ws.soap.security.callback.CleanupCallback;
3636
import org.springframework.ws.soap.security.support.SpringSecurityUtils;
@@ -43,7 +43,7 @@
4343
* password contained in this details object is then compared with the digest in the message.
4444
*
4545
* @author Arjen Poutsma
46-
* @see org.springframework.security.userdetails.UserDetailsService
46+
* @see org.springframework.security.core.userdetails.UserDetailsService
4747
* @see org.springframework.security.ui.digestauth.DigestProcessingFilter
4848
* @since 1.5.0
4949
*/
@@ -113,4 +113,4 @@ private UserDetails loadUserDetails(String username) throws DataAccessException
113113
}
114114
return user;
115115
}
116-
}
116+
}

0 commit comments

Comments
 (0)