diff --git a/config/alfresco/bootstrap-context.xml b/config/alfresco/bootstrap-context.xml
index 7ea83ead81..5dd5fc2b72 100644
--- a/config/alfresco/bootstrap-context.xml
+++ b/config/alfresco/bootstrap-context.xml
@@ -145,10 +145,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>
@@ -182,6 +178,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">
diff --git a/config/alfresco/bootstrap/categories.xml b/config/alfresco/bootstrap/categories.xml
index 87012bd9cc..5e33800a75 100644
--- a/config/alfresco/bootstrap/categories.xml
+++ b/config/alfresco/bootstrap/categories.xml
@@ -1098,102 +1098,10 @@
 					</cm:category>
 				</cm:subcategories>
 
+             </cm:category>
 
-			    </cm:category>
+             </cm:subcategories>
 
-<cm:category><cm:name>Records Categories</cm:name><sys:node-uuid>rm:recordCategory-root</sys:node-uuid><cm:subcategories>
-
-   <cm:category><cm:name>Review Period</cm:name><sys:node-uuid>rm:reviewPeriod-root</sys:node-uuid><cm:subcategories>
-
-         <cm:category><cm:name>None</cm:name><sys:node-uuid>rm:reviewPeriod-0</sys:node-uuid></cm:category>
-         <cm:category><cm:name>TBD</cm:name><sys:node-uuid>rm:reviewPeriod-1</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Annually</cm:name><sys:node-uuid>rm:reviewPeriod-2</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Calendar Year End</cm:name><sys:node-uuid>rm:reviewPeriod-3</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Fiscal Year End</cm:name><sys:node-uuid>rm:reviewPeriod-4</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Semi-Annually</cm:name><sys:node-uuid>rm:reviewPeriod-5</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Quarterly</cm:name><sys:node-uuid>rm:reviewPeriod-6</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Monthly</cm:name><sys:node-uuid>rm:reviewPeriod-7</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Weekly</cm:name><sys:node-uuid>rm:reviewPeriod-8</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Daily</cm:name><sys:node-uuid>rm:reviewPeriod-9</sys:node-uuid></cm:category>
-
-      </cm:subcategories></cm:category>
-
-   <cm:category><cm:name>Media Types</cm:name><sys:node-uuid>rm:mediaTypes-root</sys:node-uuid><cm:subcategories>
-
-         <cm:category><cm:name>TBD</cm:name><sys:node-uuid>rm:mediaTypes-0</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Electronic</cm:name><sys:node-uuid>rm:mediaTypes-1</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Paper</cm:name><sys:node-uuid>rm:mediaTypes-2</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Microform</cm:name><sys:node-uuid>rm:mediaTypes-3</sys:node-uuid></cm:category>
-         <cm:category><cm:name>Portable</cm:name><sys:node-uuid>rm:mediaTypes-4</sys:node-uuid></cm:category>
-
-      </cm:subcategories></cm:category>
-
-   <cm:category><cm:name>Markings</cm:name><sys:node-uuid>rm:markings-root</sys:node-uuid><cm:subcategories>
-
-         <cm:category><cm:name>NONE</cm:name><sys:node-uuid>rm:markings-0</sys:node-uuid></cm:category>
-
-         <cm:category><cm:name>Classifications</cm:name><sys:node-uuid>rm:markings-1</sys:node-uuid><cm:subcategories>
-
-               <cm:category><cm:name>UNCLASSIFIED</cm:name><sys:node-uuid>rm:markings-1-1</sys:node-uuid></cm:category>
-               <cm:category><cm:name>RESTRICTED</cm:name><sys:node-uuid>rm:markings-1-2</sys:node-uuid></cm:category>
-               <cm:category><cm:name>CONFIDENTIAL</cm:name><sys:node-uuid>rm:markings-1-3</sys:node-uuid></cm:category>
-               <cm:category><cm:name>SECRET</cm:name><sys:node-uuid>rm:markings-1-4</sys:node-uuid></cm:category>
-               <cm:category><cm:name>TOP SECRET</cm:name><sys:node-uuid>rm:markings-1-5</sys:node-uuid></cm:category>
-
-            </cm:subcategories></cm:category>
-
-         <cm:category><cm:name>Handling</cm:name><sys:node-uuid>rm:markings-2</sys:node-uuid><cm:subcategories>
-
-               <cm:category><cm:name>COMSEC</cm:name><sys:node-uuid>rm:markings-2-1</sys:node-uuid></cm:category>
-               <cm:category><cm:name>RD</cm:name><sys:node-uuid>rm:markings-2-2</sys:node-uuid></cm:category>
-               <cm:category><cm:name>FRD</cm:name><sys:node-uuid>rm:markings-2-3</sys:node-uuid></cm:category>
-               <cm:category><cm:name>SPECAT-A SIOP-ESI</cm:name><sys:node-uuid>rm:markings-2-4</sys:node-uuid></cm:category>
-               <cm:category><cm:name>SPECAT-B</cm:name><sys:node-uuid>rm:markings-2-5</sys:node-uuid></cm:category>
-               <cm:category><cm:name>US-UK EYES ONLY</cm:name><sys:node-uuid>rm:markings-2-6</sys:node-uuid></cm:category>
-               <cm:category><cm:name>ATOMAL</cm:name><sys:node-uuid>rm:markings-2-7</sys:node-uuid></cm:category>
-               <cm:category><cm:name>EXCLUSIVE</cm:name><sys:node-uuid>rm:markings-2-8</sys:node-uuid></cm:category>
-               <cm:category><cm:name>CRYPTO</cm:name><sys:node-uuid>rm:markings-2-9</sys:node-uuid></cm:category>
-               <cm:category><cm:name>TRC</cm:name><sys:node-uuid>rm:markings-2-10</sys:node-uuid></cm:category>
-               <cm:category><cm:name>FOR OFFICIAL USE ONLY</cm:name><sys:node-uuid>rm:markings-2-11</sys:node-uuid></cm:category>
-               <cm:category><cm:name>SBU</cm:name><sys:node-uuid>rm:markings-2-12</sys:node-uuid></cm:category>
-               <cm:category><cm:name>DEA SENSITIVE</cm:name><sys:node-uuid>rm:markings-2-13</sys:node-uuid></cm:category>
-               <cm:category><cm:name>DOD UCNI</cm:name><sys:node-uuid>rm:markings-2-14</sys:node-uuid></cm:category>
-               <cm:category><cm:name>EXDIS</cm:name><sys:node-uuid>rm:markings-2-15</sys:node-uuid></cm:category>
-               <cm:category><cm:name>LIMDIS</cm:name><sys:node-uuid>rm:markings-2-16</sys:node-uuid></cm:category>
-               <cm:category><cm:name>NODIS</cm:name><sys:node-uuid>rm:markings-2-17</sys:node-uuid></cm:category>
-               <cm:category><cm:name>SOSUS</cm:name><sys:node-uuid>rm:markings-2-18</sys:node-uuid></cm:category>
-               <cm:category><cm:name>EYES ONLY</cm:name><sys:node-uuid>rm:markings-2-19</sys:node-uuid></cm:category>
-
-            </cm:subcategories></cm:category>
-
-         <cm:category><cm:name>Dissemination</cm:name><sys:node-uuid>rm:markings-3</sys:node-uuid><cm:subcategories>
-
-               <cm:category><cm:name>ORCON</cm:name><sys:node-uuid>rm:markings-3-1</sys:node-uuid></cm:category>
-               <cm:category><cm:name>PROPIN</cm:name><sys:node-uuid>rm:markings-3-2</sys:node-uuid></cm:category>
-               <cm:category><cm:name>NOFORN</cm:name><sys:node-uuid>rm:markings-3-3</sys:node-uuid></cm:category>
-               <cm:category><cm:name>NOCONTRACT</cm:name><sys:node-uuid>rm:markings-3-34</sys:node-uuid></cm:category>
-               <cm:category><cm:name>FOUO</cm:name><sys:node-uuid>rm:markings-3-5</sys:node-uuid></cm:category>
-               <cm:category><cm:name>RELTO</cm:name><sys:node-uuid>rm:markings-3-6</sys:node-uuid></cm:category>
-               <cm:category><cm:name>EYES ONLY</cm:name><sys:node-uuid>rm:markings-3-7</sys:node-uuid></cm:category>
-
-            </cm:subcategories></cm:category>
-
-         <cm:category><cm:name>Reason</cm:name><sys:node-uuid>rm:markings-4</sys:node-uuid><cm:subcategories>
-
-               <cm:category><cm:name>CLASS</cm:name><sys:node-uuid>rm:markings-4-1</sys:node-uuid></cm:category>
-               <cm:category><cm:name>RSN</cm:name><sys:node-uuid>rm:markings-4-2</sys:node-uuid></cm:category>
-               <cm:category><cm:name>DERV</cm:name><sys:node-uuid>rm:markings-4-3</sys:node-uuid></cm:category>
-               <cm:category><cm:name>DNG</cm:name><sys:node-uuid>rm:markings-4-4</sys:node-uuid></cm:category>
-               <cm:category><cm:name>DECL</cm:name><sys:node-uuid>rm:markings-4-5</sys:node-uuid></cm:category>
-
-            </cm:subcategories></cm:category>
-
-      </cm:subcategories></cm:category>
-
-</cm:subcategories></cm:category>
-
-
-                </cm:subcategories>
              </cm:category>
 		</cm:categories>
 	</cm:category_root>
diff --git a/config/alfresco/bootstrap/example_javascripts.acp b/config/alfresco/bootstrap/example_javascripts.acp
index 48bf6636e4..4aea5d4048 100644
Binary files a/config/alfresco/bootstrap/example_javascripts.acp and b/config/alfresco/bootstrap/example_javascripts.acp differ
diff --git a/config/alfresco/bootstrap/file_plan.xml b/config/alfresco/bootstrap/file_plan.xml
deleted file mode 100644
index 62003b9bb5..0000000000
--- a/config/alfresco/bootstrap/file_plan.xml
+++ /dev/null
@@ -1,828 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<view:view xmlns:view="http://www.alfresco.org/view/repository/1.0">
-  <view:metadata>
-    <view:exportBy>admin</view:exportBy>
-    <view:exportDate>2006-09-02T09:54:43.796+01:00</view:exportDate>
-    <view:exporterVersion>1.4.0 (Dev @build-number@)</view:exporterVersion>
-    <view:exportOf>/app:company_home/app:dictionary/app:space_templates/cm:File_x0020_Plan</view:exportOf>
-  </view:metadata>
-  <cm:folder xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rma="http://www.alfresco.org/model/record/1.0" xmlns:wf="http://www.alfresco.org/model/workflow/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:bpm="http://www.alfresco.org/model/bpm/1.0" xmlns:custom="custom.model" xmlns="" view:childName="cm:File Plan">
-    <view:aspects>
-      <rule:rules></rule:rules>
-      <cm:templatable></cm:templatable>
-      <cm:auditable></cm:auditable>
-      <sys:referenceable></sys:referenceable>
-      <app:uifacets></app:uifacets>
-      <rma:userSpecifiedData></rma:userSpecifiedData>
-      <rma:filePlan></rma:filePlan>
-    </view:aspects>
-    <view:properties>
-      <rma:vitalRecordIndicator>false</rma:vitalRecordIndicator>
-      <rma:privacyActSystem>N/A</rma:privacyActSystem>
-      <rma:defaultTransferLocation>ISF</rma:defaultTransferLocation>
-      <cm:template>/app:company_home/app:dictionary/app:content_templates/cm:records_report.ftl</cm:template>
-      <app:icon>space-icon-cd</app:icon>
-      <sys:node-uuid>15cc634c-3a5c-11db-ae95-09a9ea11d246</sys:node-uuid>
-      <rma:processAccession>false</rma:processAccession>
-      <rma:dispositionAuthority>GRS 1 item 1</rma:dispositionAuthority>
-      <rma:cutoffPeriod>/cm:generalclassifiable/cm:Records_x0020_Categories/cm:Review_x0020_Period/cm:Quarterly</rma:cutoffPeriod>
-      <rma:defaultMediaType>/cm:generalclassifiable/cm:Records_x0020_Categories/cm:Media_x0020_Types/cm:Electronic</rma:defaultMediaType>
-      <rma:recordCounter>1</rma:recordCounter>
-      <rma:processTransfer>false</rma:processTransfer>
-      <cm:created>2006-09-02T09:21:51.750+01:00</cm:created>
-      <rma:cutoffOnsuperseded>false</rma:cutoffOnsuperseded>
-      <rma:accessionLocation>NARA</rma:accessionLocation>
-      <rma:transferBlockSize>1.0</rma:transferBlockSize>
-      <cm:creator>admin</cm:creator>
-      <rma:containsRecordFolders>false</rma:containsRecordFolders>
-      <rma:processDestruction>false</rma:processDestruction>
-      <rma:discretionaryHold>false</rma:discretionaryHold>
-      <rma:eventTrigger>Obsolete or Superseded</rma:eventTrigger>
-      <cm:name>File Plan</cm:name>
-      <sys:store-identifier>SpacesStore</sys:store-identifier>
-      <rma:vitalRecordReviewPeriod>/cm:generalclassifiable/cm:Records_x0020_Categories/cm:Review_x0020_Period/cm:Quarterly</rma:vitalRecordReviewPeriod>
-      <cm:description>File Plan Template for Records Management</cm:description>
-      <sys:node-dbid>458</sys:node-dbid>
-      <cm:title>File Plan Template</cm:title>
-      <rma:cutoffOnObsolete>false</rma:cutoffOnObsolete>
-      <rma:accessionBlockSize>5.0</rma:accessionBlockSize>
-      <rma:processCutoff>false</rma:processCutoff>
-      <rma:defaultMarkingList>/cm:generalclassifiable/cm:Records_x0020_Categories/cm:Markings/cm:NONE</rma:defaultMarkingList>
-      <cm:modifier>admin</cm:modifier>
-      <rma:recordFolders></rma:recordFolders>
-      <rma:permanentRecordIndicator>false</rma:permanentRecordIndicator>
-      <cm:modified>2006-09-02T09:53:17.750+01:00</cm:modified>
-      <rma:dispositionInstructions>Destroy/delete when superseded by a like survey or study, or when no longer needed, whichever is later.</rma:dispositionInstructions>
-      <sys:store-protocol>workspace</sys:store-protocol>
-      <rma:recordCategoryIdentifier>0000-00</rma:recordCategoryIdentifier>
-      <rma:destructionLocation></rma:destructionLocation>
-      <rma:defaultOriginatingOrganization>Defense Information Systems Agency</rma:defaultOriginatingOrganization>
-      <rma:processHold>false</rma:processHold>
-      <rma:holdPeriod>2.0</rma:holdPeriod>
-    </view:properties>
-    <view:associations>
-      <rule:ruleFolder>
-        <cm:systemfolder view:childName="rule:ruleFolder">
-          <view:aspects>
-            <cm:auditable></cm:auditable>
-            <sys:referenceable></sys:referenceable>
-          </view:aspects>
-          <view:properties>
-            <cm:modifier>admin</cm:modifier>
-            <cm:modified>2006-09-02T09:41:28.718+01:00</cm:modified>
-            <sys:node-uuid>7836ac9c-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-            <cm:creator>admin</cm:creator>
-            <sys:node-dbid>459</sys:node-dbid>
-            <sys:store-protocol>workspace</sys:store-protocol>
-            <cm:name>7836ac9c-3a5d-11db-ae95-09a9ea11d246</cm:name>
-            <sys:store-identifier>SpacesStore</sys:store-identifier>
-            <cm:created>2006-09-02T09:31:46.093+01:00</cm:created>
-          </view:properties>
-          <view:associations>
-            <cm:contains>
-              <rule:rule view:childName="rule:rules783b678d-3a5d-11db-ae95-09a9ea11d246">
-                <view:aspects>
-                  <cm:titled></cm:titled>
-                  <cm:auditable></cm:auditable>
-                  <sys:referenceable></sys:referenceable>
-                </view:aspects>
-                <view:properties>
-                  <cm:description>Add Email Aspect</cm:description>
-                  <sys:node-uuid>783b678e-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                  <sys:node-dbid>460</sys:node-dbid>
-                  <cm:title>Email Handling</cm:title>
-                  <cm:created>2006-09-02T09:31:46.109+01:00</cm:created>
-                  <cm:modifier>admin</cm:modifier>
-                  <rule:disabled>false</rule:disabled>
-                  <cm:modified>2006-09-02T09:31:46.250+01:00</cm:modified>
-                  <rule:applyToChildren>true</rule:applyToChildren>
-                  <cm:creator>admin</cm:creator>
-                  <sys:store-protocol>workspace</sys:store-protocol>
-                  <rule:executeAsynchronously>false</rule:executeAsynchronously>
-                  <rule:ruleType>
-                    <view:values>
-                      <view:value>inbound</view:value>
-                    </view:values>
-                  </rule:ruleType>
-                  <cm:name>783b678e-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                  <sys:store-identifier>SpacesStore</sys:store-identifier>
-                </view:properties>
-                <view:associations>
-                  <rule:action>
-                    <act:compositeaction view:childName="rule:action">
-                      <view:aspects>
-                        <cm:auditable></cm:auditable>
-                        <sys:referenceable></sys:referenceable>
-                      </view:aspects>
-                      <view:properties>
-                        <act:executeAsynchronously>false</act:executeAsynchronously>
-                        <act:actionDescription>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionDescription>
-                        <sys:node-uuid>78343b97-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                        <sys:node-dbid>461</sys:node-dbid>
-                        <cm:created>2006-09-02T09:31:46.140+01:00</cm:created>
-                        <cm:modifier>admin</cm:modifier>
-                        <cm:modified>2006-09-02T09:31:46.250+01:00</cm:modified>
-                        <act:actionTitle>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionTitle>
-                        <cm:creator>admin</cm:creator>
-                        <act:definitionName>composite-action</act:definitionName>
-                        <sys:store-protocol>workspace</sys:store-protocol>
-                        <cm:name>78343b97-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                        <sys:store-identifier>SpacesStore</sys:store-identifier>
-                      </view:properties>
-                      <view:associations>
-                        <act:conditions>
-                          <act:actioncondition view:childName="act:conditions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:31:46.250+01:00</cm:modified>
-                              <sys:node-uuid>78343b98-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <cm:creator>admin</cm:creator>
-                              <sys:node-dbid>462</sys:node-dbid>
-                              <act:definitionName>compare-mime-type</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <act:invert>false</act:invert>
-                              <cm:name>78343b98-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                              <cm:created>2006-09-02T09:31:46.171+01:00</cm:created>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:text">message/rfc822</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>value</act:parameterName>
-                                    <cm:modified>2006-09-02T09:31:46.250+01:00</cm:modified>
-                                    <sys:node-uuid>78474e6f-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>463</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>78474e6f-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:31:46.187+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:actioncondition>
-                        </act:conditions>
-                        <act:actions>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>78343b99-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>464</sys:node-dbid>
-                              <cm:created>2006-09-02T09:31:46.203+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:31:46.250+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>add-features</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>78343b99-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:qname">{http://www.alfresco.org/model/content/1.0}emailed</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>aspect-name</act:parameterName>
-                                    <cm:modified>2006-09-02T09:31:46.250+01:00</cm:modified>
-                                    <sys:node-uuid>784c0960-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>465</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>784c0960-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:31:46.234+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:action>
-                        </act:actions>
-                      </view:associations>
-                    </act:compositeaction>
-                  </rule:action>
-                </view:associations>
-              </rule:rule>
-              <rule:rule view:childName="rule:rulesd08ef27c-3a5d-11db-ae95-09a9ea11d246">
-                <view:aspects>
-                  <cm:titled></cm:titled>
-                  <cm:auditable></cm:auditable>
-                  <sys:referenceable></sys:referenceable>
-                </view:aspects>
-                <view:properties>
-                  <cm:description>Add record aspect and set up record data</cm:description>
-                  <sys:node-uuid>d091637d-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                  <sys:node-dbid>466</sys:node-dbid>
-                  <cm:title>Record Set-up</cm:title>
-                  <cm:created>2006-09-02T09:34:14.312+01:00</cm:created>
-                  <cm:modifier>admin</cm:modifier>
-                  <rule:disabled>false</rule:disabled>
-                  <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                  <rule:applyToChildren>true</rule:applyToChildren>
-                  <cm:creator>admin</cm:creator>
-                  <sys:store-protocol>workspace</sys:store-protocol>
-                  <rule:executeAsynchronously>false</rule:executeAsynchronously>
-                  <rule:ruleType>
-                    <view:values>
-                      <view:value>inbound</view:value>
-                    </view:values>
-                  </rule:ruleType>
-                  <cm:name>d091637d-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                  <sys:store-identifier>SpacesStore</sys:store-identifier>
-                </view:properties>
-                <view:associations>
-                  <rule:action>
-                    <act:compositeaction view:childName="rule:action">
-                      <view:aspects>
-                        <cm:auditable></cm:auditable>
-                        <sys:referenceable></sys:referenceable>
-                      </view:aspects>
-                      <view:properties>
-                        <act:executeAsynchronously>false</act:executeAsynchronously>
-                        <act:actionDescription>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionDescription>
-                        <sys:node-uuid>d08ca886-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                        <sys:node-dbid>467</sys:node-dbid>
-                        <cm:created>2006-09-02T09:34:14.343+01:00</cm:created>
-                        <cm:modifier>admin</cm:modifier>
-                        <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                        <act:actionTitle>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionTitle>
-                        <cm:creator>admin</cm:creator>
-                        <act:definitionName>composite-action</act:definitionName>
-                        <sys:store-protocol>workspace</sys:store-protocol>
-                        <cm:name>d08ca886-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                        <sys:store-identifier>SpacesStore</sys:store-identifier>
-                      </view:properties>
-                      <view:associations>
-                        <act:conditions>
-                          <act:actioncondition view:childName="act:conditions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                              <sys:node-uuid>d08ca887-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <cm:creator>admin</cm:creator>
-                              <sys:node-dbid>468</sys:node-dbid>
-                              <act:definitionName>is-subtype</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <act:invert>false</act:invert>
-                              <cm:name>d08ca887-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                              <cm:created>2006-09-02T09:34:14.375+01:00</cm:created>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:qname">{http://www.alfresco.org/model/content/1.0}content</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>type</act:parameterName>
-                                    <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                                    <sys:node-uuid>d09d4a5f-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>469</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>d09d4a5f-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:34:14.390+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:actioncondition>
-                        </act:conditions>
-                        <act:actions>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>d08ca888-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>470</sys:node-dbid>
-                              <cm:created>2006-09-02T09:34:14.421+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>add-features</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>d08ca888-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:qname">{http://www.alfresco.org/model/record/1.0}record</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>aspect-name</act:parameterName>
-                                    <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                                    <sys:node-uuid>d0a47550-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>471</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>d0a47550-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:34:14.453+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:action>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>d08ca889-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>472</sys:node-dbid>
-                              <cm:created>2006-09-02T09:34:14.484+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>extract-metadata</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>d08ca889-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </act:action>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>d08ca88a-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>473</sys:node-dbid>
-                              <cm:created>2006-09-02T09:34:14.515+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>script</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>d08ca88a-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:category">/app:company_home/app:dictionary/app:scripts/cm:record_setup.js</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>script-ref</act:parameterName>
-                                    <cm:modified>2006-09-02T09:34:14.546+01:00</cm:modified>
-                                    <sys:node-uuid>d0b2cd31-3a5d-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>474</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>d0b2cd31-3a5d-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:34:14.531+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:action>
-                        </act:actions>
-                      </view:associations>
-                    </act:compositeaction>
-                  </rule:action>
-                </view:associations>
-              </rule:rule>
-              <rule:rule view:childName="rule:rules96342c64-3a5e-11db-ae95-09a9ea11d246">
-                <view:aspects>
-                  <cm:titled></cm:titled>
-                  <cm:auditable></cm:auditable>
-                  <sys:referenceable></sys:referenceable>
-                </view:aspects>
-                <view:properties>
-                  <cm:description>Set up record folder</cm:description>
-                  <sys:node-uuid>96342c65-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                  <sys:node-dbid>475</sys:node-dbid>
-                  <cm:title>Records Folder</cm:title>
-                  <cm:created>2006-09-02T09:39:45.906+01:00</cm:created>
-                  <cm:modifier>admin</cm:modifier>
-                  <rule:disabled>false</rule:disabled>
-                  <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                  <rule:applyToChildren>true</rule:applyToChildren>
-                  <cm:creator>admin</cm:creator>
-                  <sys:store-protocol>workspace</sys:store-protocol>
-                  <rule:executeAsynchronously>false</rule:executeAsynchronously>
-                  <rule:ruleType>
-                    <view:values>
-                      <view:value>inbound</view:value>
-                    </view:values>
-                  </rule:ruleType>
-                  <cm:name>96342c65-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                  <sys:store-identifier>SpacesStore</sys:store-identifier>
-                </view:properties>
-                <view:associations>
-                  <rule:action>
-                    <act:compositeaction view:childName="rule:action">
-                      <view:aspects>
-                        <cm:auditable></cm:auditable>
-                        <sys:referenceable></sys:referenceable>
-                      </view:aspects>
-                      <view:properties>
-                        <act:executeAsynchronously>false</act:executeAsynchronously>
-                        <act:actionDescription>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionDescription>
-                        <sys:node-uuid>9631e26f-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                        <sys:node-dbid>476</sys:node-dbid>
-                        <cm:created>2006-09-02T09:39:45.921+01:00</cm:created>
-                        <cm:modifier>admin</cm:modifier>
-                        <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                        <act:actionTitle>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionTitle>
-                        <cm:creator>admin</cm:creator>
-                        <act:definitionName>composite-action</act:definitionName>
-                        <sys:store-protocol>workspace</sys:store-protocol>
-                        <cm:name>9631e26f-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                        <sys:store-identifier>SpacesStore</sys:store-identifier>
-                      </view:properties>
-                      <view:associations>
-                        <act:conditions>
-                          <act:actioncondition view:childName="act:conditions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                              <sys:node-uuid>9631e270-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <cm:creator>admin</cm:creator>
-                              <sys:node-dbid>477</sys:node-dbid>
-                              <act:definitionName>is-subtype</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <act:invert>false</act:invert>
-                              <cm:name>9631e270-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                              <cm:created>2006-09-02T09:39:45.953+01:00</cm:created>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:qname">{http://www.alfresco.org/model/content/1.0}folder</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>type</act:parameterName>
-                                    <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                                    <sys:node-uuid>96428447-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>478</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>96428447-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:39:45.984+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:actioncondition>
-                        </act:conditions>
-                        <act:actions>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>9631e271-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>479</sys:node-dbid>
-                              <cm:created>2006-09-02T09:39:46.000+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>add-features</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>9631e271-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:qname">{http://www.alfresco.org/model/record/1.0}record</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>aspect-name</act:parameterName>
-                                    <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                                    <sys:node-uuid>9649b038-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>480</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>9649b038-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:39:46.031+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:action>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>9631e272-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>481</sys:node-dbid>
-                              <cm:created>2006-09-02T09:39:46.046+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>script</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>9631e272-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:category">/app:company_home/app:dictionary/app:scripts/cm:record_folder.js</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>script-ref</act:parameterName>
-                                    <cm:modified>2006-09-02T09:39:46.093+01:00</cm:modified>
-                                    <sys:node-uuid>964e6b29-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>482</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>964e6b29-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:39:46.078+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:action>
-                        </act:actions>
-                      </view:associations>
-                    </act:compositeaction>
-                  </rule:action>
-                </view:associations>
-              </rule:rule>
-              <rule:rule view:childName="rule:rulesd36b6896-3a5e-11db-ae95-09a9ea11d246">
-                <view:aspects>
-                  <cm:titled></cm:titled>
-                  <cm:auditable></cm:auditable>
-                  <sys:referenceable></sys:referenceable>
-                </view:aspects>
-                <view:properties>
-                  <cm:description>Process record lifecycle based upon the file plan</cm:description>
-                  <sys:node-uuid>d36b6897-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                  <sys:node-dbid>483</sys:node-dbid>
-                  <cm:title>Record Lifecycle</cm:title>
-                  <cm:created>2006-09-02T09:41:28.609+01:00</cm:created>
-                  <cm:modifier>admin</cm:modifier>
-                  <rule:disabled>false</rule:disabled>
-                  <cm:modified>2006-09-02T09:41:28.718+01:00</cm:modified>
-                  <rule:applyToChildren>true</rule:applyToChildren>
-                  <cm:creator>admin</cm:creator>
-                  <sys:store-protocol>workspace</sys:store-protocol>
-                  <rule:executeAsynchronously>false</rule:executeAsynchronously>
-                  <rule:ruleType>
-                    <view:values>
-                      <view:value>update</view:value>
-                    </view:values>
-                  </rule:ruleType>
-                  <cm:name>d36b6897-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                  <sys:store-identifier>SpacesStore</sys:store-identifier>
-                </view:properties>
-                <view:associations>
-                  <rule:action>
-                    <act:compositeaction view:childName="rule:action">
-                      <view:aspects>
-                        <cm:auditable></cm:auditable>
-                        <sys:referenceable></sys:referenceable>
-                      </view:aspects>
-                      <view:properties>
-                        <act:executeAsynchronously>false</act:executeAsynchronously>
-                        <act:actionDescription>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionDescription>
-                        <sys:node-uuid>d36b6892-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                        <sys:node-dbid>484</sys:node-dbid>
-                        <cm:created>2006-09-02T09:41:28.640+01:00</cm:created>
-                        <cm:modifier>admin</cm:modifier>
-                        <cm:modified>2006-09-02T09:41:28.734+01:00</cm:modified>
-                        <act:actionTitle>
-                          <view:value view:isNull="true"></view:value>
-                        </act:actionTitle>
-                        <cm:creator>admin</cm:creator>
-                        <act:definitionName>composite-action</act:definitionName>
-                        <sys:store-protocol>workspace</sys:store-protocol>
-                        <cm:name>d36b6892-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                        <sys:store-identifier>SpacesStore</sys:store-identifier>
-                      </view:properties>
-                      <view:associations>
-                        <act:conditions>
-                          <act:actioncondition view:childName="act:conditions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:41:28.734+01:00</cm:modified>
-                              <sys:node-uuid>d36b6893-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <cm:creator>admin</cm:creator>
-                              <sys:node-dbid>485</sys:node-dbid>
-                              <act:definitionName>no-condition</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <act:invert>false</act:invert>
-                              <cm:name>d36b6893-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                              <cm:created>2006-09-02T09:41:28.656+01:00</cm:created>
-                            </view:properties>
-                            <view:associations></view:associations>
-                          </act:actioncondition>
-                        </act:conditions>
-                        <act:actions>
-                          <act:action view:childName="act:actions">
-                            <view:aspects>
-                              <cm:auditable></cm:auditable>
-                              <sys:referenceable></sys:referenceable>
-                            </view:aspects>
-                            <view:properties>
-                              <act:executeAsynchronously>false</act:executeAsynchronously>
-                              <act:actionDescription>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionDescription>
-                              <sys:node-uuid>d36b6894-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                              <sys:node-dbid>486</sys:node-dbid>
-                              <cm:created>2006-09-02T09:41:28.687+01:00</cm:created>
-                              <cm:modifier>admin</cm:modifier>
-                              <cm:modified>2006-09-02T09:41:28.734+01:00</cm:modified>
-                              <act:actionTitle>
-                                <view:value view:isNull="true"></view:value>
-                              </act:actionTitle>
-                              <cm:creator>admin</cm:creator>
-                              <act:definitionName>script</act:definitionName>
-                              <sys:store-protocol>workspace</sys:store-protocol>
-                              <cm:name>d36b6894-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                              <sys:store-identifier>SpacesStore</sys:store-identifier>
-                            </view:properties>
-                            <view:associations>
-                              <act:parameters>
-                                <act:actionparameter view:childName="act:parameters">
-                                  <view:aspects>
-                                    <cm:auditable></cm:auditable>
-                                    <sys:referenceable></sys:referenceable>
-                                  </view:aspects>
-                                  <view:properties>
-                                    <act:parameterValue>
-                                      <view:value view:datatype="d:category">/app:company_home/app:dictionary/app:scripts/cm:record_lifecycle.js</view:value>
-                                    </act:parameterValue>
-                                    <cm:modifier>admin</cm:modifier>
-                                    <act:parameterName>script-ref</act:parameterName>
-                                    <cm:modified>2006-09-02T09:41:28.734+01:00</cm:modified>
-                                    <sys:node-uuid>d37c3179-3a5e-11db-ae95-09a9ea11d246</sys:node-uuid>
-                                    <cm:creator>admin</cm:creator>
-                                    <sys:node-dbid>487</sys:node-dbid>
-                                    <sys:store-protocol>workspace</sys:store-protocol>
-                                    <cm:name>d37c3179-3a5e-11db-ae95-09a9ea11d246</cm:name>
-                                    <sys:store-identifier>SpacesStore</sys:store-identifier>
-                                    <cm:created>2006-09-02T09:41:28.703+01:00</cm:created>
-                                  </view:properties>
-                                  <view:associations></view:associations>
-                                </act:actionparameter>
-                              </act:parameters>
-                            </view:associations>
-                          </act:action>
-                        </act:actions>
-                      </view:associations>
-                    </act:compositeaction>
-                  </rule:action>
-                </view:associations>
-              </rule:rule>
-            </cm:contains>
-          </view:associations>
-        </cm:systemfolder>
-      </rule:ruleFolder>
-    </view:associations>
-  </cm:folder>
-</view:view>
\ No newline at end of file
diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index 3243cd34f8..42266c5fa8 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -412,7 +412,6 @@
                 <value>alfresco/model/bpmModel.xml</value>
                 <value>alfresco/model/applicationModel.xml</value>
                 <value>alfresco/model/forumModel.xml</value>
-                <value>alfresco/model/recordsModel.xml</value>
 
                 <!-- Implementation models -->
                 <value>org/alfresco/repo/security/authentication/userModel.xml</value>
diff --git a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-1.4-2.sql b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-1.4-2.sql
index 84f27b9117..60ad676333 100644
--- a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-1.4-2.sql
+++ b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-1.4-2.sql
@@ -45,6 +45,9 @@ ALTER TABLE alf_node_status
   DROP COLUMN change_txn_id,
   ADD CONSTRAINT FK71C2002B9E57C13D FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id),
   ADD INDEX FK71C2002B9E57C13D (transaction_id);
+ALTER TABLE alf_node_status
+  DROP COLUMN deleted
+  ;(optional)
 
 --
 -- Record script finish
diff --git a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-1.4-2.sql b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-1.4-2.sql
index 89e82d22d6..ee3de98dad 100644
--- a/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-1.4-2.sql
+++ b/config/alfresco/dbscripts/upgrade/1.4/org.hibernate.dialect.Oracle9Dialect/AlfrescoSchemaUpdate-1.4-2.sql
@@ -54,6 +54,7 @@ update alf_node_status ns SET ns.transaction_id =
 alter table alf_node_status DROP COLUMN change_txn_id;
 alter table alf_node_status ADD CONSTRAINT FK71C2002B9E57C13D FOREIGN KEY (transaction_id) REFERENCES alf_transaction (id);
 create index FK71C2002B9E57C13D on alf_node_status (transaction_id);
+alter table alf_node_status DROP COLUMN deleted;(optional)
 
 --
 -- Record script finish
diff --git a/config/alfresco/extension/file-servers-custom.xml b/config/alfresco/extension/file-servers-custom.xml
new file mode 100644
index 0000000000..95bf3f6d5f
--- /dev/null
+++ b/config/alfresco/extension/file-servers-custom.xml
@@ -0,0 +1,55 @@
+<alfresco-config area="file-servers">
+
+   <!-- To override the default Alfresco filesystem use replace="true", to -->
+   <!-- add additional filesystems remove the replace="true" attribute     -->
+   
+   <config evaluator="string-compare" condition="Filesystems" replace="true">
+      <filesystems>
+
+         <filesystem name="Alfresco">
+            <store>workspace://SpacesStore</store>
+            <rootPath>/app:company_home</rootPath>
+
+            <!-- Add a URL file to each folder that links back to the web client -->
+            <urlFile>
+               <filename>__Alfresco.url</filename>
+               <webpath>http://${localname}:8080/alfresco/</webpath>
+            </urlFile>
+
+            <!-- Mark locked files as offline -->
+            <offlineFiles/>
+
+            <!-- Desktop actions -->
+
+            <desktopActions>
+               <global>
+                  <path>alfresco/desktop/Alfresco.exe</path>
+                  <webpath>http://${localname}:8080/alfresco/</webpath>
+               </global>
+               <action>
+                  <class>org.alfresco.filesys.smb.server.repo.desk.CheckInOutDesktopAction</class>
+                  <name>CheckInOut</name>
+                  <filename>__CheckInOut.exe</filename>
+               </action>
+               <action>
+                  <class>org.alfresco.filesys.smb.server.repo.desk.JavaScriptDesktopAction</class>
+                  <name>JavaScriptURL</name>
+                  <filename>__ShowDetails.exe</filename>
+                  <script>alfresco/desktop/showDetails.js</script>
+                  <attributes>anyFiles</attributes>
+                  <preprocess>copyToTarget</preprocess>
+               </action>
+
+            </desktopActions>
+
+<!--
+            <accessControl default="Write">
+               <user name="admin" access="Write"/>
+               <address subnet="90.1.0.0" mask="255.255.0.0" access="Write"/>
+            </accessControl>
+-->
+         </filesystem>
+      </filesystems>
+   </config>
+
+</alfresco-config>
diff --git a/config/alfresco/import-export-context.xml b/config/alfresco/import-export-context.xml
index a171b3642e..d3844ae525 100644
--- a/config/alfresco/import-export-context.xml
+++ b/config/alfresco/import-export-context.xml
@@ -227,6 +227,9 @@
         -->
 	</bean>
 
+    <bean id="storeImporterViews" class="org.alfresco.repo.importer.ImporterBootstrapViews" abstract="true">
+    </bean>
+
 
 	<!--  -->
 	<!--  Store specific Importers -->
diff --git a/config/alfresco/model/recordsModel.xml b/config/alfresco/model/recordsModel.xml
deleted file mode 100644
index cf135f6a5a..0000000000
--- a/config/alfresco/model/recordsModel.xml
+++ /dev/null
@@ -1,458 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- Definition of Records Management Model -->
-
-<!-- Note: the rma: namespace is defined further on in the document -->
-<model name="rma:recordsmanagement" xmlns="http://www.alfresco.org/model/dictionary/1.0">
-
-   <!-- Meta-data about the model -->   
-   <description>Records Management Model</description>
-   <author>John Newton</author>
-   <version>1.0</version>
-
-   <!-- Imports are required to allow references to definitions in other models -->   
-   <imports>
-      <!-- Import Alfresco Dictionary Definitions -->
-      <import uri="http://www.alfresco.org/model/dictionary/1.0" prefix="d"/>
-      <!-- Import Alfresco Content Domain Model Definitions -->
-      <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
-      <!-- Import Alfresco Content Domain Model Definitions -->
-      <import uri="http://www.alfresco.org/model/system/1.0" prefix="sys" />
-   </imports>
-
-   <!-- Records Management Namespace -->
-   <namespaces>
-      <namespace uri="http://www.alfresco.org/model/record/1.0" prefix="rma"/>
-   </namespaces>
-   
-   <aspects>
-      
-      <!-- Definition of new Content Aspect: Record User-Specified Data -->
-      <!-- Please extend this for new records metadata -->
-      <aspect name="rma:userSpecifiedData">
-         <title>RM: User Specified Data</title>
-         <properties>
-            <property name="rma:privacyActSystem">
-               <title>Privacy Act System</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-
-      <!-- Definition of new Content Aspect: FilePlan -->
-      <aspect name="rma:filePlan">
-         <title>RM: File Plan</title>
-         <properties>
-            <property name="rma:recordCategoryIdentifier">
-               <title>Record Category Identifier</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:dispositionAuthority">
-               <title>Disposition Authority</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:permanentRecordIndicator">
-               <title>Permanent Record Indicator</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:dispositionInstructions">
-               <title>Disposition Instructions</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:containsRecordFolders">
-               <title>Contains Records Folders</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:recordFolders">
-               <title>Name of Folders</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-           <property name="rma:defaultMediaType">
-               <title>Default Media Format</title>
-               <type>d:category</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:defaultMarkingList">
-               <title>Default Marking List</title>
-               <type>d:category</type>
-               <mandatory enforced="false">false</mandatory>
-               <multiple>true</multiple>
-            </property>
-            <property name="rma:defaultOriginatingOrganization">
-               <title>Default Originating Org</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-
-            <!-- Vital Record Lifecycle State -->
-            <property name="rma:vitalRecordIndicator">
-               <title>Vital Record Indicator</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:vitalRecordReviewPeriod">
-               <title>Vital Record Review Period</title>
-               <type>d:category</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-
-            <!-- Cut-off Lifecycle State -->
-            <property name="rma:processCutoff">
-               <title>Process Cutoff</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:eventTrigger">
-               <title>Event Trigger</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:cutoffPeriod">
-               <title>Cutoff Period</title>
-               <type>d:category</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:cutoffOnObsolete">
-               <title>Cutoff When Obsolete</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:cutoffOnSuperseded">
-               <title>Cutoff When Superseded</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
- 
-            <!-- Hold Lifecycle State -->
-            <property name="rma:processHold">
-               <title>Process Hold</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:holdPeriod">
-               <title>Hold Period in Years</title>
-               <type>d:float</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:discretionaryHold">
-               <title>Discretionary Hold</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
- 
-            <!-- Transfer Lifecycle State -->
-            <property name="rma:processTransfer">
-               <title>Process Transfer</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:defaultTransferLocation">
-               <title>Transfer Location</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:transferBlockSize">
-               <title>Transfer Blocksize in Years</title>
-               <type>d:float</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
- 
-            <!-- Accession Lifecycle State -->
-            <property name="rma:processAccession">
-               <title>Process Accession</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:accessionPeriod">
-               <title>Time to Accession in Years</title>
-               <type>d:float</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:accessionLocation">
-               <title>Accession Location</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:accessionBlockSize">
-               <title>Accession Blocksize in Years</title>
-               <type>d:float</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
- 
-            <!-- Destruction Lifecycle State -->
-            <property name="rma:processDestruction">
-               <title>Process Destruction</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:destructionLocation"> <!-- hidden for now -->
-               <title>Destruction Location</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
- 
-            <!-- Miscellaneous Lifecycle Metadata -->
-            <property name="rma:filePlanNote">
-               <title>Note</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:recordCounter">
-               <title>Record Counter</title>
-               <type>d:int</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-         <mandatory-aspects>
-            <aspect>rma:userSpecifiedData</aspect>
-         </mandatory-aspects>
-      </aspect>
-
-      <!-- Definition of Association Aspect: Superseded -->
-      <aspect name="rma:superseded">
-         <title>RM: Superseded</title>
-         <associations>
-            <association name="rma:superseding">
-               <title>Superceded By</title>
-               <source>
-                  <role>rma:supersededBy</role>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </source>
-               <target>
-                  <class>cm:content</class>
-                  <role>rma:supersedes</role>
-                  <mandatory>false</mandatory>
-                  <many>true</many>
-               </target>
-            </association>
-         </associations>
-      </aspect>
-   
-
-      <!-- Definition of new Content Aspect: Record -->
-      <aspect name="rma:record">
-         <title>RM: Record</title>
-         <properties>
-            <property name="rma:recordIdentifier">
-               <title>Unique Record Identifier</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:subject">
-               <title>Subject</title>
-               <type>d:text</type>
-            </property>
-            <property name="rma:format">
-               <title>Format</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:mediaFormat">
-               <title>Media Format</title>
-               <type>d:category</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:dateFiled">
-               <title>Date Filed</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:publicationDate">
-               <title>Publication Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:dateReceived">
-               <title>Date Received</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:originator">
-               <title>Originator</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:originatingOrganization">
-               <title>Originating Organization</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:addressee">
-               <title>Addressee</title>
-               <type>d:text</type>
-               <mandatory enforced="false">true</mandatory>
-            </property>
-            <property name="rma:otherAddressees">
-               <title>Other Addressees</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:supplementalMarkingList">
-               <title>Supplemental Marking List</title>
-               <type>d:category</type>
-               <mandatory enforced="false">false</mandatory>
-               <multiple>true</multiple>
-            </property>
-            <property name="rma:isObsolete">
-               <title>Obsolete</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:recordNote">
-               <title>Note</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-         <mandatory-aspects>
-            <aspect>cm:auditable</aspect>
-            <aspect>cm:author</aspect>
-            <aspect>rma:userSpecifiedData</aspect>
-            <aspect>cm:referencing</aspect>
-            <aspect>rma:superseded</aspect>
-         </mandatory-aspects>
-      </aspect>
-
-      <!-- Definition of Disposition Aspect: Vital Record -->
-      <aspect name="rma:vitalrecord">
-         <title>RM: Vital Record</title>
-         <properties>
-            <property name="rma:isVitalRecord">
-               <title>Vital Record</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:prevReviewDate">
-               <title>Last Review Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:nextReviewDate">
-               <title>Next Review Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-
-      <!-- Definition of Disposition Aspect: Cutoffable -->
-      <aspect name="rma:cutoffable">
-         <title>RM: Cutoffable</title>
-         <properties>
-            <property name="rma:cutoffExecuted">
-               <title>Cutoff Executed</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:cutoffNow">
-               <title>Cutoff Now</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:cutoffDateTime">
-               <title>Cutoff Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:cutoffEvent">
-               <title>Cutoff Event</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-
-      <!-- Definition of Disposition Aspect: Holdable -->
-      <aspect name="rma:holdable">
-         <title>RM: Holdable</title>
-         <properties>
-            <property name="rma:holdExecuted">
-               <title>Hold Executed</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:holdUntil">
-               <title>Hold Until</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:holdUntilEvent">
-               <title>Hold Until Event</title>
-               <type>d:text</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:freeze">
-               <title>Freeze</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-
-      <!-- Definition of Disposition Aspect: Transferable -->
-      <aspect name="rma:transferable">
-         <title>RM: Transferable</title>
-         <properties>
-            <property name="rma:transferExecuted">
-               <title>Transfer Executed</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:transferDate">
-               <title>Transfer Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-
-      <!-- Definition of Disposition Aspect: Accessionable -->
-      <aspect name="rma:accessionable">
-         <title>RM: Accessionable</title>
-         <properties>
-            <property name="rma:accessionExecuted">
-               <title>Accession Executed</title>
-               <type>d:boolean</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-            <property name="rma:accessionDate">
-               <title>Accession Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-      </aspect>
-
-
-      <!-- Definition of Disposition Aspect: Destroyable -->
-      <aspect name="rma:destroyable">
-         <title>RM: Destroyable</title>
-         <properties>
-            <property name="rma:destructionDate">
-               <title>Destruction Date</title>
-               <type>d:datetime</type>
-               <mandatory enforced="false">false</mandatory>
-            </property>
-         </properties>
-         <mandatory-aspects>
-            <!-- Needed to permanently destroy the attached object -->
-            <aspect>sys:temporary</aspect>
-         </mandatory-aspects>
-      </aspect>
-
-   </aspects>
-   
-</model>
\ No newline at end of file
diff --git a/config/alfresco/templates/content/examples/records_report.ftl b/config/alfresco/templates/content/examples/records_report.ftl
deleted file mode 100644
index 0d1878a933..0000000000
--- a/config/alfresco/templates/content/examples/records_report.ftl
+++ /dev/null
@@ -1,149 +0,0 @@
-<#-- Records Report - Template to apply to a records space to report on status of records -->
-
-<style>
-body {font:small/1.2em arial,helvetica,clean,sans-serif;font:x-small;margin-top: 10px; margin-right: 10px; margin-bottom: 0px; margin-left: 10px;min-width:500px;}
-</style>
-
-<#assign datetimeformat="dd MMM yyyy HH:mm">
-<#assign xqueryformat="'yyyy-MM-dd'T'HH:mm:ss.000'Z'">
-<#-- space.childrenByXPath[".//*[@rma:nextReviewDate < '${date?string(xqueryformat)}']"]?sort_by(['properties', 'rma:nextReviewDate']) -->
-
-<#macro standardHeaders title extra="">
-    <tr><td colspan="10"><h3>${title}</h3></td></tr>
-    <tr Style="font-size:130%;font-weight:bold;color:#0000FF;">
-        <td width=16></td>
-        <td>ID</td>
-        <td width=16></td>
-        <td>Title</td>
-        <td width=16></td>
-        <td width=16></td>
-        <td>File Plan</td>
-        <td>Originator</td>
-        <td>Date Filed</td>
-        <td>${extra}</td>
-    </tr>
-</#macro>
-
-<#macro standardProperties child extraProperty="">
-    <tr>
-    <!-- Set up workspace path to child and it's associated parent and file plan -->
-    <#assign childRef=child.nodeRef>
-    <#assign childWorkspace=childRef[0..childRef?index_of("://")-1]>
-    <#assign childStorenode=childRef[childRef?index_of("://")+3..]>
-    <#assign childPath="${childWorkspace}/${childStorenode}">
-
-    <#if child.parent.hasAspect("rma:filePlan")>
-        <#assign fileplan=child.parent>
-    <#elseif child.parent.parent?exists && child.parent.hasAspect("rma:filePlan")>
-        <#assign fileplan=child.parent.parent>
-    <#else>
-        <#assign fileplan=child.parent>
-    </#if>
-
-    <#assign fpRef=fileplan.nodeRef>
-    <#assign fpWorkspace=fpRef[0..fpRef?index_of("://")-1]>
-    <#assign fpStorenode=fpRef[fpRef?index_of("://")+3..]>
-    <#assign fileplanPath="${fpWorkspace}/${fpStorenode}">
-
-    <td width=16> <#-- Record properties icon -->
-        <a href="/alfresco/navigate/showDocDetails/${childPath}">
-        <img src="/alfresco/images/icons/View_details.gif" border=0 align=absmiddle alt="Record Details" title="Record Details"></a>
-    </td>
-    <td> <#-- Record identifier -->
-        <a href="/alfresco/navigate/showDocDetails/${childPath}">
-        ${child.properties["rma:recordIdentifier"]}</a>
-    </td>
-    <td width=16> <#-- Record icon -->
-        <a href="/alfresco/download/direct/${childPath}/${child.name}">
-        <img src="/alfresco${child.icon16}" width=16 height=16 border=0 align=absmiddle alt="View Record" title="View Record"></a>
-    </td>
-    <td> <#-- Record title -->
-        <a href="/alfresco/download/direct/${childPath}/${child.name}">
-        ${child.properties["cm:title"]}</a>
-    </td>
-    <td width=16> <#-- Fileplan icon -->
-        <a href="/alfresco/navigate/browse/${fileplanPath}">
-        <img src="/alfresco${fileplan.icon16}" width=16 height=16 border=0 align=absmiddle alt="Fileplan Contents" title="Fileplan Contents"></a>
-    </td>
-    <td width=16> <#-- Fileplan properties icon -->
-        <a href="/alfresco/navigate/showDocDetails/${fileplanPath}">
-        <img src="/alfresco/images/icons/View_details.gif" border=0 align=absmiddle alt="Fileplan Details" title="Fileplan Details"></a>
-    </td>
-    <td>
-        <a href="/alfresco/navigate/showDocDetails/${fileplanPath}">
-        ${fileplan.name}</a>
-    </td>
-    <td>
-        ${child.properties["rma:originator"]}
-    </td>
-    <td>
-        ${child.properties["rma:dateFiled"]?string(datetimeformat)}
-    </td>
-    <td>
-        ${extraProperty}
-    </td>
-    </tr>
-</#macro>
-
-<#macro standardFooters>
-    <tr><td colspan="10"><hr/></td></tr>
-    <tr><td colspan="10"></td></tr>
-</#macro>
-
-
-<table width="100%"  border="0" cellpadding="1" cellspacing="1">
-
-<@standardHeaders title="Recent Records" extra="Date"/>
-<#list space.childrenByXPath[".//*[@rma:dateReceived]"]?sort_by(['properties', 'rma:dateReceived']) as child>
-    <#if (dateCompare(child.properties["cm:modified"], date, 1000*60*60*24*7) == 1) || (dateCompare(child.properties["cm:created"], date, 1000*60*60*24*7) == 1)>
-        <@standardProperties child=child extraProperty=child.properties["rma:dateReceived"]?string(datetimeformat) />
-    </#if>
-</#list>
-<@standardFooters/>
-
-
-<@standardHeaders title="Vital Records Due for Review" extra="Next Review Due"/>
-<#list space.childrenByXPath[".//*[@rma:nextReviewDate]"]?sort_by(['properties', 'rma:nextReviewDate']) as child>
-    <#if (dateCompare(date, child.properties["rma:nextReviewDate"], 1000*60*60*24*7) == 1)>
-        <@standardProperties child=child extraProperty=child.properties["rma:nextReviewDate"]?string(datetimeformat) />
-    </#if>
-</#list>
-<@standardFooters/>
-
-
-<@standardHeaders title="Records Due for Cutoff" extra="Cutoff Date"/>
-<#list space.childrenByXPath[".//*[@rma:cutoffDateTime]"]?sort_by(['properties', 'rma:cutoffDateTime']) as child>
-    <#if (dateCompare(date, child.properties["rma:cutoffDateTime"], 1000*60*60*24*7) == 1)>
-        <@standardProperties child=child extraProperty=child.properties["rma:cutoffDateTime"]?string(datetimeformat) />
-    </#if>
-</#list>
-<@standardFooters/>
-
-
-<@standardHeaders title="Records Retention Due for Expiry" extra="Expiry Date"/>
-<#list space.childrenByXPath[".//*[@rma:holdUntil]"]?sort_by(['properties', 'rma:holdUntil']) as child>
-    <#if (dateCompare(date, child.properties["rma:holdUntil"], 1000*60*60*24*7) == 1)>
-        <@standardProperties child=child extraProperty=child.properties["rma:holdUntil"]?string(datetimeformat) />
-    </#if>
-</#list>
-<@standardFooters/>
-
-
-<@standardHeaders title="Records Due for Transfer" extra="Transfer Date"/>
-<#list space.childrenByXPath[".//*[@rma:transferDate]"]?sort_by(['properties', 'rma:transferDate']) as child>
-    <#if (dateCompare(date, child.properties["rma:transferDate"], 1000*60*60*24*7) == 1)>
-        <@standardProperties child=child extraProperty=child.properties["rma:transferDate"]?string(datetimeformat) />
-    </#if>
-</#list>
-<@standardFooters/>
-
-
-<@standardHeaders title="Records Due for Destruction" extra="Destruction Due Date"/>
-<#list space.childrenByXPath[".//*[@rma:destructionDate]"]?sort_by(['properties', 'rma:destructionDate']) as child>
-    <#if (dateCompare(date, child.properties["rma:destructionDate"], 1000*60*60*24*7) == 1)>
-        <@standardProperties child=child extraProperty=child.properties["rma:destructionDate"]?string(datetimeformat) />
-    </#if>
-</#list>
-<@standardFooters/>
-
-</table>
\ No newline at end of file
diff --git a/config/alfresco/templates/content_template_examples.xml b/config/alfresco/templates/content_template_examples.xml
index ed43602646..c5947af0cb 100644
--- a/config/alfresco/templates/content_template_examples.xml
+++ b/config/alfresco/templates/content_template_examples.xml
@@ -126,20 +126,6 @@
     </view:properties>
     <view:associations></view:associations>
   </cm:content>
-  <cm:content xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:records_report.ftl">
-    <view:aspects>
-      <cm:titled></cm:titled>
-      <app:inlineeditable></app:inlineeditable>
-    </view:aspects>
-    <view:properties>
-      <app:editInline>true</app:editInline>
-      <cm:description>Displays the current state of records in a file plan space or a space containing a file plan.</cm:description>
-      <cm:content>contentUrl=classpath:alfresco/templates/content/examples/records_report.ftl|mimetype=text/plain|size=6134|encoding=UTF-8</cm:content>
-      <cm:title>records_report.ftl</cm:title>
-      <cm:name>records_report.ftl</cm:name>
-    </view:properties>
-    <view:associations></view:associations>
-  </cm:content>
   <cm:content xmlns:alf="http://www.alfresco.org" xmlns:d="http://www.alfresco.org/model/dictionary/1.0" xmlns:view="http://www.alfresco.org/view/repository/1.0" xmlns:sys="http://www.alfresco.org/model/system/1.0" xmlns:act="http://www.alfresco.org/model/action/1.0" xmlns:rule="http://www.alfresco.org/model/rule/1.0" xmlns:fm="http://www.alfresco.org/model/forum/1.0" xmlns:app="http://www.alfresco.org/model/application/1.0" xmlns:usr="http://www.alfresco.org/model/user/1.0" xmlns:ver="http://www.alfresco.org/model/versionstore/1.0" xmlns:cm="http://www.alfresco.org/model/content/1.0" xmlns="" view:childName="cm:show_audit.ftl">
     <view:aspects>
       <cm:titled></cm:titled>
diff --git a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java
index 6eb6ca27fb..60f8e1fcba 100644
--- a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java
+++ b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java
@@ -25,6 +25,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
@@ -82,6 +83,7 @@ public class ImporterBootstrap extends AbstractLifecycleBean
     private NodeService nodeService;
     private ImporterService importerService;
     private List<Properties> bootstrapViews;
+    private List<Properties> extensionBootstrapViews;
     private StoreRef storeRef = null;
     private List<String> mustNotExistStoreUrls = null;
     private Properties configuration = null;
@@ -175,6 +177,20 @@ public class ImporterBootstrap extends AbstractLifecycleBean
         this.bootstrapViews = bootstrapViews;
     }
 
+    /**
+     * Sets the bootstrap views
+     * 
+     * @param bootstrapViews
+     */
+    public void addBootstrapViews(List<Properties> bootstrapViews)
+    {
+        if (this.extensionBootstrapViews == null)
+        {
+            this.extensionBootstrapViews = new ArrayList<Properties>();
+        }
+        this.extensionBootstrapViews.addAll(bootstrapViews);
+    }
+
     /**
      * Sets the Store Ref to bootstrap into
      * 
@@ -347,6 +363,12 @@ public class ImporterBootstrap extends AbstractLifecycleBean
                 // bootstrap the store contents
                 if (bootstrapViews != null)
                 {
+                    // add-in any extended views
+                    if (extensionBootstrapViews != null)
+                    {
+                        bootstrapViews.addAll(extensionBootstrapViews);
+                    }
+                    
                     for (Properties bootstrapView : bootstrapViews)
                     {
                         String view = bootstrapView.getProperty(VIEW_LOCATION_VIEW);
diff --git a/source/java/org/alfresco/repo/importer/ImporterBootstrapViews.java b/source/java/org/alfresco/repo/importer/ImporterBootstrapViews.java
new file mode 100644
index 0000000000..a15f11da30
--- /dev/null
+++ b/source/java/org/alfresco/repo/importer/ImporterBootstrapViews.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.repo.importer;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Collection of views to import
+ * 
+ * @author David Caruana
+ */
+public class ImporterBootstrapViews implements InitializingBean
+{
+    // Dependencies
+    private ImporterBootstrap importer;
+    private List<Properties> bootstrapViews;
+    
+
+    /**
+     * Sets the importer
+     * 
+     * @param importer
+     */
+    public void setImporter(ImporterBootstrap importer)
+    {
+        this.importer = importer;
+    }
+    
+    /**
+     * Sets the bootstrap views
+     * 
+     * @param bootstrapViews
+     */
+    public void setBootstrapViews(List<Properties> bootstrapViews)
+    {
+        this.bootstrapViews = bootstrapViews;
+    }
+
+    
+    public void afterPropertiesSet() throws Exception
+    {
+        importer.addBootstrapViews(bootstrapViews);
+    }
+
+}