Merged DEV/SWIFT to HEAD

27908: ALF-8706: RSOLR 023: Locale is persisted for all nodes - Part of ALF-7991: RSOLR 023: Locale support for query: Repository - Added alf_node.locale_id mandatory column - sys:localizable is now spoofed and mandatory on sys:base - sys:locale property is always available - The locale set is the I18NUtil.getLocale() (thread then server) - TODO: Upgrade scripts, so drop database to take this change 27909: ALF-8706: RSOLR 023: Locale is persisted for all nodes - Part of ALF-7991: RSOLR 023: Locale support for query: Repository - Extended locale test to ensure that sys:locale can be set using properties during create 27910: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales - Part of ALF-7991:RSOLR 023: Locale support for query: Repository - Upgrade scripts for PostgreSQL and MySQL: patch.db-V4.0-Node-Locale 27912: WCM QS ML Support for creating missing intermediate directories when adding an "orphan" translation, plus tests 27913: Fixed failing JbpmEngineUnitTest. 27914: Build fix. Fixes failing test DiscussionServiceTest.testDeleteTopLevelPost 27916: WCM QS ML forms config for overrideable name, and passing the initially orphaned flag through to the behaviour 27917: Enable the WCM QS ML Manage Translations action in the folder details page, as well as the document details page as before 27919: Quick build fix. Introduction of new property sys:locale on all nodes means that FormService is seeing some off-by-one errors. 27921: WCM QS ML - Support copying parts of the section collections to the new folder when translating a section, plus tests 27925: ALF-8707: RSOLR 023: Upgrade to give nodes their default locales - Part of ALF-7991: RSOLR 023: Locale support for query: Repository - Upgrade scripts for DB2, Oracle and SQLServer 27927: Update FileFolderService list/paging (RINF 09) & CQ permission checking (RINF 11) - also added additional unit tests and update FileFolderPerformanceTester utility (for read / list testing) 27930: Corrected bean reference: "ServiceRegistry" 27931: Partially implemented EnvironmentImpl.getPublishingEvents(). This currently only supports searching on publishing event ids. 27933: Implemented PublishService.getPublishingEvent(String) method. 27934: WCM QS ML Pull over the locale resolver from Ian, and delegate much of the work to the main class 27941: ALF-7874 - Mime Type entries for detection and display for some Apple and Adobe formats 27947: ALF-2707 - Largely fix custom site properties that have multiple values, and custom site properties without a full definition, plus tests. 27964: ALF-7339:RSOLR 009: Index track and build from SOLR - complete ALF-7475: RSOLR 010: Index integrity check - check ACL info 27966: RINF 09: FileFolderService list - if skipCount > number of items then return empty list - related to ALF-7884 when using CMIS getChildren (via OpenCMIS - eg. http://localhost:8080/alfresco/cmisatom/...) 27968: ALF-7884 - getChildren() returns an error if skipCount > number of children 27970: WCM QS Fix issue in the webapp for sites where no port has been given yet 27972: WPUB: F150: Foundation API: Request that a node be removed from the live environment - Initial support for "unpublish" 27975: ALF-8790:RSOLR 033: Automated build produces SOLR artifacts - add configuration per core based on properties files 27976: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts - restructure, added properties files for config, track archived store 27977: ALF-8790: RSOLR 033: Automated build produces SOLR artifacts - Solr zip included in continuous build 27978: Fixed missing policy event when sys:locale is changed. 27979: Fixed tests and checks after sys:locale became a mandatory property. 27982: ALF-8547: WPUB: F163: Foundation API: Create/update/remove a delivery channel - Code and tests for channel update and delete 28007: Implemented starting publishing workflow on schedulePublishingEvent method. Added tests for PublishingEventHelper. 28008: Updated web-publishing-context.xml to include WorkflowService and workflowEngineId for PublishingEventHelper. 28009: Added more PublishingEventHelper tests. 28012: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking 28013: Fix failing Web Publishing tests. 28015: Adding a DoNotCopy CopyBehaviourCallback for the fm:commentsRollup aspect. Part of ALF-8498. 28016: Bring over the WCM QS ML RootNavInterceptor from Ian, and productise it 28019: CMIS browser: close invalid connections 28025: Update the WCM QS ML behaviour, webscript and test to handle more things having locales by default 28026: ML-WQS: - Wired up the RootNavInterceptor to detect locale based on path - Wired up the replacement locale resolver to respect the locale determined by the RootNavInterceptor - Adjusted "Manage Translations" page to render the data table correctly - Adjusted site search box to restrict search to selected site localisation - Adjusted top nav component to select menu items only from appropriate site localisation 28029: Added more tests for PublishingEventHelper and PublishingQueueImpl. Also added WebPublishingTestSuite. 28034: Support for ALF-8792: RSOLR 036: SOLR APIs to support index integrity checking - ACL and ACLTX support 28036: WCM QS ML UI tweaks for marking something as the initial translation 28038: ALF-8548: WPUB: F165: Foundation API: Cancel a scheduled publishing event - Code and initial test cases 28043: Added missing JCR mapping for property type d:locale - This property type is not new, btw. 28312: RepoBM: minor cleanup - remove hardcoded JMeter install dir - add configurable user.dir (for default import of test data) - check that default zip exists - update readme - default threadfolder should be null (in case of absolute folder paths) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28320 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2011-06-09 22:40:27 +00:00
parent f0f74b86f1
commit afe709ae54
78 changed files with 2831 additions and 624 deletions
--- a/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
+++ b/source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedSet;
@@ -77,6 +78,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeRef.Status;
 import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.StoreRef;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.ReadOnlyServerException;
 import org.alfresco.service.transaction.TransactionService;
@@ -655,7 +657,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        Long aclId = aclDAO.createAccessControlList();
        
        // Create a root node
-        NodeEntity rootNode = newNodeImpl(store, null, ContentModel.TYPE_STOREROOT, aclId, false, null);
+        NodeEntity rootNode = newNodeImpl(store, null, ContentModel.TYPE_STOREROOT, null, aclId, false, null);
        Long rootNodeId = rootNode.getId();
        addNodeAspects(rootNodeId, Collections.singleton(ContentModel.ASPECT_ROOT));

@@ -859,6 +861,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        return node.getAclId();
    }
    
+    @Override
    public ChildAssocEntity newNode(
            Long parentNodeId,
            QName assocTypeQName,
@@ -866,6 +869,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
            StoreRef storeRef,
            String uuid,
            QName nodeTypeQName,
+            Locale nodeLocale,
            String childNodeName,
            Map<QName, Serializable> auditableProperties) throws InvalidTypeException
    {
@@ -905,7 +909,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        // Get the store
        StoreEntity store = getStoreNotNull(storeRef);
        // Create the node (it is not a root node)
-        NodeEntity node = newNodeImpl(store, uuid, nodeTypeQName, childAclId, false, auditableProps);
+        NodeEntity node = newNodeImpl(store, uuid, nodeTypeQName, nodeLocale, childAclId, false, auditableProps);
        Long nodeId = node.getId();
        
        // Protect the node's cm:auditable if it was explicitly set
@@ -947,6 +951,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO

    /**
     * @param uuid                          the node UUID, or <tt>null</tt> to auto-generate
+     * @param nodeTypeQName                 the node's type
+     * @param nodeLocale                    the node's locale or <tt>null</tt> to use the default locale
     * @param aclId                         an ACL ID if available
     * @param auditableProps                <tt>null</tt> to auto-generate or provide a value to explicitly set
     * @param deleted                       <tt>true</tt> to create an already-deleted node (used for leaving trails of moved nodes)
@@ -955,6 +961,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
                StoreEntity store,
                String uuid,
                QName nodeTypeQName,
+                Locale nodeLocale,
                Long aclId,
                boolean deleted,
                AuditablePropertiesEntity auditableProps) throws InvalidTypeException
@@ -974,6 +981,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        // QName
        Long typeQNameId = qnameDAO.getOrCreateQName(nodeTypeQName).getFirst();
        node.setTypeQNameId(typeQNameId);
+        // Locale
+        final Long localeId = localeDAO.getOrCreateLocalePair(nodeLocale).getFirst();
+        node.setLocaleId(localeId);
        // ACL (may be null)
        node.setAclId(aclId);
        // Deleted
@@ -1163,7 +1173,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        return assocPair;
    }
    
-    public void updateNode(Long nodeId, StoreRef storeRef, String uuid, QName nodeTypeQName)
+    @Override
+    public void updateNode(Long nodeId, StoreRef storeRef, String uuid, QName nodeTypeQName, Locale nodeLocale)
    {
        // Get the existing node; we need to check for a change in store or UUID
        Node oldNode = getNodeNotNull(nodeId);
@@ -1176,10 +1187,23 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        {
            uuid = oldNode.getUuid();
        }
+        final Long nodeTypeQNameId;
        if (nodeTypeQName == null)
        {
-            Long nodeTypeQNameId = oldNode.getTypeQNameId();
-            nodeTypeQName = qnameDAO.getQName(nodeTypeQNameId).getSecond();
+            nodeTypeQNameId = oldNode.getTypeQNameId();
+        }
+        else
+        {
+            nodeTypeQNameId = qnameDAO.getOrCreateQName(nodeTypeQName).getFirst();
+        }
+        final Long nodeLocaleId;
+        if (nodeLocale == null)
+        {
+            nodeLocaleId = oldNode.getLocaleId();
+        }
+        else
+        {
+            nodeLocaleId = localeDAO.getOrCreateLocalePair(nodeLocale).getFirst();
        }
        
        // Wrap all the updates into one
@@ -1207,33 +1231,25 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
            nodeUpdate.setUuid(oldNode.getUuid());          // Need node reference
        }
        // TypeQName (if necessary)
-        Long nodeTypeQNameId = qnameDAO.getOrCreateQName(nodeTypeQName).getFirst();
        if (!nodeTypeQNameId.equals(oldNode.getTypeQNameId()))
        {
            nodeUpdate.setTypeQNameId(nodeTypeQNameId);
            nodeUpdate.setUpdateTypeQNameId(true);
        }
+        // Locale (if necessary)
+        if (!nodeLocaleId.equals(oldNode.getLocaleId()))
+        {
+            nodeUpdate.setLocaleId(nodeLocaleId);
+            nodeUpdate.setUpdateLocaleId(true);
+        }

        updateNodeImpl(oldNode, nodeUpdate);
    }
    
    /**
     * Updates the node's transaction and <b>cm:auditable</b> properties only.
-     * 
-     * @see #touchNodeImpl(Long, AuditablePropertiesEntity)
     */
    private void touchNodeImpl(Long nodeId)
-    {
-        touchNodeImpl(nodeId, null);
-    }
-    /**
-     * Updates the node's transaction and <b>cm:auditable</b> properties only.
-     * 
-     * @param auditableProps            optionally override the <b>cm:auditable</b> values
-     * 
-     * @see #updateNodeImpl(NodeEntity, NodeUpdateEntity)
-     */
-    private void touchNodeImpl(Long nodeId, AuditablePropertiesEntity auditableProps)
    {
        Node node = null;
        try
@@ -1248,10 +1264,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        }
        NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
        nodeUpdate.setId(nodeId);
-        if (auditableProps != null)
-        {
-            nodeUpdate.setAuditableProperties(auditableProps);
-        }
+        // Update it
        updateNodeImpl(node, nodeUpdate);
    }
    
@@ -1290,6 +1303,10 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        {
            nodeUpdate.setTypeQNameId(oldNode.getTypeQNameId());
        }
+        if (!nodeUpdate.isUpdateLocaleId())
+        {
+            nodeUpdate.setLocaleId(oldNode.getLocaleId());
+        }
        if (!nodeUpdate.isUpdateAclId())
        {
            nodeUpdate.setAclId(oldNode.getAclId());
@@ -1392,7 +1409,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
                    {
                        Long liveNodeId = liveNode.getId();
                        String liveNodeUuid = GUID.generate();
-                        updateNode(liveNodeId, null, liveNodeUuid, null);
+                        updateNode(liveNodeId, null, liveNodeUuid, null, null);
                    }
                    NodeEntity deletedNode = selectNodeByNodeRef(targetNodeRef, true);  // Only look for deleted nodes
                    if (deletedNode != null)
@@ -1443,7 +1460,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        {
            StoreEntity oldStore = oldNode.getStore();
            String oldUuid = oldNode.getUuid();
-            newNodeImpl(oldStore, oldUuid, ContentModel.TYPE_CMOBJECT, null, true, null);
+            newNodeImpl(oldStore, oldUuid, ContentModel.TYPE_CMOBJECT, null, null, true, null);
        }
        
        // Ensure that cm:auditable values are propagated, if required
@@ -1731,6 +1748,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        Node node = getNodeNotNull(nodeId);
        // Handle sys:referenceable
        ReferenceablePropertiesEntity.addReferenceableProperties(node, props);
+        // Handle sys:localized
+        LocalizedPropertiesEntity.addLocalizedProperties(localeDAO, node, props);
        // Handle cm:auditable
        if (hasNodeAspect(nodeId, ContentModel.ASPECT_AUDITABLE))
        {
@@ -1770,6 +1789,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
            Node node = getNodeNotNull(nodeId);
            value = ReferenceablePropertiesEntity.getReferenceableProperty(node, propertyQName);
        }
+        else if (LocalizedPropertiesEntity.isLocalizedProperty(propertyQName))          // sys:localized
+        {
+            Node node = getNodeNotNull(nodeId);
+            value = LocalizedPropertiesEntity.getLocalizedProperty(localeDAO, node, propertyQName);
+        }
        else
        {
            Map<QName, Serializable> props = getNodePropertiesCached(nodeId);
@@ -1811,16 +1835,20 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        {
            return false;                       // No point adding nothing
        }
-        
+
+        // Get the current node
        Node node = getNodeNotNull(nodeId);
+        // Create an update node
+        NodeUpdateEntity nodeUpdate = new NodeUpdateEntity();
+        nodeUpdate.setId(nodeId);
+        
        // Copy inbound values
        newProps = new HashMap<QName, Serializable>(newProps);

        // Copy cm:auditable
-        AuditablePropertiesEntity auditableProps = null;
        if (!policyBehaviourFilter.isEnabled(node.getNodeRef(), ContentModel.ASPECT_AUDITABLE))
        {
-            auditableProps = node.getAuditableProperties();
+            AuditablePropertiesEntity auditableProps = node.getAuditableProperties();
            if (auditableProps == null)
            {
                auditableProps = new AuditablePropertiesEntity();
@@ -1831,13 +1859,35 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
                // The behaviour is disabled, but no audit properties were passed in
                auditableProps = null;
            }
+            nodeUpdate.setAuditableProperties(auditableProps);
+            // We DON'T set the update flag because the update depends on the aspect being enabled, etc.
+            // nodeUpdate.setUpdateAuditableProperties(true);
        }
        
        // Remove cm:auditable
        newProps.keySet().removeAll(AuditablePropertiesEntity.getAuditablePropertyQNames());
+        
+        // Check if the sys:localized property is being changed
+        Long oldNodeLocaleId = node.getLocaleId();
+        Locale newLocale = DefaultTypeConverter.INSTANCE.convert(
+                Locale.class,
+                newProps.get(ContentModel.PROP_LOCALE));
+        if (newLocale != null)
+        {
+            Long newNodeLocaleId = localeDAO.getOrCreateLocalePair(newLocale).getFirst();
+            if (!newNodeLocaleId.equals(oldNodeLocaleId))
+            {
+                nodeUpdate.setLocaleId(newNodeLocaleId);
+                nodeUpdate.setUpdateLocaleId(true);
+            }
+        }
+        // else: a 'null' new locale is completely ignored.  This is the behaviour we choose.
+        
+        // Remove sys:localized
+        LocalizedPropertiesEntity.removeLocalizedProperties(node, newProps);
+
        // Remove sys:referenceable
        ReferenceablePropertiesEntity.removeReferenceableProperties(node, newProps);
-
        // Load the current properties.
        // This means that we have to go to the DB during cold-write operations,
        // but usually a write occurs after a node has been fetched of viewed in
@@ -1910,10 +1960,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
            }
        }
        
-        boolean updated = propsToDelete.size() > 0 || propsToAdd.size() > 0;
+        boolean modifyProps = propsToDelete.size() > 0 || propsToAdd.size() > 0;
+        boolean updated = modifyProps || nodeUpdate.isUpdateAnything();
        
        // Touch to bring into current txn
-        if (updated)
+        if (modifyProps)
        {
            // Clean up content properties
            try
@@ -1976,9 +2027,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
            setNodePropertiesCached(nodeId, propsToCache);
        }
        // Touch to bring into current transaction
-        if (updated || auditableProps != null)
+        if (updated)
        {
-            touchNodeImpl(nodeId, auditableProps);
+            updateNodeImpl(node, nodeUpdate);
        }
        
        // Done
@@ -1986,8 +2037,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        {
            logger.debug(
                    "Modified node properties: " + nodeId + "\n" +
-                    "   Removed: " + propsToDelete + "\n" +
-                    "   Added:   " + propsToAdd);
+                    "   Removed:     " + propsToDelete + "\n" +
+                    "   Added:       " + propsToAdd + "\n" +
+                    "   Node Update: " + nodeUpdate);
        }
        return updated;
    }
@@ -2030,6 +2082,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        {
            return false;         // sys:referenceable properties cannot be removed
        }
+        LocalizedPropertiesEntity.removeLocalizedProperties(propertyQNames);
+        if (propertyQNames.size() == 0)
+        {
+            return false;         // sys:localized properties cannot be removed
+        }
        Set<Long> qnameIds = qnameDAO.convertQNamesToIds(propertyQNames, false);
        int deleteCount = deleteNodeProperties(nodeId, qnameIds);

@@ -2126,6 +2183,8 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        Set<QName> nodeAspects = getNodeAspectsCached(nodeId);
        // Nodes are always referenceable
        nodeAspects.add(ContentModel.ASPECT_REFERENCEABLE);
+        // Nodes are always localized
+        nodeAspects.add(ContentModel.ASPECT_LOCALIZED);
        return nodeAspects;
    }

@@ -2136,6 +2195,11 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
            // Nodes are always referenceable
            return true;
        }
+        if (aspectQName.equals(ContentModel.ASPECT_LOCALIZED))
+        {
+            // Nodes are always localized
+            return true;
+        }
        Set<QName> nodeAspects = getNodeAspectsCached(nodeId);
        return nodeAspects.contains(aspectQName);
    }
@@ -2153,6 +2217,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        // Find out what needs adding
        aspectQNamesToAdd.removeAll(existingAspectQNames);
        aspectQNamesToAdd.remove(ContentModel.ASPECT_REFERENCEABLE);            // Implicit
+        aspectQNamesToAdd.remove(ContentModel.ASPECT_LOCALIZED);                // Implicit
        if (aspectQNamesToAdd.isEmpty())
        {
            // Nothing to do
@@ -2533,7 +2598,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
        // node into the current transaction for secondary associations
        if (!isPrimary)
        {
-            updateNode(childNodeId, null, null, null);
+            updateNode(childNodeId, null, null, null, null);
        }
        
        // Done