From 1946c58b5cc2c6d0d8aa3be7e3d9556d9c1443f6 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Wed, 12 Oct 2011 13:01:23 +0000 Subject: [PATCH] ALF-10429 / ALF-10413 - Start to refactor the blog service to match the other new services, as a precursor to fixing the paging bug git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31166 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java | 2 +- .../alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java | 3 +-- .../repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java | 2 +- .../repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java | 2 +- .../alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java | 2 +- .../repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java | 2 +- .../alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java | 2 +- .../repo/web/scripts/blogs/posts/BlogPostsPublishedExtGet.java | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java index 5cc32422cf..603f961a7a 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java @@ -30,7 +30,7 @@ import org.alfresco.query.PagingResults; 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.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.blog.BlogService.RangedDateProperty; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.util.Pair; diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java index 6061e1a16f..cf41ea410a 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java @@ -22,7 +22,7 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /** @@ -39,7 +39,6 @@ public class BlogPostsGet extends AbstractGetBlogWebScript { // This intentionally uses the deprecated method in the foundation service. // In fact the method is there specifically for this class. - return blogService.getMyDraftsAndAllPublished(node, fromDate, toDate, pagingReq); } } diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java index 9f6a5f4518..7dbfada420 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyDraftsGet.java @@ -23,7 +23,7 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java index 088723781c..4985903e37 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsMyPublishedGet.java @@ -23,7 +23,7 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; import org.alfresco.repo.security.authentication.AuthenticationUtil; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java index c195b60f48..ea65955542 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsNewGet.java @@ -22,7 +22,7 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /** diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java index 33db5bdf05..6f4982aee4 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPerMonthGet.java @@ -28,7 +28,7 @@ import java.util.Map; import org.alfresco.model.ContentModel; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; import org.springframework.extensions.webscripts.WebScriptRequest; 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 0eb1d77ea5..f5cac71c2b 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 @@ -29,7 +29,7 @@ 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.ActivityService; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.tagging.TaggingService; import org.apache.commons.logging.Log; diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPublishedExtGet.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPublishedExtGet.java index a9bb88a97c..2788bf408e 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPublishedExtGet.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPublishedExtGet.java @@ -22,7 +22,7 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /**