Merged V3.3-BUG-FIX to HEAD

20954: Calendar Dashlet updates. Fixes: ALF-2907 (meeting workspace issue)
   20968: Minor VersionableAspect fix to onDeleteNode policy firing (follow-on for r19507)
   20981: Removed Install Jammer installers from V3.3.3
   20982: AVMTestSuite - run PurgeTestP after AVMServiceTest (investigating ALF-3611)
   20997: Fix for ALF-2605 - updated share-config-custom.xml.sample and removed obsolete extension files
   21030: Pulled XAMConnector AMP into main 3.3SP3 codeline.  Apart from build changes (incl. EOL), there are no repo changes.
   21032: StoreSelector passes through NodeContentContext allowing stores access to node information
   21036: Fix ALF-245: Can't delete space that contains "translation without content"
      - Delete triggers 'unmakeTranslation'
      - Empty translations are marked with sys:temporary before being deleted
   21051: More on fix ALF-245.  Reduced complexity by not deleting empty translations twice
   21064: Merged V3.3 to V3.3-BUG_FIX
      20898: Merged HEAD to V3.3
         20724: AVMTestSuite - temporarily comment out PurgeTestP
            - TODO: investigate intermittent test failure
      20903: Incremented version revision
      20921: AVM - fix purge store so that vr nodes are actually orphaned (ALF-3627)
      20952: Fix for ALF-3704: Module conflict - Alfresco web client config property page missing metadata. 
         This is application of a fix made to the config service in a hotfix. The change provides a deterministic load order for config files loaded via the ConfigBootstrap spring bean. More importantly it means that config files loaded by modules on different machines in a cluster load in the same order.

         The forms client and AWE config files have been updated to take advantage of the new loading order.
      21061: Merged PATCHES/V3.1.2 to V3.3 (RECORD ONLY)
         20890: ALF-3687: Apply LUCENE-1383 patch to Lucene 2.1.0 to reduce memory leaks from ThreadLocals
         20891: ALF-3687: Build classpath fix
         20892: Incremented version label
      21062: Merged PATCHES/V3.2.1 to V3.3
         20897: (RECORD ONLY) Incremented version label
         20901: (RECORD ONLY) ALF-3740: Merged V3.3 to PATCHES/V3.2.1
            20524: VersionMigrator - option to run as scheduled job (ALF-1000)
         20904: (RECORD ONLY) ALF-3732: Merged PATCHES/V3.2.r to PATCHES/V3.2.1
            19803: ALF-558: File servers (CIFS / FTP / NFS) can now handle concurrent write operations on Alfresco repository
               - ContentDiskDriver / AVMDiskDriver now use retrying transactions for write operations
               - Disable EagerContentStoreCleaner on ContentDiskDriver / AVMDiskDriver closeFile() operations so that they may be retried after rollback (Sony zero byte problem)
               - Allow manual association of AVM ContentData with nodes so that closeFile() may be retried
               - Propagation of new argument through AVM interfaces
         20905: (RECORD ONLY) ALF-3732: Rolled back the now unnecessary reference()/dereference() stuff from ALF-558
         20906: (RECORD ONLY) ALF-3732: Merged DEV/V3.3-BUG-FIX to PATCHES/V3.2.1
            20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS
         20907: (RECORD ONLY) ALF-3732: Merged V3.3 to PATCHES/V3.2.1
            20173: Propagate IOExceptions from retryable write transactions in AlfrescoDiskDriver
         20950: ALF-3779: Upgrades on large repositories from v2.1 and v2.2 were failing on MySQL due to "The total number of locks exceeds the lock table size" errors
            - Solution was to add support for new --BEGIN TXN and --END TXN comments and execute LOCK TABLES statements in the same transaction as large INSERT - SELECT statements.
         20990: ALF-3789: Concurrency issues with InMemoryTicketComponentImpl
            - Previous ETHREEOH-1842 method of caching web session 'ref counts' against tickets could cause tickets to unpredictably fall out of the transactional cache
            - Rolled back original ETHREEOH-1842 fix. Would be too much overhead to keep these ref counts consistent across a cluster.
            - Instead, avoid invalidating tickets on web session timeout and only do it on explicit log out.
            - Now tickets maintained in non-transactional shared cache so they can't drop out unpredictably
            - Logic for ticket inactivity timeout caching improved so that it should work across a cluster
         20991: (RECORD ONLY) Incremented version label
         20993: ALF-3789: Fixed Spring configuration backward compatibily issue with previous fix
            - Ticket cache bean name restored to ticketsCache. This is actually now a non-transactional cache.
            - Also externalized parameters so that they can now be controlled by alfresco-global.properties without any bean overrides
               authentication.ticket.ticketsExpire=false
               authentication.ticket.expiryMode=AFTER_FIXED_TIME
               authentication.ticket.validDuration=PT1H
         20994: Eclipse classpath fixes for unit testing after ant build
         21057: ALF-3592: PassthruCifsAuthenticator now auto-creates / imports users who do not already exist in Alfresco
            - At least one of the following properties must be true for this to happen
               synchronization.autoCreatePeopleOnLogin
               synchronization.syncWhenMissingPeopleLogIn
            - Also improved debug logging of unknown passthru domains
      21063: Merged PATCHES/V3.2.r to V3.3
         21037: ALF-3793: Final attempt at realigning saved XForm data with a modified Schema
            - removeRemovedNodes / insertUpdatedNodes / insertPrototypeNodes replaced by a one stop recursive process that builds a new instance tree from scratch
            - Nodes copied over in correct order
            - Missing nodes added in and extra nodes discarded
            - Prototype nodes appended at appropriate points
         21038: (RECORD ONLY) Incremented version label


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

source/java/org/alfresco/repo/model/ml/MultilingualContentServiceImpl.java

@@ -291,10 +291,21 @@ public class MultilingualContentServiceImpl implements MultilingualContentServic
             // set the pivot language and the functional name
             nodeService.setProperty(mlContainerNodeRef, ContentModel.PROP_LOCALE, locale);
             nodeService.setProperty(mlContainerNodeRef, ContentModel.PROP_NAME, containerFunctionalName);
-
         }
         else
         {
+            // ALF-2200: Create the translation as the same type as the pivot
+            NodeRef pivotNodeRef = this.getPivotTranslation(mlContainerNodeRef);
+            if (pivotNodeRef != null && !pivotNodeRef.equals(contentNodeRef))
+            {
+                QName pivotNodeType = nodeService.getType(pivotNodeRef);
+                QName contentNodeType = nodeService.getType(contentNodeRef);
+                if (!pivotNodeType.equals(contentNodeType))
+                {
+                    nodeService.setType(contentNodeRef, pivotNodeType);
+                }
+            }
+            
             // Check that the language is not duplicated
             Map<Locale, NodeRef> existingLanguages = this.getTranslations(mlContainerNodeRef);
             if (existingLanguages.containsKey(locale))
@@ -379,7 +390,7 @@ public class MultilingualContentServiceImpl implements MultilingualContentServic
     /** @inheritDoc */
     public void deleteTranslationContainer(NodeRef mlContainerNodeRef)
     {
-        if(!ContentModel.TYPE_MULTILINGUAL_CONTAINER.equals(nodeService.getType(mlContainerNodeRef)))
+        if (!ContentModel.TYPE_MULTILINGUAL_CONTAINER.equals(nodeService.getType(mlContainerNodeRef)))
         {
             throw new IllegalArgumentException(
                     "Node type must be " + ContentModel.TYPE_MULTILINGUAL_CONTAINER);
@@ -394,30 +405,17 @@ public class MultilingualContentServiceImpl implements MultilingualContentServic
         // remove the translations
         for(NodeRef translationToRemove : translations.values())
         {
-            if(nodeService.exists(translationToRemove))
+            // unmake the translation, ignore any parent-child logic
+            this.unmakeTranslationSimple(translationToRemove);
+            // remove it, if necessary
+            if (nodeService.exists(translationToRemove))
             {
-                // unmake the translation
-                this.unmakeTranslation(translationToRemove);
-
-                // remove it
-                if(nodeService.exists(translationToRemove))
-                {
-                    nodeService.deleteNode(translationToRemove);
-                }
+                nodeService.deleteNode(translationToRemove);
             }
         }
 
-        // if the mlContainer is not removed with the pivot,
-        if(nodeService.exists(mlContainerNodeRef))
-        {
-            // force its deletion
-            nodeService.deleteNode(mlContainerNodeRef);
-
-            if (logger.isWarnEnabled())
-            {
-                logger.warn("The ML container " + mlContainerNodeRef + " was not removed with it's pivot translation in the unmakeTranslation process.");
-            }
-        }
+        // force its deletion
+        nodeService.deleteNode(mlContainerNodeRef);
 
         // done
         if (logger.isDebugEnabled())
@@ -427,26 +425,37 @@ public class MultilingualContentServiceImpl implements MultilingualContentServic
                     "   Number of translations: " + translationCount);
         }
     }
+    
+    /**
+     * Does the work of making the translation a simple node again.  No parent-child relationships
+     * are modified and the pivot-container logic is not done here.
+     * 
+     * @param translationNodeRef                a translation
+     */
+    private void unmakeTranslationSimple(NodeRef translationNodeRef)
+    {
+        if (nodeService.hasAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
+        {
+            nodeService.removeAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION);
+            nodeService.addAspect(translationNodeRef, ContentModel.ASPECT_TEMPORARY, null);
+        }
+        else
+        {
+            nodeService.removeAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
+        }
+    }
 
     /** @inheritDoc */
     public void unmakeTranslation(NodeRef translationNodeRef)
     {
-        // Get the container
         NodeRef containerNodeRef = getMLContainer(translationNodeRef, true);
         if (containerNodeRef == null)
         {
-            if (nodeService.hasAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
-            {
-                nodeService.deleteNode(translationNodeRef);
-            }
-            else
-            {
-                nodeService.removeAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
-            }
+            unmakeTranslationSimple(translationNodeRef);
         }
         else if (isPivotTranslation(translationNodeRef))
         {
-            // Get all translation child associations
+            // Pivot nodes are handled by unmaking all translations and removing the container
             List<ChildAssociationRef> mlChildAssocs = nodeService.getChildAssocs(
                     containerNodeRef,
                     ContentModel.ASSOC_MULTILINGUAL_CHILD,
@@ -455,30 +464,15 @@ public class MultilingualContentServiceImpl implements MultilingualContentServic
             {
                 NodeRef mlChildNodeRef = mlChildAssoc.getChildRef();
                 // Delete empty translations
-                if (nodeService.hasAspect(mlChildNodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
-                {
-                    nodeService.deleteNode(mlChildNodeRef);
-                }
-                else
-                {
-                    nodeService.removeAspect(mlChildNodeRef, ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
-                }
+                unmakeTranslationSimple(mlChildNodeRef);
             }
             // Now delete the container
             nodeService.deleteNode(containerNodeRef);
         }
         else
         {
-            if (nodeService.hasAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_EMPTY_TRANSLATION))
-            {
-                nodeService.deleteNode(translationNodeRef);
-            }
-            else
-            {
-                // Get the container and break the association to it
-                nodeService.removeChild(containerNodeRef, translationNodeRef);
-                nodeService.removeAspect(translationNodeRef, ContentModel.ASPECT_MULTILINGUAL_DOCUMENT);
-            }
+            nodeService.removeChild(containerNodeRef, translationNodeRef);
+            unmakeTranslationSimple(translationNodeRef);
         }
     }
 
@@ -739,11 +733,13 @@ public class MultilingualContentServiceImpl implements MultilingualContentServic
         // Create the document in the space of the node of reference
         NodeRef parentNodeRef = nodeService.getPrimaryParent(translationOfNodeRef).getParentRef();
 
-        // Create the empty translation
+        // Create the empty translation.
+        // ALF-2200: Create the translation as the same type as the pivot
+        QName newTranslationType = nodeService.getType(translationOfNodeRef);
         NodeRef newTranslationNodeRef = fileFolderService.create(
                 parentNodeRef,
                 name,
-                ContentModel.TYPE_CONTENT).getNodeRef();
+                newTranslationType).getNodeRef();
 
         // add the translation to the container
         addTranslation(newTranslationNodeRef, translationOfNodeRef, locale);