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

source/test-java/org/alfresco/repo/web/scripts/BaseWebScriptTest.java

@@ -87,7 +87,7 @@ public abstract class BaseWebScriptTest extends TestCase
         /**
          * Construct
          * 
-         * @param writer
+         * @param writer PrintStream
          */
         public BaseWebScriptTestListener(PrintStream writer)
         {
@@ -137,8 +137,8 @@ public abstract class BaseWebScriptTest extends TestCase
         /**
          * Add an arbitrary log statement
          * 
-         * @param  test
-         * @param  log
+         * @param  test Test
+         * @param  log String
          */
         public void addLog(Test test, String log)
         {
@@ -149,7 +149,7 @@ public abstract class BaseWebScriptTest extends TestCase
     
     /**
      * Sets custom context for Test Web Script Server (in-process only)
-     * @param customContext
+     * @param customContext String
      */
     public void setCustomContext(String customContext)
     {
@@ -169,7 +169,7 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Sets whether to trace request / response bodies
      * 
-     * @param traceReqRes
+     * @param traceReqRes boolean
      */
     public void setTraceReqRes(boolean traceReqRes)
     {
@@ -189,7 +189,7 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Gets Remote Server
      * 
-     * @return
+     * @return RemoteServer
      */
     public RemoteServer getRemoteServer()
     {
@@ -199,7 +199,7 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Set Default Local Run As User
      * 
-     * @param localRunAs
+     * @param localRunAs String
      */
     public void setDefaultRunAs(String localRunAs)
     {
@@ -287,7 +287,7 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Log Message to Test Listener
      * 
-     * @param log
+     * @param log String
      */
     protected void log(String log)
     {
@@ -300,8 +300,8 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Send Request to Test Web Script Server (as admin)
      * 
-     * @param req
-     * @param expectedStatus
+     * @param req Request
+     * @param expectedStatus int
      * @return response
      * @throws IOException
      */
@@ -314,9 +314,9 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Send Request
      * 
-     * @param req
-     * @param expectedStatus
-     * @param asUser
+     * @param req Request
+     * @param expectedStatus int
+     * @param asUser String
      * @return response
      * @throws IOException
      */
@@ -401,9 +401,9 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Send Local Request to Test Web Script Server
      * 
-     * @param req
-     * @param expectedStatus
-     * @param asUser
+     * @param req Request
+     * @param expectedStatus int
+     * @param asUser String
      * @return response
      * @throws IOException
      */
@@ -445,8 +445,8 @@ public abstract class BaseWebScriptTest extends TestCase
     /**
      * Send Remote Request to stand-alone Web Script Server
      * 
-     * @param req
-     * @param expectedStatus
+     * @param req Request
+     * @param expectedStatus int
      * @return response
      * @throws IOException
      */

source/test-java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java

@@ -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