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 2012/08/09 09:05:57 UTC
svn commit: r1371052 [2/6] - in /rave/branches/model-split:
rave-components/rave-commons/src/main/java/org/apache/rave/persistence/
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache...
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetRepository.java Thu Aug 9 07:05:51 2012
@@ -132,7 +132,7 @@ public interface WidgetRepository extend
* @param user_id id of the user
* @return {@link WidgetStatistics} with the rating information
*/
- WidgetStatistics getWidgetStatistics(long widget_id, long user_id);
+ WidgetStatistics getWidgetStatistics(String widget_id, String user_id);
/**
* Generates the mapping of widget statistics for the user.
@@ -140,7 +140,7 @@ public interface WidgetRepository extend
* @param userId id of the user
* @return Mapping of {@link WidgetStatistics} objects keyed off of the widget's entityId
*/
- Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId);
+ Map<String, WidgetStatistics> getAllWidgetStatistics(String userId);
/**
* Generates the mapping of widget ratings for the user.
@@ -148,7 +148,7 @@ public interface WidgetRepository extend
* @param userId id of the user
* @return Mapping of {@link org.apache.rave.portal.model.WidgetRating} objects keyed off of the widget's entityId
*/
- Map<Long, WidgetRating> getUsersWidgetRatings(long userId);
+ Map<String, WidgetRating> getUsersWidgetRatings(String userId);
/**
* Gets a List of {@link Widget}'s by performing a tag search
@@ -174,5 +174,5 @@ public interface WidgetRepository extend
* @param userId the widget owner to unassign
* @return the number of widgets updated
*/
- int unassignWidgetOwner(long userId);
+ int unassignWidgetOwner(String userId);
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetTagRepository.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetTagRepository.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetTagRepository.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/WidgetTagRepository.java Thu Aug 9 07:05:51 2012
@@ -30,5 +30,5 @@ public interface WidgetTagRepository ext
* @param keyword tag's keyword
* @return {@link org.apache.rave.portal.model.WidgetTag} if it exists, otherwise {@literal null}
*/
- WidgetTag getByWidgetIdAndTag(Long widgetId, String keyword);
+ WidgetTag getByWidgetIdAndTag(String widgetId, String keyword);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -86,7 +86,7 @@ public class DefaultCategoryPermissionEv
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext)targetId);
} else {
- hasPermission = hasPermission(authentication, categoryRepository.get((Long)targetId), permission, true);
+ hasPermission = hasPermission(authentication, categoryRepository.get((String)targetId), permission, true);
}
return hasPermission;
}
@@ -127,7 +127,7 @@ public class DefaultCategoryPermissionEv
// returns a trusted Category object, either from the CategoryRepository, or the
// cached container list
- private Category getTrustedCategory(long categoryId, List<Category> trustedCategoryContainer) {
+ private Category getTrustedCategory(String categoryId, List<Category> trustedCategoryContainer) {
Category p = null;
if (trustedCategoryContainer.isEmpty()) {
p = categoryRepository.get(categoryId);
@@ -156,7 +156,7 @@ public class DefaultCategoryPermissionEv
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isCategoryCreatedUserById(Authentication authentication, Long userId) {
+ private boolean isCategoryCreatedUserById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
@@ -170,7 +170,7 @@ public class DefaultCategoryPermissionEv
// perform the permissions check based on the class supplied to the RaveSecurityContext object
if (User.class == clazz) {
- return isCategoryCreatedUserById(authentication, (Long) raveSecurityContext.getId());
+ return isCategoryCreatedUserById(authentication, (String) raveSecurityContext.getId());
} else {
throw new IllegalArgumentException("unknown RaveSecurityContext type: " + raveSecurityContext.getType());
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -87,7 +87,7 @@ public class DefaultPagePermissionEvalua
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext)targetId);
} else {
- hasPermission = hasPermission(authentication, pageRepository.get((Long)targetId), permission, true);
+ hasPermission = hasPermission(authentication, pageRepository.get((String)targetId), permission, true);
}
return hasPermission;
}
@@ -132,7 +132,7 @@ public class DefaultPagePermissionEvalua
// returns a trusted Page object, either from the PageRepository, or the
// cached container list
- private Page getTrustedPage(long pageId, List<Page> trustedPageContainer) {
+ private Page getTrustedPage(String pageId, List<Page> trustedPageContainer) {
Page p = null;
if (trustedPageContainer.isEmpty()) {
p = pageRepository.get(pageId);
@@ -161,7 +161,7 @@ public class DefaultPagePermissionEvalua
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isPageOwnerById(Authentication authentication, Long userId) {
+ private boolean isPageOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
@@ -175,7 +175,7 @@ public class DefaultPagePermissionEvalua
// perform the permissions check based on the class supplied to the RaveSecurityContext object
if (User.class == clazz) {
- return isPageOwnerById(authentication, (Long)raveSecurityContext.getId());
+ return isPageOwnerById(authentication, (String)raveSecurityContext.getId());
} else {
throw new IllegalArgumentException("unknown RaveSecurityContext type: " + raveSecurityContext.getType());
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -82,7 +82,7 @@ public class DefaultRegionPermissionEval
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext) targetId);
} else {
- hasPermission = hasPermission(authentication, regionRepository.get((Long) targetId), permission, true);
+ hasPermission = hasPermission(authentication, regionRepository.get((String) targetId), permission, true);
}
return hasPermission;
}
@@ -126,7 +126,7 @@ public class DefaultRegionPermissionEval
// returns a trusted Region object, either from the RegionRepository, or the
// cached container list
- private Region getTrustedRegion(long regionId, List<Region> trustedRegionContainer) {
+ private Region getTrustedRegion(String regionId, List<Region> trustedRegionContainer) {
Region region = null;
if (trustedRegionContainer.isEmpty()) {
region = regionRepository.get(regionId);
@@ -154,7 +154,7 @@ public class DefaultRegionPermissionEval
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isRegionOwnerById(Authentication authentication, Long userId) {
+ private boolean isRegionOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
@@ -168,7 +168,7 @@ public class DefaultRegionPermissionEval
// perform the permissions check based on the class supplied to the RaveSecurityContext object
if (User.class == clazz) {
- return isRegionOwnerById(authentication, (Long) raveSecurityContext.getId());
+ return isRegionOwnerById(authentication, (String) raveSecurityContext.getId());
} else {
throw new IllegalArgumentException("unknown RaveSecurityContext type: " + raveSecurityContext.getType());
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -82,7 +82,7 @@ public class DefaultRegionWidgetPermissi
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext) targetId);
} else {
- hasPermission = hasPermission(authentication, regionWidgetRepository.get((Long) targetId), permission, true);
+ hasPermission = hasPermission(authentication, regionWidgetRepository.get((String) targetId), permission, true);
}
return hasPermission;
}
@@ -126,7 +126,7 @@ public class DefaultRegionWidgetPermissi
// returns a trusted RegionWidget object, either from the RegionWidgetRepository, or the
// cached container list
- private RegionWidget getTrustedRegionWidget(long regionWidgetId, List<RegionWidget> trustedRegionWidgetContainer) {
+ private RegionWidget getTrustedRegionWidget(String regionWidgetId, List<RegionWidget> trustedRegionWidgetContainer) {
RegionWidget regionWidget = null;
if (trustedRegionWidgetContainer.isEmpty()) {
regionWidget = regionWidgetRepository.get(regionWidgetId);
@@ -154,7 +154,7 @@ public class DefaultRegionWidgetPermissi
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isRegionWidgetOwnerById(Authentication authentication, Long userId) {
+ private boolean isRegionWidgetOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
@@ -168,7 +168,7 @@ public class DefaultRegionWidgetPermissi
// perform the permissions check based on the class supplied to the RaveSecurityContext object
if (User.class == clazz) {
- return isRegionWidgetOwnerById(authentication, (Long) raveSecurityContext.getId());
+ return isRegionWidgetOwnerById(authentication, (String) raveSecurityContext.getId());
} else {
throw new IllegalArgumentException("unknown RaveSecurityContext type: " + raveSecurityContext.getType());
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetCommentPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -83,7 +83,7 @@ public class DefaultWidgetCommentPermiss
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext)targetId, permission);
} else {
- hasPermission = hasPermission(authentication, widgetCommentRepository.get((Long)targetId), permission, true);
+ hasPermission = hasPermission(authentication, widgetCommentRepository.get((String)targetId), permission, true);
}
return hasPermission;
}
@@ -150,7 +150,7 @@ public class DefaultWidgetCommentPermiss
case UPDATE:
case CREATE_OR_UPDATE:
// anyone can create, delete, read, or update a page that they own
- hasPermission = isWidgetCommentOwnerById(authentication, (Long)raveSecurityContext.getId());
+ hasPermission = isWidgetCommentOwnerById(authentication, (String)raveSecurityContext.getId());
break;
default:
log.warn("unknown permission: " + permission);
@@ -178,7 +178,7 @@ public class DefaultWidgetCommentPermiss
// returns a trusted Page object, either from the PageRepository, or the
// cached container list
- private WidgetComment getTrustedWidgetComment(long widgetCommentId, List<WidgetComment> trustedWidgetCommentContainer) {
+ private WidgetComment getTrustedWidgetComment(String widgetCommentId, List<WidgetComment> trustedWidgetCommentContainer) {
WidgetComment p = null;
if (trustedWidgetCommentContainer.isEmpty()) {
p = widgetCommentRepository.get(widgetCommentId);
@@ -192,7 +192,7 @@ public class DefaultWidgetCommentPermiss
private boolean isWidgetCommentOwnerByUsername(Authentication authentication, String username) {
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isWidgetCommentOwnerById(Authentication authentication, Long userId) {
+ private boolean isWidgetCommentOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -84,7 +84,7 @@ public class DefaultWidgetPermissionEval
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext) targetId);
} else {
- hasPermission = hasPermission(authentication, widgetRepository.get((Long) targetId), permission, true);
+ hasPermission = hasPermission(authentication, widgetRepository.get((String) targetId), permission, true);
}
return hasPermission;
}
@@ -107,11 +107,11 @@ public class DefaultWidgetPermissionEval
switch (permission) {
case ADMINISTER:
// if you are here, you are not an administrator, so you can't administer Widget
- break;
+ break;
case READ:
// users can read any widget which they are the owner of, or any widget that is published
hasPermission = isWidgetOwner(authentication, widget, trustedWidgetContainer, trustedDomainObject) ||
- isPublishedWidget(widget, trustedWidgetContainer, trustedDomainObject);
+ isPublishedWidget(widget, trustedWidgetContainer, trustedDomainObject);
break;
case CREATE:
case UPDATE:
@@ -129,7 +129,7 @@ public class DefaultWidgetPermissionEval
// returns a trusted Widget object, either from the WidgetRepository, or the
// cached container list
- private Widget getTrustedWidget(long widgetId, List<Widget> trustedWidgetContainer) {
+ private Widget getTrustedWidget(String widgetId, List<Widget> trustedWidgetContainer) {
Widget widget;
if (trustedWidgetContainer.isEmpty()) {
widget = widgetRepository.get(widgetId);
@@ -160,10 +160,10 @@ public class DefaultWidgetPermissionEval
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isWidgetOwnerById(Authentication authentication, Long userId) {
+ private boolean isWidgetOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
-
+
private boolean isPublishedWidget(Widget widget, List<Widget> trustedWidgetContainer, boolean trustedDomainObject) {
Widget trustedWidget;
if (trustedDomainObject) {
@@ -172,7 +172,7 @@ public class DefaultWidgetPermissionEval
trustedWidget = getTrustedWidget(widget.getId(), trustedWidgetContainer);
}
return WidgetStatus.PUBLISHED.equals(trustedWidget.getWidgetStatus());
- }
+ }
private boolean verifyRaveSecurityContext(Authentication authentication, RaveSecurityContext raveSecurityContext) {
Class<?> clazz;
@@ -184,7 +184,7 @@ public class DefaultWidgetPermissionEval
// perform the permissions check based on the class supplied to the RaveSecurityContext object
if (User.class == clazz) {
- return isWidgetOwnerById(authentication, (Long) raveSecurityContext.getId());
+ return isWidgetOwnerById(authentication, (String) raveSecurityContext.getId());
} else {
throw new IllegalArgumentException("unknown RaveSecurityContext type: " + raveSecurityContext.getType());
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetRatingPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -83,7 +83,7 @@ public class DefaultWidgetRatingPermissi
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext) targetId);
} else {
- hasPermission = hasPermission(authentication, widgetRatingRepository.get((Long) targetId), permission, true);
+ hasPermission = hasPermission(authentication, widgetRatingRepository.get((String) targetId), permission, true);
}
return hasPermission;
}
@@ -127,7 +127,7 @@ public class DefaultWidgetRatingPermissi
// returns a trusted WidgetRating object, either from the WidgetRatingRepository, or the
// cached container list
- private WidgetRating getTrustedWidgetRating(long widgetRatingId, List<WidgetRating> trustedWidgetRatingContainer) {
+ private WidgetRating getTrustedWidgetRating(String widgetRatingId, List<WidgetRating> trustedWidgetRatingContainer) {
WidgetRating widgetRating = null;
if (trustedWidgetRatingContainer.isEmpty()) {
widgetRating = widgetRatingRepository.get(widgetRatingId);
@@ -155,7 +155,7 @@ public class DefaultWidgetRatingPermissi
return ((User)authentication.getPrincipal()).getUsername().equals(username);
}
- private boolean isWidgetRatingOwnerById(Authentication authentication, Long userId) {
+ private boolean isWidgetRatingOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
@@ -169,7 +169,7 @@ public class DefaultWidgetRatingPermissi
// perform the permissions check based on the class supplied to the RaveSecurityContext object
if (User.class == clazz) {
- return isWidgetRatingOwnerById(authentication, (Long) raveSecurityContext.getId());
+ return isWidgetRatingOwnerById(authentication, (String) raveSecurityContext.getId());
} else {
throw new IllegalArgumentException("unknown RaveSecurityContext type: " + raveSecurityContext.getType());
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/security/impl/DefaultWidgetTagPermissionEvaluator.java Thu Aug 9 07:05:51 2012
@@ -83,7 +83,7 @@ public class DefaultWidgetTagPermissionE
if (targetId instanceof RaveSecurityContext) {
hasPermission = verifyRaveSecurityContext(authentication, (RaveSecurityContext)targetId, permission);
} else {
- hasPermission = hasPermission(authentication, widgetTagRepository.get((Long)targetId), permission, true);
+ hasPermission = hasPermission(authentication, widgetTagRepository.get((String)targetId), permission, true);
}
return hasPermission;
}
@@ -110,7 +110,7 @@ public class DefaultWidgetTagPermissionE
hasPermission = true;
break;
case CREATE:
- hasPermission = isWidgetTagOwnerById(authentication, widgetTag.getUser().getId());
+ hasPermission = isWidgetTagOwnerById(authentication, widgetTag.getUserId());
break;
case DELETE:
case UPDATE:
@@ -148,7 +148,7 @@ public class DefaultWidgetTagPermissionE
case DELETE:
case UPDATE:
// anyone can create, delete, read, or update a WidgetTag that they own
- hasPermission = isWidgetTagOwnerById(authentication, (Long)raveSecurityContext.getId());
+ hasPermission = isWidgetTagOwnerById(authentication, (String)raveSecurityContext.getId());
break;
default:
log.warn("unknown permission: " + permission);
@@ -173,12 +173,12 @@ public class DefaultWidgetTagPermissionE
trustedWidgetTag = getTrustedWidgetTag(widgetTag.getWidgetId(), widgetTag.getTag().getKeyword(), trustedWidgetTagContainer);
}
- return isWidgetTagOwnerByUsername(authentication, trustedWidgetTag.getUser().getUsername());
+ return isWidgetTagOwnerById(authentication, trustedWidgetTag.getUserId());
}
// returns a trusted WidgetTag object, either from the WidgetTagRepository, or the
// cached container list
- private WidgetTag getTrustedWidgetTag(long widgetId, String tagKeyword, List<WidgetTag> trustedWidgetTagContainer) {
+ private WidgetTag getTrustedWidgetTag(String widgetId, String tagKeyword, List<WidgetTag> trustedWidgetTagContainer) {
WidgetTag p = null;
if (trustedWidgetTagContainer.isEmpty()) {
p = widgetTagRepository.getByWidgetIdAndTag(widgetId, tagKeyword);
@@ -189,10 +189,10 @@ public class DefaultWidgetTagPermissionE
return p;
}
- private boolean isWidgetTagOwnerByUsername(Authentication authentication, String username) {
- return ((User)authentication.getPrincipal()).getUsername().equals(username);
- }
- private boolean isWidgetTagOwnerById(Authentication authentication, Long userId) {
+// private boolean isWidgetTagOwnerByUsername(Authentication authentication, String username) {
+// return ((User)authentication.getPrincipal()).getUsername().equals(username);
+// }
+ private boolean isWidgetTagOwnerById(Authentication authentication, String userId) {
return ((User)authentication.getPrincipal()).getId().equals(userId);
}
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/AuthorityService.java Thu Aug 9 07:05:51 2012
@@ -25,10 +25,10 @@ import org.apache.rave.portal.model.util
public interface AuthorityService {
/**
- * @param entityId unique identifier of the {@link org.apache.rave.portal.model.Authority}
+ * @param id unique identifier of the {@link org.apache.rave.portal.model.Authority}
* @return Authority if it can be found, otherwise {@literal null}
*/
- Authority getAuthorityById(long entityId);
+ Authority getAuthorityById(String id);
/**
* @param authorityName name of the authority, can be a role (ROLE_USER)
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/CategoryService.java Thu Aug 9 07:05:51 2012
@@ -30,11 +30,11 @@ import java.util.List;
public interface CategoryService {
/**
- * @param entityId unique identifier of the {@link org.apache.rave.portal.model.Category}
+ * @param id unique identifier of the {@link org.apache.rave.portal.model.Category}
* @return Category if it can be found, otherwise {@literal null}
*/
@PostAuthorize("returnObject == null or hasPermission(returnObject, 'read')")
- Category get(long entityId);
+ Category get(String id);
/**
* @return a {@link java.util.List} with all {@link org.apache.rave.portal.model.Category}'s
@@ -60,7 +60,7 @@ public interface CategoryService {
* @return the updated Category object
*/
@PreAuthorize("hasPermission(#categoryId, 'org.apache.rave.portal.model.Category', 'update')")
- Category update(long categoryId, String text, User lastModifiedUser);
+ Category update(String categoryId, String text, User lastModifiedUser);
/**
* Deletes a Category
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/PageService.java Thu Aug 9 07:05:51 2012
@@ -35,7 +35,7 @@ public interface PageService {
* @return the Page object
*/
@PostAuthorize("hasPermission(returnObject, 'read')")
- Page getPage(long pageId);
+ Page getPage(String pageId);
/**
* Gets all user pages for the given user.
@@ -44,7 +44,7 @@ public interface PageService {
* @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')")
- List<Page> getAllUserPages(long userId);
+ List<Page> getAllUserPages(String userId);
/**
* Gets the profile page for the given user.
@@ -53,7 +53,7 @@ public interface PageService {
* @return The profile page
*/
@PostAuthorize("hasPermission(returnObject, 'read')")
- Page getPersonProfilePage(long userId);
+ Page getPersonProfilePage(String userId);
/**
* Return the page object from a list of pages given the pageId
@@ -62,7 +62,7 @@ public interface PageService {
* @param pages a list of pages to search in
* @return the Page object representing the pageId, or null if not found
*/
- Page getPageFromList(long pageId, List<Page> pages);
+ Page getPageFromList(String pageId, List<Page> pages);
/**
* Given a List of Page objects, return the default one
@@ -91,7 +91,7 @@ public interface PageService {
* @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')")
- Page addNewDefaultUserPage(long userId);
+ Page addNewDefaultUserPage(String userId);
/**
* Creates a new sub page with the supplied pageName and pageLayoutCode for the parentPage
@@ -117,7 +117,7 @@ public interface PageService {
* @param pageId the pageId to delete
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'delete')")
- void deletePage(long pageId);
+ void deletePage(String pageId);
/**
* Deletes all pages of the supplied pageType for the userId
@@ -126,7 +126,7 @@ public interface PageService {
* @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')")
- int deletePages(long userId, PageType pageType);
+ int deletePages(String userId, PageType pageType);
/**
* Moves a Region widget's position in a region or across regions
@@ -140,7 +140,7 @@ public interface PageService {
@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')")
- RegionWidget moveRegionWidget(long regionWidgetId, int newPosition, long toRegionId, long fromRegionId);
+ RegionWidget moveRegionWidget(String regionWidgetId, int newPosition, String toRegionId, String fromRegionId);
/**
* Moves a RegionWidget from one page to another
@@ -151,7 +151,7 @@ public interface PageService {
*/
@PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update') and " +
"hasPermission(#toPageId, 'org.apache.rave.portal.model.Page', 'update')")
- RegionWidget moveRegionWidgetToPage(long regionWidgetId, long toPageId);
+ 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
@@ -161,7 +161,7 @@ public interface PageService {
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update') and " +
"hasPermission(#widgetId, 'org.apache.rave.portal.model.Widget', 'read')")
- RegionWidget addWidgetToPage(long pageId, long widgetId);
+ RegionWidget addWidgetToPage(String pageId, String widgetId);
/**
* Deletes the specified widget from the page.
@@ -170,7 +170,7 @@ public interface PageService {
* @return the region from which the widget was deleted
*/
@PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'delete')")
- Region removeWidgetFromPage(long regionWidgetId);
+ Region removeWidgetFromPage(String regionWidgetId);
/**
* Updates the page properties.
@@ -180,7 +180,7 @@ public interface PageService {
* @param pageLayoutCode the new layout for the page
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
- Page updatePage(long pageId, String name, String pageLayoutCode);
+ Page updatePage(String pageId, String name, String pageLayoutCode);
/**
* Moves a page to be rendered after another page in order for a user
@@ -192,7 +192,7 @@ public interface PageService {
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read') and " +
"hasPermission(#moveAfterPageId, 'org.apache.rave.portal.model.Page', 'read')")
- Page movePage(long pageId, long moveAfterPageId);
+ Page movePage(String pageId, String moveAfterPageId);
/**
* Moves a page to be rendered as the first page for a user
@@ -201,7 +201,7 @@ public interface PageService {
* @return the updated Page object containing its new render sequence
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read')")
- Page movePageToDefault(long pageId);
+ Page movePageToDefault(String pageId);
/**
* Add another user to share this page with
@@ -210,7 +210,7 @@ public interface PageService {
* @return true or false whether the user was added
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
- Boolean addMemberToPage(long pageId, long userId);
+ Boolean addMemberToPage(String pageId, String userId);
/**
* Remove an existing user from the page share
@@ -221,7 +221,7 @@ public interface PageService {
* unless they are set as an 'editor' of the page, which means 'update' access.
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read')")
- Boolean removeMemberFromPage(long pageId, long userId);
+ Boolean removeMemberFromPage(String pageId, String userId);
/**
* Allows a user to accept or decline a page share
@@ -230,7 +230,7 @@ public interface PageService {
* @return
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'read')")
- Boolean updateSharedPageStatus(long pageId, String shareStatus);
+ Boolean updateSharedPageStatus(String pageId, String shareStatus);
/**
* Update a user who has shared access to a given page, so that they can edit the page (true)
@@ -241,6 +241,6 @@ public interface PageService {
* @return
*/
@PreAuthorize("hasPermission(#pageId, 'org.apache.rave.portal.model.Page', 'update')")
- Boolean updatePageEditingStatus(long pageId, long userId, boolean isEditor);
+ Boolean updatePageEditingStatus(String pageId, String userId, boolean isEditor);
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/RegionWidgetService.java Thu Aug 9 07:05:51 2012
@@ -34,7 +34,7 @@ public interface RegionWidgetService {
* @return The RegionWidget or null if not found.
*/
@PostAuthorize("hasPermission(returnObject, 'read')")
- RegionWidget getRegionWidget(long regionWidgetId);
+ RegionWidget getRegionWidget(String regionWidgetId);
/**
* Saves the given RegionWidget and returns the updated instance.
@@ -53,7 +53,7 @@ public interface RegionWidgetService {
* @return The updated RegionWidgetPreferences with all ID numbers populated.
*/
@PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update')")
- List<RegionWidgetPreference> saveRegionWidgetPreferences(long regionWidgetId,
+ List<RegionWidgetPreference> saveRegionWidgetPreferences(String regionWidgetId,
List<RegionWidgetPreference> preferences);
/**
@@ -65,7 +65,7 @@ public interface RegionWidgetService {
* @return The updated RegionWidgetPreference with all ID numbers populated.
*/
@PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update')")
- RegionWidgetPreference saveRegionWidgetPreference(long regionWidgetId, RegionWidgetPreference preference);
+ RegionWidgetPreference saveRegionWidgetPreference(String regionWidgetId, RegionWidgetPreference preference);
/**
* Saves the collapsed state of the given regionWidgetId
@@ -75,5 +75,5 @@ public interface RegionWidgetService {
* @return The updated RegionWidget with the new collapsed value
*/
@PreAuthorize("hasPermission(#regionWidgetId, 'org.apache.rave.portal.model.RegionWidget', 'update')")
- RegionWidget saveRegionWidgetCollapsedState(long regionWidgetId, boolean collapsed);
+ RegionWidget saveRegionWidgetCollapsedState(String regionWidgetId, boolean collapsed);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/TagService.java Thu Aug 9 07:05:51 2012
@@ -26,10 +26,10 @@ import java.util.List;
public interface TagService {
/**
- * @param entityId unique identifier of the {@link org.apache.rave.portal.model.Tag}
+ * @param id unique identifier of the {@link org.apache.rave.portal.model.Tag}
* @return Tag if it can be found, otherwise {@literal null}
*/
- Tag getTagById(long entityId);
+ Tag getTagById(String id);
/**
@@ -48,6 +48,6 @@ public interface TagService {
* @return a {@link org.apache.rave.portal.model.util.SearchResult} with all {@link org.apache.rave.portal.model.Tag}'s
* Not link to a widget
*/
- List<Tag> getAvailableTagsByWidgetId(Long widgetId);
+ List<Tag> getAvailableTagsByWidgetId(String widgetId);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/UserService.java Thu Aug 9 07:05:51 2012
@@ -39,7 +39,7 @@ public interface UserService extends Use
*
* @param userId the unique id of the use
*/
- void setAuthenticatedUser(long userId);
+ void setAuthenticatedUser(String userId);
/**
* Un-sets the currently authenticated user
@@ -67,7 +67,7 @@ public interface UserService extends Use
* @param id the user ID
* @return {@link org.apache.rave.portal.model.User} if one exists, otherwise {@literal null}
*/
- User getUserById(Long id);
+ User getUserById(String id);
/**
* Return a user object by the user email.
@@ -108,7 +108,7 @@ public interface UserService extends Use
*
* @param userId {@link Long} id if the user
*/
- void deleteUser(Long userId);
+ void deleteUser(String userId);
/**
* List of persons whom have added the supplied widget to one or more pages
@@ -116,7 +116,7 @@ public interface UserService extends Use
* @param widgetId the entityId of the Widget to search
* @return List of Person objects in alphabetical order sorted by familyname, givenname
*/
- List<Person> getAllByAddedWidget(long widgetId);
+ List<Person> getAllByAddedWidget(String widgetId);
/**
* Sends an email which contains link for changing user password
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetCommentService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetCommentService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetCommentService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetCommentService.java Thu Aug 9 07:05:51 2012
@@ -22,13 +22,13 @@ import org.springframework.security.acce
public interface WidgetCommentService {
@PostAuthorize("hasPermission(returnObject, 'read')")
- WidgetComment getWidgetComment(Long id);
+ WidgetComment getWidgetComment(String id);
@PreAuthorize("hasPermission(#widgetComment, 'create_or_update')")
void saveWidgetComment(WidgetComment widgetComment);
@PreAuthorize("hasPermission(#id, 'org.apache.rave.portal.model.WidgetComment', 'delete')")
- void removeWidgetComment(Long id);
+ void removeWidgetComment(String id);
/**
* Deletes all Widget Comments for a userId
@@ -37,5 +37,5 @@ public interface WidgetCommentService {
* @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')")
- int deleteAll(Long userId);
+ int deleteAll(String userId);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetRatingService.java Thu Aug 9 07:05:51 2012
@@ -35,7 +35,7 @@ public interface WidgetRatingService {
* @return WidgetRating or {@link null} if there is no such combination
*/
@PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#userId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.WidgetRating', 'read')")
- WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId);
+ WidgetRating getByWidgetIdAndUserId(String widgetId, String userId);
/**
* Updates the score of a {@link org.apache.rave.portal.model.WidgetRating}
@@ -61,7 +61,7 @@ public interface WidgetRatingService {
* @param userId unique identifier of a {@link org.apache.rave.portal.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')")
- void removeWidgetRating(Long widgetId, Long userId);
+ void removeWidgetRating(String widgetId, String userId);
/**
* Removes all widget ratings for a userId, for all widgets
@@ -70,5 +70,5 @@ public interface WidgetRatingService {
* @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')")
- int removeAllWidgetRatings(Long userId);
+ int removeAllWidgetRatings(String userId);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java Thu Aug 9 07:05:51 2012
@@ -69,7 +69,7 @@ public interface WidgetService {
* @return a valid widget if one exists for the given id; null otherwise
*/
@PostAuthorize("returnObject == null or hasPermission(returnObject, 'read')")
- Widget getWidget(long id);
+ Widget getWidget(String id);
/**
* Gets a {@link SearchResult} for {@link Widget}'s that are published
@@ -104,7 +104,7 @@ public interface WidgetService {
SearchResult<Widget> getWidgetsBySearchCriteria(String searchTerm, String widgetType, String widgetStatus,
int offset, int pageSize);
- SearchResult<Widget> getWidgetsByOwner(Long ownerId, int offset, int pageSize);
+ SearchResult<Widget> getWidgetsByOwner(String ownerId, int offset, int pageSize);
/**
* Gets a Widget by its (unique) url
@@ -139,7 +139,7 @@ public interface WidgetService {
* @param userId id of the user
* @return {@link WidgetStatistics} with the rating information
*/
- WidgetStatistics getWidgetStatistics(long widgetId, long userId);
+ WidgetStatistics getWidgetStatistics(String widgetId, String userId);
/**
* Generates the mapping of widget statistics for the user.
@@ -147,7 +147,7 @@ public interface WidgetService {
* @param userId id of the user
* @return Mapping of {@link WidgetStatistics} objects keyed off of the widget's entityId
*/
- Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId);
+ Map<String, WidgetStatistics> getAllWidgetStatistics(String userId);
/**
* Updates {@link Widget}
@@ -175,6 +175,6 @@ public interface WidgetService {
* @param pageSize maximum number of items to be returned (for paging)
* @return SearchResult
*/
- SearchResult<Widget> getWidgetsByCategory(long categoryId, int offset, int pageSize);
+ SearchResult<Widget> getWidgetsByCategory(String categoryId, int offset, int pageSize);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetTagService.java Thu Aug 9 07:05:51 2012
@@ -21,9 +21,9 @@ import org.springframework.security.acce
public interface WidgetTagService {
- WidgetTag getWidgetTag(Long id);
+ WidgetTag getWidgetTag(String id);
- WidgetTag getWidgetTagByWidgetIdAndKeyword(Long widgetId, String keyword);
+ WidgetTag getWidgetTagByWidgetIdAndKeyword(String widgetId, String keyword);
@PreAuthorize("hasPermission(#widgetTag, 'create_or_update')")
void saveWidgetTag(WidgetTag widgetTag);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultAuthorityService.java Thu Aug 9 07:05:51 2012
@@ -40,7 +40,7 @@ public class DefaultAuthorityService imp
}
@Override
- public Authority getAuthorityById(long entityId) {
+ public Authority getAuthorityById(String entityId) {
return repository.get(entityId);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultCategoryService.java Thu Aug 9 07:05:51 2012
@@ -39,8 +39,8 @@ public class DefaultCategoryService impl
}
@Override
- public Category get(long entityId) {
- return categoryRepository.get(entityId);
+ public Category get(String id) {
+ return categoryRepository.get(id);
}
@@ -66,7 +66,7 @@ public class DefaultCategoryService impl
@Override
@Transactional
- public Category update(long categoryId, String text, User lastModifiedUser) {
+ public Category update(String categoryId, String text, User lastModifiedUser) {
Category category = categoryRepository.get(categoryId);
category.setText(text);
category.setLastModifiedDate(new Date());
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Thu Aug 9 07:05:51 2012
@@ -54,7 +54,7 @@ public class DefaultPageService implemen
private final PageTemplateRepository pageTemplateRepository;
private final String defaultPageName;
- private final long MOVE_PAGE_DEFAULT_POSITION_INDEX = -1L;
+ private final String MOVE_PAGE_DEFAULT_POSITION_INDEX = "-1";
@Autowired
public DefaultPageService(PageRepository pageRepository,
@@ -76,18 +76,18 @@ public class DefaultPageService implemen
}
@Override
- public Page getPage(long pageId) {
+ public Page getPage(String pageId) {
return pageRepository.get(pageId);
}
@Override
- public List<Page> getAllUserPages(long userId) {
+ public List<Page> getAllUserPages(String userId) {
return pageRepository.getAllPages(userId, PageType.USER);
}
@Override
@Transactional
- public Page getPersonProfilePage(long userId) {
+ public Page getPersonProfilePage(String userId) {
List<Page> profilePages = pageRepository.getAllPages(userId, PageType.PERSON_PROFILE);
Page personPage = null;
if (profilePages.isEmpty()){
@@ -99,7 +99,7 @@ public class DefaultPageService implemen
}
@Override
- public Page getPageFromList(long pageId, List<Page> pages) {
+ public Page getPageFromList(String pageId, List<Page> pages) {
for(Page page: pages) {
if(page.getId().equals(pageId)){
return page;
@@ -122,7 +122,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Page addNewDefaultUserPage(long userId) {
+ public Page addNewDefaultUserPage(String userId) {
User user = userService.getUserById(userId);
return addNewUserPage(user, defaultPageName, user.getDefaultPageLayout().getCode());
}
@@ -180,7 +180,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public void deletePage(long pageId) {
+ public void deletePage(String pageId) {
User user = userService.getAuthenticatedUser();
// first delete the page
pageRepository.delete(pageRepository.get(pageId));
@@ -194,13 +194,13 @@ public class DefaultPageService implemen
@Override
@Transactional
- public int deletePages(long userId, PageType pageType) {
+ public int deletePages(String userId, PageType pageType) {
return pageRepository.deletePages(userId, pageType);
}
@Override
@Transactional
- public RegionWidget moveRegionWidget(long regionWidgetId, int newPosition, long toRegionId, long fromRegionId) {
+ public RegionWidget moveRegionWidget(String regionWidgetId, int newPosition, String toRegionId, String fromRegionId) {
Region target = getFromRepository(toRegionId, regionRepository);
// verify that the target Region and the RegionWidget are not locked and can be modified
RegionWidget regionWidget = regionWidgetRepository.get(regionWidgetId);
@@ -217,7 +217,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public RegionWidget moveRegionWidgetToPage(long regionWidgetId, long toPageId) {
+ public RegionWidget moveRegionWidgetToPage(String regionWidgetId, String toPageId) {
// Get the new page
Page toPage = getFromRepository(toPageId, pageRepository);
// Get the region widget
@@ -242,7 +242,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Region removeWidgetFromPage(long regionWidgetId) {
+ public Region removeWidgetFromPage(String regionWidgetId) {
RegionWidget regionWidget = getFromRepository(regionWidgetId, regionWidgetRepository);
verifyRegionWidgetIsNotLocked(regionWidget);
regionWidgetRepository.delete(regionWidget);
@@ -251,7 +251,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public RegionWidget addWidgetToPage(long pageId, long widgetId) {
+ public RegionWidget addWidgetToPage(String pageId, String widgetId) {
Page page = getFromRepository(pageId, pageRepository);
Widget widget = getFromRepository(widgetId, widgetRepository);
Region region = page.getRegions().get(0);
@@ -261,19 +261,19 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Page movePage(long pageId, long moveAfterPageId) {
+ public Page movePage(String pageId, String moveAfterPageId) {
return doMovePage(pageId, moveAfterPageId);
}
@Override
@Transactional
- public Page movePageToDefault(long pageId) {
+ public Page movePageToDefault(String pageId) {
return doMovePage(pageId, MOVE_PAGE_DEFAULT_POSITION_INDEX);
}
@Override
@Transactional
- public Page updatePage(long pageId, String name, String pageLayoutCode) {
+ public Page updatePage(String pageId, String name, String pageLayoutCode) {
Page page = pageRepository.get(pageId);
PageLayout newLayout = pageLayoutRepository.getByPageLayoutCode(pageLayoutCode);
PageLayout curLayout = page.getPageLayout();
@@ -302,7 +302,7 @@ public class DefaultPageService implemen
}
@Transactional
- public Boolean addMemberToPage(long pageId, long userId){
+ public Boolean addMemberToPage(String pageId, String userId){
Page page = getPage(pageId);
PageUser pageUser = new PageUserImpl();
pageUser.setUser(userService.getUserById(userId));
@@ -319,7 +319,7 @@ public class DefaultPageService implemen
}
@Transactional
- public Boolean removeMemberFromPage(long pageId, long userId){
+ public Boolean removeMemberFromPage(String pageId, String userId){
Page page = this.getPage(pageId);
PageUser pageUserToRemove = null;
for(PageUser pageUser : page.getMembers()){
@@ -341,7 +341,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Boolean updateSharedPageStatus(long pageId, String shareStatus) {
+ public Boolean updateSharedPageStatus(String pageId, String shareStatus) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
if(pageUser.getUser().equals(userService.getAuthenticatedUser())){
@@ -357,7 +357,7 @@ public class DefaultPageService implemen
@Override
@Transactional
- public Boolean updatePageEditingStatus(long pageId, long userId, boolean isEditor) {
+ public Boolean updatePageEditingStatus(String pageId, String userId, boolean isEditor) {
Page page = this.getPage(pageId);
for(PageUser pageUser : page.getMembers()){
if(pageUser.getUser().equals(userService.getUserById(userId))){
@@ -459,12 +459,12 @@ public class DefaultPageService implemen
return persistedRegion.getRegionWidgets().get(position);
}
- private void moveWithinRegion(long regionWidgetId, int newPosition, Region target) {
+ private void moveWithinRegion(String regionWidgetId, int newPosition, Region target) {
replaceRegionWidget(regionWidgetId, newPosition, target, target);
updateRenderSequences(target.getRegionWidgets());
}
- private void moveBetweenRegions(long regionWidgetId, int newPosition, long fromRegion, Region target) {
+ private void moveBetweenRegions(String regionWidgetId, int newPosition, String fromRegion, Region target) {
Region source = getFromRepository(fromRegion, regionRepository);
replaceRegionWidget(regionWidgetId, newPosition, target, source);
updateRenderSequences(source.getRegionWidgets());
@@ -472,7 +472,7 @@ public class DefaultPageService implemen
regionRepository.save(source);
}
- private void replaceRegionWidget(long regionWidgetId, int newPosition, Region target, Region source) {
+ private void replaceRegionWidget(String regionWidgetId, int newPosition, Region target, Region source) {
RegionWidget widget = findRegionWidgetById(regionWidgetId, source.getRegionWidgets());
source.getRegionWidgets().remove(widget);
target.getRegionWidgets().add(newPosition, widget);
@@ -539,7 +539,7 @@ public class DefaultPageService implemen
}
}
- private Page doMovePage(long pageId, long moveAfterPageId) {
+ private Page doMovePage(String pageId, String moveAfterPageId) {
// get the logged in user
User user = userService.getAuthenticatedUser();
// get the page to move and the page to move after
@@ -569,7 +569,7 @@ public class DefaultPageService implemen
return movingPageUser.getPage();
}
- private static <T> T getFromRepository(long id, Repository<T> repo) {
+ private static <T> T getFromRepository(String id, Repository<T> repo) {
T object = repo.get(id);
if (object == null) {
throw new IllegalArgumentException("Could not find object of given id in " + repo.getClass().getSimpleName());
@@ -585,7 +585,7 @@ public class DefaultPageService implemen
}
}
- private static RegionWidget findRegionWidgetById(Long id, List<RegionWidget> regionWidgets) {
+ private static RegionWidget findRegionWidgetById(String id, List<RegionWidget> regionWidgets) {
for (RegionWidget widget : regionWidgets) {
if (widget.getId().equals(id)) {
return widget;
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultRegionWidgetService.java Thu Aug 9 07:05:51 2012
@@ -44,7 +44,7 @@ public class DefaultRegionWidgetService
}
@Override
- public RegionWidget getRegionWidget(long regionWidgetId) {
+ public RegionWidget getRegionWidget(String regionWidgetId) {
return regionWidgetRepository.get(regionWidgetId);
}
@@ -57,7 +57,7 @@ public class DefaultRegionWidgetService
@Override
@Synchronized(discriminator = "'RegionWidget'", id = "#regionWidgetId")
@Transactional
- public List<RegionWidgetPreference> saveRegionWidgetPreferences(long regionWidgetId,
+ public List<RegionWidgetPreference> saveRegionWidgetPreferences(String regionWidgetId,
List<RegionWidgetPreference> preferences) {
RegionWidget regionWidget = this.getValidRegionWidget(regionWidgetId);
ModelUtils.normalizeRegionWidgetPreferences(regionWidgetId, preferences);
@@ -68,7 +68,7 @@ public class DefaultRegionWidgetService
@Override
@Synchronized(discriminator = "'RegionWidget'", id = "#regionWidgetId")
@Transactional
- public RegionWidgetPreference saveRegionWidgetPreference(long regionWidgetId, RegionWidgetPreference preference) {
+ public RegionWidgetPreference saveRegionWidgetPreference(String regionWidgetId, RegionWidgetPreference preference) {
RegionWidget regionWidget = this.getValidRegionWidget(regionWidgetId);
ModelUtils.normalizeRegionWidgetPreference(regionWidgetId, preference);
reconcileRegionWidgetPreferences(regionWidget.getPreferences(), Arrays.asList(preference), false);
@@ -86,13 +86,13 @@ public class DefaultRegionWidgetService
@Override
@Transactional
- public RegionWidget saveRegionWidgetCollapsedState(long regionWidgetId, boolean collapsed) {
+ public RegionWidget saveRegionWidgetCollapsedState(String regionWidgetId, boolean collapsed) {
RegionWidget regionWidget = getValidRegionWidget(regionWidgetId);
regionWidget.setCollapsed(collapsed);
return saveRegionWidget(regionWidget);
}
- private RegionWidget getValidRegionWidget(long regionWidgetId) {
+ private RegionWidget getValidRegionWidget(String regionWidgetId) {
RegionWidget regionWidget = this.getRegionWidget(regionWidgetId);
if (regionWidget == null) {
throw new IllegalArgumentException("Invalid RegionWidget ID");
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultTagService.java Thu Aug 9 07:05:51 2012
@@ -39,7 +39,7 @@ public class DefaultTagService implement
}
@Override
- public Tag getTagById(long entityId) {
+ public Tag getTagById(String entityId) {
return repository.get(entityId);
}
@@ -56,7 +56,7 @@ public class DefaultTagService implement
}
@Override
- public List<Tag> getAvailableTagsByWidgetId(Long widgetId) {
+ public List<Tag> getAvailableTagsByWidgetId(String widgetId) {
return repository.getAvailableTagsByWidgetId(widgetId);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Thu Aug 9 07:05:51 2012
@@ -137,7 +137,7 @@ public class DefaultUserService implemen
}
@Override
- public void setAuthenticatedUser(long userId) {
+ public void setAuthenticatedUser(String userId) {
final User user = userRepository.get(userId);
if (user == null) {
throw new UsernameNotFoundException("User with id '" + userId + "' was not found!");
@@ -191,7 +191,7 @@ public class DefaultUserService implemen
}
@Override
- public User getUserById(Long id) {
+ public User getUserById(String id) {
return userRepository.get(id);
}
@@ -234,7 +234,7 @@ public class DefaultUserService implemen
@Override
@Transactional
// TODO RAVE-300: add security check that is is called by admin or the user itself
- public void deleteUser(Long userId) {
+ public void deleteUser(String userId) {
log.info("about to delete userId: " + userId);
User user = userRepository.get(userId);
if (user == null) {
@@ -265,7 +265,7 @@ public class DefaultUserService implemen
}
@Override
- public List<Person> getAllByAddedWidget(long widgetId) {
+ public List<Person> getAllByAddedWidget(String widgetId) {
List<Person> persons = new ArrayList<Person>();
List<User> users = userRepository.getAllByAddedWidget(widgetId);
for (User u : users) {
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetCommentService.java Thu Aug 9 07:05:51 2012
@@ -34,7 +34,7 @@ public class DefaultWidgetCommentService
}
@Override
- public WidgetComment getWidgetComment(Long id) {
+ public WidgetComment getWidgetComment(String id) {
return widgetCommentRepository.get(id);
}
@@ -46,13 +46,13 @@ public class DefaultWidgetCommentService
@Override
@Transactional
- public void removeWidgetComment(Long id) {
+ public void removeWidgetComment(String id) {
widgetCommentRepository.delete(getWidgetComment(id));
}
@Override
@Transactional
- public int deleteAll(Long userId) {
+ public int deleteAll(String userId) {
return widgetCommentRepository.deleteAll(userId);
}
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetRatingService.java Thu Aug 9 07:05:51 2012
@@ -40,7 +40,7 @@ public class DefaultWidgetRatingService
}
@Override
- public WidgetRating getByWidgetIdAndUserId(Long widgetId, Long userId) {
+ public WidgetRating getByWidgetIdAndUserId(String widgetId, String userId) {
return repository.getByWidgetIdAndUserId(widgetId, userId);
}
@@ -64,7 +64,7 @@ public class DefaultWidgetRatingService
@Override
@Transactional
- public void removeWidgetRating(Long widgetId, Long userId) {
+ public void removeWidgetRating(String widgetId, String userId) {
WidgetRating widgetRating = repository.getByWidgetIdAndUserId(widgetId, userId);
if (widgetRating == null) {
return;
@@ -74,7 +74,7 @@ public class DefaultWidgetRatingService
@Override
@Transactional
- public int removeAllWidgetRatings(Long userId) {
+ public int removeAllWidgetRatings(String userId) {
return repository.deleteAll(userId);
}
}
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java Thu Aug 9 07:05:51 2012
@@ -87,7 +87,7 @@ public class DefaultWidgetService implem
}
@Override
- public Widget getWidget(long id) {
+ public Widget getWidget(String id) {
return widgetRepository.get(id);
}
@@ -123,7 +123,7 @@ public class DefaultWidgetService implem
}
@Override
- public SearchResult<Widget> getWidgetsByOwner(Long ownerId, int offset, int pageSize) {
+ public SearchResult<Widget> getWidgetsByOwner(String ownerId, int offset, int pageSize) {
final User user = userRepository.get(ownerId);
final int count = widgetRepository.getCountByOwner(user, offset, pageSize);
final List<Widget> widgets = widgetRepository.getByOwner(user, offset, pageSize);
@@ -153,12 +153,12 @@ public class DefaultWidgetService implem
}
@Override
- public WidgetStatistics getWidgetStatistics(long widgetId, long userId) {
+ public WidgetStatistics getWidgetStatistics(String widgetId, String userId) {
return widgetRepository.getWidgetStatistics(widgetId, userId);
}
@Override
- public Map<Long, WidgetStatistics> getAllWidgetStatistics(long userId) {
+ public Map<String, WidgetStatistics> getAllWidgetStatistics(String userId) {
return widgetRepository.getAllWidgetStatistics(userId);
}
@@ -180,7 +180,7 @@ public class DefaultWidgetService implem
}
@Override
- public SearchResult<Widget> getWidgetsByCategory(long categoryId, int offset, int pageSize) {
+ public SearchResult<Widget> getWidgetsByCategory(String categoryId, int offset, int pageSize) {
List<Widget> widgets = categoryRepository.get(categoryId).getWidgets();
SearchResult<Widget> searchResult = new SearchResult<Widget>(widgets, widgets.size());
searchResult.setOffset(offset);
Modified: rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetTagService.java Thu Aug 9 07:05:51 2012
@@ -35,7 +35,7 @@ public class DefaultWidgetTagService imp
}
@Override
- public WidgetTag getWidgetTag(Long id) {
+ public WidgetTag getWidgetTag(String id) {
return widgetTagRepository.get(id);
}
@@ -47,7 +47,7 @@ public class DefaultWidgetTagService imp
}
@Override
- public WidgetTag getWidgetTagByWidgetIdAndKeyword(Long widgetId, String keyword) {
+ public WidgetTag getWidgetTagByWidgetIdAndKeyword(String widgetId, String keyword) {
return widgetTagRepository.getByWidgetIdAndTag(widgetId, keyword);
}
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/model/util/ModelUtilsTest.java Thu Aug 9 07:05:51 2012
@@ -29,7 +29,7 @@ import java.util.List;
import static org.junit.Assert.assertTrue;
public class ModelUtilsTest {
- long VALID_REGION_WIDGET_ID = 1L;
+ String VALID_REGION_WIDGET_ID = "1";
@Test
public void normalizeRegionWidgetPreference() {
@@ -50,7 +50,7 @@ public class ModelUtilsTest {
public List<RegionWidgetPreference> getTestRegionWidgetPreferences() {
return Arrays.asList((RegionWidgetPreference)new RegionWidgetPreferenceImpl( null, "camelCaseName", "FOO"),
- (RegionWidgetPreference)new RegionWidgetPreferenceImpl(20L, "lowercasename", "FOO"),
- (RegionWidgetPreference)new RegionWidgetPreferenceImpl( -100L, "UPPERCASENAME", "FOO"));
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl("20", "lowercasename", "FOO"),
+ (RegionWidgetPreference)new RegionWidgetPreferenceImpl( "-100", "UPPERCASENAME", "FOO"));
}
}
\ No newline at end of file
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultCategoryPermissionEvaluatorTest.java Thu Aug 9 07:05:51 2012
@@ -49,8 +49,8 @@ public class DefaultCategoryPermissionEv
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthorities;
- private final Long VALID_WIDGET_CATEGORY_ID = 22L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_WIDGET_CATEGORY_ID = "22";
+ private final String VALID_USER_ID = "99";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultPagePermissionEvaluatorTest.java Thu Aug 9 07:05:51 2012
@@ -53,13 +53,13 @@ public class DefaultPagePermissionEvalua
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_USER_ID = "99";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_PAGE_ID2 = 77L;
- private final Long VALID_PAGE_ID3 = 177L;
- private final Long VALID_PAGE_ID4 = 665L;
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_PAGE_ID2 = "77";
+ private final String VALID_PAGE_ID3 = "177";
+ private final String VALID_PAGE_ID4 = "665";
@Before
public void setUp() {
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionPermissionEvaluatorTest.java Thu Aug 9 07:05:51 2012
@@ -50,9 +50,9 @@ public class DefaultRegionPermissionEval
private Authentication mockAuthentication;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_REGION_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_REGION_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@@ -70,8 +70,7 @@ public class DefaultRegionPermissionEval
page = new PageImpl();
page.setId(VALID_PAGE_ID);
page.setOwner(user);
- region = new RegionImpl();
- region.setId(VALID_REGION_ID);
+ region = new RegionImpl(VALID_REGION_ID);
region.setPage(page);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));
Modified: rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java
URL: http://svn.apache.org/viewvc/rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java?rev=1371052&r1=1371051&r2=1371052&view=diff
==============================================================================
--- rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java (original)
+++ rave/branches/model-split/rave-components/rave-core/src/test/java/org/apache/rave/portal/security/impl/DefaultRegionWidgetPermissionEvaluatorTest.java Thu Aug 9 07:05:51 2012
@@ -53,10 +53,10 @@ public class DefaultRegionWidgetPermissi
private UserImpl user, user2;
private List<GrantedAuthority> grantedAuthoritiesList;
- private final Long VALID_REGION_ID = 1L;
- private final Long VALID_REGION_WIDGET_ID = 1L;
- private final Long VALID_PAGE_ID = 3L;
- private final Long VALID_USER_ID = 99L;
+ private final String VALID_REGION_ID = "1";
+ private final String VALID_REGION_WIDGET_ID = "1";
+ private final String VALID_PAGE_ID = "3";
+ private final String VALID_USER_ID = "99";
private final String VALID_USERNAME = "john.doe";
private final String VALID_USERNAME2 = "jane.doe";
@@ -74,11 +74,9 @@ public class DefaultRegionWidgetPermissi
page = new PageImpl();
page.setId(VALID_PAGE_ID);
page.setOwner(user);
- region = new RegionImpl();
- region.setId(VALID_REGION_ID);
+ region = new RegionImpl(VALID_REGION_ID);
region.setPage(page);
- regionWidget = new RegionWidgetImpl();
- regionWidget.setId(VALID_REGION_WIDGET_ID);
+ regionWidget = new RegionWidgetImpl(VALID_REGION_WIDGET_ID);
regionWidget.setRegion(region);
grantedAuthoritiesList = new ArrayList<GrantedAuthority>();
grantedAuthoritiesList.add(new SimpleGrantedAuthority("ROLE_USER"));