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

@@ -41,7 +41,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer;
*/
public class TestWebScriptRepoServer extends TestWebScriptServer
{
/**
/**
* Main entry point.
*/
public static void main(String[] args)
@@ -66,11 +66,11 @@ public class TestWebScriptRepoServer extends TestWebScriptServer
}
private final static String[] CONFIG_LOCATIONS = new String[]
{
"classpath:alfresco/application-context.xml",
"classpath:alfresco/web-scripts-application-context.xml",
"classpath:alfresco/web-scripts-application-context-test.xml"
};
{
"classpath:alfresco/application-context.xml",
"classpath:alfresco/web-scripts-application-context.xml",
"classpath:alfresco/web-scripts-application-context-test.xml"
};
/** A static reference to the application context being used */
private static ClassPathXmlApplicationContext ctx;
@@ -89,7 +89,7 @@ public class TestWebScriptRepoServer extends TestWebScriptServer
}
/**
* @param authenticationService
* @param authenticationService AuthenticationService
*/
public void setAuthenticationService(AuthenticationService authenticationService)
{
@@ -208,7 +208,7 @@ public class TestWebScriptRepoServer extends TestWebScriptServer
}
catch(AuthenticationException e)
{
executeCommand("user " + getDefaultUserName());
executeCommand("user " + getDefaultUserName());
}
// execute command in context of currently selected user