Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

99981: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE) 99482: Merged DEV to 5.0.N (5.0.1) 99198 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc typo in project alfresco-jlan 99413 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project alfresco-jlan 99205 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project core 99415 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project data-model 99227 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project file-transfer-receiver 99416 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project legacy-lucene 99417 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project qa-share 99418 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project remote-api 99427 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc in project Repository, letters S..Z 99433 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc in project Repository, letters A..R 99421 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project share-po 99247 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc typo in project slingshot 99248 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project slingshot 99424 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr 99426 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr4 99253 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project solr-client 99259 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project web-client 99260 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code - Changed Javadoc parameters inconsistence in project web-framework-commons git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100501 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-10-15 15:02:20 +00:00 · 2015-03-27 23:00:01 +00:00
parent 8109be0920
commit a4a7c5f8e7
492 changed files with 4135 additions and 4255 deletions
--- a/source/java/org/alfresco/repo/blog/BaseBlogIntegrationImplementation.java
+++ b/source/java/org/alfresco/repo/blog/BaseBlogIntegrationImplementation.java
@@ -63,7 +63,7 @@ public abstract class BaseBlogIntegrationImplementation implements BlogIntegrati
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#getName()
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#getName()
     */
    public String getName()
    {
@@ -81,7 +81,7 @@ public abstract class BaseBlogIntegrationImplementation implements BlogIntegrati
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#getDisplayName()
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#getDisplayName()
     */
    public String getDisplayName()
    {
--- a/source/java/org/alfresco/repo/blog/BlogIntegrationService.java
+++ b/source/java/org/alfresco/repo/blog/BlogIntegrationService.java
@@ -76,7 +76,6 @@ public interface BlogIntegrationService
    
    /**
     * 
-     * @param postId
     * @param nodeRef
     * @param contentProperty
     * @param publish
@@ -85,7 +84,6 @@ public interface BlogIntegrationService
    
    /**
     * 
-     * @param postId
     * @param nodeRef
     */
    void deletePost(NodeRef nodeRef);
--- a/source/java/org/alfresco/repo/blog/BlogIntegrationServiceImpl.java
+++ b/source/java/org/alfresco/repo/blog/BlogIntegrationServiceImpl.java
@@ -83,7 +83,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#register(org.alfresco.module.blogIntegration.BlogIntegrationImplementation)
+     * @see org.alfresco.repo.blog.BlogIntegrationService#register(org.alfresco.repo.blog.BlogIntegrationImplementation)
     */
    public void register(BlogIntegrationImplementation implementation)
    {
@@ -95,7 +95,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#getBlogIntegrationImplementation(java.lang.String)
+     * @see org.alfresco.repo.blog.BlogIntegrationService#getBlogIntegrationImplementation(java.lang.String)
     */
    public BlogIntegrationImplementation getBlogIntegrationImplementation(String implementationName)
    {
@@ -103,7 +103,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }

    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#getBlogIntegrationImplementations()
+     * @see org.alfresco.repo.blog.BlogIntegrationService#getBlogIntegrationImplementations()
     */
    public List<BlogIntegrationImplementation> getBlogIntegrationImplementations()
    {
@@ -111,7 +111,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }

    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#getBlogDetails(org.alfresco.service.cmr.repository.NodeRef)
+     * @see org.alfresco.repo.blog.BlogIntegrationService#getBlogDetails(org.alfresco.service.cmr.repository.NodeRef)
     */
    public List<BlogDetails> getBlogDetails(NodeRef nodeRef)
    {
@@ -157,7 +157,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#newPost(org.alfresco.module.blogIntegration.BlogDetails, org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, boolean)
+     * @see org.alfresco.repo.blog.BlogIntegrationService#newPost(org.alfresco.module.blogIntegration.BlogDetails, org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, boolean)
     */
    public void newPost(BlogDetails blogDetails, NodeRef nodeRef, QName contentProperty, boolean publish)
    {
@@ -249,7 +249,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#updatePost(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, boolean)
+     * @see org.alfresco.repo.blog.BlogIntegrationService#updatePost(org.alfresco.service.cmr.repository.NodeRef, org.alfresco.service.namespace.QName, boolean)
     */
    public void updatePost(NodeRef nodeRef, QName contentProperty, boolean publish)
    {
@@ -326,7 +326,7 @@ public class BlogIntegrationServiceImpl implements BlogIntegrationService, BlogI
    }

    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationService#deletePost(org.alfresco.service.cmr.repository.NodeRef)
+     * @see org.alfresco.repo.blog.BlogIntegrationService#deletePost(org.alfresco.service.cmr.repository.NodeRef)
     */
    public void deletePost(NodeRef nodeRef)
    {
--- a/source/java/org/alfresco/repo/blog/DefaultBlogIntegrationImplementation.java
+++ b/source/java/org/alfresco/repo/blog/DefaultBlogIntegrationImplementation.java
@@ -54,7 +54,7 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg
    protected abstract String getEndpointURL(BlogDetails blogDetails);
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#newPost(org.alfresco.module.blogIntegration.BlogDetails, java.lang.String, java.lang.String, boolean)
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#newPost(org.alfresco.repo.blog.BlogDetails, java.lang.String, java.lang.String, boolean)
     */
    public String newPost(BlogDetails blogDetails, String title, String body, boolean publish)
    {
@@ -76,7 +76,7 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg
    }

    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#updatePost(org.alfresco.module.blogIntegration.BlogDetails, java.lang.String, java.lang.String, java.lang.String, boolean)
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#updatePost(org.alfresco.repo.blog.BlogDetails, java.lang.String, java.lang.String, java.lang.String, boolean)
     */
    public boolean updatePost(BlogDetails blogDetails, String postId, String title, String body, boolean publish)
    {
@@ -105,7 +105,7 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg
    }
    
    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#getPost(org.alfresco.module.blogIntegration.BlogDetails, java.lang.String)
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#getPost(org.alfresco.repo.blog.BlogDetails, java.lang.String)
     */
    @SuppressWarnings("unchecked")
    public Map<String, Object> getPost(BlogDetails blogDetails, String postId)
@@ -121,7 +121,7 @@ public abstract class DefaultBlogIntegrationImplementation extends BaseBlogInteg
    }

    /**
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#deletePost(org.alfresco.module.blogIntegration.BlogDetails, java.lang.String)
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#deletePost(org.alfresco.repo.blog.BlogDetails, java.lang.String)
     */
    public boolean deletePost(BlogDetails blogDetails, String postId)
    {
--- a/source/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java
+++ b/source/java/org/alfresco/repo/blog/cannedqueries/DraftsAndPublishedBlogPostsCannedQuery.java
@@ -42,13 +42,13 @@ import org.apache.commons.logging.LogFactory;
 /**
 * This is a {@link CannedQuery} for the rather particular 'get my drafts and all published' blog-post query.
 * 
- * @author Neil Mc Erlean
- * @since 4.0
- * 
- * @see BlogService#getMyDraftsAndAllPublished(NodeRef, Date, Date, String, org.alfresco.query.PagingRequest)
- */
-public class DraftsAndPublishedBlogPostsCannedQuery extends AbstractCannedQueryPermissions<BlogEntity>
-{
+ * @author Neil Mc Erlean
+ * @since 4.0
+ * 
+ * @see org.alfresco.service.cmr.blog.BlogService#getMyDraftsAndAllPublished(NodeRef, Date, Date, org.alfresco.query.PagingRequest)
+ */
+public class DraftsAndPublishedBlogPostsCannedQuery extends AbstractCannedQueryPermissions<BlogEntity>
+{
    private Log logger = LogFactory.getLog(getClass());
    
    private static final String QUERY_NAMESPACE = "alfresco.query.blogs";
--- a/source/java/org/alfresco/repo/blog/typepad/TypepadIntegration.java
+++ b/source/java/org/alfresco/repo/blog/typepad/TypepadIntegration.java
@@ -29,7 +29,7 @@ import org.alfresco.repo.blog.DefaultBlogIntegrationImplementation;
 public class TypepadIntegration extends DefaultBlogIntegrationImplementation
 {
    /**
-     * @see org.alfresco.module.blogIntegration.DefaultBlogIntegrationImplementation#getEndpointURL(org.alfresco.module.blogIntegration.BlogDetails)
+     * @see org.alfresco.repo.blog.DefaultBlogIntegrationImplementation#getEndpointURL(org.alfresco.repo.blog.BlogDetails)
     */
    @Override
    protected String getEndpointURL(BlogDetails blogDetails)
@@ -40,7 +40,7 @@ public class TypepadIntegration extends DefaultBlogIntegrationImplementation
    /**
     * For some reason typepad returns a hash table rather than the expected boolean result.
     * 
-     * @see org.alfresco.module.blogIntegration.BlogIntegrationImplementation#deletePost(org.alfresco.module.blogIntegration.BlogDetails, java.lang.String)
+     * @see org.alfresco.repo.blog.BlogIntegrationImplementation#deletePost(org.alfresco.repo.blog.BlogDetails, java.lang.String)
     */
    @Override
    public boolean deletePost(BlogDetails blogDetails, String postId)
--- a/source/java/org/alfresco/repo/blog/wordpress/WordPressIntegration.java
+++ b/source/java/org/alfresco/repo/blog/wordpress/WordPressIntegration.java
@@ -29,7 +29,7 @@ public class WordPressIntegration extends DefaultBlogIntegrationImplementation
    private static String ENDPOINT = "xmlrpc.php";
    
    /**
-     * @see org.alfresco.module.blogIntegration.DefaultBlogIntegrationImplementation#getEndpointURL(org.alfresco.module.blogIntegration.BlogDetails)
+     * @see DefaultBlogIntegrationImplementation#getEndpointURL(BlogDetails)
     */
    @Override
    protected String getEndpointURL(BlogDetails blogDetails)