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

107541: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      107413: Merged DEV to 5.0.N (5.0.3)
         106858 : MNT-13545: JavaDoc : Inconsistencies between the Java doc and the actual code
            - Cleaning of Javadoc,
   107565: MNT-13545 Fix compilation after merge of Javadoc


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@107633 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-07-02 16:13:03 +00:00
parent 4c30e52dc3
commit 7dd2291753
784 changed files with 5454 additions and 5487 deletions

View File

@@ -291,7 +291,7 @@ public class InviteSenderTest extends TestCase
/**
* Mocks up a Repository that will return the inviter as the current user.
*
* @return
* @return Repository
*/
private Repository mockRepository()
{
@@ -301,7 +301,7 @@ public class InviteSenderTest extends TestCase
}
/**
* @return
* @return ServiceRegistry
*/
private ServiceRegistry mockServices()
{
@@ -360,7 +360,7 @@ public class InviteSenderTest extends TestCase
/**
* Mocks up a SiteService that returns appropriate SiteInfo.
*
* @return
* @return SiteService
*/
private SiteService mockSiteService()
{
@@ -374,7 +374,7 @@ public class InviteSenderTest extends TestCase
* Mocks up a SearchService that will return the template NodeRef when
* queried.
*
* @return
* @return SearchService
*/
private SearchService mockSearchService()
{
@@ -393,7 +393,7 @@ public class InviteSenderTest extends TestCase
* Mocks up a PersonService that returns the correct NodeRef when given a
* user name.
*
* @return
* @return PersonService
*/
private PersonService mockPersonService()
{
@@ -408,7 +408,7 @@ public class InviteSenderTest extends TestCase
/**
* Mocks up NodeService to return email adresses for inviter and invitee.
*
* @return
* @return NodeService
*/
private NodeService mockNodeService()
{