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 BRANCHES/DEV/V4.1-BUG-FIX to HEAD

Browse Source 
43598: Merged HEAD to BRANCHES/DEV/V4.1-BUG-FIX *RECORD ONLY*
             41906: ALF-11378: REST API has been modified to return extra information about a user whether s/he belongs to a group or not.
   44003: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to BRANCHES/DEV/V4.1-BUG-FIX:
            ALF-15210: Inconsistency in the '?' icon over the dashlets projects\slingshot\source\web\js\share.js DashletTitleBarActions_onReady() function was updated. Fix initialize the style for actionsNode elements into the DOM for IE.
   44004: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_22 to V4.1-BUG-FIX:
            ALF-15793: edit offline hides version history projects\slingshot\source\web\components\document-details\document-actions.js onActionUploadNewVersion function was updated. Fix sets version variable correctly now using asset.workingCopy property instead asset.custom property, which is undefined.
   44018: ALF-16540 : CMIS: createDocument with VersioningState.CHECKEDOUT causes NodeLockedException for types with mandatory versionable aspect
            The ckeck for lock was disabled when beforeCreateVersion policy is handled.
            Version could be created for a locked node. 
   44054: Fix for ALF-16337. Datalist assignee not searchable by full name.
   44056: Trivial change. Fixing some compiler warnings under org.alfresco.repo.content.metadata including a noisy Tika one.
   44143: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_10_19 to BRANCHES/DEV/V4.1-BUG-FIX:
            42989: ALF-16331: Wrong user for "completed by" information provided in Group Review And Approve workflow
   44147: Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.1-BUG-FIX:
   44146: Merged BRANCHES/DEV/BELARUS/V3.4-BUG-FIX-2012_05_22 to BRANCHES/DEV/V3.4-BUG-FIX:
            37733: ALF-12051: Webdav - Cannot open files containing "?" character in the filename in WinXP
   44152: ALF-17009 : Merged V3.4-BUG-FIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
            44151: ALF-14035 Tiny HTML file that causes Jodconverter to launch a 100% CPU soffice instance
               - HTML to PDF is now done via ODT as the direct transform hangs if there are <sub> tags in the HTML.
               - Added in 'unsupportedTransformations' to stop a bare transformer.JodConverter from doing HTML to PDF 
               - TransformerDebug test file debugTransformers.txt no longer needs to be 18 bytes, as it made it too fiddly.
               - Modified debug from RuntimeExec so less editing is required to running from the command line
            - Removed tabs that had been added to enterprise/content-services-context.xml in 4.1-BUG-FIX
   44192: ALF-16560 - CIFS: Word document version history lost after saving content in Word:mac 2011 on Mac Mountain Lion
   44224: ALF-16896 Exception with TIKA meta data extractor.
            - Patch POI to handle parsing of Unicode properties that starts on a 4 byte boundary
              rather than the specified offset. Example file was created using http://www.aspose.com/
   44241: Merged DEV to V4.1-BUG-FIX
            44208: ALF-14591 : Ordering not supported for IMAP properties defining IMAP sort fields in Share
                   Make properties from imap:imapContent aspect indexable for SOLR. 
   44253: Merged BRANCHES/DEV/AMILLER/CLOUD1 to BRANCHES/DEV/V4.1-BUG-FIX:
            38927: CLOUD-128 - Update rules works incorrectly
          This is a partial fix for ALF-14568. The rest is coming in a separate check-in.
          I made some minor adjustments to this change - trivial spelling fix and whitespace changes.
   44257: ALF-16563 - CIFS: Image document version history lost after saving content in Preview on Mac Mountain Lion
   44260: Fix for ALF-16430 - List of values shown in alphabetical order in Share Forms. Values now only sorted if the Forms config 'field' element has the sorted='true' attribute.
   44269: Completion of fix for ALF-14568 - Update rule works incorrectly.
   44318: Fix for ALF-17055 - remoteadm webscript set a Last-Modified HTTP header whose date format does not conform to RFC 2616 hence breaking proxy caching
   44320: Fix for ALF-16463 - documentLibrary RSS feed does not pass the w3c validator, in particular pubDate breaks RFC-822, date not displayed when using non English locale
   44352: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX
            43860: ALF-16263: Search using a "Stop Word" not displaying any result

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-12-07 14:04:23 +00:00
parent 4f3f2ce521
commit f651abe34a
38 changed files with 1442 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/version/BaseVersionStoreTest.java
View File

@@ -35,6 +35,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.version.common.versionlabel.SerialVersionLabelPolicy;
import org.alfresco.service.cmr.coci.CheckOutCheckInService;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.ContentWriter;
@@ -66,6 +67,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
protected NodeArchiveService nodeArchiveService;
protected NodeService nodeService;
protected PermissionService permissionService;
protected CheckOutCheckInService checkOutCheckInService;
/*
* Data used by tests
@@ -155,6 +157,7 @@ public abstract class BaseVersionStoreTest extends BaseSpringTest
this.nodeArchiveService = (NodeArchiveService) applicationContext.getBean("nodeArchiveService");
this.nodeService = (NodeService)applicationContext.getBean("nodeService");
this.permissionService = (PermissionService)this.applicationContext.getBean("permissionService");
this.checkOutCheckInService = (CheckOutCheckInService) applicationContext.getBean("checkOutCheckInService");
setVersionService((VersionService)applicationContext.getBean("versionService"));

19
source/java/org/alfresco/repo/version/Version2ServiceImpl.java
View File

@@ -353,11 +353,20 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
// Create the version data object
Version version = getVersion(newVersionRef);
// Set the new version label on the 'live' (versioned) node
this.nodeService.setProperty(
nodeRef,
ContentModel.PROP_VERSION_LABEL,
version.getVersionLabel());
// Disabling behavior to be able to create properties for a locked node, see ALF-16540
policyBehaviourFilter.disableBehaviour(nodeRef, ContentModel.ASPECT_LOCKABLE);
try
{
// Set the new version label on the 'live' (versioned) node
this.nodeService.setProperty(
nodeRef,
ContentModel.PROP_VERSION_LABEL,
version.getVersionLabel());
}
finally
{
policyBehaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_LOCKABLE);
}
// Re-enable the auditable aspect (if we turned it off earlier)
policyBehaviourFilter.enableBehaviour(nodeRef, ContentModel.ASPECT_AUDITABLE);

30
source/java/org/alfresco/repo/version/VersionServiceImplTest.java
View File

@@ -2052,6 +2052,36 @@ public class VersionServiceImplTest extends BaseVersionStoreTest
assertEquals(USER_NAME_A, nodeService.getProperty(versioned, ContentModel.PROP_MODIFIER));
}
/*
* It should be possible to create a version for a locked node, see ALF-16540
*/
public void testVersionLockedNode()
{
transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<Object>()
{
public Object execute() throws Exception
{
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
// create versionable node and ensure it has the necessary aspect
NodeRef versionableNode = createNewVersionableNode();
assertEquals(true, nodeService.hasAspect(versionableNode, ContentModel.ASPECT_VERSIONABLE));
// add lockable aspect and write lock the node
dbNodeService.addAspect(versionableNode, ContentModel.ASPECT_LOCKABLE, new HashMap<QName, Serializable>());
assertEquals(true, nodeService.hasAspect(versionableNode, ContentModel.ASPECT_LOCKABLE));
checkOutCheckInService.checkout(versionableNode);
// try to create a version
createVersion(versionableNode);
VersionHistory vh = versionService.getVersionHistory(versionableNode);
assertEquals(1, vh.getAllVersions().size());
return null;
}
});
}
public static void main(String ... args)
{
try