You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by cg...@apache.org on 2013/03/22 17:13:07 UTC
svn commit: r1459881 [3/8] - in /rave/trunk: ./ rave-components/
rave-components/rave-core-api/ rave-components/rave-core-api/src/
rave-components/rave-core-api/src/main/
rave-components/rave-core-api/src/main/java/
rave-components/rave-core-api/src/ma...
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/UserRepository.java Fri Mar 22 16:12:58 2013
@@ -19,38 +19,38 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import java.util.List;
public interface UserRepository extends Repository<User> {
/**
- * Gets a {@link org.apache.rave.portal.model.User} by its username
+ * Gets a {@link org.apache.rave.model.User} by its username
*
* @param username the (unique) name of the user
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getByUsername(String username);
/**
- * Gets a {@link org.apache.rave.portal.model.User} by its email address
+ * Gets a {@link org.apache.rave.model.User} by its email address
*
* @param userEmail the (unique) email address of the user
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getByUserEmail(String userEmail);
/**
- * Gets a {@link org.apache.rave.portal.model.User} by openId
+ * Gets a {@link org.apache.rave.model.User} by openId
*
* @param openId the (unique) openIdURL of the user
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getByOpenId(String openId);
/**
- * List of {@link org.apache.rave.portal.model.User}'s with a limited resultset
+ * List of {@link org.apache.rave.model.User}'s with a limited resultset
*
* @param offset start point within the total resultset
* @param pageSize maximum number of items to be returned (for paging)
@@ -59,12 +59,12 @@ public interface UserRepository extends
List<User> getLimitedList(int offset, int pageSize);
/**
- * @return the total number of {@link org.apache.rave.portal.model.User}'s in the repository. Useful for paging.
+ * @return the total number of {@link org.apache.rave.model.User}'s in the repository. Useful for paging.
*/
int getCountAll();
/**
- * List of {@link org.apache.rave.portal.model.User}'s that match a searchterm in their username or email address
+ * List of {@link org.apache.rave.model.User}'s that match a searchterm in their username or email address
*
* @param searchTerm search term
* @param offset start point within the total resultset
@@ -76,7 +76,7 @@ public interface UserRepository extends
/**
*
* @param searchTerm search term
- * @return the total number of {@link org.apache.rave.portal.model.User}'s that match a searchterm in their username or email address.
+ * @return the total number of {@link org.apache.rave.model.User}'s that match a searchterm in their username or email address.
* Useful for paging.
*/
int getCountByUsernameOrEmail(String searchTerm);
@@ -90,10 +90,10 @@ public interface UserRepository extends
List<User> getAllByAddedWidget(String widgetId);
/**
- * Gets a {@link org.apache.rave.portal.model.User} by generated forgot email hash
+ * Gets a {@link org.apache.rave.model.User} by generated forgot email hash
*
* @param hash unique generated hash
- * @return {@link org.apache.rave.portal.model.User} if one exists for given hash, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists for given hash, otherwise {@literal null}
*/
User getByForgotPasswordHash(String hash);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.repository;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.util.WidgetStatistics;
import java.util.List;
@@ -45,7 +45,7 @@ public interface WidgetRepository extend
List<Widget> getLimitedList(int offset, int pageSize);
/**
- * @return the total number of {@link Widget}'s in the repository. Useful for paging.
+ * @return the total number of {@link org.apache.rave.model.Widget}'s in the repository. Useful for paging.
*/
int getCountAll();
@@ -143,7 +143,7 @@ public interface WidgetRepository extend
* Generates the mapping of widget ratings for the user.
*
* @param userId id of the user
- * @return Mapping of {@link org.apache.rave.portal.model.WidgetRating} objects keyed off of the widget's entityId
+ * @return Mapping of {@link org.apache.rave.model.WidgetRating} objects keyed off of the widget's entityId
*/
Map<String, WidgetRating> getUsersWidgetRatings(String userId);
@@ -178,19 +178,19 @@ public interface WidgetRepository extend
// ***************************************************************************************************************
/**
- * Tries to find a {@link org.apache.rave.portal.model.WidgetTag} by the id's of a Widget and Tag keyword
+ * Tries to find a {@link org.apache.rave.model.WidgetTag} by the id's of a Widget and Tag keyword
*
* @param widgetId unique identifier of a Widget
* @param keyword tag's keyword
- * @return {@link org.apache.rave.portal.model.WidgetTag} if it exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.WidgetTag} if it exists, otherwise {@literal null}
*/
WidgetTag getTagByWidgetIdAndKeyword(String widgetId, String keyword);
/**
- * Tries to find a {@link org.apache.rave.portal.model.WidgetTag} by the id of the Tag
+ * Tries to find a {@link org.apache.rave.model.WidgetTag} by the id of the Tag
*
* @param widgetTagId tag's id
- * @return {@link org.apache.rave.portal.model.WidgetTag} if it exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.WidgetTag} if it exists, otherwise {@literal null}
*/
WidgetTag getTagById(String widgetTagId);
@@ -231,11 +231,11 @@ public interface WidgetRepository extend
void deleteWidgetRating(String widgetId, WidgetRating rating);
/**
- * Tries to find a {@link org.apache.rave.portal.model.WidgetRating} by the id's of a Widget and USer
+ * Tries to find a {@link org.apache.rave.model.WidgetRating} by the id's of a Widget and USer
*
* @param widgetId unique identifier of a Widget
* @param userId unique identifier of a User
- * @return {@link org.apache.rave.portal.model.WidgetRating} if it exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.WidgetRating} if it exists, otherwise {@literal null}
*/
WidgetRating getWidgetRatingsByWidgetIdAndUserId(String widgetId, String userId);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.User;
import org.apache.rave.portal.repository.CategoryRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,10 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageType;
+import org.apache.rave.model.PageUser;
+import org.apache.rave.model.User;
import org.apache.rave.portal.repository.PageRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.slf4j.Logger;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,10 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageUser;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.User;
import org.apache.rave.portal.repository.RegionRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.slf4j.Logger;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,10 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageUser;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.User;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.apache.rave.portal.repository.UserRepository;
import org.slf4j.Logger;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -15,8 +15,8 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.WidgetComment;
+import org.apache.rave.model.User;
+import org.apache.rave.model.WidgetComment;
import org.apache.rave.portal.repository.WidgetRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -18,10 +18,11 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetStatus;
import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.repository.WidgetRepository;
-import org.apache.rave.portal.security.util.AuthenticationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.security.impl;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.WidgetRating;
+import org.apache.rave.model.User;
+import org.apache.rave.model.WidgetRating;
import org.apache.rave.portal.repository.WidgetRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java Fri Mar 22 16:12:58 2013
@@ -19,13 +19,13 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Authority;
+import org.apache.rave.model.Authority;
import org.apache.rave.portal.model.util.SearchResult;
public interface AuthorityService {
/**
- * @param id unique identifier of the {@link org.apache.rave.portal.model.Authority}
+ * @param id unique identifier of the {@link org.apache.rave.model.Authority}
* @return Authority if it can be found, otherwise {@literal null}
*/
Authority getAuthorityById(String id);
@@ -37,13 +37,13 @@ public interface AuthorityService {
Authority getAuthorityByName(String authorityName);
/**
- * @return a {@link SearchResult} with all {@link org.apache.rave.portal.model.Authority}'s
+ * @return a {@link SearchResult} with all {@link org.apache.rave.model.Authority}'s
*/
SearchResult<Authority> getAllAuthorities();
/**
* @return a {@link SearchResult} with the list of all default
- * {@link org.apache.rave.portal.model.Authority}'s
+ * {@link org.apache.rave.model.Authority}'s
*/
SearchResult<Authority> getDefaultAuthorities();
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Category;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Category;
+import org.apache.rave.model.User;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PostFilter;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -30,14 +30,14 @@ import java.util.List;
public interface CategoryService {
/**
- * @param id unique identifier of the {@link org.apache.rave.portal.model.Category}
+ * @param id unique identifier of the {@link org.apache.rave.model.Category}
* @return Category if it can be found, otherwise {@literal null}
*/
@PostAuthorize("returnObject == null or hasPermission(returnObject, 'read')")
Category get(String id);
/**
- * @return a {@link java.util.List} with all {@link org.apache.rave.portal.model.Category}'s
+ * @return a {@link java.util.List} with all {@link org.apache.rave.model.Category}'s
*/
@PostFilter("hasPermission(filterObject, 'read')")
List<Category> getAll();
@@ -59,7 +59,7 @@ public interface CategoryService {
* @param lastModifiedUser the user performing the update
* @return the updated Category object
*/
- @PreAuthorize("hasPermission(#categoryId, 'org.apache.rave.portal.model.Category', 'update')")
+ @PreAuthorize("hasPermission(#categoryId, 'org.apache.rave.model.Category', 'update')")
Category update(String categoryId, String text, User lastModifiedUser);
/**
@@ -67,6 +67,6 @@ public interface CategoryService {
*
* @param category
*/
- @PreAuthorize("hasPermission(#category.id, 'org.apache.rave.portal.model.Category', 'delete')")
+ @PreAuthorize("hasPermission(#category.id, 'org.apache.rave.model.Category', 'delete')")
void delete(Category category);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/NewAccountService.java Fri Mar 22 16:12:58 2013
@@ -19,14 +19,14 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
public interface NewAccountService {
/**
* Creates a new account using several other Rave services.
*
- * @param newUser the {@link org.apache.rave.portal.model.User} from which a new {@link org.apache.rave.portal.model.User} can be created
+ * @param newUser the {@link org.apache.rave.model.User} from which a new {@link org.apache.rave.model.User} can be created
* @throws Exception in case something goes wrong
*/
public void createNewAccount(User newUser) throws Exception;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/OmdlService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/OmdlService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/OmdlService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/OmdlService.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Page;
+import org.apache.rave.model.Page;
import org.apache.rave.portal.model.util.omdl.OmdlOutputAdapter;
import org.springframework.web.multipart.MultipartFile;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageLayoutService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageLayoutService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageLayoutService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageLayoutService.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.model.PageLayout;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,10 @@
*/
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.PageType;
+import org.apache.rave.model.Region;
+import org.apache.rave.model.RegionWidget;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -43,7 +46,7 @@ public interface PageService {
* @param userId The user to retrieve pages for.
* @return A non null possible empty list of pages for the given user.
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.Page', 'read')")
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'read')")
List<Page> getAllUserPages(String userId);
/**
@@ -90,7 +93,7 @@ public interface PageService {
* @param userId the entityId of the user to create a default page for
* @return the new default Page object for the user
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.Page', 'create')")
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'create')")
Page addNewDefaultUserPage(String userId);
/**
@@ -116,7 +119,7 @@ public interface PageService {
*
* @param pageId the pageId to delete
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'delete')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'delete')")
void deletePage(String pageId);
/**
@@ -125,7 +128,7 @@ public interface PageService {
* @param userId
* @param pageType
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.Page', 'delete')")
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.model.User'), 'org.apache.rave.model.Page', 'delete')")
int deletePages(String userId, PageType pageType);
/**
@@ -137,9 +140,9 @@ public interface PageService {
* @param fromRegionId the id of the Region where the RegionWidget currently resides
* @return the updated RegionWidget
*/
- @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update') and " +
- "hasPermission(#toRegionId, 'org.apache.rave.portal.model.Region', 'update') and " +
- "hasPermission(#fromRegionId, 'org.apache.rave.portal.model.Region', 'update')")
+ @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.model.RegionWidget', 'update') and " +
+ "hasPermission(#toRegionId, 'org.apache.rave.model.Region', 'update') and " +
+ "hasPermission(#fromRegionId, 'org.apache.rave.model.Region', 'update')")
RegionWidget moveRegionWidget(String regionWidgetId, int newPosition, String toRegionId, String fromRegionId);
/**
@@ -149,28 +152,28 @@ public interface PageService {
* @param toPageId the new page to move the regionWidgetTo
* @return the updated RegionWidget object
*/
- @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update') and " +
- "hasPermission(#toPageId, 'org.apache.rave.portal.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.model.RegionWidget', 'update') and " +
+ "hasPermission(#toPageId, 'org.apache.rave.model.Page', 'update')")
RegionWidget moveRegionWidgetToPage(String regionWidgetId, String toPageId);
/**
* Creates a new instance of a widget and adds it to the first position of the first region on the page
* @param pageId the id of the page to add the widget to
- * @param widgetId the {@link org.apache.rave.portal.model.Widget} id to add
+ * @param widgetId the {@link org.apache.rave.model.Widget} id to add
* @return a valid widget instance
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update') and " +
- "hasPermission(#widgetId, 'org.apache.rave.portal.model.Widget', 'read')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update') and " +
+ "hasPermission(#widgetId, 'org.apache.rave.model.Widget', 'read')")
RegionWidget addWidgetToPage(String pageId, String widgetId);
/**
* Creates a new instance of a widget and adds it to the first position of the identified region on the page
* @param pageId the id of the page to add the widget to
- * @param widgetId the {@link org.apache.rave.portal.model.Widget} id to add
+ * @param widgetId the {@link org.apache.rave.model.Widget} id to add
* @return a valid widget instance
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update') and " +
- "hasPermission(#widgetId, 'org.apache.rave.portal.model.Widget', 'read')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update') and " +
+ "hasPermission(#widgetId, 'org.apache.rave.model.Widget', 'read')")
RegionWidget addWidgetToPageRegion(String pageId, String widgetId, String regionId);
/**
@@ -179,7 +182,7 @@ public interface PageService {
* @param regionWidgetId the id of the region widget to delete.\
* @return the region from which the widget was deleted
*/
- @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'delete')")
+ @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.model.RegionWidget', 'delete')")
Region removeWidgetFromPage(String regionWidgetId);
/**
@@ -189,7 +192,7 @@ public interface PageService {
* @param name the new name for the page
* @param pageLayoutCode the new layout for the page
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
Page updatePage(String pageId, String name, String pageLayoutCode);
/**
@@ -200,8 +203,8 @@ public interface PageService {
* -1 if you want this to be the first page
* @return the updated Page object containing its new render sequence
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read') and " +
- "hasPermission(#moveAfterPageId, 'org.apache.rave.portal.model.Page', 'read')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'read') and " +
+ "hasPermission(#moveAfterPageId, 'org.apache.rave.model.Page', 'read')")
Page movePage(String pageId, String moveAfterPageId);
/**
@@ -210,7 +213,7 @@ public interface PageService {
* @param pageId the pageId of the page to move to the default position
* @return the updated Page object containing its new render sequence
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'read')")
Page movePageToDefault(String pageId);
/**
@@ -220,7 +223,7 @@ public interface PageService {
* @param pageName = name of the page
* @return true or false whether the user was added
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
Boolean clonePageForUser(String pageId, String userId, String pageName);
/**
@@ -229,7 +232,7 @@ public interface PageService {
* @param userId - the userid to add
* @return true or false whether the user was added
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
Boolean addMemberToPage(String pageId, String userId);
/**
@@ -240,7 +243,7 @@ public interface PageService {
* Note: this is read access because a page shared to a non page owner means they have 'read' access
* unless they are set as an 'editor' of the page, which means 'update' access.
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'read')")
Boolean removeMemberFromPage(String pageId, String userId);
/**
@@ -249,7 +252,7 @@ public interface PageService {
* @param shareStatus - a string value defined in PageStatus
* @return
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'read')")
Boolean updateSharedPageStatus(String pageId, String shareStatus);
/**
@@ -260,7 +263,7 @@ public interface PageService {
* @param isEditor - value to denote if the user can edit or not
* @return
*/
- @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
+ @PreAuthorize("hasPermission(#pageId, 'org.apache.rave.model.Page', 'update')")
Boolean updatePageEditingStatus(String pageId, String userId, boolean isEditor);
}
\ No newline at end of file
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PortalPreferenceService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import java.util.List;
import java.util.Map;
@@ -30,14 +30,14 @@ import java.util.Map;
public interface PortalPreferenceService {
/**
- * Creates a Map of all {@link org.apache.rave.portal.model.PortalPreference}'s using the preference key as key for the Map.Entry
+ * Creates a Map of all {@link org.apache.rave.model.PortalPreference}'s using the preference key as key for the Map.Entry
*
* @return Map of PortalPreference's
*/
Map<String, PortalPreference> getPreferencesAsMap();
/**
- * Gets a {@link org.apache.rave.portal.model.PortalPreference} by its key
+ * Gets a {@link org.apache.rave.model.PortalPreference} by its key
*
* @param key unique name of the preference
* @return PortalPreference if it exists, otherwise {@literal null}
@@ -45,7 +45,7 @@ public interface PortalPreferenceService
PortalPreference getPreference(String key);
/**
- * Saves a {@link org.apache.rave.portal.model.PortalPreference} with a single value.
+ * Saves a {@link org.apache.rave.model.PortalPreference} with a single value.
* If a PortalPreference already exists with this key, its value(s) will be overwritten.
*
* @param key of the preference, e.g. {@literal title}
@@ -54,7 +54,7 @@ public interface PortalPreferenceService
void savePreference(String key, String value);
/**
- * Saves a {@link org.apache.rave.portal.model.PortalPreference} with a List of values.
+ * Saves a {@link org.apache.rave.model.PortalPreference} with a List of values.
* If a PortalPreference already exists with this key, its value(s) will be overwritten.
*
* @param key of the preference, e.g. {@literal colors}
@@ -63,7 +63,7 @@ public interface PortalPreferenceService
void savePreference(String key, List<String> values);
/**
- * Saves a {@link org.apache.rave.portal.model.PortalPreference}
+ * Saves a {@link org.apache.rave.model.PortalPreference}
*
* @param preference PortalPreference to save
*/
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionService.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Region;
+import org.apache.rave.model.Region;
import org.springframework.security.access.prepost.PreAuthorize;
public interface RegionService {
@@ -27,6 +27,6 @@ public interface RegionService {
* Register a new region
* @param region the region object to register
*/
- @PreAuthorize("hasPermission(#region.id, 'org.apache.rave.portal.model.Region', 'create')")
+ @PreAuthorize("hasPermission(#region.id, 'org.apache.rave.model.Region', 'create')")
void registerNewRegion(Region region);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java Fri Mar 22 16:12:58 2013
@@ -19,8 +19,8 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.RegionWidgetPreference;
import org.springframework.security.access.prepost.PostAuthorize;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -42,7 +42,7 @@ public interface RegionWidgetService {
* @param regionWidget The RegionWidget to save.
* @return The updated RegionWidget with all ID numbers populated.
*/
- @PreAuthorize("hasPermission(#regionWidget.id, 'org.apache.rave.portal.model.RegionWidget', 'update')")
+ @PreAuthorize("hasPermission(#regionWidget.id, 'org.apache.rave.model.RegionWidget', 'update')")
RegionWidget saveRegionWidget(RegionWidget regionWidget);
/**
@@ -52,7 +52,7 @@ public interface RegionWidgetService {
* @param preferences The collection of new RegionWidgetPreferences.
* @return The updated RegionWidgetPreferences with all ID numbers populated.
*/
- @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update')")
+ @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.model.RegionWidget', 'update')")
List<RegionWidgetPreference> saveRegionWidgetPreferences(String regionWidgetId,
List<RegionWidgetPreference> preferences);
@@ -64,7 +64,7 @@ public interface RegionWidgetService {
* @param preference The RegionWidgetPreference to save.
* @return The updated RegionWidgetPreference with all ID numbers populated.
*/
- @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update')")
+ @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.model.RegionWidget', 'update')")
RegionWidgetPreference saveRegionWidgetPreference(String regionWidgetId, RegionWidgetPreference preference);
/**
@@ -74,6 +74,6 @@ public interface RegionWidgetService {
* @param collapsed the collapsed state of the RegionWidget
* @return The updated RegionWidget with the new collapsed value
*/
- @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update')")
+ @PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.model.RegionWidget', 'update')")
RegionWidget saveRegionWidgetCollapsedState(String regionWidgetId, boolean collapsed);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RemoteWidgetResolverService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RemoteWidgetResolverService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RemoteWidgetResolverService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RemoteWidgetResolverService.java Fri Mar 22 16:12:58 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
public interface RemoteWidgetResolverService {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Tag;
+import org.apache.rave.model.Tag;
import javax.swing.text.html.parser.TagElement;
import java.util.List;
@@ -27,26 +27,26 @@ import java.util.List;
public interface TagService {
/**
- * @param id unique identifier of the {@link org.apache.rave.portal.model.Tag}
+ * @param id unique identifier of the {@link org.apache.rave.model.Tag}
* @return Tag if it can be found, otherwise {@literal null}
*/
Tag getTagById(String id);
/**
- * @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.portal.model.Tag}'s
+ * @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.model.Tag}'s
*/
List<Tag> getAllTags();
/**
- * @param keyword unique keyword of the {@link org.apache.rave.portal.model.Tag}
+ * @param keyword unique keyword of the {@link org.apache.rave.model.Tag}
* @return Tag if it can be found, otherwise {@literal null}
*/
Tag getTagByKeyword(String keyword);
/**
- * @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.portal.model.Tag}'s
+ * @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.model.Tag}'s
* Not link to a widget
*/
//List<Tag> getAvailableTagsByWidgetId(String widgetId);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java Fri Mar 22 16:12:58 2013
@@ -22,8 +22,8 @@ package org.apache.rave.portal.service;
import java.util.HashMap;
import java.util.List;
-import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.util.SearchResult;
import org.springframework.security.core.userdetails.AuthenticationUserDetailsService;
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -60,7 +60,7 @@ public interface UserService extends Use
* Return the requested user object using the user's name.
*
* @param userName (unique) name of the user
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getUserByUsername(String userName);
@@ -68,7 +68,7 @@ public interface UserService extends Use
* Return a user object by the user ID.
*
* @param id the user ID
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getUserById(String id);
@@ -76,7 +76,7 @@ public interface UserService extends Use
* Return a user object by the user email.
*
* @param userEmail email address of the user
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getUserByEmail(String userEmail);
@@ -88,7 +88,7 @@ public interface UserService extends Use
void updateUserProfile(User user);
/**
- * Gets a limited {@link SearchResult} for {@link org.apache.rave.portal.model.User}'s
+ * Gets a limited {@link SearchResult} for {@link org.apache.rave.model.User}'s
*
* @param offset start point within the resultset (for paging)
* @param pageSize maximum number of items to be returned (for paging)
@@ -97,7 +97,7 @@ public interface UserService extends Use
SearchResult<User> getLimitedListOfUsers(int offset, int pageSize);
/**
- * Gets a {@link SearchResult} for {@link org.apache.rave.portal.model.User}'s that match the search term
+ * Gets a {@link SearchResult} for {@link org.apache.rave.model.User}'s that match the search term
*
* @param searchTerm free text input to search on users
* @param offset start point within the resultset (for paging)
@@ -124,14 +124,14 @@ public interface UserService extends Use
/**
* Sends an email which contains link for changing user password
*
- * @param user the {@link org.apache.rave.portal.model.User} which requested password change
+ * @param user the {@link org.apache.rave.model.User} which requested password change
*/
void sendPasswordReminder(User user);
/**
* Sends an email which contains username
*
- * @param user the {@link org.apache.rave.portal.model.User} which requested username reminder
+ * @param user the {@link org.apache.rave.model.User} which requested username reminder
*/
void sendUserNameReminder(User user);
@@ -139,7 +139,7 @@ public interface UserService extends Use
/**
* Changes password for given user
*
- * @param user the {@link org.apache.rave.portal.model.User} which requested password change
+ * @param user the {@link org.apache.rave.model.User} which requested password change
* @throws Exception in case something goes wrong
*/
void updatePassword(User user);
@@ -202,12 +202,12 @@ public interface UserService extends Use
* Return a user object by the openId.
*
* @param openId OpenId url of the user
- * @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
+ * @return {@link org.apache.rave.model.User} if one exists, otherwise {@literal null}
*/
User getUserByOpenId(String openId);
/**
- * Gets a limited {@link SearchResult} for {@link org.apache.rave.portal.model.Person}'s
+ * Gets a limited {@link SearchResult} for {@link org.apache.rave.model.Person}'s
*
* @param offset start point within the resultset (for paging)
* @param pageSize maximum number of items to be returned (for paging)
@@ -216,7 +216,7 @@ public interface UserService extends Use
SearchResult<Person> getLimitedListOfPersons(int offset, int pageSize);
/**
- * Gets a {@link SearchResult} for {@link org.apache.rave.portal.model.Person}'s that match the search term
+ * Gets a {@link SearchResult} for {@link org.apache.rave.model.Person}'s that match the search term
*
* @param searchTerm free text input to search on users
* @param offset start point within the resultset (for paging)
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMarketplaceService.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service;
import java.util.List;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.util.SearchResult;
/**
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetMetadataResolver.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Widget;
public interface WidgetMetadataResolver {
String getSupportedContext();
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetProviderService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetProviderService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetProviderService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetProviderService.java Fri Mar 22 16:12:58 2013
@@ -18,8 +18,8 @@
*/
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
public interface WidgetProviderService {
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java Fri Mar 22 16:12:58 2013
@@ -19,10 +19,10 @@
package org.apache.rave.portal.service;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.WidgetComment;
-import org.apache.rave.portal.model.WidgetRating;
-import org.apache.rave.portal.model.WidgetTag;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetComment;
+import org.apache.rave.model.WidgetRating;
+import org.apache.rave.model.WidgetTag;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.springframework.security.access.prepost.PostAuthorize;
@@ -99,7 +99,7 @@ public interface WidgetService {
*
* @param searchTerm free text search term
* @param widgetType type of Widget
- * @param widgetStatus status of the Widget, should match a value in {@link org.apache.rave.portal.model.WidgetStatus}
+ * @param widgetStatus status of the Widget, should match a value in {@link org.apache.rave.model.WidgetStatus}
* @param offset start point within the resultset (for paging)
* @param pageSize maximum number of items to be returned (for paging)
* @return SearchResult
@@ -157,7 +157,7 @@ public interface WidgetService {
*
* @param widget to save
*/
- @PreAuthorize("hasPermission(#widget.id, 'org.apache.rave.portal.model.Widget', 'update')")
+ @PreAuthorize("hasPermission(#widget.id, 'org.apache.rave.model.Widget', 'update')")
void updateWidget(Widget widget);
/**
@@ -204,7 +204,7 @@ public interface WidgetService {
@PreAuthorize("hasPermission(#widgetComment, 'update')")
void updateWidgetComment(String widgetId, WidgetComment widgetComment);
- @PreAuthorize("hasPermission(#commentId, 'org.apache.rave.portal.model.WidgetComment', 'delete')")
+ @PreAuthorize("hasPermission(#commentId, 'org.apache.rave.model.WidgetComment', 'delete')")
void removeWidgetComment(String widgetId, String commentId);
/**
@@ -213,7 +213,7 @@ public interface WidgetService {
* @param userId
* @return number of comments deleted
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.WidgetComment', 'delete')")
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.model.User'), 'org.apache.rave.model.WidgetComment', 'delete')")
int deleteAllWidgetComments(String userId);
// ***************************************************************************************************************
@@ -221,7 +221,7 @@ public interface WidgetService {
// ***************************************************************************************************************
/**
- * Gets a {@link org.apache.rave.portal.model.WidgetRating} for the widgetId and userId
+ * Gets a {@link org.apache.rave.model.WidgetRating} for the widgetId and userId
*
* @param widgetId unique identifier for a Widget
* @param userId unique identifier for a User
@@ -230,17 +230,17 @@ public interface WidgetService {
WidgetRating getWidgetRatingByWidgetIdAndUserId(String widgetId, String userId);
/**
- * Updates the score of a {@link org.apache.rave.portal.model.WidgetRating}
+ * Updates the score of a {@link org.apache.rave.model.WidgetRating}
*
* @param widgetId Widget ID
* @param widgetRating WidgetRating
* @param score value of the rating
*/
- @PreAuthorize("hasPermission(#widgetRating.entityId, 'org.apache.rave.portal.model.WidgetRating', 'update')")
+ @PreAuthorize("hasPermission(#widgetRating.entityId, 'org.apache.rave.model.WidgetRating', 'update')")
void updateWidgetRatingScore(String widgetId, WidgetRating widgetRating, Integer score);
/**
- * Saves a {@link org.apache.rave.portal.model.WidgetRating} for a widget
+ * Saves a {@link org.apache.rave.model.WidgetRating} for a widget
*
* @param rating WidgetRating
*/
@@ -249,10 +249,10 @@ public interface WidgetService {
/**
* Removes the rating of a widget
*
- * @param widgetId unique identifier of a {@link org.apache.rave.portal.model.Widget}
- * @param userId unique identifier of a {@link org.apache.rave.portal.model.User}
+ * @param widgetId unique identifier of a {@link org.apache.rave.model.Widget}
+ * @param userId unique identifier of a {@link org.apache.rave.model.User}
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.WidgetRating', 'delete')")
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.model.User'), 'org.apache.rave.model.WidgetRating', 'delete')")
void removeWidgetRating(String widgetId, String userId);
/**
@@ -261,6 +261,6 @@ public interface WidgetService {
* @param userId
* @return the number of widget ratings deleted
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.WidgetRating', 'delete')")
+ @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.model.User'), 'org.apache.rave.model.WidgetRating', 'delete')")
int removeAllWidgetRatings(String userId);
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.Authority;
+import org.apache.rave.model.Authority;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.repository.AuthorityRepository;
import org.apache.rave.portal.service.AuthorityService;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java Fri Mar 22 16:12:58 2013
@@ -15,9 +15,9 @@
*/
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.Category;
+import org.apache.rave.model.Category;
import org.apache.rave.portal.model.impl.CategoryImpl;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import org.apache.rave.portal.repository.CategoryRepository;
import org.apache.rave.portal.service.CategoryService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultNewAccountService.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.commons.lang.StringUtils;
-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.service.AuthorityService;
import org.apache.rave.portal.service.NewAccountService;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultOmdlService.java Fri Mar 22 16:12:58 2013
@@ -29,8 +29,8 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.io.FileUtils;
import org.apache.rave.exception.DuplicateItemException;
-import org.apache.rave.portal.model.Page;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.Page;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.impl.WidgetImpl;
import org.apache.rave.portal.model.util.omdl.BadOmdlXmlFormatException;
import org.apache.rave.portal.model.util.omdl.OmdlConstants;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageLayoutService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageLayoutService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageLayoutService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageLayoutService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.PageLayout;
+import org.apache.rave.model.PageLayout;
import org.apache.rave.portal.repository.PageLayoutRepository;
import org.apache.rave.portal.service.PageLayoutService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Fri Mar 22 16:12:58 2013
@@ -20,7 +20,7 @@
package org.apache.rave.portal.service.impl;
import org.apache.rave.persistence.Repository;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.impl.PageImpl;
import org.apache.rave.portal.model.impl.PageUserImpl;
import org.apache.rave.portal.model.impl.RegionImpl;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPortalPreferenceService.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.rave.portal.events.PortalPreferenceJavascriptDebugModeSaveEvent;
import org.apache.rave.portal.events.RaveEventManager;
-import org.apache.rave.portal.model.PortalPreference;
+import org.apache.rave.model.PortalPreference;
import org.apache.rave.portal.model.impl.PortalPreferenceImpl;
import org.apache.rave.portal.repository.PortalPreferenceRepository;
import org.apache.rave.portal.service.PortalPreferenceService;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.Region;
+import org.apache.rave.model.Region;
import org.apache.rave.portal.repository.RegionRepository;
import org.apache.rave.portal.service.RegionService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java Fri Mar 22 16:12:58 2013
@@ -20,8 +20,8 @@
package org.apache.rave.portal.service.impl;
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.util.ModelUtils;
import org.apache.rave.portal.repository.RegionWidgetRepository;
import org.apache.rave.portal.service.RegionWidgetService;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRemoteWidgetResolverService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRemoteWidgetResolverService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRemoteWidgetResolverService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRemoteWidgetResolverService.java Fri Mar 22 16:12:58 2013
@@ -22,10 +22,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.rave.portal.model.PortalPreference;
-import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.model.Widget;
-import org.apache.rave.portal.model.WidgetStatus;
+import org.apache.rave.model.PortalPreference;
+import org.apache.rave.model.User;
+import org.apache.rave.model.Widget;
+import org.apache.rave.model.WidgetStatus;
import org.apache.rave.portal.service.PortalPreferenceService;
import org.apache.rave.portal.service.UserService;
import org.apache.rave.portal.service.WidgetMetadataResolver;
@@ -83,7 +83,7 @@ public class DefaultRemoteWidgetResolver
/*
* (non-Javadoc)
- * @see org.apache.rave.portal.service.WidgetResolverService#addWidget(org.apache.rave.portal.model.Widget)
+ * @see org.apache.rave.portal.service.WidgetResolverService#addWidget(org.apache.rave.model.Widget)
*/
@Override
public Widget addWidget(Widget widget) throws Exception{
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.service.impl;
-import org.apache.rave.portal.model.Tag;
+import org.apache.rave.model.Tag;
import org.apache.rave.portal.repository.TagRepository;
import org.apache.rave.portal.service.TagService;
import org.springframework.beans.factory.annotation.Autowired;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Fri Mar 22 16:12:58 2013
@@ -21,9 +21,9 @@ package org.apache.rave.portal.service.i
import org.apache.commons.lang.StringUtils;
-import org.apache.rave.portal.model.PageType;
-import org.apache.rave.portal.model.Person;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.PageType;
+import org.apache.rave.model.Person;
+import org.apache.rave.model.User;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.repository.*;
import org.apache.rave.portal.service.EmailService;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetMarketplaceService.java Fri Mar 22 16:12:58 2013
@@ -24,8 +24,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.rave.portal.model.PortalPreference;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.PortalPreference;
+import org.apache.rave.model.Widget;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetMarketplaceSearchResult;
import org.apache.rave.portal.model.util.WidgetMarketplaceWidgetResult;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.service.i
import org.apache.commons.lang.StringUtils;
import org.apache.rave.exception.DuplicateItemException;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.model.util.SearchResult;
import org.apache.rave.portal.model.util.WidgetStatistics;
import org.apache.rave.portal.repository.CategoryRepository;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/DataImporter.java Fri Mar 22 16:12:58 2013
@@ -21,7 +21,7 @@ package org.apache.rave.portal.util.data
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import org.apache.rave.portal.repository.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.Resource;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/ModelWrapper.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/ModelWrapper.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/ModelWrapper.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/util/data/ModelWrapper.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.util.data;
-import org.apache.rave.portal.model.*;
+import org.apache.rave.model.*;
import java.util.List;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/RenderService.java Fri Mar 22 16:12:58 2013
@@ -35,7 +35,7 @@ public interface RenderService {
Collection<String> getSupportedWidgetTypes();
/**
- * Renders the {@link org.apache.rave.portal.model.RegionWidget} as a String\
+ * Renders the {@link org.apache.rave.model.RegionWidget} as a String\
*
* @param regionWidgetWrapper widget to renderer
* @param context the cotnext under which to render the widget
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RegionWidgetWrapper.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RegionWidgetWrapper.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RegionWidgetWrapper.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RegionWidgetWrapper.java Fri Mar 22 16:12:58 2013
@@ -20,8 +20,8 @@
package org.apache.rave.portal.web.renderer.model;
-import org.apache.rave.portal.model.RegionWidget;
-import org.apache.rave.portal.model.Widget;
+import org.apache.rave.model.RegionWidget;
+import org.apache.rave.model.Widget;
public class RegionWidgetWrapper {
private Widget widget;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/renderer/model/RenderContext.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.renderer.model;
-import org.apache.rave.portal.model.User;
+import org.apache.rave.model.User;
import java.util.Map;
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.web.util;
/**
- * Utility class for {@link org.apache.rave.portal.model.PortalPreference} keys
+ * Utility class for {@link org.apache.rave.model.PortalPreference} keys
*/
public final class PortalPreferenceKeys {
private PortalPreferenceKeys() { }
Added: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java (added)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPeopleResource.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest.impl;
+
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.rave.model.FriendRequest;
+import org.apache.rave.rest.model.Person;
+import org.apache.rave.portal.service.UserService;
+import org.apache.rave.rest.PeopleResource;
+
+import javax.ws.rs.core.Response;
+
+public class DefaultPeopleResource implements PeopleResource {
+
+ private UserService userService;
+
+ @Override
+ public Response getPeople() {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public Response getPerson(String id) {
+ org.apache.rave.model.Person person = userService.getUserById(id);
+ if (person != null) {
+ return Response.ok(new Person(person)).build();
+ } else {
+ return Response.status(Response.Status.NOT_FOUND).build();
+ }
+ }
+
+ @Override
+ public Response getFriends(String id) {
+ return Response.ok("Friends").build();
+ }
+
+ @Override
+ public Response getFriend(String id, String friendID) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response deleteFriend(String id, String friendID) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response getRequests(String id) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response createRequest(String id, FriendRequest request) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response getRequest(String id, String requestID) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ @Override
+ public Response deleteRequest(String id, String requestID) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public void setUserService(UserService userService) {
+ this.userService = userService;
+ }
+}
Added: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java?rev=1459881&view=auto
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java (added)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultUsersResource.java Fri Mar 22 16:12:58 2013
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.rave.rest.impl;
+
+import org.apache.commons.lang.NotImplementedException;
+import org.apache.rave.rest.model.User;
+import org.apache.rave.portal.service.UserService;
+import org.apache.rave.rest.UsersResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.core.Response;
+
+public class DefaultUsersResource implements UsersResource {
+ private static final Logger log = LoggerFactory.getLogger(DefaultUsersResource.class);
+
+ private UserService userService;
+
+ @Override
+ public Response getUsers() {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public Response getUser(String id) {
+ org.apache.rave.model.User user = userService.getUserById(id);
+ if (user != null) {
+ return Response.ok(new User(user)).build();
+ } else {
+ return Response.status(Response.Status.NOT_FOUND).build();
+ }
+ }
+
+ @Override
+ public Response updateUser(String id, User newUser) {
+ org.apache.rave.model.User user = userService.getUserById(id);
+ if (user != null) {
+ newUser.saveToUser(user);
+ userService.updateUserProfile(user);
+ return Response.ok().build();
+ } else {
+ return Response.status(Response.Status.NOT_FOUND).build();
+ }
+ }
+
+ public void setUserService(UserService userService) {
+ this.userService = userService;
+ }
+}
Modified: rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1459881&r1=1459880&r2=1459881&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ rave/trunk/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Fri Mar 22 16:12:58 2013
@@ -19,7 +19,7 @@
package org.apache.rave.portal.model.util;
-import org.apache.rave.portal.model.RegionWidgetPreference;
+import org.apache.rave.model.RegionWidgetPreference;
import org.apache.rave.portal.model.impl.RegionWidgetPreferenceImpl;
import org.junit.Test;