Merge 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4351 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4352 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4353 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4354 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4362 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4657 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/authentication-services-context.xml

@@ -246,10 +246,9 @@
         <!-- If dsiabled an error will be generated for missing       -->
         <!-- people. If enabled then a person will be created and     -->
         <!-- persisted.                                               -->
-        <!--                                                          -->
-        <!-- This value should be false or only true if the           -->
-        <!-- repository is mutable; set from the property             -->
-        <!-- ${server.transaction.allow-writes}                       -->
+        <!-- Valid values are                                         -->
+        <!--     ${server.transaction.allow-writes}                   -->
+        <!--     false                                                -->
         <property name="createMissingPeople">
            <value>${server.transaction.allow-writes}</value>
         </property>

config/alfresco/bootstrap-context.xml

@@ -223,9 +223,6 @@
        <property name="strict">
            <value>${system.bootstrap.config_check.strict}</value>
        </property>
-       <property name="checkAllContent">
-           <value>false</value>
-       </property>
        <property name="dirRoot">
            <value>${dir.root}</value>
        </property>
@@ -233,20 +230,23 @@
            <value>${index.recovery.mode}</value>
        </property>
        <!-- helper beans -->
-       <property name="authenticationComponent">
-           <ref bean="authenticationComponent"/>
+       <property name="transactionService">
+           <ref bean="transactionComponent"/>
        </property>
-       <property name="dictionaryService">
-           <ref bean="DictionaryService"/>
+       <property name="systemBootstrap">
+           <ref bean="systemBootstrap"/>
+       </property>
+       <property name="namespaceService">
+           <ref bean="namespaceService"/>
        </property>
        <property name="nodeService">
-           <ref bean="NodeService"/>
+           <ref bean="nodeService"/>
        </property>
        <property name="searchService">
-           <ref bean="SearchService"/>
+           <ref bean="searchService"/>
        </property>
        <property name="contentService">
-           <ref bean="ContentService"/>
+           <ref bean="contentService"/>
        </property>
     </bean>
 

config/alfresco/bootstrap/descriptor.xml

@@ -18,6 +18,7 @@
 		<sys:versionEdition><view:values><view:value>${version.edition}</view:value></view:values></sys:versionEdition>
 		<sys:versionLabel>${version.label}</sys:versionLabel>
 		<sys:versionSchema>${version.schema}</sys:versionSchema>
+    	<sys:versionProperties>contentUrl=classpath:alfresco/version.properties|mimetype=text/plain|size=|encoding=UTF8</sys:versionProperties>
 	</sys:descriptor>
 
 </view:view>

config/alfresco/extension/index-tracking-context.xml.sample

@@ -23,7 +23,7 @@
             <ref bean="schedulerFactory" />
         </property>
         <property name="cronExpression">
-            <value>0,30 * * * * ?</value>
+            <value>0,10,20,30,40,50 * * * * ?</value>
         </property>
     </bean>
     

config/alfresco/messages/patch-service.properties

@@ -104,3 +104,8 @@ patch.invalidNameEnding.description=Fixes names ending with a space or full stop
 patch.invalidNameEnding.result=Fixed {0} names ending with a space or full stop.  See file {1} for details.
 patch.invalidNameEnding.err.unable_to_fix=Auto-fixing of names ending with a space or full stop failed.  See file {0} for details.
 patch.invalidNameEnding.rewritten=Name ''{0}'' rewritten to ''{1}''
+
+patch.systemDescriptorContent.description=Adds the version properties content to the system descriptor.
+patch.systemDescriptorContent.result=Added the version properties content to the system descriptor.
+patch.systemDescriptorContent.err.no_version_properties=The version.properties resource could not be found.
+patch.systemDescriptorContent.err.no_descriptor=The system descriptor could not be found.

config/alfresco/messages/system-messages.properties

@@ -9,7 +9,7 @@ system.config_check.warn.dir_root=The Alfresco ''dir.root'' property is set to a
 system.config_check.msg.dir_root=The Alfresco root data directory (''dir.root'') is: {0}
 system.config_check.err.indexes.duplicate_root_node=The store ''{0}'' has a duplicate root node entry.
 system.config_check.err.missing_index=CONTENT INTEGRITY ERROR: Indexes not found for {0} stores.
-system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: Content not found for {0} stores.
+system.config_check.err.missing_content=CONTENT INTEGRITY ERROR: System content not found in content store.
 system.config_check.err.fix_dir_root=Ensure that the ''dir.root'' property is pointing to the correct data location.
 system.config_check.msg.howto_index_recover=You may set 'index.recovery.mode=FULL' if you need to rebuild the indexes.
 system.config_check.warn.starting_with_errors=Alfresco is starting with errors.

config/alfresco/model/systemModel.xml

@@ -53,6 +53,10 @@
 					<type>d:any</type>
 					<multiple>true</multiple>
 				</property>					
+				<property name="sys:versionProperties">
+					<type>d:content</type>
+					<multiple>false</multiple>
+				</property>					
 			</properties>
         </type>		
 

config/alfresco/patch/patch-services-context.xml

@@ -503,5 +503,19 @@
             <ref bean="nodeDaoService" />
         </property>
     </bean>
+    <bean id="patch.systemDescriptorContent" class="org.alfresco.repo.admin.patch.impl.SystemDescriptorContentPatch" parent="basePatch" >
+        <property name="id"><value>patch.systemDescriptorContent</value></property>
+        <property name="description"><value>patch.systemDescriptorContent.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>22</value></property>
+        <property name="targetSchema"><value>23</value></property>
+        <!-- helper beans -->
+        <property name="configurationChecker">
+            <ref bean="configurationChecker" />
+        </property>
+        <property name="contentService">
+            <ref bean="contentService" />
+        </property>
+    </bean>
 
 </beans>

config/alfresco/template-services-context.xml

@@ -24,9 +24,14 @@
     <bean id="freeMarkerProcessor" class="org.alfresco.repo.template.FreeMarkerProcessor" singleton="false">
         <property name="nodeService">
             <ref bean="NodeService"/>
-		  </property>
-		  <property name="contentService">
+        </property>
+        <property name="contentService">
             <ref bean="ContentService"/>
-		  </property>
+        </property>
+        <!-- 
+        <property name="defaultEncoding">
+            <value>UTF-8</value>
+        </property>
+        -->
     </bean>
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=22
+version.schema=23