You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2011/10/28 19:17:30 UTC
svn commit: r1190457 - in
/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service:
WidgetService.java impl/DefaultWidgetService.java
Author: carlucci
Date: Fri Oct 28 17:17:30 2011
New Revision: 1190457
URL: http://svn.apache.org/viewvc?rev=1190457&view=rev
Log:
RAVE-319: Widget persistence not working
Added @Transaction annotation to the registerNewWidget and updateWidget methods to ensure JPA commits
Modified:
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java?rev=1190457&r1=1190456&r2=1190457&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/WidgetService.java Fri Oct 28 17:17:30 2011
@@ -119,12 +119,8 @@ public interface WidgetService {
*
* @param widget new Widget to store
* @return Widget if it is new and can be stored, otherwise {@literal null}
- *
- * TODO: change the security annotation to:
- * @PostAuthorize("hasPermission(returnObject, 'create')")
- * once RAVE-319 has been resolved
*/
- @PreAuthorize("hasPermission(new org.apache.rave.portal.security.impl.RaveSecurityContext(#widget.owner.entityId, 'org.apache.rave.portal.model.User'), 'org.apache.rave.portal.model.Widget', 'create')")
+ @PostAuthorize("hasPermission(returnObject, 'create')")
Widget registerNewWidget(Widget widget);
/**
Modified: incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java?rev=1190457&r1=1190456&r2=1190457&view=diff
==============================================================================
--- incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java (original)
+++ incubator/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultWidgetService.java Fri Oct 28 17:17:30 2011
@@ -33,6 +33,7 @@ import org.springframework.stereotype.Se
import java.util.List;
import java.util.Map;
+import org.springframework.transaction.annotation.Transactional;
@Service
public class DefaultWidgetService implements WidgetService {
@@ -122,11 +123,12 @@ public class DefaultWidgetService implem
}
@Override
+ @Transactional
public Widget registerNewWidget(Widget widget) {
if (getWidgetByUrl(widget.getUrl()) != null) {
logger.debug("Trying to add an existing widget for url {}", widget.getUrl());
return null;
- }
+ }
return widgetRepository.save(widget);
}
@@ -141,6 +143,7 @@ public class DefaultWidgetService implem
}
@Override
+ @Transactional
public void updateWidget(Widget widget) {
widgetRepository.save(widget);
}