From ba6d532d55ca7b25784bec7dfc1e5abbce415d87 Mon Sep 17 00:00:00 2001
From: Neil McErlean <neil.mcerlean@alfresco.com>
Date: Mon, 27 Jun 2011 11:24:52 +0000
Subject: [PATCH] Merged BRANCHES/DEV/SWIFT to HEAD:    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
---
 config/alfresco/blogs/web-scripts-blog-context.xml     |  4 ++--
 .../repo/web/scripts/blogs/post/BlogPostDelete.java    | 10 +++++-----
 .../repo/web/scripts/blogs/posts/BlogPostsPost.java    | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/alfresco/blogs/web-scripts-blog-context.xml b/config/alfresco/blogs/web-scripts-blog-context.xml
index f7541298d8..6791bb0295 100644
--- a/config/alfresco/blogs/web-scripts-blog-context.xml
+++ b/config/alfresco/blogs/web-scripts-blog-context.xml
@@ -29,7 +29,7 @@
     <bean id="webscript.org.alfresco.repository.blogs.post.blog-post.delete"
           class="org.alfresco.repo.web.scripts.blogs.post.BlogPostDelete"
           parent="abstractBlogWebScript">
-        <property name="activityPostService" ref="activityPostService"/>
+        <property name="activityService" ref="activityService"/>
     </bean>
     
     <bean id="webscript.org.alfresco.repository.blogs.post.blog-post.get"
@@ -73,6 +73,6 @@
           class="org.alfresco.repo.web.scripts.blogs.posts.BlogPostsPost"
           parent="abstractBlogWebScript">
         <property name="taggingService" ref="TaggingService"/>
-        <property name="activityPostService" ref="activityPostService"/>
+        <property name="activityService" ref="activityService"/>
     </bean>
 </beans>
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java b/source/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java
index 798488d71b..859e81d222 100644
--- a/source/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java
+++ b/source/java/org/alfresco/repo/web/scripts/blogs/post/BlogPostDelete.java
@@ -24,7 +24,7 @@ import java.util.Map;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
 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.json.JSONException;
 import org.json.JSONStringer;
@@ -40,11 +40,11 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
  */
 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")
@@ -92,7 +92,7 @@ public class BlogPostDelete extends AbstractBlogWebScript
         }
         if (data != null)
         {
-            activityPostService.postActivity("org.alfresco.blog.post-deleted", site, "blog", data);
+            activityService.postActivity("org.alfresco.blog.post-deleted", site, "blog", data);
         }
     }
 }
diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
index 5330a28060..d5501ec909 100644
--- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
@@ -28,7 +28,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.web.scripts.blogs.AbstractBlogWebScript;
 import org.alfresco.repo.web.scripts.blogs.BlogPostLibJs;
 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.NodeRef;
 import org.alfresco.service.cmr.tagging.TaggingService;
@@ -51,12 +51,12 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
 public class BlogPostsPost extends AbstractBlogWebScript
 {
     // Injected services
-    private ActivityPostService activityPostService;
+    private ActivityService activityService;
     private TaggingService taggingService;
     
-    public void setActivityPostService(ActivityPostService activityPostService)
+    public void setActivityService(ActivityService activityService)
     {
-        this.activityPostService = activityPostService;
+        this.activityService = activityService;
     }
     
     public void setTaggingService(TaggingService taggingService)
@@ -104,7 +104,7 @@ public class BlogPostsPost extends AbstractBlogWebScript
             }
             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);
             }
         }