Author: jasha
Date: Mon Jul 16 11:29:07 2012
New Revision: 1361976
URL: http://svn.apache.org/viewvc?rev=1361976&view=rev
Log:
Update vanilla-extension to latest trunk
Added:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/static/
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/static/css/
- copied from r1361967,
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/
Removed:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/css/
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml
Modified: rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
--- rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml (original)
+++ rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml Mon Jul 16
11:29:07 2012
@@ -31,10 +31,10 @@
<module>rave-vanilla-extension-shindig</module>
</modules>
<packaging>pom</packaging>
- <version>0.10-SNAPSHOT</version>
+ <version>0.14-SNAPSHOT</version>
<properties>
- <apache.rave.version>0.10-SNAPSHOT</apache.rave.version>
- <com.h2database.version>1.3.154</com.h2database.version>
+ <apache.rave.version>0.14-SNAPSHOT</apache.rave.version>
+ <com.h2database.version>1.3.167</com.h2database.version>
<org.springframework.version>3.1.0.RELEASE</org.springframework.version>
<javax.servlet.version>2.5</javax.servlet.version>
<javax.mail.version>1.4.4</javax.mail.version>
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
(original)
+++
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/pom.xml
Mon Jul 16 11:29:07 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>rave-vanilla-extension</artifactId>
<groupId>org.apache.rave</groupId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.14-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
(original)
+++
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/java/org/apache/rave/portal/service/impl/CustomUserService.java
Mon Jul 16 11:29:07 2012
@@ -20,6 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.apache.rave.portal.repository.WidgetCommentRepository;
@@ -52,9 +53,10 @@ public class CustomUserService extends D
WidgetRatingRepository widgetRatingRepository,
WidgetCommentRepository widgetCommentRepository,
WidgetRepository widgetRepository,
- PageTemplateRepository pageTemplateRepository) {
+ PageTemplateRepository pageTemplateRepository,
+ CategoryRepository categoryRepository) {
super(pageRepository, userRepository, widgetRatingRepository,
widgetCommentRepository,
- widgetRepository,pageTemplateRepository);
+ widgetRepository,pageTemplateRepository, categoryRepository);
this.userRepository = userRepository;
}
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
(original)
+++
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/applicationContext-security.xml
Mon Jul 16 11:29:07 2012
@@ -19,15 +19,16 @@
-->
<!--
- This security file uses the default spring simple form login
+ This security file uses the default spring simple form login
-->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:security="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-3.1.xsd";>
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd";>
<security:http auto-config="true" use-expressions="true"
disable-url-rewriting="true">
+ <security:intercept-url pattern="/static/**" access="permitAll"/>
<security:intercept-url pattern="/login" access="permitAll"/>
<security:intercept-url pattern="/newaccount.jsp*" access="permitAll"/>
<security:intercept-url pattern="/app/newaccount*" access="permitAll"/>
@@ -35,9 +36,6 @@
<security:intercept-url pattern="/app/retrieveusername/**"
access="permitAll"/>
<security:intercept-url pattern="/app/changepassword/**"
access="permitAll"/>
<security:intercept-url pattern="/app/messagebundle/*.js"
access="permitAll"/>
- <security:intercept-url pattern="/css/**" access="permitAll"/>
- <security:intercept-url pattern="/images/**" access="permitAll"/>
- <security:intercept-url pattern="/script/**" access="permitAll"/>
<security:intercept-url pattern="/app/admin/**"
access="hasRole('ROLE_ADMIN')"/> <!-- all urls must be authenticated -->
<security:intercept-url pattern="/**"
access="hasAnyRole('ROLE_USER','ROLE_ADMIN')"/>
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
(original)
+++
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/main/webapp/WEB-INF/tags/custom_css.tag
Mon Jul 16 11:29:07 2012
@@ -19,4 +19,4 @@
under the License.
--%>
-<link rel="stylesheet" href="<c:url value="/css/custom.css" />" />
+<link rel="stylesheet" href="<c:url value="/static/css/custom.css" />" />
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
(original)
+++
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-portal/src/test/java/org/apache/rave/portal/service/impl/CustomUserServiceTest.java
Mon Jul 16 11:29:07 2012
@@ -19,24 +19,18 @@
package org.apache.rave.portal.service.impl;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-
import java.util.ArrayList;
import java.util.List;
import org.apache.rave.portal.model.User;
+import org.apache.rave.portal.model.impl.UserImpl;
+import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.repository.PageRepository;
+import org.apache.rave.portal.repository.PageTemplateRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.apache.rave.portal.repository.WidgetCommentRepository;
import org.apache.rave.portal.repository.WidgetRatingRepository;
import org.apache.rave.portal.repository.WidgetRepository;
-import org.apache.rave.portal.repository.PageTemplateRepository;
import org.junit.Before;
import org.junit.Test;
import org.springframework.security.authentication.TestingAuthenticationToken;
@@ -47,6 +41,14 @@ import org.springframework.security.core
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
/**
* Test class for {@link CustomUserService}
*/
@@ -63,13 +65,14 @@ public class CustomUserServiceTest {
createMock(WidgetRatingRepository.class),
createMock(WidgetCommentRepository.class),
createMock(WidgetRepository.class),
- createMock(PageTemplateRepository.class));
+ createMock(PageTemplateRepository.class),
+ createMock(CategoryRepository.class));
}
@Test
public void testLoadUserByUsername() throws Exception {
final String username = "canonical";
- User user = new User(1L, username);
+ User user = new UserImpl(1L, username);
expect(repository.getByUsername(username)).andReturn(user);
replay(repository);
@@ -95,7 +98,7 @@ public class CustomUserServiceTest {
public void testGetAuthenticatedUser() throws Exception {
List<GrantedAuthority> grantedAuthorities = new
ArrayList<GrantedAuthority>();
grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_USER"));
- UserDetails userDetails = new User(1L, "canonical");
+ UserDetails userDetails = new UserImpl(1L, "canonical");
Authentication authentication = new
TestingAuthenticationToken(userDetails, "canonical", grantedAuthorities);
SecurityContextHolder.getContext().setAuthentication(authentication);
Modified:
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml?rev=1361976&r1=1361975&r2=1361976&view=diff
==============================================================================
---
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml
(original)
+++
rave/sandbox/rave-extensions/rave-vanilla-extension/rave-vanilla-extension-shindig/pom.xml
Mon Jul 16 11:29:07 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>rave-vanilla-extension</artifactId>
<groupId>org.apache.rave</groupId>
- <version>0.10-SNAPSHOT</version>
+ <version>0.14-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
