Author: jasha
Date: Sat Dec 29 13:04:13 2012
New Revision: 1426756
URL: http://svn.apache.org/viewvc?rev=1426756&view=rev
Log:
Update Rave-Vanilla-Extension after 0.15 - 0.18 release
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/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=1426756&r1=1426755&r2=1426756&view=diff
==============================================================================
--- rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml (original)
+++ rave/sandbox/rave-extensions/rave-vanilla-extension/pom.xml Sat Dec 29
13:04:13 2012
@@ -30,21 +30,21 @@
<module>rave-vanilla-extension-shindig</module>
</modules>
<packaging>pom</packaging>
- <version>0.15-SNAPSHOT</version>
+ <version>0.19-SNAPSHOT</version>
<properties>
- <apache.rave.version>0.15-SNAPSHOT</apache.rave.version>
- <com.h2database.version>1.3.167</com.h2database.version>
- <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
+ <apache.rave.version>0.19-SNAPSHOT</apache.rave.version>
+ <com.h2database.version>1.3.170</com.h2database.version>
+ <org.springframework.version>3.2.0.RELEASE</org.springframework.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <javax.mail.version>1.4.4</javax.mail.version>
+ <javax.mail.version>1.4.5</javax.mail.version>
<jsp-api.version>2.1</jsp-api.version>
<el-api.version>1.0</el-api.version>
- <org.slf4j.version>1.6.1</org.slf4j.version>
- <log4j.version>1.2.16</log4j.version>
+ <org.slf4j.version>1.7.2</org.slf4j.version>
+ <log4j.version>1.2.17</log4j.version>
<commons-lang.version>2.6</commons-lang.version>
- <junit.version>4.7</junit.version>
- <easymock.version>3.0</easymock.version>
+ <junit.version>4.11</junit.version>
+ <easymock.version>3.1</easymock.version>
<javaagent/>
<!-- Force maven-filesync-plugin rewrite the Eclipse FileSync plugin
configuration with
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=1426756&r1=1426755&r2=1426756&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
Sat Dec 29 13:04:13 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>rave-vanilla-extension</artifactId>
<groupId>org.apache.rave</groupId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.19-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,7 @@
<packaging>war</packaging>
<properties>
- <cargo.version>1.1.0</cargo.version>
+ <cargo.version>1.3.1</cargo.version>
<!-- if you want a remote debugging on a different a address
override on command line with -Dcargo.debug.addres=xxxx -->
<cargo.debug.address>8000</cargo.debug.address>
@@ -226,7 +226,33 @@ override on command line with -Dcargo.de
<artifactId>cargo-maven2-plugin</artifactId>
<version>${cargo.version}</version>
<configuration>
- <wait>true</wait>
+ <deployables>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-vanilla-extension-shindig</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/ROOT</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-demo-gadgets</artifactId>
+ <type>war</type>
+ <!-- I tried giving this name gagdets and it did not
work. -->
+ <properties>
+ <context>/demogadgets</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>org.apache.rave</groupId>
+ <artifactId>rave-vanilla-extension-portal</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/portal</context>
+ </properties>
+ </deployable>
+ </deployables>
<configuration>
<properties>
<cargo.jvmargs>
@@ -235,33 +261,6 @@ override on command line with -Dcargo.de
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
</properties>
<home>${project.build.directory}/tomcat6x</home>
- <deployables>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-vanilla-extension-shindig</artifactId>
- <type>war</type>
- <properties>
- <context>/ROOT</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
- <artifactId>rave-demo-gadgets</artifactId>
- <type>war</type>
- <!-- I tried giving this name gagdets and it did not
work. -->
- <properties>
- <context>/demogadgets</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>org.apache.rave</groupId>
-
<artifactId>rave-vanilla-extension-portal</artifactId>
- <type>war</type>
- <properties>
- <context>/portal</context>
- </properties>
- </deployable>
- </deployables>
</configuration>
<container>
<containerId>tomcat6x</containerId>
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=1426756&r1=1426755&r2=1426756&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
Sat Dec 29 13:04:13 2012
@@ -22,12 +22,10 @@ package org.apache.rave.portal.service.i
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.PageTemplateRepository;
import org.apache.rave.portal.repository.PersonRepository;
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.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,14 +49,11 @@ public class CustomUserService extends D
@Autowired
public CustomUserService(UserRepository userRepository,
PageRepository pageRepository,
- WidgetRatingRepository widgetRatingRepository,
- WidgetCommentRepository widgetCommentRepository,
WidgetRepository widgetRepository,
PageTemplateRepository pageTemplateRepository,
CategoryRepository categoryRepository,
PersonRepository personRepository) {
- super(pageRepository, userRepository, widgetRatingRepository,
widgetCommentRepository,
- widgetRepository,pageTemplateRepository,
categoryRepository,personRepository);
+ super(pageRepository, userRepository,
widgetRepository,pageTemplateRepository, categoryRepository,personRepository);
this.userRepository = userRepository;
}
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=1426756&r1=1426755&r2=1426756&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
Sat Dec 29 13:04:13 2012
@@ -19,9 +19,6 @@
package org.apache.rave.portal.service.impl;
-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;
@@ -29,8 +26,6 @@ import org.apache.rave.portal.repository
import org.apache.rave.portal.repository.PageTemplateRepository;
import org.apache.rave.portal.repository.PersonRepository;
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.junit.Before;
import org.junit.Test;
@@ -42,6 +37,9 @@ import org.springframework.security.core
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import java.util.ArrayList;
+import java.util.List;
+
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertFalse;
import static org.easymock.EasyMock.createMock;
@@ -63,8 +61,6 @@ public class CustomUserServiceTest {
repository = createMock(UserRepository.class);
userService = new CustomUserService(repository,
createMock(PageRepository.class),
- createMock(WidgetRatingRepository.class),
- createMock(WidgetCommentRepository.class),
createMock(WidgetRepository.class),
createMock(PageTemplateRepository.class),
createMock(CategoryRepository.class),
@@ -74,7 +70,7 @@ public class CustomUserServiceTest {
@Test
public void testLoadUserByUsername() throws Exception {
final String username = "canonical";
- User user = new UserImpl(1L, username);
+ User user = new UserImpl("1", username);
expect(repository.getByUsername(username)).andReturn(user);
replay(repository);
@@ -100,7 +96,7 @@ public class CustomUserServiceTest {
public void testGetAuthenticatedUser() throws Exception {
List<GrantedAuthority> grantedAuthorities = new
ArrayList<GrantedAuthority>();
grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_USER"));
- UserDetails userDetails = new UserImpl(1L, "canonical");
+ UserDetails userDetails = new UserImpl("1", "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=1426756&r1=1426755&r2=1426756&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
Sat Dec 29 13:04:13 2012
@@ -23,7 +23,7 @@
<parent>
<artifactId>rave-vanilla-extension</artifactId>
<groupId>org.apache.rave</groupId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.19-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
