Merged DEV to HEAD

52217: MT code cleanup before continuing ALF-19172
          - @Override
          - deprecated TenantAdminService.getAllTenants
          - Add TenantAdminService.getTenants(enabledOnly) ... TODO: not implemented fully, yet
          - Remove unused methods
          - Make internal service methods private
          - Line endings


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@52287 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-07-09 13:51:38 +00:00
parent a3f60b6596
commit b687de2f80
4 changed files with 377 additions and 355 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2013 Alfresco Software Limited.
/*
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -14,217 +14,240 @@
* 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.tenant;
import java.io.File;
import java.util.Collections;
import java.util.List;
import org.alfresco.repo.workflow.WorkflowDeployer;
import org.apache.commons.logging.Log;
/**
* Empty Tenant Deployer Service implementation (for Single-Tenant / Single-Instance)
*/
public class SingleTAdminServiceImpl implements TenantAdminService
{
/**
* NO-OP
*/
public void startTenants()
{
}
/**
* NO-OP
*/
public void stopTenants()
{
}
/**
* @return Returns <tt>false</tt> always
*/
public boolean isEnabled()
{
return false;
}
/**
* NO-OP
*/
public void initialiseTenants()
{
}
/**
* NO-OP
*/
public void deployTenants(final TenantDeployer deployer, Log logger)
{
}
/**
* NO-OP
*/
public void undeployTenants(final TenantDeployer deployer, Log logger)
{
}
/**
* NO-OP
*/
public void register(TenantDeployer tenantDeployer)
{
}
/**
* NO-OP
*/
public void unregister(TenantDeployer tenantDeployer)
{
}
/**
* NO-OP
*/
public void register(WorkflowDeployer workflowDeployer)
{
}
/**
* @return Returns an empty list always
*/
public List<Tenant> getAllTenants()
{
return Collections.emptyList();
}
/**
* @return Returns {@link TenantService#DEFAULT_DOMAIN} always
*/
public String getCurrentUserDomain()
{
return TenantService.DEFAULT_DOMAIN;
}
/**
* @return Returns {@link TenantService#DEFAULT_DOMAIN} always
*/
public String getUserDomain(String username)
{
return TenantService.DEFAULT_DOMAIN;
}
/**
* @return Returns the given <tt>username</tt> always
*/
public String getBaseNameUser(String username)
{
return username;
}
/**
* @return Returns the given <tt>baseUserName</tt> always
*/
public String getDomainUser(String baseUsername, String tenantDomain)
{
return baseUsername;
}
/**
* @return Returns {@link TenantService#DEFAULT_DOMAIN} always
*/
public String getDomain(String name)
{
return TenantService.DEFAULT_DOMAIN;
}
/**
* @throws UnsupportedOperationException always
*/
public void createTenant(String tenantDomain, char[] adminRawPassword, String contentRoot)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
public void createTenant(String tenantDomain, char[] adminRawPassword, String contentRoot, String dbUrl)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public void createTenant(String tenantDomain, char[] adminRawPassword)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public void deleteTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public void disableTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public void enableTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public boolean existsTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public void exportTenant(String tenantDomain, File directoryDestination)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public Tenant getTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public void importTenant(String tenantDomain, File directorySource, String rootContentStoreDir)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
public boolean isEnabledTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.tenant;
import java.io.File;
import java.util.Collections;
import java.util.List;
import org.alfresco.repo.workflow.WorkflowDeployer;
import org.apache.commons.logging.Log;
/**
* Empty Tenant Deployer Service implementation (for Single-Tenant / Single-Instance)
*/
public class SingleTAdminServiceImpl implements TenantAdminService
{
/**
* NO-OP
*/
@Override
public void startTenants()
{
}
/**
* NO-OP
*/
@Override
public void stopTenants()
{
}
/**
* @return Returns <tt>false</tt> always
*/
@Override
public boolean isEnabled()
{
return false;
}
/**
* NO-OP
*/
@Override
public void deployTenants(final TenantDeployer deployer, Log logger)
{
}
/**
* NO-OP
*/
@Override
public void undeployTenants(final TenantDeployer deployer, Log logger)
{
}
/**
* NO-OP
*/
@Override
public void register(TenantDeployer tenantDeployer)
{
}
/**
* NO-OP
*/
@Override
public void unregister(TenantDeployer tenantDeployer)
{
}
/**
* NO-OP
*/
@Override
public void register(WorkflowDeployer workflowDeployer)
{
}
/**
* NO-OP
*/
@Override
@Deprecated
public List<Tenant> getAllTenants()
{
return getTenants(false);
}
/**
* NO-OP
*/
@Override
@Deprecated
public List<Tenant> getTenants(boolean enabledOnly)
{
return Collections.emptyList();
}
/**
* @return Returns {@link TenantService#DEFAULT_DOMAIN} always
*/
@Override
public String getCurrentUserDomain()
{
return TenantService.DEFAULT_DOMAIN;
}
/**
* @return Returns {@link TenantService#DEFAULT_DOMAIN} always
*/
@Override
public String getUserDomain(String username)
{
return TenantService.DEFAULT_DOMAIN;
}
/**
* @return Returns the given <tt>username</tt> always
*/
@Override
public String getBaseNameUser(String username)
{
return username;
}
/**
* @return Returns the given <tt>baseUserName</tt> always
*/
@Override
public String getDomainUser(String baseUsername, String tenantDomain)
{
return baseUsername;
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void createTenant(String tenantDomain, char[] adminRawPassword, String contentRoot)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void createTenant(String tenantDomain, char[] adminRawPassword, String contentRoot, String dbUrl)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void createTenant(String tenantDomain, char[] adminRawPassword)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void deleteTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void disableTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void enableTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public boolean existsTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void exportTenant(String tenantDomain, File directoryDestination)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public Tenant getTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public void importTenant(String tenantDomain, File directorySource, String rootContentStoreDir)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
/**
* @throws UnsupportedOperationException always
*/
@Override
public boolean isEnabledTenant(String tenantDomain)
{
throw new UnsupportedOperationException("Single tenant mode is active.");
}
}