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

@@ -1,19 +1,19 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.security.person;
@@ -30,8 +30,8 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
/**
* Common support for creating home folders This is hooked into node creation events from Person type objects via the
* homeFolderManager. Provider must all be wired up to the homeFolderManager.
* Common support for creating home folders This is hooked into node creation events from Person type objects via the
* homeFolderManager. Provider must all be wired up to the homeFolderManager.
*
* @deprecated
* Depreciated since 4.0. {@link AbstractHomeFolderProvider2} should now be used.
@@ -59,12 +59,12 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
* Service registry to get hold of public services (so that actions are audited)
*/
private ServiceRegistry serviceRegistry;
/**
* The path to a folder
*/
private String path;
/**
* The owner to set on creation of a home folder (if unset this will be the uid).
*/
@@ -85,9 +85,9 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
*/
private V2Adaptor v2Adaptor = new V2Adaptor(this);
public AbstractHomeFolderProvider()
{
super();
public AbstractHomeFolderProvider()
{
super();
}
/**
@@ -109,7 +109,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
/**
* Set the home folder manager.
* @param homeFolderManager
* @param homeFolderManager PortableHomeFolderManager
*/
public void setHomeFolderManager(PortableHomeFolderManager homeFolderManager)
{
@@ -196,7 +196,7 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
{
this.serviceRegistry = serviceRegistry;
}
/**
* Set the tenant service
*/
@@ -204,13 +204,13 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
{
// keep class signature but no longer use value
}
/**
* Set the permission manager
* Set the permission manager
*/
public void setOnCreatePermissionsManager(PermissionsManager onCreatePermissionsManager)
public void setOnCreatePermissionsManager(PermissionsManager onCreatePermissionsManager)
{
this.onCreatePermissionsManager = onCreatePermissionsManager;
this.onCreatePermissionsManager = onCreatePermissionsManager;
}
/**
@@ -221,10 +221,10 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
return onCreatePermissionsManager;
}
public void setOnReferencePermissionsManager(PermissionsManager onReferencePermissionsManager)
{
this.onReferencePermissionsManager = onReferencePermissionsManager;
}
public void setOnReferencePermissionsManager(PermissionsManager onReferencePermissionsManager)
{
this.onReferencePermissionsManager = onReferencePermissionsManager;
}
/**
* Gets the PermissionsManager used on referencing the home folder
@@ -233,9 +233,9 @@ public abstract class AbstractHomeFolderProvider implements HomeFolderProvider,
{
return onReferencePermissionsManager;
}
/**
* Set the authority to use as the owner of all home folder nodes.
* Set the authority to use as the owner of all home folder nodes.
*/
public void setOwnerOnCreate(String ownerOnCreate)
{