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 DEV to HEAD (5.0)

Browse Source 
87808: ACE-2030: Remove more patches introduced for upgrade to V3.4 (pre-release)
  87809: ACE-2030: Remove final 3.4 (pre-release) patches.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87813 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2014-10-11 20:59:05 +00:00
parent 958b298f4a
commit 89a179e2d7
15 changed files with 58 additions and 1089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/java/org/alfresco/repo/tenant/MultiTenantBootstrap.java
View File

@@ -18,12 +18,7 @@
*/
package org.alfresco.repo.tenant;
import java.util.List;
import org.alfresco.repo.admin.patch.AppliedPatch;
import org.alfresco.repo.admin.patch.PatchService;
import org.alfresco.repo.admin.patch.impl.MigrateAttrTenantsPatch;
import org.alfresco.service.descriptor.Descriptor;
import org.alfresco.service.descriptor.DescriptorService;
import org.alfresco.util.PropertyCheck;
import org.springframework.context.ApplicationEvent;
@@ -32,13 +27,12 @@ import org.springframework.extensions.surf.util.AbstractLifecycleBean;
/**
* This component is responsible for starting the enabled tenants (if MT is enabled).
*
* @author Derek Hulley, janv
* @author janv
*/
public class MultiTenantBootstrap extends AbstractLifecycleBean
{
private TenantAdminService tenantAdminService;
private PatchService patchService;
private MigrateAttrTenantsPatch migrateAttrTenantsPatch;
private DescriptorService descriptorService;
/**
@@ -59,43 +53,16 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
this.descriptorService = descriptorService;
}
public void setMigrateAttrTenantsPatch(MigrateAttrTenantsPatch migrateAttrTenantsPatch)
{
this.migrateAttrTenantsPatch = migrateAttrTenantsPatch;
}
@Override
protected void onBootstrap(ApplicationEvent event)
{
PropertyCheck.mandatory(this, "tenantAdminService", tenantAdminService);
PropertyCheck.mandatory(this, "patchService", patchService);
PropertyCheck.mandatory(this, "descriptorService", descriptorService);
// TODO: Is it really necessary to count the tenants?
if (tenantAdminService.getAllTenants().size() > 0)
{
// note: alf*attributes* tables do not exist from Alfresco 4.0.0 schema 5007
Descriptor desc = descriptorService.getInstalledRepositoryDescriptor();
if ((desc != null) && (desc.getSchema() < 5007) && (tenantAdminService.getAllTenants().size() == 0))
{
// could be an upgrade (from before 3.4)
boolean applied = false;
List<AppliedPatch> appliedPatches = patchService.getPatches(null, null);
for (AppliedPatch appliedPatch : appliedPatches)
{
if (appliedPatch.getId().equals("patch.migrateAttrTenants"))
{
applied = true;
break;
}
}
if (! applied)
{
// upgrade to 3.4 or higher (chicken & egg)
migrateAttrTenantsPatch.apply();
}
}
tenantAdminService.startTenants();
}
}