Author: raminder
Date: Tue Aug 14 15:56:12 2012
New Revision: 1372949
URL: http://svn.apache.org/viewvc?rev=1372949&view=rev
Log:
Fixed RAVE-758
Modified:
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
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=1372949&r1=1372948&r2=1372949&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
Tue Aug 14 15:56:12 2012
@@ -274,6 +274,10 @@ override on command line with -Dcargo.de
</zipUrlInstaller>
<systemProperties>
<net.sf.ehcache.skipUpdateCheck>true</net.sf.ehcache.skipUpdateCheck>
+ <!-- un-comment following property for: Loading the
SizeOfAgent will probably fail,
+ as you are running on Apple OS X and have a value
set for java.io.tmpdir -->
+ <!--
<net.sf.ehcache.pool.sizeof.AgentSizeOf.bypass>true</net.sf.ehcache.pool.sizeof.AgentSizeOf.bypass>
-->
+
<!-- Documentation:
http://incubator.apache.org/rave/documentation/host-configuration.html -->
<!--
<portal.override.properties>/path/to/custom.portal.properties</portal.override.properties>
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=1372949&r1=1372948&r2=1372949&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
Tue Aug 14 15:56:12 2012
@@ -22,6 +22,7 @@ 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.PersonRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.apache.rave.portal.repository.WidgetCommentRepository;
import org.apache.rave.portal.repository.WidgetRatingRepository;
@@ -54,9 +55,10 @@ public class CustomUserService extends D
WidgetCommentRepository widgetCommentRepository,
WidgetRepository widgetRepository,
PageTemplateRepository pageTemplateRepository,
- CategoryRepository categoryRepository) {
+ CategoryRepository categoryRepository,
+ PersonRepository personRepository) {
super(pageRepository, userRepository, widgetRatingRepository,
widgetCommentRepository,
- widgetRepository,pageTemplateRepository, categoryRepository);
+ 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=1372949&r1=1372948&r2=1372949&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
Tue Aug 14 15:56:12 2012
@@ -27,6 +27,7 @@ import org.apache.rave.portal.model.impl
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;
@@ -66,7 +67,8 @@ public class CustomUserServiceTest {
createMock(WidgetCommentRepository.class),
createMock(WidgetRepository.class),
createMock(PageTemplateRepository.class),
- createMock(CategoryRepository.class));
+ createMock(CategoryRepository.class),
+ createMock(PersonRepository.class));
}
@Test