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

Fix MT bootstrap (on HEAD)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2011-06-13 10:44:06 +00:00
parent 08835a782e
commit caef326c23
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/bootstrap-context.xml
View File

@@ -370,6 +370,7 @@
<bean id="multiTenantBootstrap" class="org.alfresco.repo.tenant.MultiTenantBootstrap" > <bean id="multiTenantBootstrap" class="org.alfresco.repo.tenant.MultiTenantBootstrap" >
<property name="tenantAdminService" ref="tenantAdminService"/> <property name="tenantAdminService" ref="tenantAdminService"/>
<property name="patchService" ref="PatchService"/> <property name="patchService" ref="PatchService"/>
<property name="descriptorService" ref="descriptorComponent"/>
<property name="migrateAttrTenantsPatch" ref="patch.migrateAttrTenants"/> <property name="migrateAttrTenantsPatch" ref="patch.migrateAttrTenants"/>
</bean> </bean>

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

@@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2005-2010 Alfresco Software Limited. * Copyright (C) 2005-2011 Alfresco Software Limited.
* *
* This file is part of Alfresco * This file is part of Alfresco
* *
@@ -23,6 +23,8 @@ import java.util.List;
import org.alfresco.repo.admin.patch.AppliedPatch; import org.alfresco.repo.admin.patch.AppliedPatch;
import org.alfresco.repo.admin.patch.PatchService; import org.alfresco.repo.admin.patch.PatchService;
import org.alfresco.repo.admin.patch.impl.MigrateAttrTenantsPatch; 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.alfresco.util.PropertyCheck;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.extensions.surf.util.AbstractLifecycleBean;
@@ -37,6 +39,7 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
private TenantAdminService tenantAdminService; private TenantAdminService tenantAdminService;
private PatchService patchService; private PatchService patchService;
private MigrateAttrTenantsPatch migrateAttrTenantsPatch; private MigrateAttrTenantsPatch migrateAttrTenantsPatch;
private DescriptorService descriptorService;
/** /**
* @param tenantAdminService the service that will perform the bootstrap * @param tenantAdminService the service that will perform the bootstrap
@@ -51,6 +54,11 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
this.patchService = patchService; this.patchService = patchService;
} }
public void setDescriptorService(DescriptorService descriptorService)
{
this.descriptorService = descriptorService;
}
public void setMigrateAttrTenantsPatch(MigrateAttrTenantsPatch migrateAttrTenantsPatch) public void setMigrateAttrTenantsPatch(MigrateAttrTenantsPatch migrateAttrTenantsPatch)
{ {
this.migrateAttrTenantsPatch = migrateAttrTenantsPatch; this.migrateAttrTenantsPatch = migrateAttrTenantsPatch;
@@ -61,12 +69,15 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
{ {
PropertyCheck.mandatory(this, "tenantAdminService", tenantAdminService); PropertyCheck.mandatory(this, "tenantAdminService", tenantAdminService);
PropertyCheck.mandatory(this, "patchService", patchService); PropertyCheck.mandatory(this, "patchService", patchService);
PropertyCheck.mandatory(this, "descriptorService", descriptorService);
if (tenantAdminService.isEnabled()) if (tenantAdminService.isEnabled())
{ {
// Upgrade to 3.4 (chicken & egg) // note: alf*attributes* tables do not exist from Alfresco 4.0.0 schema 5007
if (tenantAdminService.getAllTenants().size() == 0) 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; boolean applied = false;
List<AppliedPatch> appliedPatches = patchService.getPatches(null, null); List<AppliedPatch> appliedPatches = patchService.getPatches(null, null);
for (AppliedPatch appliedPatch : appliedPatches) for (AppliedPatch appliedPatch : appliedPatches)
@@ -80,6 +91,7 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
if (! applied) if (! applied)
{ {
// upgrade to 3.4 or higher (chicken & egg)
migrateAttrTenantsPatch.apply(); migrateAttrTenantsPatch.apply();
} }
} }
@@ -87,7 +99,7 @@ public class MultiTenantBootstrap extends AbstractLifecycleBean
tenantAdminService.startTenants(); tenantAdminService.startTenants();
} }
} }
@Override @Override
protected void onShutdown(ApplicationEvent event) protected void onShutdown(ApplicationEvent event)
{ {