inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.4-BUG-FIX to HEAD

Browse Source 
28513: Merged DEV/SKYITALIA to V3.4-BUG-FIX
      26917: ALF-9145: AVM: fix "get store" (+ store not found)
         - if root node id is not found - remove from cache and throw concurrency failure (see also r26916)
         - add missing error info - report store name (if not found)
   28514: ALF-9145: Fixed merge issue
   28518: Fixed ALF-8511: Share - Property with prefix name with - can't be updated/found by Share
   28525: Merged DEV to V3.4-BUG-FIX
      28522: ALF-8197: Replication service fails to replicate Multilingual Containers
             1) Inject list of excluded aspects into ReplicationActionExecutor using replication-services-context.xml.
             2) Don't write value in XMLTransferManifestWriter.writeMLValue if it is null. 
   28534: Merged DEV/TEMPORARY to V3.4-BUG-FIX
      28533: ALF-9085: Share version numbers wrong when uploading initial change, initial Inline edit or adding versionable aspect.
         1. In ScriptNode.addAspect() if ContentModel.ASPECT_VERSIONABLE aspect added than call ensureVersioningEnabled(true, true) otherwise this.nodeService.addAspect (this.nodeRef, aspectQName, aspectProps)
         2. In VersionServiceImpl.ensureVersioningEnabled() the call of createVersion(nodeRef, null) is replaced on createVersion(nodeRef, Collections.<String,Serializable>singletonMap(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR));
   28536: Merged V3.4 to V3.4-BUG-FIX
      28246: ALF-3037: Fixed English in patch message
      28313: Latest L10N Updates from Gloria.
      28335: Removed translations of untranslated bundle!
      28364: Merged V3.4-TEAM to V3.4
         26978: Fixes: ALF-6107 - Fixes Tab order issues with Add event form.
      28387: Merged V3.4-BUG-FIX to V3.4
         28386: ALF-9100: Merged PATCHES/V3.4.1 to V3.4-BUG-FIX
            28249: ALF-8946: Avoid one full table scan per batch in full reindex
               - Now each batch scans a single time sample, dynamically adjusted based on the number of transactions in the previous sample, always aiming for 1000 transactions per sample.
      28421: ALF-9064: commas in "tinymce_languages=en,de,es,fr,it,ja" had been translated.
      28422: ALF-7882: security setting incorrect. FileFolderService.moveFrom arguments changed position, but not reflected in RM security file
      28496: ALF-2740 - File Types are not properly recognized by Alfresco
   28537: Merged V3.4 to V3.4-BUG-FIX (RECORD ONLY)
      28240: Merged V3.4-BUG-FIX to V3.4 (3.4.3)
      28535: Merged V3.4-BUG-FIX to V3.4
         28534: Merged DEV/TEMPORARY to V3.4-BUG-FIX
            28533: ALF-9085: Share version numbers wrong when uploading initial change, initial Inline edit or adding versionable aspect.
               1. In ScriptNode.addAspect() if ContentModel.ASPECT_VERSIONABLE aspect added than call ensureVersioningEnabled(true, true) otherwise this.nodeService.addAspect (this.nodeRef, aspectQName, aspectProps)
               2. In VersionServiceImpl.ensureVersioningEnabled() the call of createVersion(nodeRef, null) is replaced on createVersion(nodeRef, Collections.<String,Serializable>singletonMap(VersionModel.PROP_VERSION_TYPE, VersionType.MAJOR));
   28538: ALF-8589: Fixes "Message could not be displayed" errors with IMAP in Outlook Express
   - Corrected generation of subtypes


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28540 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2011-06-23 14:19:47 +00:00
parent 47b45d9ee1
commit 8d2485c755
24 changed files with 155 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
View File

@@ -50,6 +50,8 @@ import org.alfresco.repo.domain.avm.AVMNodeEntity;
import org.alfresco.repo.domain.avm.AVMVersionRootEntity;
import org.alfresco.repo.domain.permissions.Acl;
import org.alfresco.service.namespace.QName;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* iBATIS DAO wrapper for AVMNode
@@ -59,6 +61,8 @@ import org.alfresco.service.namespace.QName;
*/
class AVMNodeDAOIbatis implements AVMNodeDAO
{
private static Log logger = LogFactory.getLog(AVMNodeDAO.class);
/* (non-Javadoc)
* @see org.alfresco.repo.avm.AVMNodeDAO#save(org.alfresco.repo.avm.AVMNode)
*/
@@ -150,11 +154,19 @@ class AVMNodeDAOIbatis implements AVMNodeDAO
/* package */ AVMNode getRootNodeByID(AVMStore store, long rootNodeId)
{
AVMNodeEntity rootNodeEntity = AVMDAOs.Instance().newAVMNodeDAO.getNode(rootNodeId);
AVMNodeEntity rootNodeEntity = null;
if (rootNodeEntity == null)
try
{
return null;
rootNodeEntity = AVMDAOs.Instance().newAVMNodeDAO.getNode(rootNodeId);
}
catch (RuntimeException re)
{
if (logger.isWarnEnabled())
{
logger.warn("Root node ("+rootNodeId+") not found for store: "+store);
}
throw re;
}
AVMNode rootNode = null;

6
source/java/org/alfresco/repo/avm/ibatis/AVMStoreDAOIbatis.java
View File

@@ -29,6 +29,7 @@ import org.alfresco.repo.avm.AVMStoreImpl;
import org.alfresco.repo.avm.DirectoryNode;
import org.alfresco.repo.domain.avm.AVMStoreEntity;
import org.alfresco.repo.domain.permissions.Acl;
import org.alfresco.service.cmr.avm.AVMException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -145,17 +146,18 @@ class AVMStoreDAOIbatis implements AVMStoreDAO
{
logger.warn("Root node id is null for store: "+storeEntity);
}
return null;
throw new AVMException(storeEntity.toString());
}
DirectoryNode rootNode = (DirectoryNode) ((AVMNodeDAOIbatis)AVMDAOs.Instance().fAVMNodeDAO).getRootNodeByID(store, rootNodeId);
if (rootNode == null)
{
// belts-and-braces
if (logger.isWarnEnabled())
{
logger.warn("Root node ("+rootNodeId+") not found for store: "+storeEntity);
}
return null;
throw new AVMException(storeEntity.toString());
}
store.setRoot(rootNode);