inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/web/scripts/bean/ADMRemoteStore.java
View File

@@ -865,8 +865,8 @@ public class ADMRemoteStore extends BaseRemoteStore
* <p>
* Disassmbles the path to correct match either user, site or generic folder path.
*
* @param path
* @param create
* @param path String
* @param create boolean
*
* @return NodeRef to the "surf-config" folder, or null if it does not exist yet.
*/

4
source/java/org/alfresco/repo/web/scripts/bean/AbstractLoginBean.java
View File

@@ -47,7 +47,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
protected EventPublisher eventPublisher;
/**
* @param authenticationService
* @param authenticationService AuthenticationService
*/
public void setAuthenticationService(AuthenticationService authenticationService)
{
@@ -55,7 +55,7 @@ import org.springframework.extensions.webscripts.WebScriptRequest;
}
/**
* @param eventPublisher
* @param eventPublisher EventPublisher
*/
public void setEventPublisher(EventPublisher eventPublisher)
{

7
source/java/org/alfresco/repo/web/scripts/bean/BaseRemoteStore.java
View File

@@ -365,8 +365,7 @@ public abstract class BaseRemoteStore extends AbstractWebScript
*
* @param store the store id
* @param path document path
* @return
*
*
* @throws IOException if an error occurs retrieving the document
*/
protected abstract void getDocument(WebScriptResponse res, String store, String path)
@@ -409,7 +408,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
* @param path document path
* @param content content of the document to write
*
* @throws IOException if the create fails
*/
protected abstract void createDocument(WebScriptResponse res, String store, String path, InputStream content);
@@ -420,7 +418,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
* @param store the store id
* @param content content of the document to write
*
* @throws IOException if the create fails
*/
protected abstract void createDocuments(WebScriptResponse res, String store, InputStream content);
@@ -431,7 +428,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
* @param path document path
* @param content content to update the document with
*
* @throws IOException if the update fails
*/
protected abstract void updateDocument(WebScriptResponse res, String store, String path, InputStream content);
@@ -441,7 +437,6 @@ public abstract class BaseRemoteStore extends AbstractWebScript
* @param store the store id
* @param path document path
*
* @throws IOException if the delete fails
*/
protected abstract void deleteDocument(WebScriptResponse res, String store, String path);

2
source/java/org/alfresco/repo/web/scripts/bean/LoginTicket.java
View File

@@ -43,7 +43,7 @@ public class LoginTicket extends DeclarativeWebScript
private TicketComponent ticketComponent;
/**
* @param ticketComponent
* @param ticketComponent TicketComponent
*/
public void setTicketComponent(TicketComponent ticketComponent)
{

4
source/java/org/alfresco/repo/web/scripts/bean/LoginTicketDelete.java
View File

@@ -45,7 +45,7 @@ public class LoginTicketDelete extends DeclarativeWebScript
private TicketComponent ticketComponent;
/**
* @param ticketComponent
* @param ticketComponent TicketComponent
*/
public void setTicketComponent(TicketComponent ticketComponent)
{
@@ -53,7 +53,7 @@ public class LoginTicketDelete extends DeclarativeWebScript
}
/**
* @param authenticationService
* @param authenticationService AuthenticationService
*/
public void setAuthenticationService(AuthenticationService authenticationService)
{

4
source/java/org/alfresco/repo/web/scripts/bean/SearchEngines.java
View File

@@ -55,7 +55,7 @@ public class SearchEngines extends DeclarativeWebScript
protected SearchProxy searchProxy;
/**
* @param configService
* @param configService ConfigService
*/
public void setConfigService(ConfigService configService)
{
@@ -63,7 +63,7 @@ public class SearchEngines extends DeclarativeWebScript
}
/**
* @param searchProxy
* @param searchProxy SearchProxy
*/
public void setSearchProxy(SearchProxy searchProxy)
{

12
source/java/org/alfresco/repo/web/scripts/bean/SearchProxy.java
View File

@@ -77,7 +77,7 @@ public class SearchProxy extends AbstractWebScript implements InitializingBean
protected String proxyPath;
/**
* @param formatRegistry
* @param formatRegistry FormatRegistry
*/
public void setFormatRegistry(FormatRegistry formatRegistry)
{
@@ -85,7 +85,7 @@ public class SearchProxy extends AbstractWebScript implements InitializingBean
}
/**
* @param configService
* @param configService ConfigService
*/
public void setConfigService(ConfigService configService)
{
@@ -192,10 +192,10 @@ public class SearchProxy extends AbstractWebScript implements InitializingBean
/**
* Construct
*
* @param rootPath
* @param engine
* @param engineUrl
* @param response
* @param rootPath String
* @param engine String
* @param engineUrl String
* @param response HttpServletResponse
* @param headers request headers
* @throws MalformedURLException
*/