From 74b9ff5845c0df6fbc338eef9ab11401db2e4756 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick.burch@quanticate.com>
Date: Fri, 23 Sep 2011 16:41:09 +0000
Subject: [PATCH] ALF-9456 - Finish updating the Site Importer/Exporter now
 that Site Config is in the normal repo rather than in AVM (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
---
 .../bootstrap/team-sample-sites/swsdp/AVM.zip | Bin 4921 -> 0 bytes
 .../alfresco/patch/patch-services-context.xml |   1 -
 .../repo/admin/patch/impl/SiteLoadPatch.java  |  18 ------------------
 3 files changed, 19 deletions(-)
 delete mode 100644 config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip

diff --git a/config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip b/config/alfresco/bootstrap/team-sample-sites/swsdp/AVM.zip
deleted file mode 100644
index 52c828cabc71c89b5e3e1f6afad698439af2e6c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4921
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

diff --git a/config/alfresco/patch/patch-services-context.xml b/config/alfresco/patch/patch-services-context.xml
index b738cb2862..42fa314ca9 100644
--- a/config/alfresco/patch/patch-services-context.xml
+++ b/config/alfresco/patch/patch-services-context.xml
@@ -2752,7 +2752,6 @@
         <property name="targetSchema"><value>10000</value></property>
         <property name="spacesBootstrap" ref="siteLoadBootstrap-Spaces" />
         <property name="usersBootstrap" ref="siteLoadBootstrap-Users" />
-        <property name="avmBootstrap" ref="siteLoadBootstrap-AVM" />
         <property name="siteService" ref="siteService" />
         <property name="authorityService" ref="authorityService" />
         <property name="behaviourFilter" ref="policyBehaviourFilter" />
diff --git a/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java b/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
index d5c51cbc7f..10bee9abb8 100644
--- a/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
+++ b/source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java
@@ -33,11 +33,9 @@ import java.util.StringTokenizer;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.admin.patch.AbstractPatch;
-import org.alfresco.repo.importer.AVMZipBootstrap;
 import org.alfresco.repo.importer.ImporterBootstrap;
 import org.alfresco.repo.policy.BehaviourFilter;
 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.site.SiteInfo;
 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_GROUPS = "groups";
     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>();
     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_PEOPLE, "/${system.system_container.childname}/${system.people_container.childname}"); 
         DEFAULT_PATHS.put(PROPERTIES_GROUPS, null);
@@ -86,7 +82,6 @@ public class SiteLoadPatch extends AbstractPatch
     
     private ImporterBootstrap spacesBootstrap;
     private ImporterBootstrap usersBootstrap;
-    private AVMZipBootstrap avmBootstrap;
     
     private Map<String,Properties> bootstrapViews;
     
@@ -114,10 +109,6 @@ public class SiteLoadPatch extends AbstractPatch
     {
         this.usersBootstrap = usersBootstrap;
     }
-    public void setAvmBootstrap(AVMZipBootstrap avmBootstrap)
-    {
-        this.avmBootstrap = avmBootstrap;
-    }
 
     /**
      * 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
         if(bootstrapViews.containsKey(PROPERTIES_CONTENTS))
         {