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

config/alfresco/blog-context.xml

@@ -5,7 +5,7 @@
     <!-- Blog Service (Alfresco internal storage of blog-related content) -->
     <bean id="BlogService" class="org.springframework.aop.framework.ProxyFactoryBean">
        <property name="proxyInterfaces">
-          <value>org.alfresco.repo.blog.BlogService</value>
+          <value>org.alfresco.service.cmr.blog.BlogService</value>
        </property>
        <property name="target">
           <ref bean="blogService" />
@@ -15,7 +15,7 @@
              <idref local="BlogService_transaction" />
              <idref bean="AuditMethodInterceptor" />
              <idref bean="exceptionTranslator" />
-             <idref local="BlogService_security" />
+             <idref bean="BlogService_security" />
           </list>
        </property>
     </bean>
@@ -32,46 +32,30 @@
           </props>
        </property>
     </bean>
-   
+    
-    <bean id="BlogService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
+    
-        <property name="authenticationManager"><ref bean="authenticationManager"/></property>
+    
-        <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
-        <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
-        <property name="objectDefinitionSource">
-            <value>
-               <!-- ACL_NODE.0 means you need the following permissions on a NodeRef method-arg at index 0. -->
-               <!-- AFTER_ACL_NODE means you need the specified permissions on the return type,
-                                   type must be one of ChAssRef, FileInfo, NodeRef, StoreRef, ResultSet & Collections, arrays of same -->
-               org.alfresco.repo.blog.BlogService.getDrafts=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
-               org.alfresco.repo.blog.BlogService.getPublished=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
-               org.alfresco.repo.blog.BlogService.getPublishedExternally=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
-               org.alfresco.repo.blog.BlogService.getMyDraftsAndAllPublished=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
-               org.alfresco.repo.blog.BlogService.*=ACL_ALLOW
-            </value>
-        </property>
-    </bean>
-      
     <bean id="BlogService_security_getDrafts" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">
         <property name="methodSecurityInterceptor" ref="BlogService_security" />
-        <property name="service" value="org.alfresco.repo.blog.BlogService" />
+        <property name="service" value="org.alfresco.service.cmr.blog.BlogService" />
         <property name="methodName" value="getDrafts" />
     </bean>
 
     <bean id="BlogService_security_getPublished" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">
         <property name="methodSecurityInterceptor" ref="BlogService_security" />
-        <property name="service" value="org.alfresco.repo.blog.BlogService" />
+        <property name="service" value="org.alfresco.service.cmr.blog.BlogService" />
         <property name="methodName" value="getPublished" />
     </bean>
 
     <bean id="BlogService_security_getPublishedExternally" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">
         <property name="methodSecurityInterceptor" ref="BlogService_security" />
-        <property name="service" value="org.alfresco.repo.blog.BlogService" />
+        <property name="service" value="org.alfresco.service.cmr.blog.BlogService" />
         <property name="methodName" value="getPublishedExternally" />
     </bean>
 
     <bean id="BlogService_security_getMyDraftsAndAllPublished" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean">
         <property name="methodSecurityInterceptor" ref="BlogService_security" />
-        <property name="service" value="org.alfresco.repo.blog.BlogService" />
+        <property name="service" value="org.alfresco.service.cmr.blog.BlogService" />
         <property name="methodName" value="getMyDraftsAndAllPublished" />
     </bean>
 

config/alfresco/public-services-security-context.xml

@@ -900,6 +900,26 @@
         </property>
     </bean>
     
+    <!-- ============ -->
+    <!-- Blog Service -->
+    <!-- ============ -->
+    
+    <bean id="BlogService_security" class="org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityInterceptor">
+        <property name="authenticationManager"><ref bean="authenticationManager"/></property>
+        <property name="accessDecisionManager"><ref bean="accessDecisionManager"/></property>
+        <property name="afterInvocationManager"><ref bean="afterInvocationManager"/></property>
+        <property name="objectDefinitionSource">
+            <value>
+               org.alfresco.service.cmr.blog.BlogService.getDrafts=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
+               org.alfresco.service.cmr.blog.BlogService.getPublished=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
+               org.alfresco.service.cmr.blog.BlogService.getPublishedExternally=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
+               org.alfresco.service.cmr.blog.BlogService.getMyDraftsAndAllPublished=ACL_NODE.0.sys:base.ReadChildren,AFTER_ACL_NODE.sys:base.ReadProperties
+               org.alfresco.service.cmr.blog.BlogService.*=ACL_ALLOW
+            </value>
+        </property>
+    </bean>
+    
+    
     <!-- ============ -->
     <!-- Site Service -->
     <!-- ============ -->

source/java/org/alfresco/repo/blog/BlogServiceImpl.java

@@ -36,6 +36,7 @@ import org.alfresco.repo.blog.cannedqueries.GetBlogPostsCannedQuery;
 import org.alfresco.repo.blog.cannedqueries.GetBlogPostsCannedQueryFactory;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
+import org.alfresco.service.cmr.blog.BlogService;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.ContentWriter;

source/java/org/alfresco/repo/blog/BlogServiceImplTest.java

@@ -31,11 +31,12 @@ import java.util.List;
 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.repo.policy.BehaviourFilter;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.site.SiteModel;
 import org.alfresco.repo.transaction.RetryingTransactionHelper;
+import org.alfresco.service.cmr.blog.BlogService;
+import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;

source/java/org/alfresco/repo/blog/cannedqueries/AbstractBlogPostsCannedQueryFactory.java

@@ -29,12 +29,12 @@ import org.alfresco.query.CannedQueryPageDetails;
 import org.alfresco.query.CannedQuerySortDetails;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.CannedQuerySortDetails.SortOrder;
-import org.alfresco.repo.blog.BlogService.BlogPostInfo;
 import org.alfresco.repo.domain.node.NodeDAO;
 import org.alfresco.repo.domain.qname.QNameDAO;
 import org.alfresco.repo.domain.query.CannedQueryDAO;
 import org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean;
 import org.alfresco.repo.tenant.TenantService;
+import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo;
 import org.alfresco.service.cmr.repository.InvalidNodeRefException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.namespace.QName;

source/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java

@@ -26,15 +26,14 @@ import java.util.List;
 import org.alfresco.query.CannedQuery;
 import org.alfresco.query.CannedQueryParameters;
 import org.alfresco.query.CannedQuerySortDetails.SortOrder;
-import org.alfresco.repo.blog.BlogService;
-import org.alfresco.repo.blog.BlogService.BlogPostInfo;
 import org.alfresco.repo.blog.cannedqueries.AbstractBlogPostsCannedQueryFactory.PropertyBasedComparator;
 import org.alfresco.repo.domain.query.CannedQueryDAO;
 import org.alfresco.repo.security.permissions.impl.acegi.AbstractCannedQueryPermissions;
 import org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean;
+import org.alfresco.service.cmr.blog.BlogService;
+import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
-import org.alfresco.service.cmr.tagging.TaggingService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;
 import org.apache.commons.logging.Log;

source/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQueryFactory.java

@@ -28,7 +28,7 @@ import org.alfresco.query.CannedQueryParameters;
 import org.alfresco.query.CannedQuerySortDetails;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.CannedQuerySortDetails.SortOrder;
-import org.alfresco.repo.blog.BlogService.BlogPostInfo;
+import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.ParameterCheck;
 

source/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQuery.java

@@ -26,13 +26,13 @@ import java.util.List;
 import org.alfresco.query.CannedQuery;
 import org.alfresco.query.CannedQueryParameters;
 import org.alfresco.query.CannedQuerySortDetails.SortOrder;
-import org.alfresco.repo.blog.BlogService;
-import org.alfresco.repo.blog.BlogService.BlogPostInfo;
 import org.alfresco.repo.blog.cannedqueries.AbstractBlogPostsCannedQueryFactory.PropertyBasedComparator;
 import org.alfresco.repo.domain.node.AuditablePropertiesEntity;
 import org.alfresco.repo.domain.query.CannedQueryDAO;
 import org.alfresco.repo.security.permissions.impl.acegi.AbstractCannedQueryPermissions;
 import org.alfresco.repo.security.permissions.impl.acegi.MethodSecurityBean;
+import org.alfresco.service.cmr.blog.BlogService;
+import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo;
 import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.Pair;

source/java/org/alfresco/repo/blog/cannedqueries/GetBlogPostsCannedQueryFactory.java

@@ -29,8 +29,8 @@ import org.alfresco.query.CannedQueryParameters;
 import org.alfresco.query.CannedQuerySortDetails;
 import org.alfresco.query.PagingRequest;
 import org.alfresco.query.CannedQuerySortDetails.SortOrder;
-import org.alfresco.repo.blog.BlogService;
+import org.alfresco.service.cmr.blog.BlogService;
-import org.alfresco.repo.blog.BlogService.BlogPostInfo;
+import org.alfresco.service.cmr.blog.BlogService.BlogPostInfo;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.util.ParameterCheck;
 

source/java/org/alfresco/repo/rendition/MockedTestServiceRegistry.java

@@ -41,6 +41,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.deploy.DeploymentService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.blog.BlogService;
 import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -532,4 +533,12 @@ public class MockedTestServiceRegistry implements ServiceRegistry
         // TODO Auto-generated method stub
         return null;
     }
+
+
+    @Override
+    public BlogService getBlogService()
+    {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }

source/java/org/alfresco/repo/service/ServiceDescriptorRegistry.java

@@ -39,6 +39,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.deploy.DeploymentService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.blog.BlogService;
 import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -544,6 +545,15 @@ public class ServiceDescriptorRegistry
         return (NodeLocatorService)getService(NODE_LOCATOR_SERVICE);
     }
     
+    /*
+     * (non-Javadoc)
+     * @see org.alfresco.service.ServiceRegistry#getBlogService()
+     */
+    public BlogService getBlogService() 
+    {
+        return (BlogService)getService(BLOG_SERVICE);
+    }
+    
     /*
      * (non-Javadoc)
      * @see org.alfresco.service.ServiceRegistry#getCalendarService()

source/java/org/alfresco/service/ServiceRegistry.java

@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.deploy.DeploymentService;
 import org.alfresco.service.cmr.avm.locking.AVMLockingService;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.blog.BlogService;
 import org.alfresco.service.cmr.calendar.CalendarService;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
@@ -139,6 +140,7 @@ public interface ServiceRegistry
     static final QName RATING_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RatingService");
     static final QName REPO_ADMIN_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "RepoAdminService");
     static final QName NODE_LOCATOR_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "nodeLocatorService");
+    static final QName BLOG_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "BlogService");
     static final QName CALENDAR_SERVICE = QName.createQName(NamespaceService.ALFRESCO_URI, "CalendarService");
     
     // WCM / AVM
@@ -519,9 +521,20 @@ public interface ServiceRegistry
     @NotAuditable
     NodeLocatorService getNodeLocatorService();
     
+    /**
+     * Get the blog service (or null if one is not provided)
+     * @return
+     * 
+     * @since 4.0
+     */
+    @NotAuditable
+    BlogService getBlogService();
+    
     /**
      * Get the calendar service (or null if one is not provided)
      * @return
+     * 
+     * @since 4.0
      */
     @NotAuditable
     CalendarService getCalendarService();

source/java/org/alfresco/service/cmr/blog/BlogService.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.alfresco.repo.blog;
+package org.alfresco.service.cmr.blog;
 
 import java.util.Date;