Author: cgeer
Date: Sun Jul 29 19:55:47 2012
New Revision: 1366928
URL: http://svn.apache.org/viewvc?rev=1366928&view=rev
Log:
RAVE-726 Updated to support Rave 0.14-SNAPSHOT
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/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=1366928&r1=1366927&r2=1366928&view=diff
==============================================================================
--- rave/sandbox/rave-extensions/rave-extension-sso/pom.xml (original)
+++ rave/sandbox/rave-extensions/rave-extension-sso/pom.xml Sun Jul 29 19:55:47
2012
@@ -27,12 +27,12 @@
<groupId>org.apache.rave.extensions</groupId>
<artifactId>rave-extension-sso</artifactId>
<description>Rave Extension for Single Sign-On authentication</description>
- <version>0.9-SNAPSHOT</version>
+ <version>0.14-SNAPSHOT</version>
<inceptionYear>2011</inceptionYear>
<properties>
- <apache.rave.version>0.9-incubating-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.14-SNAPSHOT</apache.rave.version>
<org.springframework.version>3.1.0.RELEASE</org.springframework.version>
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=1366928&r1=1366927&r2=1366928&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
Sun Jul 29 19:55:47 2012
@@ -26,8 +26,8 @@ import javax.servlet.http.HttpServletReq
import org.apache.commons.lang.RandomStringUtils;
import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.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;
import org.apache.rave.portal.service.AuthorityService;
@@ -99,10 +99,10 @@ public class DefaultSSOLoginHandler impl
}
private void createNewUser(String username, String email) {
- NewUser newUser = new NewUser();
+ User newUser = new UserImpl();
newUser.setUsername(username);
newUser.setEmail(email);
- newUser.setPageLayout(getDefaultPageLayout());
+ newUser.setDefaultPageLayoutCode(getDefaultPageLayout());
newUser.setPassword(RandomStringUtils.random(16));
try {
newAccountService.createNewAccount(newUser);
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=1366928&r1=1366927&r2=1366928&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
Sun Jul 29 19:55:47 2012
@@ -1,6 +1,7 @@
package org.apache.rave.portal.security.filter;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
import org.apache.rave.portal.security.SSOLoginHandler;
import org.apache.rave.portal.service.UserService;
import org.junit.Before;
@@ -70,7 +71,7 @@ public class SSORequestHeaderAuthenticat
final String username = "john.doe";
MockHttpServletRequest request = new MockHttpServletRequest();
request.addHeader("USERNAME", username);
- User user = new User(1L, username);
+ User user = new UserImpl(1L, 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=1366928&r1=1366927&r2=1366928&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
Sun Jul 29 19:55:47 2012
@@ -21,8 +21,9 @@ package org.apache.rave.portal.security.
import javax.servlet.http.HttpServletRequest;
import org.apache.rave.portal.model.Authority;
-import org.apache.rave.portal.model.NewUser;
import org.apache.rave.portal.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;
import org.apache.rave.portal.service.NewAccountService;
import org.apache.rave.portal.service.UserService;
@@ -66,13 +67,13 @@ public class DefaultSSOLoginHandlerTest
HttpServletRequest mockRequest = new MockHttpServletRequest();
mockRequest.setAttribute("EMAIL", "[email protected]");
- NewUser newUser = new NewUser();
+ User newUser = new UserImpl();
newUser.setUsername("mrsmith");
newUser.setEmail("[email protected]");
- newUser.setPageLayout("columns_2");
- User user = new User(1L, "mrsmith");
+ newUser.setDefaultPageLayoutCode("columns_2");
+ User user = new UserImpl(1L, "mrsmith");
- Authority authority= new Authority();
+ Authority authority= new AuthorityImpl();
authority.setAuthority("ROLE_USER");
expect(authorityService.getAuthorityByName("ROLE_USER")).andReturn(authority);
