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 a5f8df310a
commit 22d2935235
119 changed files with 444 additions and 434 deletions

View File

@@ -179,7 +179,6 @@ public class TestRemovePermissions extends EnterpriseTestApi
* cmisws?wsdl is not available using jetty in automated test suite should
* be runned using an external alfresco server
*
* @throws Exception
*/
// @Test
public void testRemoveAllPermissions_WEBSERVICE_10()
@@ -357,9 +356,9 @@ public class TestRemovePermissions extends EnterpriseTestApi
/**
*
* @param session
* @param name
* @return
* @param session Session
* @param name String
* @return Folder
*/
private Folder createFolder(Session session, String name)
{
@@ -376,8 +375,8 @@ public class TestRemovePermissions extends EnterpriseTestApi
/**
*
* @param session
* @return
* @param session Session
* @return List<Ace>
*/
private List<Ace> create2TestACLs(Session session)
{