Merged V2.1 to HEAD

6910: Fix for WCM-858, actions for files with an apostrophe in the name emit JavaScript errors
   6916: Fix to layout when My Spaces portlet follows on same page
   6919: Fix for AWC-1367 and AWC-1627
   6923: Added suport for datetime tokens in the lucene inedx
   6925: Fix for WCM-810
   6930: Fix for WCM-854
   Moved schema version to 110 and adjusted patch accordingly.


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

config/alfresco/messages/patch-service.properties

@@ -179,3 +179,6 @@ patch.customWebClientExtension.description=Adds Web Client Extension space to Da
 patch.customWorkflowDefs.description=Adds Workflow Definitions space to Data Dictionary.
 
 patch.emailContributorGroup.description=Adds the 'GROUP_EMAIL_CONTRIBUTORS' group.
+
+patch.avmStoreAsIdentifier.description=Reindex wca:webfolder to make wca:avmstore an identifier
+patch.avmStoreAsIdentifier.result=Reindexed wca:webfolder to make wca:avmstore an identifier

config/alfresco/model/dictionaryModel.xml

@@ -64,7 +64,7 @@
       </data-type>
 
       <data-type name="d:datetime">
-         <analyser-class>org.alfresco.repo.search.impl.lucene.analysis.DateAnalyser</analyser-class>
+         <analyser-class>org.alfresco.repo.search.impl.lucene.analysis.DateTimeAnalyser</analyser-class>
          <java-class>java.util.Date</java-class>
       </data-type>
 

config/alfresco/model/wcmAppModel.xml

@@ -27,6 +27,11 @@
             <property name="wca:avmstore">
                <title>AVM Store Root</title>
                <type>d:text</type>
+               <index enabled="true">
+                  <atomic>true</atomic>
+                  <stored>false</stored>
+                  <tokenised>false</tokenised>
+               </index>
             </property>
             <property name="wca:defaultwebapp">
                <title>Default Webapp</title>

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

@@ -1015,7 +1015,7 @@
                 <prop key="location">alfresco/bootstrap/webScriptsReadme2.xml</prop>
             </props>
         </property>
-    </bean>
+    </bean>
 
     <bean id="patch.customWorkflowDefs" class="org.alfresco.repo.admin.patch.impl.GenericBootstrapPatch" parent="basePatch" >
         <property name="id"><value>patch.customWorkflowDefs</value></property>
@@ -1059,4 +1059,18 @@
         </property>
     </bean>
     
+    <bean id="patch.avmStoreAsIdentifier" class="org.alfresco.repo.admin.patch.impl.AVMStorePropertyTokenisationPatch" parent="basePatch" >
+        <property name="id"><value>patch.avmStoreAsIdentifier</value></property>
+        <property name="description"><value>patch.avmStoreAsIdentifier.description</value></property>
+        <property name="fixesFromSchema"><value>0</value></property>
+        <property name="fixesToSchema"><value>109</value></property>
+        <property name="targetSchema"><value>110</value></property>
+        <property name="spacesImporterBootstrap">
+            <ref bean="spacesBootstrap" />
+        </property>
+        <property name="indexerAndSearcher">
+            <ref bean="indexerAndSearcherFactory" />
+        </property>
+    </bean>
+    
 </beans>

config/alfresco/version.properties

@@ -19,4 +19,4 @@ version.build=@build-number@
 
 # Schema number
 
-version.schema=109
+version.schema=110