From d914c1e445b475fefd81ac8865d2bb30ce07cccd Mon Sep 17 00:00:00 2001 From: Neil McErlean Date: Tue, 12 Jul 2011 15:22:05 +0000 Subject: [PATCH] ALF-9385. Moved BlogService interface to standard org.alfresco.service.cmr package. Also moved the BlogService_Security bean from blog-context.xml into public-services-security-context.xml. Loads of imports had to be repointed, hence the long change set. Also some spring config. Didn't repackage BlogIntegrationService as it has been released in previous Alfresco versions in its current location. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java | 2 +- .../java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java | 2 +- .../repo/web/scripts/blogs/posts/AbstractGetBlogWebScript.java | 2 +- .../org/alfresco/repo/web/scripts/blogs/posts/BlogPostsGet.java | 2 +- .../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 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java b/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java index 025af42a08..7f6381b542 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java @@ -18,9 +18,9 @@ */ package org.alfresco.repo.web.scripts.blogs; -import org.alfresco.repo.blog.BlogService; import org.alfresco.repo.model.Repository; import org.alfresco.service.ServiceRegistry; +import org.alfresco.service.cmr.blog.BlogService; import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.site.SiteService; import org.springframework.extensions.webscripts.DeclarativeWebScript; diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java b/source/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java index c71aa8ebc5..9716288275 100644 --- a/source/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java +++ b/source/java/org/alfresco/repo/web/scripts/blogs/AllBlogTests.java @@ -18,8 +18,8 @@ */ package org.alfresco.repo.web.scripts.blogs; -import org.alfresco.repo.blog.BlogService; import org.alfresco.repo.blog.BlogServiceImplTest; +import org.alfresco.service.cmr.blog.BlogService; import org.junit.runner.RunWith; import org.junit.runners.Suite; 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 861457c488..02a8bec6f0 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 @@ -26,10 +26,10 @@ import java.util.Map; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.repo.blog.BlogService.BlogPostInfo; 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.repository.NodeRef; import org.alfresco.util.Pair; import org.apache.commons.logging.Log; 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 8c57409c5c..6061e1a16f 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.repo.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /** 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 9c08ac2470..9f6a5f4518 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 @@ -22,8 +22,8 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.repo.blog.BlogService.BlogPostInfo; import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.service.cmr.blog.BlogService.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 7aff7f94f0..088723781c 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 @@ -22,8 +22,8 @@ import java.util.Date; import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingResults; -import org.alfresco.repo.blog.BlogService.BlogPostInfo; import org.alfresco.repo.security.authentication.AuthenticationUtil; +import org.alfresco.service.cmr.blog.BlogService.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 b431167809..c195b60f48 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.repo.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogService.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 221e18d29e..33db5bdf05 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.repo.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogService.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 764909e27f..0eb1d77ea5 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 @@ -25,11 +25,11 @@ import java.util.List; import java.util.Map; import org.alfresco.model.ContentModel; -import org.alfresco.repo.blog.BlogService.BlogPostInfo; 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.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 5b234cb6ae..a9bb88a97c 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.repo.blog.BlogService.BlogPostInfo; +import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo; import org.alfresco.service.cmr.repository.NodeRef; /**