Merged V4.0-BUG-FIX to HEAD

33757: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX
      33755: Latest Spring Surf libs:
             - Updates to convert FreeMarker directives for processing directives Spring Beans to allow their behaviour to be customized.
             - Changed Extensibility model objects to use a non-blocking GUID generator to avoid thread contention (small amount noticed with 1000 concurrent user test)
             - Removed old machine gun code to generate Object GUIDs, which weren't even valid GUIDs ironically.
             - Replaced with new non-blocking fast GUID generator in webscripts package.
             - Added Reentrant ReadWriteLock around resources in singleton Spring beans that are manipulated by multiple threads.
             - Added Reentrant ReadWriteLock around Advanced Component internal resources.
             - Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
             - Removed lock around ModelWriter (which is only used by a single request thread at a time)
             - Replaced StringBuffer with StringBuilder for Writer usage in extensibility framework to remove locking.
             - Performance improvements around retrieval of RemoteClient instance
             - avoid expensive Spring prototype bean retrieval, use a threadlocal clone of a base RemoteClient bean instead.
             - Concurrency fixes around CRUD operations on shared ModelObjects instances.
             - Surf ModelObjects are shared between all users in the model object caches - but the original machine gun code has no locking what-so-ever around CRUD operations - which meant that it was possible for incorrect property values to be received from a ModelObject in a heavily multi-threaded scenario on initialisation of a Surf application.
             - was causing nonsense warnings such as:
               WARN  [extensions.webscripts.WebTemplateProcessor] [http-8081-exec-10] Unable to find a valid template path for uri: freemarker
             - Modified default web-tier server response codes for read timeout and connect timeout to return more sensible codes to client browsers.
             - Fix for concurrency issue resolving SpringMVC View objects found during heavy thread testing on web-tier startup.
             - Improved caching strategy for WebScripts View Resolver - move techniques from Surf down to WebScripts layer.
             - Improved general View Resolver strategy by caching failed view requests.
             - WebScript resource bundle extension module application thread safety modifications   
   Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
      33684: Fixes for ALF-12628, ALF-12639 - timeout handling for READ_TIMEOUT from web-tier to Alfresco
   33771: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled
   33773: ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
   - filter to include only updateable properties at persistence and start up time
   33775: ALF-11870 Handle the odd way that Outlook requests yearly repeating events, and add unit tests for the yearly recurrence cases
   33776: ALF-12569: org.postgresql.util.PSQLException Invalid ESCAPE on customizing alfresco share site dashboard   
      Added backwards compatible PostgreSQL-specific ESCAPE fragment - fixes for PostgreSQL 9.1.2.
   33784: Fixes: ALF-12111 - Publishing Error when authenticating Facebook channels using IE8. Required an update to stand-alone-auth-return.html.
   33787: Fix for ALF-12337 Remove patch.siteLoadPatch.swsdp from being run for upgrades
   - only add the sample site for new installs and not upgrades
   33794: ITALIAN: Translation updates based on EN r33523
   33807: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      33717: (RECORD ONLY) ALF-12632 Move the Site Service permissions to public-services-security-context.xml, to mirror the behaviour on 4.0, and add a (commented out) example of how to restrict site creation permissions with it
      33806: Merged V3.4 to V3.4-BUG-FIX
         33728: ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
            - Added configuration to limit older excel format 'xls' from Excel 5.0/95 and Excel 97-2003
              Already had configuration for xlsx Microsoft Office 2007
         33743: ALF-12724: Merge HEAD to V3.4 (3.4.8)
            Issue found while fixing ALF-9899 and again by QA when testing ALF-9899
            32941: ALF-11300:
              - fix locking issues
         33772: Merged DEV to V3.4
            33768: ALF-12685 : Search isn't working correctly
               Index delete events were not getting fired for the entire tree of affected nodes when a node was archive
               Added a deletion of child nodes from indexes in DbNodeServiceImpl.pullNodeChildrenToSameStore() method.
         33803: ALF-12724: Merged V4.0-BUG-FIX to V3.4 (Reverts previous revision and changes an error message to debug)
            33137: Activities feed generator: change info log messages to debug log messages
            33452: Fix for ALF-12536
            33536: Fix for ALF-12536: hopefully this will be the final fix.
         33805: ALF-12624: Fix regression introduced by ALF-9514


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

config/alfresco/content-services-context.xml

@@ -672,6 +672,16 @@
                     </entry>
                 </map>
             </entry>
+            <!-- Limit use of xls to pdf (and onwards to swf) if too large -->
+            <entry key="application/vnd.ms-excel">
+                <map>
+                    <entry key="application/pdf">
+                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
+                            <property name="maxSourceSizeKBytes"><value>${content.transformer.OpenOffice.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes}</value></property>
+                        </bean>
+                    </entry>
+                </map>
+            </entry>
         </map>
       </property>
    </bean>
@@ -712,6 +722,16 @@
                     </entry>
                 </map>
             </entry>
+            <!-- Don't use for xls to text as there are better options -->
+            <entry key="application/vnd.ms-excel">
+                <map>
+                    <entry key="text/plain">
+                        <bean class="org.alfresco.service.cmr.repository.TransformationOptionLimits">
+                            <property name="maxSourceSizeKBytes"><value>0</value></property>
+                        </bean>
+                    </entry>
+                </map>
+            </entry>
         </map>
       </property>
    </bean>

config/alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/alfresco-util-SqlMap.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="alfresco.util">
+    <!--
+        ALF-12569: PostgreSQL 9.1.2 no longer treats backslashes specially. Using E'' quoting
+        allows this fragment to work with 9.1.2 and older databases.
+     -->
+    <sql id="escape">
+        escape E'\\'
+    </sql>
+
+</mapper>

config/alfresco/messages/action-config_it.properties

@@ -176,6 +176,10 @@ start-workflow.workflowName.display-label=Nome workflow
 start-workflow.endStartTask.display-label=Compito
 start-workflow.startTaskTransition.display-label=Transizione
 
+cancel-workflow.title=Cancella i workflow
+cancel-workflow.description=Cancella la lista dei workflow con un determinato ID
+cancel-workflow.workflow-id-list.display-label=Lista di workflow con ID
+
 #WCM Actions
 
 simple-avm-submit.title=Invio diretto semplice

config/alfresco/messages/bpm-messages_it.properties

@@ -57,9 +57,8 @@ bpm_businessprocessmodel.aspect.bpm_workflowPackage.description=Raccolta di cont
 bpm_businessprocessmodel.type.bpm_activitiStartTask.title=Inizia il compito del workflow
 bpm_businessprocessmodel.type.bpm_activitiStartTask.description=Compito per raccogliere le informazioni necessarie per iniziare il workflow
 
-#Workflow Start Task
 bpm_businessprocessmodel.type.bpm_startTask.title=Compito di avvio del workflow
-bpm_businessprocessmodel.type.bpm_startTask.description=Compito utilizzato per raccogliere le informazioni richieste per l'avvio del workflow
+bpm_businessprocessmodel.type.bpm_startTask.description=Compito per raccogliere le informazioni necessarie per iniziare il workflow
 bpm_businessprocessmodel.property.bpm_workflowDescription.title=Descrizione
 bpm_businessprocessmodel.property.bpm_workflowDescription.description=Descrizione
 bpm_businessprocessmodel.property.bpm_workflowDueDate.title=Data di scadenza del workflow

config/alfresco/messages/categories_it.properties

@@ -0,0 +1,6 @@
+message.changeCategoryName.success=Il nome della categoria \u00e8 stato cambiato con successo
+message.changeCategoryName.solr.success=L'aggiornamento della categoria \u00e8 stato inserito con successo nella coda di SOLR Il processo di aggiornamento potrebbe tardare alcuni minuti; per favore aggiornare la pagina per vedere la modifica eseguita.
+message.addCategory.success=Categoria aggiunta con successo
+message.addCategory.solr.success=La nuova categoria \u00e8 stata inserita con successo nella coda di SOLR Il processo di aggiornamento potrebbe tardare alcuni minuti; per favore aggiornare la pagina per vedere la modifica eseguita.
+message.removeCategory.success=Categoria rimossa con successo
+message.removeCategory.solr.success=Eliminazione della categoria inserita con successo nella coda di SOLR Il processo di aggiornamento potrebbe tardare alcuni minuti; per favore aggiornare la pagina per vedere la modifica eseguita.

config/alfresco/messages/imap-service_it.properties

@@ -11,4 +11,4 @@ imap.server.error.permission_denied = "Impossibile creare la cartella - Permesso
 imap.server.error.folder_already_exist = "La cartella esiste gi\u00e0."
 imap.server.error.mailbox_name_is_mandatory = "Il nome della cassetta postale \u00e8 un parametro obbligatorio."
 imap.server.error.cannot_get_a_folder = "Impossibile recuperare una cartella con il nome ''{0}''."
-imap.server.error.cannot_parse_default_email = "Impossibile analizzare l'indirizzo e-mail predefinito address ''{0}''."
+imap.server.error.cannot_parse_default_email = "Impossibile analizzare l'indirizzo e-mail predefinito ''{0}''."

config/alfresco/messages/lock-service_it.properties

@@ -1,6 +1,6 @@
 # Lock service externalised display strings
 
-lock_service.insufficent_privileges=Privilegi insufficienti per rilasciare il blocco del nodo (id: {0}).  Il nodo \u00e8 bloccato da un altro utente.
+lock_service.insufficent_privileges=Privilegi insufficienti per rilasciare il blocco del nodo (id: {0}). Il nodo \u00e8 bloccato da un altro utente.
 lock_service.node_locked=Impossibile bloccare il nodo (id: {0}) perch\u00e9 \u00e8 gi\u00e0 bloccato da un altro utente.
 lock_service.no_op=Impossibile eseguire l''operazione perch\u00e9 il nodo (id: {0}) \u00e8 bloccato.
 lock_service.no_op2=Impossibile eseguire l''operazione {0} perch\u00e9 il nodo (id: {1}) \u00e8 bloccato.

config/alfresco/messages/patch-service.properties

@@ -152,6 +152,7 @@ patch.siteLoadPatch.description=Loads a sample site into the repository.
 patch.siteLoadPatch.exists=The Site {0} already exists and so could not be imported
 patch.siteLoadPatch.noBootstrapViews=No bootstrap views were given for importing Site {0} - please check the bootstrap extension bean configuration
 patch.siteLoadPatch.result=Site {0} imported.
+patch.siteLoadPatch.siteNotCreated=The site {0} is only created for new installs.
 
 patch.wcmFolders.description=Ensures the existance of the WCM specific 'Web Projects' and 'Web Forms' folders.
 patch.wcmFolders.webprojects.result.exists=The Web Projects folder already exists: {0}

config/alfresco/messages/patch-service_it.properties

@@ -453,3 +453,5 @@ patch.fixBpmPackages.description=Corrects workflow package types and association
 patch.fixBpmPackages.result=Patch successful. {0} packages converted.
 patch.fixBpmPackages.invalidBootsrapStore=Bootstrap store has not been set
 patch.fixBpmPackages.emptyContainer={0} node has no children
+
+patch.alterJBPM331CLOBcolumnsToNvarchar.description=Altering CLOB columns in the jBPM 3.3.1 tables to introduce Unicode characters support for jBPM 3.3.1

config/alfresco/messages/system-messages_it.properties

@@ -32,6 +32,7 @@ system.schema_comp.redundant_obj.many_matches={0} redundant items? reference: {1
 system.schema_comp.validation=Validation: {0} {1}="{2}" fails to match rule: {3}
 #   Specific validator (implementations) messages...
 system.schema_comp.name_validator=name must match pattern ''{0}''
+system.schema_comp.schema_version_validator=version must be at least ''{0}''
 
 # OpenOffice
 system.openoffice.info.connection_verified=The connection to OpenOffice has been established.

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

@@ -2562,6 +2562,7 @@
         <property name="spacesBootstrap" ref="siteLoadBootstrap-Spaces" />
         <property name="usersBootstrap" ref="siteLoadBootstrap-Users" />
         <property name="siteService" ref="siteService" />
+        <property name="descriptorService" ref="descriptorComponent" />
         <property name="authorityService" ref="authorityService" />
         <property name="behaviourFilter" ref="policyBehaviourFilter" />
         <property name="siteName">

config/alfresco/repository.properties

@@ -608,9 +608,11 @@ content.transformer.complex.Text.Pdf2swf.maxSourceSizeKBytes=1024
 # Has implication for Share preview which generally goes via pdf to get to swf
 content.transformer.OpenOffice.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes=1024
 content.transformer.OpenOffice.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes=1024
+content.transformer.OpenOffice.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes=1024
 
 content.transformer.JodConverter.mimeTypeLimits.txt.pdf.maxSourceSizeKBytes=1024
 content.transformer.JodConverter.mimeTypeLimits.xlsx.pdf.maxSourceSizeKBytes=1024
+content.transformer.JodConverter.mimeTypeLimits.xls.pdf.maxSourceSizeKBytes=1024
 
 # Property to enable upgrade from 2.1-A
 V2.1-A.fixes.to.schema=0

source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java

@@ -2459,14 +2459,6 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                                 netFile.truncateFile(0);
                             }
 
-                            // Generate a file id for the file
-
-                            if ( netFile != null) 
-                            {
-                                long id = DefaultTypeConverter.INSTANCE.convert(Long.class, nodeService.getProperty(nodeRef, ContentModel.PROP_NODE_DBID));
-                                netFile.setFileId((int) (id & 0xFFFFFFFFL));
-                            }
-
                             if (logger.isDebugEnabled())
                             {
                                 logger.debug("Created file: path=" + name + " node=" + nodeRef + " network file=" + netFile);
@@ -2499,14 +2491,6 @@ public class ContentDiskDriver2 extends  AlfrescoDiskDriver implements ExtendedD
                             // Needs to be READWRITE for JavaNetworkFile - there's no such thing as WRITEONLY!
                             netFile.setGrantedAccess( NetworkFile.READWRITE);
 
-                            // Generate a file id for the file
-
-                            if ( netFile != null) 
-                            {
-                                long id = DefaultTypeConverter.INSTANCE.convert(Long.class, nodeService.getProperty(nodeRef, ContentModel.PROP_NODE_DBID));
-                                netFile.setFileId((int) (id & 0xFFFFFFFFL));
-                            }
-
                             if (logger.isDebugEnabled())
                             {
                                 logger.debug("Created temporary file: path=" + name + " node=" + nodeRef + " network file=" + netFile);

source/java/org/alfresco/filesys/repo/LegacyFileStateDriver.java

@@ -37,6 +37,7 @@ import org.alfresco.jlan.server.filesys.TreeConnection;
 import org.alfresco.jlan.server.filesys.cache.FileState;
 import org.alfresco.jlan.server.filesys.cache.FileStateCache;
 import org.alfresco.jlan.server.filesys.cache.NetworkFileStateInterface;
+import org.alfresco.jlan.server.filesys.pseudo.PseudoFile;
 import org.alfresco.jlan.smb.SharingMode;
 import org.alfresco.model.ContentModel;
 import org.alfresco.util.PropertyCheck;
@@ -100,6 +101,8 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface
         {
             NetworkFile newFile = diskInterface.createFile(sess, tree, params);
             
+            newFile.setAccessToken(token);
+          
             if(tctx.hasStateCache())
             {
                 FileState fstate = tctx.getStateCache().findFileState( params.getPath(), true);
@@ -195,65 +198,61 @@ public class LegacyFileStateDriver implements ExtendedDiskInterface
         {
             NetworkFile openFile = diskInterface.openFile(sess, tree, params);
             
+            openFile.setAccessToken(token);
+            
+            FileState fstate = null;
+            
+            if(tctx.hasStateCache())
+            {
+                fstate = tctx.getStateCache().findFileState( path, true);
+                fstate.setProcessId(params.getProcessId());
+                fstate.setSharedAccess( params.getSharedAccess());
+                
+                // Access date time is read/write time not open time
+                // fstate.updateAccessDateTime();
+                
+                fstate.setFileSize(openFile.getFileSize());
+                fstate.updateChangeDateTime(openFile.getModifyDate());
+                fstate.updateModifyDateTime(openFile.getModifyDate());
+            }
+            
             if (openFile instanceof ContentNetworkFile)
             {
                 ContentNetworkFile x = (ContentNetworkFile)openFile;
                 x.setProcessId( params.getProcessId());
-                x.setAccessToken(token);
-                if(tctx.hasStateCache())
-                {
-                    FileState fstate = tctx.getStateCache().findFileState( path, true);
-                    x.setFileState(fstate);
-                    fstate.setProcessId(params.getProcessId());
-                    fstate.setSharedAccess( params.getSharedAccess());
-                    fstate.setFileStatus(FileStatus.FileExists);
-                    // Access date time is read/write time not open time
-                    // fstate.updateAccessDateTime();
 
-                    fstate.setFileSize(x.getFileSize());
-                    fstate.updateChangeDateTime(x.getModifyDate());
-                    fstate.updateModifyDateTime(x.getModifyDate());
+                if(fstate != null)
+                {
+                    x.setFileState(fstate);
+                    fstate.setFileStatus(FileStatus.FileExists);
                 }
             } 
-
-            if (openFile instanceof TempNetworkFile)
+            else if (openFile instanceof TempNetworkFile)
             {
                 TempNetworkFile x = (TempNetworkFile)openFile;
-                x.setAccessToken(token);
-                // x.setProcessId( params.getProcessId());
-                if(tctx.hasStateCache())
+                if(fstate != null)
                 {
-                    FileState fstate = tctx.getStateCache().findFileState( path, true);
                     x.setFileState(fstate);
                     fstate.setFileStatus(FileStatus.FileExists);
-                    fstate.setProcessId(params.getProcessId());
-                    fstate.setSharedAccess( params.getSharedAccess());
-                    // access date time is read/write time not open time
-                    //fstate.updateAccessDateTime();
-                    
-                    fstate.setFileSize(x.getFileSize());
-                    fstate.updateChangeDateTime(x.getModifyDate());
-                    fstate.updateModifyDateTime(x.getModifyDate());
                 }
             }
-
-            if (openFile instanceof AlfrescoFolder)
+            else if (openFile instanceof AlfrescoFolder)
             {
                 AlfrescoFolder x = (AlfrescoFolder)openFile;
-                //x.setProcessId( param.getProcessId());
-                if(tctx.hasStateCache())
+                if(fstate != null)
                 {
-                    FileState fstate = tctx.getStateCache().findFileState( path, true);
                     x.setFileState(fstate);
                     fstate.setFileStatus(FileStatus.DirectoryExists);
-                    fstate.setProcessId(params.getProcessId());
-                    fstate.setSharedAccess( params.getSharedAccess());
-                    // Access date time is read/write time not open time
-                    //fstate.updateAccessDateTime();
-                    
-                    fstate.setFileSize(x.getFileSize());
-                    fstate.updateChangeDateTime(x.getModifyDate());
-                    fstate.updateModifyDateTime(x.getModifyDate());
+                }
+            }
+            else if (openFile instanceof NetworkFile)
+            {
+                NetworkFile x = (NetworkFile)openFile;
+                if(fstate != null)
+                {
+                    // NetworkFile does not have setFileState
+                    //x.setFileState(fstate);
+                    fstate.setFileStatus(FileStatus.FileExists);
                 }           
             }
 

source/java/org/alfresco/repo/admin/patch/impl/SiteLoadPatch.java

@@ -41,6 +41,8 @@ import org.alfresco.service.cmr.site.SiteInfo;
 import org.alfresco.service.cmr.site.SiteService;
 import org.alfresco.service.cmr.site.SiteVisibility;
 import org.alfresco.service.cmr.view.ImporterBinding.UUID_BINDING;
+import org.alfresco.service.descriptor.Descriptor;
+import org.alfresco.service.descriptor.DescriptorService;
 import org.alfresco.util.PropertyCheck;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -70,6 +72,7 @@ public class SiteLoadPatch extends AbstractPatch
     private static final String MSG_SITE_ALREADY_EXISTS = "patch.siteLoadPatch.exists";
     private static final String MSG_NO_BOOTSTRAP_VIEWS_GIVEN = "patch.siteLoadPatch.noBootstrapViews";
     private static final String MSG_SITE_CREATED = "patch.siteLoadPatch.result";
+    private static final String MSG_SITE_NOT_CREATED = "patch.siteLoadPatch.siteNotCreated";
     
     // Logger
     private static final Log logger = LogFactory.getLog(SiteLoadPatch.class);
@@ -77,6 +80,7 @@ public class SiteLoadPatch extends AbstractPatch
     private AuthorityService authorityService;
     private BehaviourFilter behaviourFilter;
     private SiteService siteService;
+    private DescriptorService descriptorService;
     
     private String siteName;
     
@@ -138,6 +142,16 @@ public class SiteLoadPatch extends AbstractPatch
         this.authorityService = authorityService;
     }
 
+    
+    
+    /**
+     * @param descriptorService the descriptorService to set
+     */
+    public void setDescriptorService(DescriptorService descriptorService)
+    {
+        this.descriptorService = descriptorService;
+    }
+
     public void setBehaviourFilter(BehaviourFilter behaviourFilter)
     {
         this.behaviourFilter = behaviourFilter;
@@ -177,6 +191,17 @@ public class SiteLoadPatch extends AbstractPatch
      */
     private String applyInternalImpl() throws Exception
     {
+        if(descriptorService != null)
+        {
+            // if the descriptor service is wired up only load the site at install time (and not on upgrade)
+            Descriptor installed = descriptorService.getInstalledRepositoryDescriptor();
+            Descriptor live = descriptorService.getServerDescriptor();
+
+            if(!installed.getVersion().equals(live.getVersion()))
+            {
+                return I18NUtil.getMessage(MSG_SITE_NOT_CREATED, siteName);
+            }
+        }
         if (bootstrapViews == null || bootstrapViews.size() == 0)
         {
             if (logger.isDebugEnabled())

source/java/org/alfresco/repo/calendar/CalendarHelpersTest.java

@@ -783,6 +783,314 @@ public class CalendarHelpersTest
       assertEquals("2012-01-20", dateFmt.format(dates.get(2)));
    }
    
+   /**
+    * eg every 21st of February
+    */
+   @Test public void yearlyRecurrenceByDateInMonth()
+   {
+       List<Date> dates = new ArrayList<Date>();
+       Calendar currentDate = Calendar.getInstance();
+       
+       // How Outlook ought to do it
+       Map<String,String> params = new HashMap<String, String>();
+       params.put("COUNT", "10");
+       params.put("BYMONTH", "2");
+       params.put("BYMONTHDAY", "21");
+       
+       // How many Outlook versions do do it...
+       // FREQ=MONTHLY;COUNT=10;BYMONTH=2;INTERVAL=1;BYSETPOS=17;BYDAY=SU,MO,TU,WE,TH,FR,SA; 
+       Map<String,String> paramsOUTLOOK = new HashMap<String, String>();
+       paramsOUTLOOK.put("FREQ", "MONTHLY");
+       paramsOUTLOOK.put("COUNT", "10");
+       paramsOUTLOOK.put("BYMONTH", "2");
+       paramsOUTLOOK.put("INTERVAL", "1");
+       paramsOUTLOOK.put("BYSETPOS", "21");
+       paramsOUTLOOK.put("BYDAY", "SU,MO,TU,WE,TH,FR,SA");
+       
+       // Check that the outlook crazy version gets fixed
+       Map<String,String> paramsFIXED = RecurrenceHelper.fixOutlookRecurrenceQuirks(paramsOUTLOOK);
+       assertEquals("YEARLY", paramsFIXED.get("FREQ"));
+       assertEquals("2",  paramsFIXED.get("BYMONTH"));
+       assertEquals("21", paramsFIXED.get("BYMONTHDAY"));
+       assertEquals("10", paramsFIXED.get("COUNT"));
+       assertEquals("1", paramsFIXED.get("INTERVAL"));
+       assertEquals(null, paramsFIXED.get("BYDAY"));
+       assertEquals(null, paramsFIXED.get("BYSETPOS"));
+
+       
+       // Dates in the past, get nothing
+       dates.clear();
+       currentDate.set(2012,1-1,19,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,10), date(2012,2,15),
+             true, 1);
+       assertEquals(0, dates.size());
+       
+       dates.clear();
+       RecurrenceHelper.buildYearlyRecurrences(
+               currentDate, dates, params,
+               date(2012,2,10), date(2012,2,15),
+               false, 1);
+       assertEquals(0, dates.size());
+       
+       
+       // With the month that contains it
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2012,2,26),
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2012,2,26),
+             false, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
+       
+       
+       // In the next month
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2012,3,26),
+             true, 1);
+       assertEquals(0, dates.size());
+       
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2012,3,26),
+             false, 1);
+       assertEquals(0, dates.size());
+       
+       
+       // From before, into the next year
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2013,3,26),
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2013,3,26),
+             false, 1);
+       assertEquals(2, dates.size());
+       assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
+       assertEquals("2013-02-21", dateFmt.format(dates.get(1)));
+       
+       
+       // From next month, into the next year
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2013,2,26),
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2013-02-21", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2013,3,26),
+             false, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2013-02-21", dateFmt.format(dates.get(0)));
+       
+       
+       // With no end date but only first, check it behaves
+       dates.clear();
+       currentDate.set(2011,7-1,2,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2011,7,1), null,
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,7-1,19,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2011,7,19), null,
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2013-02-21", dateFmt.format(dates.get(0)));
+   }
+   
+   /**
+    * eg the 2nd Thursday in every March
+    */
+   @Test public void yearlyRecurrenceByDayOfWeekInMonth()
+   {
+       List<Date> dates = new ArrayList<Date>();
+       Calendar currentDate = Calendar.getInstance();
+       
+       // How Outlook ought to do it
+       Map<String,String> params = new HashMap<String, String>();
+       params.put("COUNT", "7");
+       params.put("BYMONTH", "2");
+       params.put("BYDAY", "SA");
+       params.put("BYSETPOS", "2");
+       
+       // 2nd Saturday in February is 11th Feb 2012, 9th Feb 2013
+       
+       // Note - outlook seems to like to set these as monthly...
+       // FREQ=MONTHLY;COUNT=7;BYDAY=SA;BYMONTH=2;BYSETPOS=2;INTERVAL=1
+       // This is right except for the FREQ!
+       Map<String,String> paramsOUTLOOK = new HashMap<String, String>();
+       paramsOUTLOOK.put("FREQ", "MONTHLY");
+       paramsOUTLOOK.put("COUNT", "7");
+       paramsOUTLOOK.put("BYMONTH", "2");
+       paramsOUTLOOK.put("BYDAY", "SA");
+       paramsOUTLOOK.put("BYSETPOS", "2");
+       paramsOUTLOOK.put("INTERVAL", "1");
+       
+       // Check that the outlook crazy version gets fixed
+       Map<String,String> paramsFIXED = RecurrenceHelper.fixOutlookRecurrenceQuirks(paramsOUTLOOK);
+       assertEquals("YEARLY", paramsFIXED.get("FREQ"));
+       assertEquals("2",  paramsFIXED.get("BYMONTH"));
+       assertEquals("SA", paramsFIXED.get("BYDAY"));
+       assertEquals("2", paramsFIXED.get("BYSETPOS"));
+       assertEquals("7", paramsFIXED.get("COUNT"));
+       assertEquals("1", paramsFIXED.get("INTERVAL"));
+       assertEquals(null, paramsFIXED.get("BYMONTHDAY"));
+
+       
+
+       
+       // Dates in the past, get nothing
+       dates.clear();
+       currentDate.set(2012,1-1,19,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,4), date(2012,2,5),
+             true, 1);
+       assertEquals(0, dates.size());
+       
+       dates.clear();
+       RecurrenceHelper.buildYearlyRecurrences(
+               currentDate, dates, params,
+               date(2012,2,4), date(2012,2,5),
+               false, 1);
+       assertEquals(0, dates.size());
+       
+       
+       // With the month that contains it
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2012,2,26),
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2012,2,26),
+             false, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
+       
+       
+       // In the next month
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2012,3,26),
+             true, 1);
+       assertEquals(0, dates.size());
+       
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2012,3,26),
+             false, 1);
+       assertEquals(0, dates.size());
+       
+       
+       // From before, into the next year
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2013,3,26),
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,2-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,2,1), date(2013,3,26),
+             false, 1);
+       assertEquals(2, dates.size());
+       assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
+       assertEquals("2013-02-09", dateFmt.format(dates.get(1)));
+       
+       
+       // From next month, into the next year
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2013,2,26),
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2013-02-09", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,3-1,1,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2012,3,1), date(2013,3,26),
+             false, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2013-02-09", dateFmt.format(dates.get(0)));
+       
+       
+       // With no end date but only first, check it behaves
+       dates.clear();
+       currentDate.set(2011,7-1,2,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2011,7,1), null,
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
+       
+       dates.clear();
+       currentDate.set(2012,7-1,19,10,30);
+       RecurrenceHelper.buildYearlyRecurrences(
+             currentDate, dates, params,
+             date(2011,7,19), null,
+             true, 1);
+       assertEquals(1, dates.size());
+       assertEquals("2013-02-09", dateFmt.format(dates.get(0)));
+   }
+
    /**
     * Checks we correctly build the Timezone for somewhere
     *  that doesn't have DST (eg Brisbane)
@@ -921,6 +1229,11 @@ public class CalendarHelpersTest
          CalendarRecurrenceHelper.buildYearlyRecurrences(
                currentDate, dates, params, onOrAfter, until, firstOnly, interval);
       }
+      
+      protected static Map<String,String> fixOutlookRecurrenceQuirks(Map<String,String> params)
+      {
+          return CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(params);
+      }
    }
    
    private static Date date(int year, int month, int day)

source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java

@@ -2552,6 +2552,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
             Pair<Long, NodeRef> newChildNodePair = moveResult.getSecond();
             ChildAssociationRef newParentAssocRef = newParentAssocPair.getSecond();
             // Index
+            nodeIndexer.indexDeleteNode(oldParentAssocPair.getSecond());
             nodeIndexer.indexCreateNode(newParentAssocPair.getSecond());
             // Propagate timestamps
             propagateTimeStamps(oldParentAssocRef);

source/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java

@@ -63,9 +63,7 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
     @Override
     public String getProperty(String name)
     {
-        if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE)
-                || name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG) || name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION) || name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE)
-                || name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG) || name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION))
+        if (false == isUpdateable(name))
         {
             try
             {
@@ -150,50 +148,10 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
 
     public void setProperty(String name, String value)
     {
-        if (name.equals(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE)
-                || name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG) || name.equals(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION) || name.equals(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE)
-                || name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG) || name.equals(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION))
+        if(false == isUpdateable(name))
         {
             throw new IllegalStateException("Illegal write to property \"" + name + "\"");
         }
         super.setProperty(name, value);
     }    
-
-    /* (non-Javadoc)
-     * @see org.alfresco.repo.management.subsystems.AbstractPropertyBackedBean#setProperties(java.util.Map)
-     */
-    @Override
-    public void setProperties(Map<String, String> properties)
-    {
-        // Remove any read only properties
-        HashMap<String, String> propertiesToSet = new HashMap<String, String>(properties);
-        if(propertiesToSet.containsKey(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE))
-        {
-            propertiesToSet.remove(SolrChildApplicationContextFactory.ALFRESCO_ACTIVE);
-        }
-        if(propertiesToSet.containsKey(SolrChildApplicationContextFactory.ALFRESCO_LAG))
-        {
-            propertiesToSet.remove(SolrChildApplicationContextFactory.ALFRESCO_LAG);
-        }
-        if(propertiesToSet.containsKey(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION))
-        {
-            propertiesToSet.remove(SolrChildApplicationContextFactory.ALFRESCO_LAG_DURATION);
-        }
-        if(propertiesToSet.containsKey(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE))
-        {
-            propertiesToSet.remove(SolrChildApplicationContextFactory.ARCHIVE_ACTIVE);
-        }
-        if(propertiesToSet.containsKey(SolrChildApplicationContextFactory.ARCHIVE_LAG))
-        {
-            propertiesToSet.remove(SolrChildApplicationContextFactory.ARCHIVE_LAG);
-        }
-        if(propertiesToSet.containsKey(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION))
-        {
-            propertiesToSet.remove(SolrChildApplicationContextFactory.ARCHIVE_LAG_DURATION);
-        }
-       
-        super.setProperties(propertiesToSet);
-    }
-
-    
 }

source/java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelper.java

@@ -122,6 +122,43 @@ public class CalendarRecurrenceHelper
       return params;
    }
    
+   /**
+    * Outlook does some crazy stuff, which is only just about permitted by
+    *  the specification, and is hard to parse, especially for yearly events.
+    * Fix these to more normal cases where possible
+    */
+   protected static Map<String,String> fixOutlookRecurrenceQuirks(Map<String,String> params)
+   {
+      if (params.containsKey("FREQ"))
+      {
+         // Is it really yearly?
+         if ("MONTHLY".equals(params.get("FREQ")) &&
+             params.get("BYMONTH") != null)
+         {
+             // Outlook can be "delightfully" different, and likes to generate
+             //  events that recur yearly on a specific date+month as FREQ=MONTHLY
+             // Detect those cases, and treat as YEARLY as per the spec
+             params.put("FREQ", "YEARLY");
+             
+             // Outlook will sometimes do nth of the month (eg 17) instead as
+             //  BYDAY={any}, BYSETPOS=n
+             if (params.containsKey("BYDAY") && params.containsKey("BYSETPOS"))
+             {
+                 int days = params.get("BYDAY").split(",").length;
+                 if (days == 7)
+                 {
+                     // Make it normal
+                     params.put("BYMONTHDAY", params.get("BYSETPOS"));
+                     params.remove("BYDAY");
+                     params.remove("BYSETPOS");
+                 }
+             }
+         }                 
+      }
+      return params;
+   }
+   
+   
    /**
     * For the given Calendar Entry, return its subsequent Recurrence on or after
     *  the specified date, until the given limit. If it doesn't have any recurrences 
@@ -194,8 +231,15 @@ public class CalendarRecurrenceHelper
       // To hold our events
       List<Date> dates = new ArrayList<Date>();
       
-      // Handle the different frequencies
+      // Extract out the rule into its parts
       Map<String,String> params = extractRecurrenceRule(recurrenceRule);
+      
+      // Outlook does some crazy stuff, which is only just about
+      //  permitted by the specification, and is hard to parse
+      // Fix these to more normal cases where possible
+      params = fixOutlookRecurrenceQuirks(params);
+      
+      // Fetch the frequency and interval
       if (params.containsKey("FREQ"))
       {
          String freq = params.get("FREQ");
@@ -213,6 +257,7 @@ public class CalendarRecurrenceHelper
             }
          }
          
+         // Start with today, and roll forward
          Calendar currentDate = Calendar.getInstance();
          currentDate.setTime(eventStart);
          
@@ -458,7 +503,8 @@ public class CalendarRecurrenceHelper
    protected static void buildYearlyRecurrences(Calendar currentDate, List<Date> dates, 
          Map<String,String> params, Date onOrAfter, Date until, boolean firstOnly, int interval)
    {
-      int month = Integer.parseInt(params.get("BYMONTH"));
+      int realMonth = Integer.parseInt(params.get("BYMONTH"));
+      int month = realMonth - 1; // Java months count from zero
       
       if (params.get("BYMONTHDAY") != null)
       {
@@ -469,12 +515,22 @@ public class CalendarRecurrenceHelper
          {
             // Correct start time
          }
-         else
+         else if (currentDate.get(Calendar.MONTH) < month ||
+                  (currentDate.get(Calendar.MONTH) == month &&
+                   currentDate.get(Calendar.DAY_OF_MONTH) < dayOfMonth))
          {
-            currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
+            // The current date is before the requested date this year
+            // Move forward to it in this year
             currentDate.set(Calendar.MONTH, month);
             currentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
          }
+         else
+         {
+            // The current date is after the date this year, move to next year
+             currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
+             currentDate.set(Calendar.MONTH, month);
+             currentDate.set(Calendar.DAY_OF_MONTH, dayOfMonth);
+         }
          
          while (currentDate.getTime().before(onOrAfter))
          {
@@ -505,10 +561,79 @@ public class CalendarRecurrenceHelper
       }
       else
       {
-         // eg the first Tuesday in February every year
-         int dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYSETPOS"));
-         // TODO
-      }
+          // eg the third Tuesday in February every year
+          int dayOfWeek = -1;
+          int instanceInMonth = 1;
+          
+          // There are two forms...
+          if (params.containsKey("BYDAY"))
+          {
+             dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYDAY"));
+             instanceInMonth = Integer.parseInt(params.get("BYSETPOS"));
+          }
+          else
+          {
+             // Implies the first one in the month
+             dayOfWeek = DAY_NAMES_TO_CALENDAR_DAYS.get(params.get("BYSETPOS"));
+             instanceInMonth = 1;
+          }
+          
+          
+          // Find when it is this year 
+          Date origDate = currentDate.getTime();
+          currentDate.set(Calendar.MONTH, month);
+          currentDate.set(Calendar.DAY_OF_MONTH, 1);
+          toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
+          Date thisYear = currentDate.getTime();
+          currentDate.setTime(origDate);
+          
+          // Have we missed it for the year? If so, go to next year
+          if (currentDate.getTime().after(thisYear))
+          {
+              currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
+              currentDate.set(Calendar.MONTH, month);
+              currentDate.set(Calendar.DAY_OF_MONTH, 1);
+              toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
+          }
+          else
+          {
+              // Otherwise move to it
+              currentDate.setTime(thisYear);
+          }
+          
+          
+          // Move forward to the required date
+          while (currentDate.getTime().before(onOrAfter))
+          {
+              currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
+              currentDate.set(Calendar.MONTH, month);
+              currentDate.set(Calendar.DAY_OF_MONTH, 1);
+              toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
+          }
+          
+          // Roll on until we get valid matches
+          while (true)
+          {
+             if (until != null)
+             {
+                if (currentDate.getTime().after(until))
+                {
+                   break;
+                }
+             }
+             
+             dates.add(currentDate.getTime());
+             if (firstOnly)
+             {
+                break;
+             }
+             
+             currentDate.set(Calendar.YEAR, currentDate.get(Calendar.YEAR) + interval);
+             currentDate.set(Calendar.MONTH, month);
+             currentDate.set(Calendar.DAY_OF_MONTH, 1);
+             toDayOfWeekInMonth(currentDate, dayOfWeek, instanceInMonth);
+          }
+       }
    }
    
    private static void addMonthToDayOfMonth(Calendar c, int dayOfMonth, int monthInterval)