Author: cgeer
Date: Sat Jun 1 08:40:39 2013
New Revision: 1488491
URL: http://svn.apache.org/r1488491
Log:
Updated to support Rave 0.21.1
Modified:
rave/sandbox/rave-extensions/rave-extension-sso/pom.xml
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilter.java
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandler.java
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilterTest.java
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandlerTest.java
Modified: rave/sandbox/rave-extensions/rave-extension-sso/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-extension-sso/pom.xml?rev=1488491&r1=1488490&r2=1488491&view=diff
==============================================================================
--- rave/sandbox/rave-extensions/rave-extension-sso/pom.xml (original)
+++ rave/sandbox/rave-extensions/rave-extension-sso/pom.xml Sat Jun 1 08:40:39
2013
@@ -27,14 +27,14 @@
<groupId>org.apache.rave.extensions</groupId>
<artifactId>rave-extension-sso</artifactId>
<description>Rave Extension for Single Sign-On authentication</description>
- <version>0.14-SNAPSHOT</version>
+ <version>0.21-SNAPSHOT</version>
<inceptionYear>2011</inceptionYear>
<properties>
- <apache.rave.version>0.14-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.21.1</apache.rave.version>
- <org.springframework.version>3.1.0.RELEASE</org.springframework.version>
+ <org.springframework.version>3.2.0.RELEASE</org.springframework.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
Modified:
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilter.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilter.java?rev=1488491&r1=1488490&r2=1488491&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilter.java
(original)
+++
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilter.java
Sat Jun 1 08:40:39 2013
@@ -24,7 +24,8 @@ import org.apache.rave.portal.security.S
import org.apache.rave.portal.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.security.web.authentication.preauth.RequestHeaderAuthenticationFilter;
-import org.springframework.util.Assert;
+
+import static org.apache.commons.lang.Validate.notNull;
/**
* Handles for SSO request headers to create Authorization ids.
@@ -48,8 +49,8 @@ public class SSORequestHeaderAuthenticat
@Override
public void afterPropertiesSet() {
super.afterPropertiesSet();
- Assert.notNull(userService, "An UserService must be set");
- Assert.notNull(loginHandler, "An SSOLoginHandler must be set");
+ notNull(userService, "An UserService must be set");
+ notNull(loginHandler, "An SSOLoginHandler must be set");
}
/**
Modified:
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandler.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandler.java?rev=1488491&r1=1488490&r2=1488491&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandler.java
(original)
+++
rave/sandbox/rave-extensions/rave-extension-sso/src/main/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandler.java
Sat Jun 1 08:40:39 2013
@@ -25,8 +25,8 @@ import java.util.HashSet;
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.User;
+import org.apache.rave .model.Authority;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.security.SSOLoginHandler;
import org.apache.rave.portal.security.exception.NewUserException;
@@ -35,12 +35,15 @@ import org.apache.rave.portal.service.Ne
import org.apache.rave.portal.service.UserService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
/**
* Handles creation and updating of user account details when
* authenticating a user.
*/
+@Component
public class DefaultSSOLoginHandler implements SSOLoginHandler {
private static final Logger logger =
LoggerFactory.getLogger(DefaultSSOLoginHandler.class);
@@ -56,6 +59,7 @@ public class DefaultSSOLoginHandler impl
private String defaultPageLayout;
private String defaultUserRole;
+ @Autowired
public DefaultSSOLoginHandler(NewAccountService newAccountService,
UserService userService, AuthorityService
authorityService) {
this.newAccountService = newAccountService;
Modified:
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilterTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilterTest.java?rev=1488491&r1=1488490&r2=1488491&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilterTest.java
(original)
+++
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/filter/SSORequestHeaderAuthenticationFilterTest.java
Sat Jun 1 08:40:39 2013
@@ -1,6 +1,6 @@
package org.apache.rave.portal.security.filter;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.security.SSOLoginHandler;
import org.apache.rave.portal.service.UserService;
@@ -71,7 +71,7 @@ public class SSORequestHeaderAuthenticat
final String username = "john.doe";
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("USERNAME", username);
- User user = new UserImpl(1L, username);
+ User user = new UserImpl("1", username);
expect(userService.getUserByUsername(username)).andReturn(user);
replay(userService);
Modified:
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandlerTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandlerTest.java?rev=1488491&r1=1488490&r2=1488491&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandlerTest.java
(original)
+++
rave/sandbox/rave-extensions/rave-extension-sso/src/test/java/org/apache/rave/portal/security/impl/DefaultSSOLoginHandlerTest.java
Sat Jun 1 08:40:39 2013
@@ -20,8 +20,8 @@ package org.apache.rave.portal.security.
import javax.servlet.http.HttpServletRequest;
-import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Authority;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.impl.AuthorityImpl;
import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.service.AuthorityService;
@@ -71,7 +71,7 @@ public class DefaultSSOLoginHandlerTest
newUser.setUsername("mrsmith");
newUser.setEmail("[email protected]");
newUser.setDefaultPageLayoutCode("columns_2");
- User user = new UserImpl(1L, "mrsmith");
+ User user = new UserImpl("1", "mrsmith");
Authority authority= new AuthorityImpl();
authority.setAuthority("ROLE_USER");
