Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement

were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/bootstrap-context.xml

@@ -35,7 +35,7 @@
       </property>
       <property name="postCreateScriptUrls">
          <list>
-            <value>classpath:alfresco/dbscripts/create/1.4/${db.script.dialect}/sample.sql</value>
+            <value>classpath:alfresco/dbscripts/create/1.4/${db.script.dialect}/post-create-indexes.sql</value>
          </list>
       </property>
       <property name="validateUpdateScriptPatches">
@@ -149,10 +149,6 @@
                     <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.scripts.childname}</prop>
                     <prop key="location">alfresco/bootstrap/example_javascripts.acp</prop>
                 </props>
-                <props>
-                    <prop key="path">/${spaces.company_home.childname}/${spaces.dictionary.childname}/${spaces.templates.childname}</prop>
-                    <prop key="location">alfresco/bootstrap/file_plan.xml</prop>
-                </props>
             </list>
         </property>
     </bean>
@@ -192,6 +188,10 @@
 		</property>
 	</bean>
 
+    <!-- Bootstrap any extensions -->
+    
+    <import resource="classpath*:alfresco/extension/bootstrap/*-context.xml" />
+
     <!-- Descriptor Service -->
 
     <bean id="descriptorComponent" class="org.alfresco.repo.descriptor.DescriptorServiceImpl">