inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/SWIFT to HEAD:

Browse Source 
r28607 Fixing a spring configuration error. I had injected the activityPostService instead of the activityService into some webscript controllers.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Neil McErlean
2011-06-27 11:24:52 +00:00
parent 9e38ed78ea
commit ba6d532d55
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/blogs/web-scripts-blog-context.xml
View File

@@ -29,7 +29,7 @@
<bean id="webscript.org.alfresco.repository.blogs.post.blog-post.delete" <bean id="webscript.org.alfresco.repository.blogs.post.blog-post.delete"
class="org.alfresco.repo.web.scripts.blogs.post.BlogPostDelete" class="org.alfresco.repo.web.scripts.blogs.post.BlogPostDelete"
parent="abstractBlogWebScript"> parent="abstractBlogWebScript">
<property name="activityPostService" ref="activityPostService"/> <property name="activityService" ref="activityService"/>
</bean> </bean>
<bean id="webscript.org.alfresco.repository.blogs.post.blog-post.get" <bean id="webscript.org.alfresco.repository.blogs.post.blog-post.get"
@@ -73,6 +73,6 @@
class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsPost" class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsPost"
parent="abstractBlogWebScript"> parent="abstractBlogWebScript">
<property name="taggingService" ref="TaggingService"/> <property name="taggingService" ref="TaggingService"/>
<property name="activityPostService" ref="activityPostService"/> <property name="activityService" ref="activityService"/>
</bean> </bean>
</beans> </beans>

10
source/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java
View File

@@ -24,7 +24,7 @@ import java.util.Map;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript; import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
import org.alfresco.repo.web.scripts.blogs.RequestUtilsLibJs; import org.alfresco.repo.web.scripts.blogs.RequestUtilsLibJs;
import org.alfresco.service.cmr.activities.ActivityPostService; import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONStringer; import org.json.JSONStringer;
@@ -40,11 +40,11 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
*/ */
public class BlogPostDelete extends AbstractBlogWebScript public class BlogPostDelete extends AbstractBlogWebScript
{ {
private ActivityPostService activityPostService; private ActivityService activityService;
public void setActivityPostService(ActivityPostService activityPostService) public void setActivityService(ActivityService activityService)
{ {
this.activityPostService = activityPostService; this.activityService = activityService;
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@@ -92,7 +92,7 @@ public class BlogPostDelete extends AbstractBlogWebScript
} }
if (data != null) if (data != null)
{ {
activityPostService.postActivity("org.alfresco.blog.post-deleted", site, "blog", data); activityService.postActivity("org.alfresco.blog.post-deleted", site, "blog", data);
} }
} }
} }

10
source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
View File

@@ -28,7 +28,7 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript; import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs; import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs;
import org.alfresco.repo.web.scripts.blogs.RequestUtilsLibJs; import org.alfresco.repo.web.scripts.blogs.RequestUtilsLibJs;
import org.alfresco.service.cmr.activities.ActivityPostService; import org.alfresco.service.cmr.activities.ActivityService;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.tagging.TaggingService; import org.alfresco.service.cmr.tagging.TaggingService;
@@ -51,12 +51,12 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
public class BlogPostsPost extends AbstractBlogWebScript public class BlogPostsPost extends AbstractBlogWebScript
{ {
// Injected services // Injected services
private ActivityPostService activityPostService; private ActivityService activityService;
private TaggingService taggingService; private TaggingService taggingService;
public void setActivityPostService(ActivityPostService activityPostService) public void setActivityService(ActivityService activityService)
{ {
this.activityPostService = activityPostService; this.activityService = activityService;
} }
public void setTaggingService(TaggingService taggingService) public void setTaggingService(TaggingService taggingService)
@@ -104,7 +104,7 @@ public class BlogPostsPost extends AbstractBlogWebScript
} }
if (data != null) if (data != null)
{ {
activityPostService.postActivity("org.alfresco.blog.post-created", jsonPostParams.getSite(), "blog", data); activityService.postActivity("org.alfresco.blog.post-created", jsonPostParams.getSite(), "blog", data);
} }
} }