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

ALF-9456 - Finish updating the Site Importer/Exporter now that Site Config is in the normal repo rather than in AVM

Browse Source 
(The sample team site export had already been tweaked by Kev in June to include the surf-config)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30745 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-09-23 16:41:09 +00:00
parent c2e5a7546c
commit 74b9ff5845
3 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip
View File

Binary file not shown.

1
config/alfresco/patch/patch-services-context.xml
View File

@@ -2752,7 +2752,6 @@
<property name="targetSchema"><value>10000</value></property> <property name="targetSchema"><value>10000</value></property>
<property name="spacesBootstrap" ref="siteLoadBootstrap-Spaces" /> <property name="spacesBootstrap" ref="siteLoadBootstrap-Spaces" />
<property name="usersBootstrap" ref="siteLoadBootstrap-Users" /> <property name="usersBootstrap" ref="siteLoadBootstrap-Users" />
<property name="avmBootstrap" ref="siteLoadBootstrap-AVM" />
<property name="siteService" ref="siteService" /> <property name="siteService" ref="siteService" />
<property name="authorityService" ref="authorityService" /> <property name="authorityService" ref="authorityService" />
<property name="behaviourFilter" ref="policyBehaviourFilter" /> <property name="behaviourFilter" ref="policyBehaviourFilter" />

18
source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
View File

@@ -33,11 +33,9 @@ import java.util.StringTokenizer;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.admin.patch.AbstractPatch; import org.alfresco.repo.admin.patch.AbstractPatch;
import org.alfresco.repo.importer.AVMZipBootstrap;
import org.alfresco.repo.importer.ImporterBootstrap; import org.alfresco.repo.importer.ImporterBootstrap;
import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.service.cmr.security.AuthorityService; import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.site.SiteInfo; import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
@@ -60,11 +58,9 @@ public class SiteLoadPatch extends AbstractPatch
public static final String PROPERTIES_PEOPLE = "people"; public static final String PROPERTIES_PEOPLE = "people";
public static final String PROPERTIES_GROUPS = "groups"; public static final String PROPERTIES_GROUPS = "groups";
public static final String PROPERTIES_CONTENTS = "contents"; public static final String PROPERTIES_CONTENTS = "contents";
public static final String PROPERTIES_AVM = "avm";
private static final Map<String,String> DEFAULT_PATHS = new HashMap<String, String>(); private static final Map<String,String> DEFAULT_PATHS = new HashMap<String, String>();
static { static {
DEFAULT_PATHS.put(PROPERTIES_AVM, null);
DEFAULT_PATHS.put(PROPERTIES_USERS, "/${alfresco_user_store.system_container.childname}/${alfresco_user_store.user_container.childname}"); DEFAULT_PATHS.put(PROPERTIES_USERS, "/${alfresco_user_store.system_container.childname}/${alfresco_user_store.user_container.childname}");
DEFAULT_PATHS.put(PROPERTIES_PEOPLE, "/${system.system_container.childname}/${system.people_container.childname}"); DEFAULT_PATHS.put(PROPERTIES_PEOPLE, "/${system.system_container.childname}/${system.people_container.childname}");
DEFAULT_PATHS.put(PROPERTIES_GROUPS, null); DEFAULT_PATHS.put(PROPERTIES_GROUPS, null);
@@ -86,7 +82,6 @@ public class SiteLoadPatch extends AbstractPatch
private ImporterBootstrap spacesBootstrap; private ImporterBootstrap spacesBootstrap;
private ImporterBootstrap usersBootstrap; private ImporterBootstrap usersBootstrap;
private AVMZipBootstrap avmBootstrap;
private Map<String,Properties> bootstrapViews; private Map<String,Properties> bootstrapViews;
@@ -114,10 +109,6 @@ public class SiteLoadPatch extends AbstractPatch
{ {
this.usersBootstrap = usersBootstrap; this.usersBootstrap = usersBootstrap;
} }
public void setAvmBootstrap(AVMZipBootstrap avmBootstrap)
{
this.avmBootstrap = avmBootstrap;
}
/** /**
* Sets the details of the bootstraps to perform * Sets the details of the bootstraps to perform
@@ -280,15 +271,6 @@ public class SiteLoadPatch extends AbstractPatch
} }
} }
// Load the AVM contents
if(bootstrapViews.containsKey(PROPERTIES_AVM))
{
avmBootstrap.setLocation(
bootstrapViews.get(PROPERTIES_AVM).getProperty("location")
);
avmBootstrap.bootstrap();
}
// Load the Main (ACP) Contents // Load the Main (ACP) Contents
if(bootstrapViews.containsKey(PROPERTIES_CONTENTS)) if(bootstrapViews.containsKey(PROPERTIES_CONTENTS))
{ {