ALF-4875 - MT upgrade to 3.4 - fix patch sequence

- tenant attributes need to be migrated first

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-09-24 11:33:06 +00:00
parent 44b1d5ff6f
commit 0466c42f00
3 changed files with 82 additions and 10 deletions

View File

@@ -18,20 +18,26 @@
*/
package org.alfresco.repo.tenant;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
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.util.PropertyCheck;
import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean;
/**
* This component is responsible for ensuring that patches are applied
* at the appropriate time.
* This component is responsible for starting the enabled tenants (if MT is enabled).
*
* @author Derek Hulley
* @author Derek Hulley, janv
*/
public class MultiTenantBootstrap extends AbstractLifecycleBean
{
private TenantAdminService tenantAdminService;
private PatchService patchService;
private MigrateAttrTenantsPatch migrateAttrTenantsPatch;
/**
* @param tenantAdminService the service that will perform the bootstrap
*/
@@ -39,12 +45,47 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
{
this.tenantAdminService = tenantAdminService;
}
public void setPatchService(PatchService patchService)
{
this.patchService = patchService;
}
public void setMigrateAttrTenantsPatch(MigrateAttrTenantsPatch migrateAttrTenantsPatch)
{
this.migrateAttrTenantsPatch = migrateAttrTenantsPatch;
}
@Override
protected void onBootstrap(ApplicationEvent event)
{
PropertyCheck.mandatory(this, "tenantAdminService", tenantAdminService);
tenantAdminService.startTenants();
PropertyCheck.mandatory(this, "patchService", patchService);
if (tenantAdminService.isEnabled())
{
// Upgrade to 3.4 (chicken & egg)
if (tenantAdminService.getAllTenants().size() == 0)
{
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)
{
migrateAttrTenantsPatch.apply();
}
}
tenantAdminService.startTenants();
}
}
@Override